diff --git a/erpnext/accounts/doctype/asset/asset.py b/erpnext/accounts/doctype/asset/asset.py
index 070461e..986beb7 100644
--- a/erpnext/accounts/doctype/asset/asset.py
+++ b/erpnext/accounts/doctype/asset/asset.py
@@ -19,7 +19,8 @@
 		self.validate_asset_values()
 		self.make_depreciation_schedule()
 		self.set_accumulated_depreciation()
-		self.validate_expected_value_after_useful_life()
+		if self.get("schedules"):
+			self.validate_expected_value_after_useful_life()
 		# Validate depreciation related accounts
 		get_depreciation_accounts(self)
 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index d42bcd5..8f9fe58 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -48,6 +48,8 @@
 		self.validate_transaction_reference()
 		self.set_title()
 		self.set_remarks()
+		self.validate_duplicate_entry()
+		self.validate_allocated_amount()
 		
 	def on_submit(self):
 		self.setup_party_account_field()
@@ -61,7 +63,22 @@
 		self.make_gl_entries(cancel=1)
 		self.update_advance_paid()
 		self.delink_advance_entry_references()
+
+	def validate_duplicate_entry(self):
+		reference_names = []
+		for d in self.get("references"):
+			if (d.reference_doctype, d.reference_name) in reference_names:
+				frappe.throw(_("Row #{0}: Duplicate entry in References {1} {2}").format(d.idx, d.reference_doctype, d.reference_name))
+			reference_names.append((d.reference_doctype, d.reference_name))
 	
+	
+	def validate_allocated_amount(self):
+		for d in self.get("references"):
+			if (flt(d.allocated_amount))> 0:
+				if flt(d.allocated_amount) > flt(d.outstanding_amount):
+					frappe.throw(_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx))
+
+
 	def delink_advance_entry_references(self):
 		for reference in self.references:
 			if reference.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 1f8aa1d..0e4edcc 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -324,7 +324,8 @@
 		}
 	}
 
-	item_fields_stock = ['serial_no', 'batch_no', 'actual_qty', 'expense_account', 'warehouse', 'expense_account', 'warehouse']
+	item_fields_stock = ['batch_no', 'actual_batch_qty', 'actual_qty', 'expense_account',
+		'warehouse', 'expense_account', 'quality_inspection']
 	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
 		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 4b1837d..6d88326 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -88,6 +88,8 @@
 		self.validate_c_form()
 		self.validate_time_sheets_are_submitted()
 		self.validate_multiple_billing("Delivery Note", "dn_detail", "amount", "items")
+		if not self.is_return:
+			self.validate_serial_numbers()
 		self.update_packing_list()
 		self.set_billing_hours_and_amount()
 		self.update_timesheet_billing_for_project()
@@ -125,6 +127,7 @@
 		if not self.is_return:
 			self.update_billing_status_for_zero_amount_refdoc("Sales Order")
 			self.check_credit_limit()
+			self.update_serial_no()
 
 		if not cint(self.is_pos) == 1 and not self.is_return:
 			self.update_against_document_in_jv()
@@ -155,6 +158,7 @@
 
 		if not self.is_return:
 			self.update_billing_status_for_zero_amount_refdoc("Sales Order")
+			self.update_serial_no(in_cancel=True)
 
 		self.validate_c_form_on_cancel()
 
@@ -781,6 +785,61 @@
 
 		self.due_date = None
 
+	def update_serial_no(self, in_cancel=False):
+		""" update Sales Invoice refrence in Serial No """
+
+		for item in self.items:
+			if not item.serial_no:
+				continue
+
+			serial_nos = ["'%s'"%serial_no for serial_no in item.serial_no.split("\n")]
+
+			frappe.db.sql(""" update `tabSerial No` set sales_invoice='{invoice}'
+				where name in ({serial_nos})""".format(
+					invoice='' if in_cancel else self.name,
+					serial_nos=",".join(serial_nos)
+				)
+			)
+
+	def validate_serial_numbers(self):
+		"""
+			validate serial number agains Delivery Note and Sales Invoice
+		"""
+		self.validate_serial_against_delivery_note()
+		self.validate_serial_against_sales_invoice()
+
+	def validate_serial_against_delivery_note(self):
+		""" 
+			validate if the serial numbers in Sales Invoice Items are same as in
+			Delivery Note Item
+		"""
+
+		for item in self.items:
+			if not item.delivery_note or not item.dn_detail:
+				continue
+
+			serial_nos = frappe.db.get_value("Delivery Note Item", item.dn_detail, "serial_no") or ""
+			dn_serial_nos = set(serial_nos.split("\n"))
+
+			serial_nos = item.serial_no or ""
+			si_serial_nos = set(serial_nos.split("\n"))
+
+			if si_serial_nos - dn_serial_nos:
+				frappe.throw(_("Serial Numbers in row {0} does not match with Delivery Note".format(item.idx)))
+
+	def validate_serial_against_sales_invoice(self):
+		""" check if serial number is already used in other sales invoice """
+		for item in self.items:
+			if not item.serial_no:
+				continue
+
+			for serial_no in item.serial_no.split("\n"):
+				sales_invoice = frappe.db.get_value("Serial No", serial_no, "sales_invoice")
+				if sales_invoice and self.name != sales_invoice:
+					frappe.throw(_("Serial Number: {0} is already referenced in Sales Invoice: {1}".format(
+						serial_no, sales_invoice
+					)))
+
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 0ada847..8335879 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -737,6 +737,12 @@
 		self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0], "warehouse"))
 		self.assertEquals(frappe.db.get_value("Serial No", serial_nos[0],
 			"delivery_document_no"), si.name)
+		self.assertEquals(frappe.db.get_value("Serial No", serial_nos[0], "sales_invoice"),
+			si.name)
+
+		# check if the serial number is already linked with any other Sales Invoice
+		_si = frappe.copy_doc(si.as_dict())
+		self.assertRaises(frappe.ValidationError, _si.insert)
 
 		return si
 
@@ -750,6 +756,7 @@
 		self.assertEquals(frappe.db.get_value("Serial No", serial_nos[0], "warehouse"), "_Test Warehouse - _TC")
 		self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0],
 			"delivery_document_no"))
+		self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0], "sales_invoice"))
 
 	def test_serialize_status(self):
 		serial_no = frappe.get_doc({
@@ -768,6 +775,27 @@
 
 		self.assertRaises(SerialNoWarehouseError, si.submit)
 
+	def test_serial_numbers_against_delivery_note(self):
+		""" 
+			check if the sales invoice item serial numbers and the delivery note items
+			serial numbers are same
+		"""
+		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
+		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+		from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
+		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+		se = make_serialized_item()
+		serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+
+		dn = create_delivery_note(item=se.get("items")[0].item_code, serial_no=serial_nos[0])
+		dn.submit()
+
+		si = make_sales_invoice(dn.name)
+		si.save()
+
+		self.assertEquals(si.get("items")[0].serial_no, dn.get("items")[0].serial_no)
+
 	def test_invoice_due_date_against_customers_credit_days(self):
 		# set customer's credit days
 		frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Fixed Days")
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 223e915..dc524e1 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -398,7 +398,7 @@
 		this.make_item_list();
 		this.make_discount_field()
 	},
-	
+
 	make_control: function() {
 		this.frm = {}
 		this.frm.doc = this.doc
@@ -543,7 +543,7 @@
 			me.toggle_totals_area();
 		});
 	},
-	
+
 	bind_numeric_keypad: function() {
 		var me = this;
 		$(this.numeric_keypad).find('.pos-operation').on('click', function(){
@@ -572,7 +572,7 @@
 				me.selected_field.closest('.pos-list-row').addClass('active');
 			}
 		})
-		
+
 		$(this.numeric_keypad).find('.numeric-del').click(function(){
 			me.selected_field = $(me.wrapper).find('.selected-item').find('.' + me.numeric_id)
 			me.numeric_val = cstr(flt(me.selected_field.val())).slice(0, -1);
@@ -580,7 +580,7 @@
 			me.selected_field.trigger("change")
 			// me.render_selected_item()
 		})
-		
+
 		$(this.numeric_keypad).find('.pos-pay').click(function(){
 			me.validate();
 			me.update_paid_amount_status(true);
@@ -988,7 +988,7 @@
 					})).tooltip().appendTo($wrap);
 				}
 			});
-			
+
 			$wrap.append(`
 				<div class="image-view-item btn-more text-muted text-center">
 					<div class="image-view-body">
@@ -1070,7 +1070,7 @@
 			});
 		}
 	},
-	
+
 	bind_items_event: function() {
 		var me = this;
 		$(this.wrapper).on('click', '.pos-bill-item', function() {
@@ -1107,7 +1107,7 @@
 			var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) - 1;
 			me.update_qty(item_code, qty)
 		})
-		
+
 		$(this.wrapper).on("change", ".pos-item-disc", function () {
 			var item_code = $(this).parents(".pos-selected-item-action").attr("data-item-code");
 			var discount = $(this).val();
@@ -1763,10 +1763,14 @@
 	mandatory_batch_no: function () {
 		var me = this;
 		if (this.items[0].has_batch_no && !this.item_batch_no[this.items[0].item_code]) {
-			frappe.throw(__(repl("Error: Batch no is mandatory for item %(item)s", {
-				'item': this.items[0].item_code
-			})))
-		}
+			frappe.prompt([
+				{'fieldname': 'batch', 'fieldtype': 'Select', 'label': __('Batch No'), 'reqd': 1, 'options':this.batch_no_data[this.items[0].item_code]}
+				],
+				function(values){
+					me.item_batch_no[me.items[0].item_code] = values.batch;
+				},
+				__('Select Batch No'))
+			}
 	},
 
 	apply_pricing_rule: function () {
@@ -1788,7 +1792,7 @@
 				item.pricing_rule = null;
 				me.apply_pricing_rule_on_item(item)
 			}
-			
+
 			if(item.discount_percentage > 0) {
 				me.apply_pricing_rule_on_item(item)
 			}
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index ccbb536..aafc128 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import (cstr, validate_email_add, cint, comma_and, has_gravatar, now)
+from frappe.utils import (cstr, validate_email_add, cint, comma_and, has_gravatar, now, getdate, nowdate)
 from frappe.model.mapper import get_mapped_doc
 
 from erpnext.controllers.selling_controller import SellingController
@@ -46,7 +46,7 @@
 			if self.is_new() or not self.image:
 				self.image = has_gravatar(self.email_id)
 
-		if self.contact_date and self.contact_date < now():
+		if self.contact_date and getdate(self.contact_date) < getdate(nowdate()):
 			frappe.throw(_("Next Contact Date cannot be in the past"))
 
 	def on_update(self):
diff --git a/erpnext/demo/data/assessment_criteria.json b/erpnext/demo/data/assessment_criteria.json
new file mode 100644
index 0000000..8295682
--- /dev/null
+++ b/erpnext/demo/data/assessment_criteria.json
@@ -0,0 +1,18 @@
+[
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Aptitude"
+	},
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Application"
+	},
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Understanding"
+	},
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Knowledge"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/grading_scale.json b/erpnext/demo/data/grading_scale.json
new file mode 100644
index 0000000..0760919
--- /dev/null
+++ b/erpnext/demo/data/grading_scale.json
@@ -0,0 +1,17 @@
+[
+	{
+		"doctype": "Grading Scale",
+		"grading_scale_name": "Standard Grading",
+		"description": "Standard Grading Scale",
+		"intervals": [
+			{"threshold": 100.0, "grade_code": "A", "grade_description": "Excellent"},
+			{"threshold": 89.9, "grade_code": "B+", "grade_description": "Close to Excellence"},
+			{"threshold": 80.0, "grade_code": "B", "grade_description": "Good"},
+			{"threshold": 69.9, "grade_code": "C+", "grade_description": "Almost Good"},
+			{"threshold": 60.0, "grade_code": "C", "grade_description": "Average"},
+			{"threshold": 50.0, "grade_code": "D+", "grade_description": "Have to Work"},
+			{"threshold": 40.0, "grade_code": "D", "grade_description": "Not met Baseline Expectations"},
+			{"threshold": 0.0, "grade_code": "F", "grade_description": "Have to work a lot"}
+		]
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/item_schools.json b/erpnext/demo/data/item_schools.json
index 5eb6082..077fcaa 100644
--- a/erpnext/demo/data/item_schools.json
+++ b/erpnext/demo/data/item_schools.json
@@ -57,6 +57,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "Computer",
   "item_code": "Computer",
   "item_name": "Computer",
@@ -64,6 +65,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "Mobile",
   "item_code": "Mobile",
   "item_name": "Mobile",
@@ -71,6 +73,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "ERP",
   "item_code": "ERP",
   "item_name": "ERP",
@@ -78,6 +81,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "Autocad",
   "item_code": "Autocad",
   "item_name": "Autocad",
@@ -85,6 +89,7 @@
  },
  {
   "default_warehouse": "Stores",
+  "default_warehouse": "Stores",
   "item_code": "Service",
   "item_group": "Services",
   "item_name": "Service",
diff --git a/erpnext/demo/data/program.json b/erpnext/demo/data/program.json
index 8638311..9c2ec77 100644
--- a/erpnext/demo/data/program.json
+++ b/erpnext/demo/data/program.json
@@ -1,102 +1,46 @@
 [
 	{
 		"doctype": "Program",
+		"name": "MCA",
 		"program_name": "Masters of Computer Applications",
 		"program_code": "MCA",
 		"department": "Information Technology",
 		"courses": [
-			{
-				"course": "Microprocessor",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Probability and Statistics",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Programing in Java",
-				"academic_term": "Semester 2"
-			}
+			{ "course": "MCA4010" },
+			{ "course": "MCA4020" },
+			{ "course": "MCA4030" }
 		]
 	},
 	{
 		"doctype": "Program",
+		"name": "BCA",
 		"program_name": "Bachelor of Computer Applications",
 		"program_code": "BCA",
 		"department": "Information Technology",
 		"courses": [
-			{
-				"course": "Communication Skiils",
-				"academic_term": "Semester 3"
-			},
-			{
-				"course": "Object Oriented Programing - C++",
-				"academic_term": "Semester 3"
-			},
-			{
-				"course": "Basic Mathematics",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Data Structures and Algorithm",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Digital Logic",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Fundamentals of IT & Programing",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Operating System",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Programing in C",
-				"academic_term": "Semester 1"
-			}
+			{ "course": "BCA2030" },
+			{ "course": "BCA1030" },
+			{ "course": "BCA2020" },
+			{ "course": "BCA1040" },
+			{ "course": "BCA1010" },
+			{ "course": "BCA2010" },
+			{ "course": "BCA1020" }
 		]
 	},
 	{
 		"doctype": "Program",
+		"name": "BBA",
 		"program_name": "Bachelor of Business Administration",
 		"program_code": "BBA",
 		"department": "Management Studies",
 		"courses": [
-			{
-				"course": "Organizational Behavior",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Management Development and Skills",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Legal and Regulatory Framework",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Human Resource Management",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Entrepreneurship Management",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Communication Skills",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Business Environment",
-				"academic_term": "Semester 3"
-			},
-			{
-				"course": "Advertising and Sales",
-				"academic_term": "Semester 3"
-			}
+			{ "course": "BBA 101" },
+			{ "course": "BBA 102" },
+			{ "course": "BBA 103" },
+			{ "course": "BBA 301" },
+			{ "course": "BBA 302" },
+			{ "course": "BBA 304" },
+			{ "course": "BBA 505" }
 		]
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/demo/data/student_batch_name.json b/erpnext/demo/data/student_batch_name.json
new file mode 100644
index 0000000..ef3f18d
--- /dev/null
+++ b/erpnext/demo/data/student_batch_name.json
@@ -0,0 +1,10 @@
+[
+	{
+		"doctype": "Student Batch Name",
+		"batch_name": "Section-A"
+	},
+	{
+		"doctype": "Student Batch Name",
+		"batch_name": "Section-B"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
index aeaa1f0..a270e05 100644
--- a/erpnext/demo/demo.py
+++ b/erpnext/demo/demo.py
@@ -35,6 +35,7 @@
 	frappe.destroy()
 	frappe.init(site)
 	frappe.connect()
+
 	simulate(domain)
 
 def simulate(domain='Manufacturing'):
@@ -73,7 +74,7 @@
 			stock.work()
 			accounts.work()
 			projects.run_projects(current_date)
-			#run_messages()
+			# run_messages()
 
 			if domain=='Manufacturing':
 				sales.work()
diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py
index b164057..a124ee7 100644
--- a/erpnext/demo/setup/education.py
+++ b/erpnext/demo/setup/education.py
@@ -15,6 +15,7 @@
 	make_student_group()
 	make_fees_category()
 	make_fees_structure()
+	make_assessment_groups()
 	frappe.db.commit()
 	frappe.clear_cache()
 
@@ -24,6 +25,9 @@
 	import_json("Instructor")
 	import_json("Course")
 	import_json("Program")
+	import_json("Student Batch Name")
+	import_json("Assessment Criteria")
+	import_json("Grading Scale")
 	frappe.db.commit()
 
 def setup_item():
@@ -81,13 +85,24 @@
 			count+=1
 
 def make_student_group():
-	for d in frappe.db.get_list("Academic Term"):
-		sg_tool = frappe.new_doc("Student Group Creation Tool")
-		sg_tool.academic_year = "2016-17"
-		sg_tool.academic_term = d.name
-		sg_tool.courses = sg_tool.get_courses()
-		sg_tool.create_student_groups()
-		frappe.db.commit()
+	for term in frappe.db.get_list("Academic Term"):
+		for program in frappe.db.get_list("Program"):
+			sg_tool = frappe.new_doc("Student Group Creation Tool")
+			sg_tool.academic_year = "2017-18"
+			sg_tool.academic_term = term.name
+			sg_tool.program = program.name
+			for d in sg_tool.get_courses():
+				d = frappe._dict(d)
+				student_group = frappe.new_doc("Student Group")
+				student_group.student_group_name = d.student_group_name
+				student_group.group_based_on = d.group_based_on
+				student_group.program = program.name
+				student_group.course = d.course
+				student_group.batch = d.batch
+				student_group.academic_term = term.name
+				student_group.academic_year = "2017-18"
+				student_group.save()
+			frappe.db.commit()
 
 def make_fees_category():
 	fee_type = ["Tuition Fee", "Hostel Fee", "Logistics Fee",
@@ -111,7 +126,7 @@
 def make_fees_structure():
 	for d in frappe.db.get_list("Program"):
 		program = frappe.get_doc("Program", d.name)
-		for academic_term in ["Semester 1", "Semester 2", "Semester 3"]:
+		for academic_term in ["2017-18 (Semester 1)", "2017-18 (Semester 2)", "2017-18 (Semester 3)"]:
 			fee_structure = frappe.new_doc("Fee Structure")
 			fee_structure.program = d.name
 			fee_structure.academic_term = random.choice(frappe.db.get_list("Academic Term")).name
@@ -123,6 +138,27 @@
 		program.save()
 	frappe.db.commit()
 
+def make_assessment_groups():
+	for year in frappe.db.get_list("Academic Year"):
+		ag = frappe.new_doc('Assessment Group')
+		ag.assessment_group_name = year.name
+		ag.parent_assessment_group = "All Assessment Groups"
+		ag.is_group = 1
+		ag.insert()
+		for term in frappe.db.get_list("Academic Term", filters = {"academic_year": year.name}):
+			ag1 = frappe.new_doc('Assessment Group')
+			ag1.assessment_group_name = term.name
+			ag1.parent_assessment_group = ag.name
+			ag1.is_group = 1
+			ag1.insert()
+			for assessment_group in ['Term I', 'Term II']:
+				ag2 = frappe.new_doc('Assessment Group')
+				ag2.assessment_group_name = ag1.name + " " + assessment_group
+				ag2.parent_assessment_group = ag1.name
+				ag2.insert()
+	frappe.db.commit()
+
+
 def get_json_path(doctype):
 		return frappe.get_app_path('erpnext', 'demo', 'data', frappe.scrub(doctype) + '.json')
 		
diff --git a/erpnext/demo/user/schools.py b/erpnext/demo/user/schools.py
index 6388f9a..422c31a 100644
--- a/erpnext/demo/user/schools.py
+++ b/erpnext/demo/user/schools.py
@@ -8,30 +8,22 @@
 from frappe.utils import cstr
 from frappe.utils.make_random import get_random
 from datetime import timedelta
-from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, get_fee_schedule, collect_fees
+from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, \
+								get_fee_schedule, collect_fees, get_course
+from erpnext.schools.doctype.program_enrollment.program_enrollment import get_program_courses
+from erpnext.schools.doctype.student_group.student_group import get_students
 
 def work():
 	frappe.set_user(frappe.db.get_global('demo_schools_user'))
 	for d in xrange(20):
 		approve_random_student_applicant()
 		enroll_random_student(frappe.flags.current_date)
-	if frappe.flags.current_date.weekday()== 0:
-		make_course_schedule(frappe.flags.current_date, frappe.utils.add_days(frappe.flags.current_date, 5))	
+	# if frappe.flags.current_date.weekday()== 0:
+	# 	make_course_schedule(frappe.flags.current_date, frappe.utils.add_days(frappe.flags.current_date, 5))	
 	mark_student_attendance(frappe.flags.current_date)
+	# make_assessment_plan()
 	make_fees()
 
-def mark_student_attendance(current_date):
-	status = ["Present", "Absent"]
-	for d in frappe.db.get_list("Course Schedule", filters={"schedule_date": current_date}, fields=("name", "student_group")):
-		students = get_student_group_students(d.student_group)
-		for stud in students:
-			make_attendance_records(stud.student, stud.student_name, d.name, status[weighted_choice([9,4])])
-			
-def make_fees():
-	for d in range(1,10):
-		random_fee = get_random("Fees", {"paid_amount": 0})
-		collect_fees(random_fee, frappe.db.get_value("Fees", random_fee, "outstanding_amount"))
-	
 def approve_random_student_applicant():
 	random_student = get_random("Student Applicant", {"application_status": "Applied"})
 	if random_student:
@@ -39,31 +31,59 @@
 		frappe.db.set_value("Student Applicant", random_student, "application_status", status[weighted_choice([9,3])])
 
 def enroll_random_student(current_date):
+	batch = ["Section-A", "Section-B"]
 	random_student = get_random("Student Applicant", {"application_status": "Approved"})
 	if random_student:
 		enrollment = enroll_student(random_student)
 		enrollment.academic_year = get_random("Academic Year")
 		enrollment.enrollment_date = current_date
+		enrollment.student_batch_name = batch[weighted_choice([9,3])]
 		fee_schedule = get_fee_schedule(enrollment.program)
 		for fee in fee_schedule:
 			enrollment.append("fees", fee)
+		enrolled_courses = get_course(enrollment.program)
+		for course in enrolled_courses:
+			enrollment.append("courses", course)
 		enrollment.submit()
 		frappe.db.commit()
-		assign_student_group(enrollment.student, enrollment.program)
+		assign_student_group(enrollment.student, enrollment.student_name, enrollment.program,
+			enrolled_courses, enrollment.student_batch_name)
 		
-def assign_student_group(student, program):
-	courses = []
-	for d in frappe.get_list("Program Course", fields=("course"), filters={"parent": program }):
-		courses.append(d.course)
+def assign_student_group(student, student_name, program, courses, batch):
+	course_list = [d["course"] for d in courses]
+	for d in frappe.get_list("Student Group", fields=("name"), filters={"program": program, "course":("in", course_list)}):
+		student_group = frappe.get_doc("Student Group", d.name)
+		student_group.append("students", {"student": student, "student_name": student_name,
+			"group_roll_number":len(student_group.students)+1, "active":1})
+		student_group.save()
+	student_batch = frappe.get_list("Student Group", fields=("name"), filters={"program": program, "group_based_on":"Batch", "batch":batch})[0]
+	student_batch_doc = frappe.get_doc("Student Group", student_batch.name)
+	student_batch_doc.append("students", {"student": student, "student_name": student_name,
+		"group_roll_number":len(student_batch_doc.students)+1, "active":1})
+	student_batch_doc.save()
+	frappe.db.commit()
 
-	for d in xrange(3):
-		course = random.choice(courses)
-		random_sg = get_random("Student Group", {"course": course})
-		if random_sg:
-			student_group = frappe.get_doc("Student Group", random_sg)
-			student_group.append("students", {"student": student})
-			student_group.save()
-		courses.remove(course)
+def mark_student_attendance(current_date):
+	status = ["Present", "Absent"]
+	for d in frappe.db.get_list("Student Group", filters={"group_based_on": "Batch"}):
+		students = get_student_group_students(d.name)
+		for stud in students:
+			make_attendance_records(stud.student, stud.student_name, status[weighted_choice([9,4])], None, d.name, current_date)
+			
+def make_fees():
+	for d in range(1,10):
+		random_fee = get_random("Fees", {"paid_amount": 0})
+		collect_fees(random_fee, frappe.db.get_value("Fees", random_fee, "outstanding_amount"))	
+
+def make_assessment_plan(date):
+	for d in range(1,4):
+		random_group = get_random("Student Group", {"group_based_on": "Course"}, True)
+		doc = frappe.new_doc("Assessment Plan")
+		doc.student_group = random_group.name
+		doc.course = random_group.course
+		doc.assessment_group = get_random("Assessment Group", {"is_group": 0, "parent": "2017-18 (Semester 2)"})
+		doc.grading_scale = get_random("Grading Scale")
+		doc.maximum_assessment_score = 100
 		
 def make_course_schedule(start_date, end_date):
 	for d in frappe.db.get_list("Student Group"):
diff --git a/erpnext/docs/assets/img/setup/users/user-login-email.png b/erpnext/docs/assets/img/setup/users/user-login-email.png
new file mode 100644
index 0000000..71050af
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-login-email.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/users/user-login-mobile.png b/erpnext/docs/assets/img/setup/users/user-login-mobile.png
new file mode 100644
index 0000000..1d7af14
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-login-mobile.png
Binary files differ
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
index 053b4f1..b436b46 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
@@ -2,6 +2,8 @@
 
 You can localize ERPNext to use particular timezone, date, number or currency format and also set global session expiry via System Settings.
 
+By checking the 'Allow Login using Mobile Number' checkbox, you can login to ERPNext using a valid mobile number set in your User account. 
+
 To open System Settings, go to:
 
 > Setup > Settings > System Settings
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
index 517c674..6fb64df 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -20,7 +20,10 @@
 
 Add user details such as First Name, Last Name, Email etc.
 
-The user's Email will become the user id.
+The user's Email will become the user id. Mobile No can also be used to log in if you check the Allow Login using Mobile No checkbox under the Security section in System Settings. While Mobile No will be unique, it will not be treated as a user id.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-login-email.png" alt="Email Login">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-login-mobile.png" alt="Mobile No Login">
 
 After adding these details, save the user.
 
diff --git a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
index 9344870..fc5ef00 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
@@ -24,5 +24,3 @@
   * **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
 
 > New Value X2 = (X * Y + X1 * Y1) / (Y + Y1)
-
-{next}
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 36e375d..fa3bcf5 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -66,8 +66,7 @@
 				parent=%s""", (d.sales_person, d.item_code, self.name), as_dict=1)
 
 			for key in scheduled_date:
-				description = frappe._("Reference: %s, Item Code: %s and Customer: %s") % \
-					(self.name, d.item_code, self.customer)
+				description =frappe._("Reference: {0}, Item Code: {1} and Customer: {2}").format(self.name, d.item_code, self.customer)	
 				frappe.get_doc({
 					"doctype": "Event",
 					"owner": email_map.get(d.sales_person, self.owner),
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index c42403c..7dc6f2c 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -1586,7 +1586,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-10 12:13:59.630780", 
+ "modified": "2017-05-20 13:10:59.630780", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM", 
@@ -1595,26 +1595,6 @@
   {
    "amend": 0, 
    "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -1662,4 +1642,4 @@
  "sort_order": "DESC", 
  "track_changes": 1, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 853efa1..fef0872 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -396,4 +396,5 @@
 erpnext.patches.v8_0.rename_total_margin_to_rate_with_margin # 11-05-2017
 erpnext.patches.v8_0.fix_status_for_invoices_with_negative_outstanding
 erpnext.patches.v8_0.make_payments_table_blank_for_non_pos_invoice
+erpnext.patches.v8_0.set_sales_invoice_serial_number_from_delivery_note
 erpnext.patches.v8_0.delete_schools_depricated_doctypes
diff --git a/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py b/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py
new file mode 100644
index 0000000..2ae74cd
--- /dev/null
+++ b/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py
@@ -0,0 +1,42 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
+
+def execute():
+	""" Set the Serial Numbers in Sales Invoice Item from Delivery Note Item """
+
+	frappe.reload_doc("stock", "doctype", "serial_no")
+
+	frappe.db.sql(""" update `tabSales Invoice Item` sii inner join 
+		`tabDelivery Note Item` dni on sii.dn_detail=dni.name and  sii.qty=dni.qty
+		set sii.serial_no=dni.serial_no where sii.parent IN (select si.name 
+			from `tabSales Invoice` si where si.update_stock=0 and si.docstatus=1)""")
+
+	items = frappe.db.sql(""" select  sii.parent, sii.serial_no from  `tabSales Invoice Item` sii
+		left join `tabSales Invoice` si on sii.parent=si.name
+		where si.docstatus=1 and si.update_stock=0""", as_dict=True)
+
+	for item in items:
+		sales_invoice = item.get("parent", None)
+		serial_nos = item.get("serial_no", "")
+
+		if not sales_invoice or not serial_nos:
+			continue
+
+		serial_nos = ["'%s'"%no for no in serial_nos.split("\n")]
+
+		frappe.db.sql("""
+			UPDATE 
+				`tabSerial No`
+			SET 
+				sales_invoice='{sales_invoice}'
+			WHERE
+				name in ({serial_nos})
+			""".format(
+				sales_invoice=sales_invoice,
+				serial_nos=",".join(serial_nos)
+			)
+		)
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index f9485e9..e4ab5a7 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "TASK.#####", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -73,6 +76,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,6 +107,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -134,6 +139,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -165,6 +171,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -193,6 +200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -223,6 +231,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -255,6 +264,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -284,6 +294,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -312,6 +323,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -342,6 +354,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -371,6 +384,37 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_milestone", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Is Milestone", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -400,6 +444,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -432,6 +477,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -461,6 +507,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -491,6 +538,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -520,6 +568,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -552,6 +601,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -582,6 +632,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -614,6 +665,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -642,6 +694,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -672,6 +725,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -700,6 +754,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -731,6 +786,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -761,6 +817,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -789,6 +846,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -818,6 +876,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -846,6 +905,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -877,6 +937,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -908,6 +969,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -935,6 +997,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -964,19 +1027,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-check", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2017-02-24 01:47:05.438887", 
+ "modified": "2017-05-23 11:28:28.161600", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 66daf0d..1eeb896 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -48,15 +48,15 @@
 		report.page.add_inner_button(__("Balance Sheet"), function() {
 			var filters = report.get_values();
 			frappe.set_route('query-report', 'Balance Sheet', {company: filters.company});
-		}, 'Financial Statements');
+		}, __('Financial Statements'));
 		report.page.add_inner_button(__("Profit and Loss"), function() {
 			var filters = report.get_values();
 			frappe.set_route('query-report', 'Profit and Loss Statement', {company: filters.company});
-		}, 'Financial Statements');
+		}, __('Financial Statements'));
 		report.page.add_inner_button(__("Cash Flow Statement"), function() {
 			var filters = report.get_values();
 			frappe.set_route('query-report', 'Cash Flow', {company: filters.company});
-		}, 'Financial Statements');
+		}, __('Financial Statements'));
 	}
 };
 
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
index 43d2438..db65a69 100644
--- a/erpnext/schools/api.py
+++ b/erpnext/schools/api.py
@@ -10,6 +10,14 @@
 from frappe.utils import flt, cstr
 from frappe.email.doctype.email_group.email_group import add_subscribers
 
+def get_course(program):
+	'''Return list of courses for a particular program
+	:param program: Program
+	'''
+	courses = frappe.db.sql('''select course, course_name from `tabProgram Course` where parent=%s''',
+			(program), as_dict=1)
+	return courses
+
 @frappe.whitelist()
 def enroll_student(source_name):
 	"""Creates a Student Record and returns a Program Enrollment.
diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/schools/doctype/course/course.js
index f84c59f..c667eca 100644
--- a/erpnext/schools/doctype/course/course.js
+++ b/erpnext/schools/doctype/course/course.js
@@ -1,18 +1,30 @@
 frappe.ui.form.on("Course", "refresh", function(frm) {
 	if(!cur_frm.doc.__islocal) {
 		frm.add_custom_button(__("Program"), function() {
+			frappe.route_options = {
+				"Program Course.course": frm.doc.name
+			}
 			frappe.set_route("List", "Program");
 		});
 		
 		frm.add_custom_button(__("Student Group"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
 			frappe.set_route("List", "Student Group");
 		});
 		
 		frm.add_custom_button(__("Course Schedule"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
 			frappe.set_route("List", "Course Schedule");
 		});
 		
 		frm.add_custom_button(__("Assessment Plan"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
 			frappe.set_route("List", "Assessment Plan");
 		});
 	}
diff --git a/erpnext/schools/doctype/program/program.js b/erpnext/schools/doctype/program/program.js
index cc09d0e..5146a19 100644
--- a/erpnext/schools/doctype/program/program.js
+++ b/erpnext/schools/doctype/program/program.js
@@ -6,22 +6,37 @@
 frappe.ui.form.on("Program", "refresh", function(frm) {
 	if(!frm.doc.__islocal) {
 		frm.add_custom_button(__("Student Applicant"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Student Applicant");
 		});
 		
 		frm.add_custom_button(__("Program Enrollment"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Program Enrollment");
 		});
 		
 		frm.add_custom_button(__("Student Group"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Student Group");
 		});
 		
 		frm.add_custom_button(__("Fee Structure"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Fee Structure");
 		});
 		
 		frm.add_custom_button(__("Fees"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Fees");
 		});
 	}
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
index 6f8c6cd..11a79e1 100644
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
@@ -4,6 +4,12 @@
 
 frappe.ui.form.on('Student Attendance Tool', {
 	refresh: function(frm) {
+		if (frappe.route_options) {
+			frm.set_value("based_on", frappe.route_options.based_on);
+			frm.set_value("student_group", frappe.route_options.student_group);
+			frm.set_value("course_schedule", frappe.route_options.course_schedule);
+			frappe.route_options = null;
+		}
 		frm.disable_save();
 	},
 
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
index ed94690..83fe094 100644
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -13,11 +13,23 @@
 
 	refresh: function(frm) {
 		if (!frm.doc.__islocal) {
+			frm.add_custom_button(__("Attendance"), function() {
+				frappe.route_options = {
+					based_on: "Student Group",
+					student_group: frm.doc.name
+				}
+				frappe.set_route("List", "Student Attendance Tool");
+			});
 			frm.add_custom_button(__("Course Schedule"), function() {
+				frappe.route_options = {
+					student_group: frm.doc.name
+				}
 				frappe.set_route("List", "Course Schedule");
 			});
-
 			frm.add_custom_button(__("Assessment Plan"), function() {
+				frappe.route_options = {
+					student_group: frm.doc.name
+				}
 				frappe.set_route("List", "Assessment Plan");
 			});
 			frm.add_custom_button(__("Update Email Group"), function() {
@@ -30,6 +42,9 @@
 				});
 			});
 			frm.add_custom_button(__("Newsletter"), function() {
+				frappe.route_options = {
+					"Newsletter Email Group.email_group": frm.doc.name
+				}
 				frappe.set_route("List", "Newsletter");
 			});
 		}
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index b66fd4d..8c19db5 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -58,7 +58,7 @@
 				if msg_for_this_receipient:
 					frappe.sendmail(
 						recipients=user_id,
-						subject="{frequency} Digest".format(frequency=self.frequency),
+						subject=_("{frequency} Digest").format(frequency=self.frequency),
 						message=msg_for_this_receipient,
 						reference_doctype = self.doctype,
 						reference_name = self.name,
@@ -77,7 +77,7 @@
 		self.set_title(context)
 		self.set_style(context)
 		self.set_accounting_cards(context)
-		
+
 		if self.get("calendar_events"):
 			context.events, context.event_count = self.get_calendar_events()
 		if self.get("todo_list"):
@@ -146,7 +146,7 @@
 		from frappe.desk.doctype.event.event import get_events
 		events = get_events(self.future_from_date.strftime("%Y-%m-%d"),
 			self.future_to_date.strftime("%Y-%m-%d")) or []
-		
+
 		event_count = 0
 		for i, e in enumerate(events):
 			e.starts_on_label = format_time(e.starts_on)
@@ -171,13 +171,13 @@
 			t.link = get_url_to_form("ToDo", t.name)
 
 		return todo_list
-	
+
 	def get_todo_count(self, user_id=None):
 		"""Get count of Todo"""
 		if not user_id:
 			user_id = frappe.session.user
 
-		return frappe.db.sql("""select count(*) from `tabToDo` 
+		return frappe.db.sql("""select count(*) from `tabToDo`
 			where status='Open' and (owner=%s or assigned_by=%s)""",
 			(user_id, user_id))[0][0]
 
@@ -185,7 +185,7 @@
 		"""Get issue list"""
 		if not user_id:
 			user_id = frappe.session.user
-		
+
 		meta = frappe.get_meta("Issue")
 		role_permissions = frappe.permissions.get_role_permissions(meta, user_id)
 		if not role_permissions.get("read"):
@@ -199,7 +199,7 @@
 			t.link = get_url_to_form("Issue", t.name)
 
 		return issue_list
-	
+
 	def get_issue_count(self):
 		"""Get count of Issue"""
 		return frappe.db.sql("""select count(*) from `tabIssue`
@@ -267,7 +267,7 @@
 							card.delivered = "% Delivered " + str(card.delivered)
 						else:
 							card.delivered = "% Received " + str(card.delivered)
-						
+
 					if key =="credit_balance":
 						card.value = card.value *-1
 					card.value = self.fmt_money(card.value,False if key in ("bank_balance", "credit_balance") else True)
@@ -313,7 +313,7 @@
 	def get_bank_balance(self):
 		# account is of type "Bank" and root_type is Asset
 		return self.get_type_balance('bank_balance', 'Bank', root_type='Asset')
-	
+
 	def get_credit_balance(self):
 		# account is of type "Bank" and root_type is Liability
 		return self.get_type_balance('credit_balance', 'Bank', root_type='Liability')
@@ -351,7 +351,7 @@
 		return balance, past_balance, count
 
 	def get_type_balance(self, fieldname, account_type, root_type=None):
-		
+
 		if root_type:
 			accounts = [d.name for d in \
 				frappe.db.get_all("Account", filters={"account_type": account_type,
@@ -367,7 +367,7 @@
 			balance += get_balance_on(account, date=self.future_to_date)
 			count += get_count_on(account, fieldname, date=self.future_to_date)
 			prev_balance += get_balance_on(account, date=self.past_to_date)
-		
+
 		if fieldname in ("bank_balance","credit_balance"):
 			return {
 				'label': self.meta.get_label(fieldname),
@@ -380,7 +380,7 @@
 				'last_value': prev_balance,
 				'count': count
 			}
-	
+
 
 	def get_root_type_accounts(self, root_type):
 		if not root_type in self._accounts:
@@ -390,13 +390,13 @@
 		return self._accounts[root_type]
 
 	def get_purchase_order(self):
-		
+
 		return self.get_summary_of_doc("Purchase Order","purchase_order")
 
 	def get_sales_order(self):
 
 		return self.get_summary_of_doc("Sales Order","sales_order")
-    
+
 	def get_pending_purchase_orders(self):
 
 		return self.get_summary_of_pending("Purchase Order","pending_purchase_orders","per_received")
@@ -412,15 +412,15 @@
 	def get_pending_quotations(self):
 
 		return self.get_summary_of_pending_quotations("pending_quotations")
-	
+
 	def get_summary_of_pending(self, doc_type, fieldname, getfield):
 
-		value, count, billed_value, delivered_value = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*), 
+		value, count, billed_value, delivered_value = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*),
 			ifnull(sum(grand_total*per_billed/100),0), ifnull(sum(grand_total*{0}/100),0)  from `tab{1}`
 			where (transaction_date <= %(to_date)s)
 			and status not in ('Closed','Cancelled', 'Completed') """.format(getfield, doc_type),
 			{"to_date": self.future_to_date})[0]
-		
+
 		return {
 			"label": self.meta.get_label(fieldname),
             		"value": value,
@@ -428,7 +428,7 @@
 			"delivered_value": delivered_value,
             		"count": count
 		}
-	
+
 	def get_summary_of_pending_quotations(self, fieldname):
 
 		value, count = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*) from `tabQuotation`
@@ -438,7 +438,7 @@
 		last_value = frappe.db.sql("""select ifnull(sum(grand_total),0) from `tabQuotation`
 			where (transaction_date <= %(to_date)s)
 			and status not in ('Ordered','Cancelled', 'Lost') """,{"to_date": self.past_to_date})[0][0]
-		
+
 		return {
 			"label": self.meta.get_label(fieldname),
             		"value": value,
@@ -447,9 +447,9 @@
 		}
 
 	def get_summary_of_doc(self, doc_type, fieldname):
-		
+
 		value = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[0]
-		count = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[1] 
+		count = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[1]
 
 		last_value =self.get_total_on(doc_type, self.past_from_date, self.past_to_date)[0]
 
@@ -459,9 +459,9 @@
             		"last_value": last_value,
 			"count": count
 		}
-	
+
 	def get_total_on(self, doc_type, from_date, to_date):
-		
+
 		return frappe.db.sql("""select ifnull(sum(grand_total),0), count(*) from `tab{0}`
 			where (transaction_date between %(from_date)s and %(to_date)s) and status not in ('Cancelled')""".format(doc_type),
 			{"from_date": from_date, "to_date": to_date})[0]
diff --git a/erpnext/setup/doctype/email_digest/templates/default.html b/erpnext/setup/doctype/email_digest/templates/default.html
index 78acbd9..5a657d2 100644
--- a/erpnext/setup/doctype/email_digest/templates/default.html
+++ b/erpnext/setup/doctype/email_digest/templates/default.html
@@ -1,6 +1,6 @@
 {% macro show_card(card) %}
 <div style="width: 50%; float:left; min-height: 80px; padding-top: 20px;">
-    <h6 style="color: {{ text_muted }}; font-size: 12px; margin-bottom: 0px; margin-top: 0px;">{{ card.label }}
+    <h6 style="color: {{ text_muted }}; font-size: 12px; margin-bottom: 0px; margin-top: 0px;">{{ _(card.label) }}
     {% if card.count %}
     <span class="badge">({{ card.count }})</span>
     {% endif %}</h6>
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index c5efdf8..ed782ad 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -13,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +42,67 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Attachments can be shown without enabling the shopping cart", 
+   "fieldname": "show_attachments", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show Public Attachments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,6 +130,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -97,6 +160,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -128,6 +192,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -157,6 +222,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -184,6 +250,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -214,6 +281,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -242,6 +310,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -272,6 +341,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -301,6 +371,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -333,6 +404,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -361,6 +433,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -402,7 +475,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-03-21 15:42:08.574497", 
+ "modified": "2017-05-19 09:31:38.078110", 
  "modified_by": "Administrator", 
  "module": "Shopping Cart", 
  "name": "Shopping Cart Settings", 
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
index 4e24d2e..aa4f163 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
@@ -89,3 +89,7 @@
 	if not get_shopping_cart_settings().enabled:
 		frappe.throw(_("You need to enable Shopping Cart"), ShoppingCartSetupError)
 
+def show_attachments():
+        return get_shopping_cart_settings().show_attachments
+
+
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 25f3055..cf7171d 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -2748,7 +2748,7 @@
    "in_standard_filter": 0, 
    "label": "Route", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -3143,7 +3143,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2017-05-15 11:49:47.525859", 
+ "modified": "2017-05-31 14:10:19.976457", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
@@ -3320,4 +3320,4 @@
  "title_field": "item_name", 
  "track_changes": 1, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 58c16e1..b386a47 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -33,7 +33,7 @@
 	"qty": function(frm, doctype, name) {
 			var d = locals[doctype][name];
 			if (flt(d.qty) < flt(d.min_order_qty)) {
-				alert(__("Warning: Material Requested Qty is less than Minimum Order Qty"));
+				frappe.msgprint(__("Warning: Material Requested Qty is less than Minimum Order Qty"));
 			}
 		}
 	}
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 3b65ff8..b37713b 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:serial_no", 
@@ -13,6 +14,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -69,6 +72,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -99,6 +103,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,6 +135,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +168,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,6 +196,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -217,6 +225,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -248,6 +257,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -280,6 +290,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -311,6 +322,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -339,6 +351,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -367,6 +380,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -396,6 +410,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -425,6 +440,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -455,6 +471,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -483,6 +500,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -514,6 +532,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -542,6 +561,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -571,6 +591,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -599,6 +620,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -628,6 +650,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -657,6 +680,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -686,6 +710,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -716,6 +741,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -744,6 +770,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -775,6 +802,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -803,6 +831,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -834,6 +863,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -864,6 +894,68 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "invoice_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_invoice", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -892,6 +984,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -920,6 +1013,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -952,6 +1046,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -983,6 +1078,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1011,6 +1107,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1042,6 +1139,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1073,6 +1171,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1101,6 +1200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1129,6 +1229,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1158,18 +1259,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-barcode", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:26:55.864960", 
+ "modified": "2017-05-15 18:22:23.685286", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No", 
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index c0399a7..de54493 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -87,7 +87,7 @@
 				<table class="table borderless" style="width: 100%">
 				{% for d in website_specifications -%}
 					<tr>
-						<td class="uppercase text-muted" style="width: 30%;">{{ d.label }}</td>
+						<td class="text-muted" style="width: 30%;">{{ d.label }}</td>
 						<td>{{ d.description }}</td>
 					</tr>
 				{%- endfor %}
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 7129178..da9eb33 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -86,6 +86,24 @@
 			{% endif %}
 		{% endif %}
 	</div>
+	
+{% if attachments %}
+<div class="order-item-table">
+	<div class="row order-items order-item-header text-muted">
+		<div class="col-sm-12 h6 text-uppercase">
+			{{ _("Attachments") }}
+		</div>
+	</div>
+	<div class="row order-items">
+		<div class="col-sm-12">
+			{% for attachment in attachments %}
+			<p class="small">
+				<a href="{{ attachment.file_url }}" target="blank"> {{ attachment.file_name }} </a>
+			</p>
+			{% endfor %}
+		</div>
+	</div>
 </div>
-
+{% endif %}
+</div>
 {% endblock %}
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index 296b907..b453c7e 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -5,6 +5,7 @@
 import frappe
 
 from frappe import _
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import show_attachments
 
 def get_context(context):
 	context.no_cache = 1
@@ -13,6 +14,9 @@
 	if hasattr(context.doc, "set_indicator"):
 		context.doc.set_indicator()
 
+	if show_attachments():
+                context.attachments = get_attachments(frappe.form_dict.doctype, frappe.form_dict.name)
+
 	context.parents = frappe.form_dict.parents
 	context.payment_ref = frappe.db.get_value("Payment Request",
 		{"reference_name": frappe.form_dict.name}, "name")
@@ -21,3 +25,7 @@
 
 	if not frappe.has_website_permission(context.doc):
 		frappe.throw(_("Not Permitted"), frappe.PermissionError)
+
+def get_attachments(dt, dn):
+        return frappe.get_all("File", fields=["name", "file_name", "file_url", "is_private"],
+                              filters = {"attached_to_name": dn, "attached_to_doctype": dt, "is_private":0})
diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py
index 81dbdc9..e46fed6 100644
--- a/erpnext/templates/utils.py
+++ b/erpnext/templates/utils.py
@@ -19,13 +19,13 @@
         and c.email_id='{email_id}'""".format(email_id=sender))
 
     if not customer:
-    	lead = frappe.db.get_value('Lead', dict(email_id=sender))
-    if not lead:
-    	new_lead = frappe.get_doc(dict(
-    		doctype='Lead',
-    		email_id = sender,
-    		lead_name = sender.split('@')[0].title()
-    	)).insert(ignore_permissions=True)
+		lead = frappe.db.get_value('Lead', dict(email_id=sender))
+		if not lead:
+			new_lead = frappe.get_doc(dict(
+				doctype='Lead',
+				email_id = sender,
+				lead_name = sender.split('@')[0].title()
+			)).insert(ignore_permissions=True)
 
     opportunity = frappe.get_doc(dict(
     	doctype='Opportunity',
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index e13128b..11722f4 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,ባች ንጥል የሚቃጠልበት ሁኔታ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ባንክ ረቂቅ
 DocType: Mode of Payment Account,Mode of Payment Account,የክፍያ መለያ ሁነታ
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,አሳይ አይነቶች
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,አሳይ አይነቶች
 DocType: Academic Term,Academic Term,ትምህርታዊ የሚቆይበት ጊዜ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ቁሳዊ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ብዛት
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,የጤና ጥበቃ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ክፍያ መዘግየት (ቀኖች)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,የአገልግሎት የወጪ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,የዋጋ ዝርዝር
 DocType: Maintenance Schedule Item,Periodicity,PERIODICITY
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,በጀት ዓመት {0} ያስፈልጋል
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ማስታወቂያ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,በዚሁ ኩባንያ ከአንድ ጊዜ በላይ ገባ ነው
 DocType: Employee,Married,ያገባ
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},አይፈቀድም {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},አይፈቀድም {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,ከ ንጥሎችን ያግኙ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ&gt; የሰው ሀብት ውስጥ HR ቅንብሮች ስርዓት እየሰየሙ ማዋቀር የሰራተኛ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},የምርት {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,የተዘረዘሩት ምንም ንጥሎች የሉም
 DocType: Payment Reconciliation,Reconcile,ያስታርቅ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ግሮሰሪ
 DocType: Quality Inspection Reading,Reading 1,1 ማንበብ
 DocType: Process Payroll,Make Bank Entry,ባንክ Entry አድርግ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,የጡረታ ፈንድ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
 DocType: SMS Center,All Sales Person,ሁሉም ሽያጭ ሰው
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ወርሃዊ ስርጭት ** የእርስዎን ንግድ ውስጥ ወቅታዊ ቢኖራችሁ ወራት በመላ በጀት / ዒላማ ለማሰራጨት ይረዳል.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ንጥሎች አልተገኘም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,ንጥሎች አልተገኘም
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
 DocType: Lead,Person Name,ሰው ስም
 DocType: Sales Invoice Item,Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ለምሳሌ &quot;አንደኛ ደረጃ ትምህርት ቤት&quot; ወይም &quot;ዩኒቨርሲቲ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,የክምችት ሪፖርቶች
 DocType: Warehouse,Warehouse Detail,የመጋዘን ዝርዝር
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,የሚለው ቃል መጨረሻ ቀን በኋላ የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት መጨረሻ ቀን በላይ መሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም &quot;ቋሚ ንብረት ነው&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም &quot;ቋሚ ንብረት ነው&quot;
 DocType: Vehicle Service,Brake Oil,ፍሬን ኦይል
 DocType: Tax Rule,Tax Type,የግብር አይነት
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ከእናንተ በፊት ግቤቶችን ማከል ወይም ዝማኔ ስልጣን አይደለም {0}
 DocType: BOM,Item Image (if not slideshow),ንጥል ምስል (የተንሸራታች አይደለም ከሆነ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,አንድ የደንበኛ በተመሳሳይ ስም አለ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ሰዓት ተመን / 60) * ትክክለኛ ኦፕሬሽን ሰዓት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ይምረጡ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,ይምረጡ BOM
 DocType: SMS Log,SMS Log,ኤስ ኤም ኤስ ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,የደረሱ ንጥሎች መካከል ወጪ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} ላይ ያለው የበዓል ቀን ጀምሮ እና ቀን ወደ መካከል አይደለም
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,ደረጃ
 DocType: Sales Invoice Item,Delivered By Supplier,አቅራቢ በ ደርሷል
 DocType: SMS Center,All Contact,ሁሉም እውቂያ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,የምርት ትዕዛዝ አስቀድሞ BOM ጋር ሁሉም ንጥሎች የተፈጠሩ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,የምርት ትዕዛዝ አስቀድሞ BOM ጋር ሁሉም ንጥሎች የተፈጠሩ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ዓመታዊ ደመወዝ
 DocType: Daily Work Summary,Daily Work Summary,ዕለታዊ የስራ ማጠቃለያ
 DocType: Period Closing Voucher,Closing Fiscal Year,በጀት ዓመት መዝጊያ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} የታሰሩ ነው
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} የታሰሩ ነው
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,መለያዎች ገበታ ለመፍጠር የወቅቱ ኩባንያ ይምረጡ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,የክምችት ወጪ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ዒላማ መጋዘን ይምረጡ
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra የሚመዘገብ መረጃ
 DocType: Journal Entry Account,Credit in Company Currency,ኩባንያ የምንዛሬ ውስጥ የብድር
 DocType: Delivery Note,Installation Status,መጫን ሁኔታ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",እናንተ በስብሰባው ማዘመን ይፈልጋሉ? <br> አቅርብ: {0} \ <br> ብርቅ: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ብዛት ተቀባይነት አላገኘም ተቀባይነት + ንጥል ለማግኘት የተቀበልከው ብዛት ጋር እኩል መሆን አለባቸው {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,አቅርቦት ጥሬ እቃዎች ግዢ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,የክፍያ ቢያንስ አንድ ሁነታ POS መጠየቂያ ያስፈልጋል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,የክፍያ ቢያንስ አንድ ሁነታ POS መጠየቂያ ያስፈልጋል.
 DocType: Products Settings,Show Products as a List,አሳይ ምርቶች አንድ እንደ ዝርዝር
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ወደ መለጠፊያ አውርድ ተገቢ የውሂብ መሙላት እና የተሻሻለው ፋይል ማያያዝ. በተመረጠው ክፍለ ጊዜ ውስጥ ሁሉም ቀኖች እና ሠራተኛ ጥምረት አሁን ያሉ ክትትል መዛግብት ጋር, በአብነት ውስጥ ይመጣል"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,የእርጅና Entry አድርግ
 DocType: Appraisal Template Goal,KRA,ክራ
 DocType: Lead,Request Type,ጥያቄ አይነት
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,የሰራተኛ አድርግ
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,የሰራተኛ አድርግ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ብሮድካስቲንግ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ማስፈጸም
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ስለ ስራዎች ዝርዝሮች ፈጽሟል.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,የጥገና ጉብኝት ያቅዱ.
 DocType: SMS Settings,Enter url parameter for message,መልዕክት ዩአርኤል መስፈርት አስገባ
 DocType: POS Profile,Customer Groups,የደንበኛ ቡድኖች
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,የሂሳብ መግለጫዎቹ
 DocType: Guardian,Students,ተማሪዎች
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ለዋጋ እና ቅናሽ ተግባራዊ ደንቦች.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,የዋጋ ዝርዝር መግዛት እና መሸጥ ተፈጻሚ መሆን አለበት
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},አስቀድሞ መጠን መብለጥ አይችልም {0} {1}
 DocType: Naming Series,Series List for this Transaction,ለዚህ ግብይት ተከታታይ ዝርዝር
 DocType: Company,Default Payroll Payable Account,ነባሪ የደመወዝ ክፍያ የሚከፈል መለያ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,አዘምን የኢሜይል ቡድን
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,አዘምን የኢሜይል ቡድን
 DocType: Sales Invoice,Is Opening Entry,Entry በመክፈት ላይ ነው
 DocType: Customer Group,Mention if non-standard receivable account applicable,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ተገቢነት ካለው
 DocType: Course Schedule,Instructor Name,አስተማሪ ስም
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል ላይ
 ,Production Orders in Progress,በሂደት ላይ የምርት ትዕዛዞች
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,በገንዘብ ከ የተጣራ ገንዘብ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
 DocType: Lead,Address & Contact,አድራሻ እና ዕውቂያ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ወደ ቀዳሚው አመዳደብ ጀምሮ ጥቅም ላይ ያልዋለ ቅጠሎችን አክል
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ቀጣይ ተደጋጋሚ {0} ላይ ይፈጠራል {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(ጊዜ ሉህ በኩል) ጠቅላላ ዋጋና መጠን
 DocType: Item Website Specification,Item Website Specification,ንጥል የድር ጣቢያ ዝርዝር
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ውጣ የታገዱ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ባንክ ግቤቶችን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ዓመታዊ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,የክምችት ማስታረቅ ንጥል
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,ማዕከል ውስጥ አትም
 DocType: Student Admission,Student Admission,የተማሪ ምዝገባ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} ንጥል ተሰርዟል
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} ንጥል ተሰርዟል
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ቁሳዊ ጥያቄ
 DocType: Bank Reconciliation,Update Clearance Date,አዘምን መልቀቂያ ቀን
 DocType: Item,Purchase Details,የግዢ ዝርዝሮች
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ራስ-ሰር የቁስ ጥያቄ መፍጠር ላይ በኢሜይል አሳውቅ
 DocType: Journal Entry,Multi Currency,ባለብዙ ምንዛሬ
 DocType: Payment Reconciliation Invoice,Invoice Type,የደረሰኝ አይነት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,የመላኪያ ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,የመላኪያ ማስታወሻ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ግብሮች በማቀናበር ላይ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,የተሸጠ ንብረት ዋጋ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,አንተም አፈረሰ በኋላ የክፍያ Entry ተቀይሯል. እንደገና ጎትተው እባክህ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
-DocType: Grade Interval,Min Score,ዝቅተኛ ውጤት
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,በዚህ ሳምንት እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 DocType: Student Applicant,Admitted,አምኗል
 DocType: Workstation,Rent Cost,የቤት ኪራይ ወጪ
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,የትዕዛዝ ዋጋ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ፓርቲ ላይ ወይም የውስጥ ለማስተላለፍ ባንክ / ጥሬ ገንዘብ ግብይቶች
 DocType: Shipping Rule,Valid for Countries,አገሮች የሚሰራ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ይህ ንጥል አብነት ነው ግብይቶች ላይ ሊውል አይችልም. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ንጥል ባህሪዎች ልዩነቶች ወደ ላይ ይገለበጣሉ
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ይህ ንጥል አብነት ነው ግብይቶች ላይ ሊውል አይችልም. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ንጥል ባህሪዎች ልዩነቶች ወደ ላይ ይገለበጣሉ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,እንደሆነ የመሠከሩለት ጠቅላላ ትዕዛዝ
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ያስገቡ የመስክ እሴት «ቀን ቀን ወር መካከል ላይ ድገም &#39;እባክህ
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,የግብር ተመን
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} አስቀድሞ የሰራተኛ የተመደበው {1} ወደ ጊዜ {2} ለ {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ንጥል ምረጥ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},የረድፍ # {0}: የጅምላ ምንም እንደ አንድ አይነት መሆን አለበት {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ያልሆኑ ቡድን መቀየር
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,አንድ ንጥል ባች (ዕጣ).
 DocType: C-Form Invoice Detail,Invoice Date,የደረሰኝ ቀን
 DocType: GL Entry,Debit Amount,ዴት መጠን
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,አባሪ ይመልከቱ
 DocType: Purchase Order,% Received,% ደርሷል
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,የተማሪ ቡድኖች ይፍጠሩ
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,ትዕምርተ ጥያቄ
 DocType: Salary Slip Timesheet,Working Hours,የስራ ሰዓት
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,አንድ ነባር ተከታታይ ጀምሮ / የአሁኑ ቅደም ተከተል ቁጥር ለውጥ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","በርካታ የዋጋ ደንቦች አይችሉአትም የሚቀጥሉ ከሆነ, ተጠቃሚዎች ግጭት ለመፍታት በእጅ ቅድሚያ ለማዘጋጀት ይጠየቃሉ."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,የግዢ ትዕዛዞች ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,የግዢ ትዕዛዞች ፍጠር
 ,Purchase Register,የግዢ ይመዝገቡ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ተገቢነት ክፍያዎች
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,"በሙሉ አቅማቸው ባለማምረታቸው, ሂደቶች ዓለም አቀፍ ቅንብሮች."
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen እስከሁለት መለያዎች
 DocType: SMS Log,Sent On,ላይ የተላከ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
 DocType: HR Settings,Employee record is created using selected field. ,የተቀጣሪ መዝገብ የተመረጠው መስክ በመጠቀም የተፈጠረ ነው.
 DocType: Sales Order,Not Applicable,ተፈፃሚ የማይሆን
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,የበዓል ጌታ.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,ጥቅል ቁጥር ከ
 DocType: Item Attribute,To Range,ወደ ክልል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ዋስትና እና ተቀማጭ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ይህን የለውም ይህም አንዳንድ ንጥሎች ላይ ግብይቶችን አሉ እንደ ግምቱ ስልት መቀየር አይቻልም የራሱን ከግምቱ ዘዴ ነው
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,የተመደበ ጠቅላላ ቅጠሎች የግዴታ ነው
 DocType: Job Opening,Description of a Job Opening,የክፍት ሥራው ዝርዝር
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,በዛሬው ጊዜ በመጠባበቅ ላይ እንቅስቃሴዎች
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
 DocType: Production Order,Additional Operating Cost,ተጨማሪ ስርዓተ ወጪ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,መዋቢያዎች
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
 DocType: Shipping Rule,Net Weight,የተጣራ ክብደት
 DocType: Employee,Emergency Phone,የአደጋ ጊዜ ስልክ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ግዛ
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ገደብ 0% የሚሆን ክፍል ለመወሰን እባክዎ
 DocType: Sales Order,To Deliver,ለማዳን
 DocType: Purchase Invoice Item,Item,ንጥል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
 DocType: Journal Entry,Difference (Dr - Cr),ልዩነት (ዶክተር - CR)
 DocType: Account,Profit and Loss,ትርፍ ማጣት
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ማኔጂንግ Subcontracting
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,የአጫጫን ማስታወሻ ንጥል
 DocType: Production Plan Item,Pending Qty,በመጠባበቅ ላይ ብዛት
 DocType: Budget,Ignore,ችላ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ንቁ አይደለም
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ንቁ አይደለም
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ኤስ ኤም ኤስ የሚከተሉትን ቁጥሮች ላከ: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,የህትመት ማዋቀር ቼክ ልኬቶችን
 DocType: Salary Slip,Salary Slip Timesheet,የቀጣሪ Timesheet
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,ጠቅላላ ኮሚሽን
 DocType: Pricing Rule,Sales Partner,የሽያጭ አጋር
 DocType: Buying Settings,Purchase Receipt Required,የግዢ ደረሰኝ ያስፈልጋል
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,የመክፈቻ የአክሲዮን ገብቶ ከሆነ ግምቱ ተመን የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,የመክፈቻ የአክሲዮን ገብቶ ከሆነ ግምቱ ተመን የግዴታ ነው
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,በ የደረሰኝ ሠንጠረዥ ውስጥ አልተገኘም ምንም መዝገቦች
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,በመጀመሪያ ኩባንያ እና የፓርቲ አይነት ይምረጡ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,የፋይናንስ / የሂሳብ ዓመት ነው.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ሲጠራቀሙ እሴቶች
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ይቅርታ, ተከታታይ ቁጥሮች ሊዋሃዱ አይችሉም"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
 DocType: Project Task,Project Task,ፕሮጀክት ተግባር
 ,Lead Id,ቀዳሚ መታወቂያ
 DocType: C-Form Invoice Detail,Grand Total,አጠቃላይ ድምር
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,ከቆመበት ቀጥል አባሪ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ተደጋጋሚ ደንበኞች
 DocType: Leave Control Panel,Allocate,አካፈለ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,የሽያጭ ተመለስ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,የሽያጭ ተመለስ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ማስታወሻ: ጠቅላላ የተመደበ ቅጠሎች {0} አስቀድሞ ተቀባይነት ቅጠሎች ያነሰ መሆን የለበትም {1} ወደ ጊዜ
 DocType: Announcement,Posted By,በ ተለጥፏል
 DocType: Item,Delivered by Supplier (Drop Ship),አቅራቢው ደርሷል (ጣል መርከብ)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,ወደ ጥቅስ
 DocType: Lead,Middle Income,የመካከለኛ ገቢ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),በመክፈት ላይ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,እናንተ አስቀድሞ ከሌላ UOM አንዳንድ ግብይት (ዎች) ምክንያቱም ንጥል ለ ይለኩ ነባሪ ክፍል {0} በቀጥታ ሊቀየር አይችልም. የተለየ ነባሪ UOM ለመጠቀም አዲስ ንጥል መፍጠር አለብዎት.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,እናንተ አስቀድሞ ከሌላ UOM አንዳንድ ግብይት (ዎች) ምክንያቱም ንጥል ለ ይለኩ ነባሪ ክፍል {0} በቀጥታ ሊቀየር አይችልም. የተለየ ነባሪ UOM ለመጠቀም አዲስ ንጥል መፍጠር አለብዎት.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,የተመደበ መጠን አሉታዊ መሆን አይችልም
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ካምፓኒው ማዘጋጀት እባክዎ
 DocType: Purchase Order Item,Billed Amt,የሚከፈል Amt
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,የሽያጭ ደረሰኝ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ማጣቀሻ የለም እና ማጣቀሻ ቀን ያስፈልጋል {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ይምረጡ የክፍያ መለያ ባንክ የሚመዘገብ ለማድረግ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ቅጠሎች, ወጪዎች እና የመክፈል ዝርዝር ለማስተዳደር የሰራተኛ መዝገብ ይፍጠሩ"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ቅጠሎች, ወጪዎች እና የመክፈል ዝርዝር ለማስተዳደር የሰራተኛ መዝገብ ይፍጠሩ"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,እውቀት ቤዝን ወደ አክል
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ሐሳብ መጻፍ
 DocType: Payment Entry Deduction,Payment Entry Deduction,የክፍያ Entry ተቀናሽ
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 ጋር በተያያዘ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,አስተዳዳሪ
 DocType: Payment Entry,Payment From / To,/ ከ ወደ ክፍያ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ቀን ክልል
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},አዲስ የክሬዲት ገደብ ለደንበኛው ከአሁኑ የላቀ መጠን ያነሰ ነው. የክሬዲት ገደብ ላይ ቢያንስ መሆን አለበት {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},አዲስ የክሬዲት ገደብ ለደንበኛው ከአሁኑ የላቀ መጠን ያነሰ ነው. የክሬዲት ገደብ ላይ ቢያንስ መሆን አለበት {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ብዙ ጊዜ ተመሳሳይ ንጥል ገብቶ ነበር.
 DocType: SMS Settings,Receiver Parameter,ተቀባይ መለኪያ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,እና &#39;የቡድን በ&#39; &#39;ላይ የተመሠረተ »ጋር ተመሳሳይ መሆን አይችልም
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,ጥራት ቀን
 DocType: Student Batch Name,Batch Name,ባች ስም
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ይመዝገቡ
 DocType: Selling Settings,Customer Naming By,በ የደንበኛ አሰያየም
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,የተማሪ ወርሃዊ ክትትል ሪፖርት ውስጥ ያቅርቡ ተማሪው ያሳያል
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,የተማሪ የትምህርት ክትትል
 DocType: Sales Invoice Timesheet,Time Sheet,የጊዜ ሉህ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ጥሬ እቃዎች ላይ የተመረኮዘ ላይ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ንጥል ዝርዝሮችን ያስገቡ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ንጥል ዝርዝሮችን ያስገቡ
 DocType: Interest,Interest,ዝንባሌ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ቅድመ ሽያጭ
 DocType: Purchase Receipt,Other Details,ሌሎች ዝርዝሮች
@@ -726,7 +729,7 @@
 ,Absent Student Report,ብርቅ የተማሪ ሪፖርት
 DocType: Email Digest,Next email will be sent on:,ቀጣይ ኢሜይል ላይ ይላካል:
 DocType: Offer Letter Term,Offer Letter Term,ደብዳቤ የሚቆይበት ጊዜ ሊያቀርብ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ንጥል ተለዋጮች አለው.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ንጥል ተለዋጮች አለው.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ንጥል {0} አልተገኘም
 DocType: Bin,Stock Value,የክምችት እሴት
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ኩባንያ {0} የለም
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,የዋስትና የሚቃጠልበት ቀን
 DocType: Material Request Item,Quantity and Warehouse,ብዛት እና መጋዘን
 DocType: Sales Invoice,Commission Rate (%),ኮሚሽን ተመን (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; የስያሜ ተከታታይ ለ ተከታታይ የስያሜ ለማዘጋጀት እባክዎ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,እባክዎ ይምረጡ ፕሮግራም
 DocType: Project,Estimated Cost,የተገመተው ወጪ
 DocType: Purchase Order,Link to material requests,ቁሳዊ ጥያቄዎች አገናኝ
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} አንድ የአክሲዮን ንጥል አይደለም
 DocType: Mode of Payment Account,Default Account,ነባሪ መለያ
 DocType: Payment Entry,Received Amount (Company Currency),ተቀብሏል መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ሳምንታዊ ጠፍቷል ቀን ይምረጡ
 DocType: Production Order Operation,Planned End Time,የታቀደ መጨረሻ ሰዓት
 ,Sales Person Target Variance Item Group-Wise,የሽያጭ ሰው ዒላማ ልዩነት ንጥል ቡድን ጥበበኛ
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,የዋጋ ዝርዝር አልተመረጠም
 DocType: Employee,Family Background,የቤተሰብ ዳራ
 DocType: Request for Quotation Supplier,Send Email,ኢሜይል ይላኩ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ምንም ፍቃድ
 DocType: Company,Default Bank Account,ነባሪ የባንክ ሂሳብ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",የድግስ ላይ የተመሠረተ ለማጣራት ይምረጡ ፓርቲ በመጀመሪያ ይተይቡ
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ምንም ሰራተኛ አልተገኘም
 DocType: Supplier Quotation,Stopped,አቁሟል
 DocType: Item,If subcontracted to a vendor,አንድ አቅራቢው subcontracted ከሆነ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,የተማሪ ቡድን አስቀድሞ የዘመነ ነው.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,የተማሪ ቡድን አስቀድሞ የዘመነ ነው.
 DocType: SMS Center,All Customer Contact,ሁሉም የደንበኛ ያግኙን
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV በኩል የአክሲዮን ቀሪ ይስቀሉ.
 DocType: Warehouse,Tree Details,ዛፍ ዝርዝሮች
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ዝቅተኛው የደረሰኝ የገንዘብ መጠን
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: የወጪ ማዕከል {2} ኩባንያ የእርሱ ወገን አይደለም {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: መለያ {2} አንድ ቡድን ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ንጥል ረድፍ {idx}: {doctype} {DOCNAME} ከላይ ውስጥ የለም &#39;{doctype} »ሰንጠረዥ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ንጥል ረድፍ {idx}: {doctype} {DOCNAME} ከላይ ውስጥ የለም &#39;{doctype} »ሰንጠረዥ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ምንም ተግባራት
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ራስ መጠየቂያ 05, 28, ወዘተ ለምሳሌ ይፈጠራል ይህም ላይ ያለው ወር ቀን"
 DocType: Asset,Opening Accumulated Depreciation,ክምችት መቀነስ በመክፈት ላይ
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,አማካኝ ደረጃ በመውሰድ ላይ
 DocType: Production Planning Tool,Select Items,ይምረጡ ንጥሎች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ቢል ላይ {1} የተዘጋጀው {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,የኮርስ ፕሮግራም
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,የኮርስ ፕሮግራም
 DocType: Maintenance Visit,Completion Status,የማጠናቀቂያ ሁኔታ
 DocType: HR Settings,Enter retirement age in years,ዓመታት ውስጥ ጡረታ ዕድሜ ያስገቡ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ዒላማ መጋዘን
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ይህ በመቶ እስከሁለት ርክክብ ወይም ደረሰኝ ላይ ፍቀድ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,አስመጣ ክትትል
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ሁሉም ንጥል ቡድኖች
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ሁሉም ንጥል ቡድኖች
 DocType: Process Payroll,Activity Log,የእንቅስቃሴ ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,የተጣራ ትርፍ / ማጣት
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,በራስ-ሰር ግብይቶች ማቅረቢያ ላይ መልዕክት ያዘጋጁ.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ክፍያ ትዕዛዝ መግዛት
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ፕሮጀክት ብዛት
 DocType: Sales Invoice,Payment Due Date,ክፍያ መጠናቀቅ ያለበት ቀን
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;በመክፈት ላይ&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ማድረግ ወደ ክፈት
 DocType: Notification Control,Delivery Note Message,የመላኪያ ማስታወሻ መልዕክት
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,ዳግም-ትዕዛዝ ብዛት
 DocType: Leave Block List Date,Leave Block List Date,አግድ ዝርዝር ቀን ውጣ
 DocType: Pricing Rule,Price or Discount,ዋጋ ወይም ቅናሽ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,የግዢ ደረሰኝ ንጥሎች ሰንጠረዥ ውስጥ ጠቅላላ የሚመለከታቸው ክፍያዎች ጠቅላላ ግብሮች እና ክፍያዎች እንደ አንድ አይነት መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,የግዢ ደረሰኝ ንጥሎች ሰንጠረዥ ውስጥ ጠቅላላ የሚመለከታቸው ክፍያዎች ጠቅላላ ግብሮች እና ክፍያዎች እንደ አንድ አይነት መሆን አለበት
 DocType: Sales Team,Incentives,ማበረታቻዎች
 DocType: SMS Log,Requested Numbers,ተጠይቋል ዘኍልቍ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ብቻ ጥሬ እቃዎች ያግኙ
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,ነባሪ ተከፋይ መለያዎች
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
 DocType: Fee Structure,Components,ክፍሎች
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
 DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,የደረሰኝ የቅድሚያ ግዢ
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ረድፍ {0}: ሽያጮች / የግዥ ትዕዛዝ ላይ ክፍያ ሁልጊዜ አስቀድሞ እንደ ምልክት ሊደረግባቸው ይገባል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ኬሚካል
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ይህ ሁነታ በሚመረጥ ጊዜ ነባሪ ባንክ / በጥሬ ገንዘብ መለያ በራስ-ሰር ደመወዝ ጆርናል የሚመዘገብ ውስጥ ይዘምናል.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ክፍል ኮድ ለ ክፍተቶች {0} ሌሎች ክፍሎች ኛ ክፍል ልዩነት ጋር ይደራረባል. ያረጋግጡ ክፍተቶች {0} እና {1} እና እንደገና ይሞክሩ
 DocType: BOM,Raw Material Cost(Company Currency),ጥሬ ሐሳብ ወጪ (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ሁሉም ንጥሎች አስቀድሞ በዚህ የምርት ትዕዛዝ ለ ተላልፈዋል.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},የረድፍ # {0}: ተመን ላይ የዋለውን መጠን መብለጥ አይችልም {1} {2}
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM የድር ጣቢያ ንጥል
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,የእርስዎን ደብዳቤ ራስ እና አርማ ይስቀሉ. (ቆይተው አርትዕ ማድረግ ይችላሉ).
 DocType: Timesheet Detail,Bill,ቢል
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ነጭ
 DocType: SMS Center,All Lead (Open),ሁሉም ቀዳሚ (ክፈት)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ረድፍ {0}: ለ ብዛት አይገኝም {4} መጋዘን ውስጥ {1} መግቢያ ጊዜ መለጠፍ (በ {2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ትዕዛዝ አይነት ውስጥ አንዱ መሆን አለበት {0}
 DocType: Lead,Next Contact Date,ቀጣይ የእውቂያ ቀን
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ብዛት በመክፈት ላይ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
 DocType: Student Batch Name,Student Batch Name,የተማሪ የቡድን ስም
 DocType: Holiday List,Holiday List Name,የበዓል ዝርዝር ስም
 DocType: Repayment Schedule,Balance Loan Amount,ቀሪ የብድር መጠን
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ይጥቀሱ እባክዎ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ብዛት ወይም ዋጋ ላይ ምንም ለውጥ ጋር የተወገዱ ንጥሎች.
 DocType: Delivery Note,Delivery To,ወደ መላኪያ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
 DocType: Production Planning Tool,Get Sales Orders,የሽያጭ ትዕዛዞች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} አሉታዊ መሆን አይችልም
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,የዋጋ ቅናሽ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,የዋጋ ቅናሽ
 DocType: Asset,Total Number of Depreciations,Depreciations አጠቃላይ ብዛት
 DocType: Sales Invoice Item,Rate With Margin,ኅዳግ ጋር ፍጥነት
 DocType: Workstation,Wages,ደመወዝ
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,የድርጅት ስም
 DocType: Tax Rule,Shipping State,መላኪያ መንግስት
 ,Projected Quantity as Source,ምንጭ ፕሮጀክት ብዛት
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ንጥል አዝራር &#39;የግዢ ደረሰኞች ከ ንጥሎች ያግኙ&#39; በመጠቀም መታከል አለበት
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ንጥል አዝራር &#39;የግዢ ደረሰኞች ከ ንጥሎች ያግኙ&#39; በመጠቀም መታከል አለበት
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,ያልሆኑ-የአክሲዮን ንጥሎችን አካትት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,የሽያጭ ወጪዎች
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,ላይ
 DocType: Item,Default Selling Cost Center,ነባሪ ሽያጭ ወጪ ማዕከል
 DocType: Sales Partner,Implementation Partner,የትግበራ አጋር
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,አካባቢያዊ መለያ ቁጥር
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,አካባቢያዊ መለያ ቁጥር
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
 DocType: Opportunity,Contact Info,የመገኛ አድራሻ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,የክምችት ግቤቶችን ማድረግ
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,አከፋፋይ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ወደ ግዢ ሳጥን ጨመር መላኪያ ደንብ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,የምርት ትዕዛዝ {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',ለማዘጋጀት &#39;ላይ ተጨማሪ ቅናሽ ተግብር&#39; እባክህ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',ለማዘጋጀት &#39;ላይ ተጨማሪ ቅናሽ ተግብር&#39; እባክህ
 ,Ordered Items To Be Billed,የዕቃው ንጥሎች እንዲከፍሉ ለማድረግ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ክልል ያነሰ መሆን አለበት ከ ይልቅ ወደ ክልል
 DocType: Global Defaults,Global Defaults,ዓለም አቀፍ ነባሪዎች
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ባች ቁጥር ለማግኘት ንጥል ኮድ ያስገቡ
 DocType: Stock Settings,Default Item Group,ነባሪ ንጥል ቡድን
 DocType: Employee Loan,Partially Disbursed,በከፊል በመገኘቱ
-DocType: Grading Structure,Grading System Name,አሰጣጥ ስርዓት ስም
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,አቅራቢው ጎታ.
 DocType: Account,Balance Sheet,ወጭና ገቢ ሂሳብ መመዝገቢያ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,የእርስዎ የሽያጭ ሰው የደንበኛ ለማነጋገር በዚህ ቀን ላይ አስታዋሽ ያገኛሉ
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ብዙ ጊዜ ተመሳሳይ ንጥል ሊገቡ አይችሉም.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ተጨማሪ መለያዎች ቡድኖች ስር ሊሆን ይችላል, ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ሥራ ተከናውኗል
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,በ አይነታዎች ሰንጠረዥ ውስጥ ቢያንስ አንድ መገለጫ ባህሪ ይግለጹ
 DocType: Announcement,All Students,ሁሉም ተማሪዎች
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ይመልከቱ የሒሳብ መዝገብ
 DocType: Grading Scale,Intervals,ክፍተቶች
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,የጥንቶቹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","አንድ ንጥል ቡድን በተመሳሳይ ስም አለ, ወደ ንጥል ስም መቀየር ወይም ንጥል ቡድን ዳግም መሰየም እባክዎ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","አንድ ንጥል ቡድን በተመሳሳይ ስም አለ, ወደ ንጥል ስም መቀየር ወይም ንጥል ቡድን ዳግም መሰየም እባክዎ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ወደ ተቀረው ዓለም
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,የ ንጥል {0} ባች ሊኖረው አይችልም
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},የታሰረው መለያ አርትዕ ለማድረግ ፈቃድ የለውም {0}
 DocType: Journal Entry,Get Outstanding Invoices,ያልተከፈሉ ደረሰኞች ያግኙ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,የግዢ ትዕዛዞች ዕቅድ ለማገዝ እና ግዢዎች ላይ መከታተል
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,የግዢ ትዕዛዞች ዕቅድ ለማገዝ እና ግዢዎች ላይ መከታተል
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ሐሳብ ጥያቄ ውስጥ ጠቅላላ እትም / ማስተላለፍ ብዛት {0} {1} \ ንጥል ለ የተጠየቀው ብዛት {2} በላይ ሊሆን አይችልም {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ትንሽ
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,አመሳስል መምህር ውሂብ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,የእርስዎ ምርቶች ወይም አገልግሎቶች
 DocType: Mode of Payment,Mode of Payment,የክፍያ ሁነታ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
 DocType: Student Applicant,AP,የ AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ይህ ሥር ንጥል ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,የቡድን ጥቅል ቁጥር
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}: ብቻ የክሬዲት መለያዎች ሌላ ዴቢት ግቤት ላይ የተገናኘ ሊሆን ይችላል
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ሁሉ ተግባር ክብደት ጠቅላላ 1. መሰረት በሁሉም የፕሮጀክቱ ተግባራት ክብደት ለማስተካከል እባክዎ መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,ንጥል {0} አንድ ንዑስ-ኮንትራት ንጥል መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,የካፒታል ዕቃዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","የዋጋ ደ መጀመሪያ ላይ በመመስረት ነው ንጥል, ንጥል ቡድን ወይም የምርት ስም ሊሆን ይችላል, ይህም መስክ ላይ ተግብር. &#39;"
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,በሂደት ላይ {0} ንጥሎች
 DocType: Workstation,Workstation Name,ከገቢር ስም
-DocType: Grade Interval,Grade Code,ኛ ክፍል ኮድ
+DocType: Grading Scale Interval,Grade Code,ኛ ክፍል ኮድ
 DocType: POS Item Group,POS Item Group,POS ንጥል ቡድን
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ጥንቅር ኢሜይል:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ሃርድዌር
 DocType: Sales Order,Recurring Upto,ተደጋጋሚ እስከሁለት
 DocType: Attendance,HR Manager,የሰው ሀይል አስተዳደር
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,መብት ውጣ
 DocType: Purchase Invoice,Supplier Invoice Date,አቅራቢው ደረሰኝ ቀን
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,አንተ ወደ ግዢ ሳጥን ጨመር ማንቃት አለብዎት
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ምግብ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ጥበቃና ክልል 3
 DocType: Maintenance Schedule Item,No of Visits,ጉብኝቶች አይ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,ማርቆስ Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,ማርቆስ Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},ጥገና ፕሮግራም {0} ላይ አለ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,የተመዝጋቢው ተማሪ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},የ በመዝጋት መለያ ምንዛሬ መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ለሁሉም ግቦች ነጥቦች ድምር ነው 100. መሆን አለበት {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,መለያዎች ገበታ
 DocType: Material Request,Terms and Conditions Content,ውል እና ሁኔታዎች ይዘት
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
 DocType: Maintenance Visit,Unscheduled,E ሶችን
 DocType: Employee,Owned,ባለቤትነት የተያዘ
 DocType: Salary Detail,Depends on Leave Without Pay,ይክፈሉ ያለ ፈቃድ ላይ የተመካ ነው
 DocType: Pricing Rule,"Higher the number, higher the priority",ቁጥሩ ከፍ ከፍ ቅድሚያ
 ,Purchase Invoice Trends,የደረሰኝ በመታየት ላይ ይግዙ
 DocType: Employee,Better Prospects,የተሻለ ተስፋ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","የረድፍ # {0}: የ ስብስብ {1} ብቻ {2} ብዛት አለው. የሚገኙ {3} ብዛት ያለው ሌላ ስብስብ ለመምረጥ ወይም በርካታ ቡድኖች ከ / ጉዳይ ለማድረስ, በርካታ ረድፎች ወደ ረድፍ ተከፋፍለው እባክዎ"
 DocType: Vehicle,License Plate,ታርጋ ቁጥር
 DocType: Appraisal,Goals,ግቦች
 DocType: Warranty Claim,Warranty / AMC Status,የዋስትና / AMC ሁኔታ
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,የተቀጣሪ ራሱን ሪፖርት አይችልም.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","መለያ የታሰሩ ከሆነ, ግቤቶች የተገደቡ ተጠቃሚዎች ይፈቀዳል."
 DocType: Email Digest,Bank Balance,ባንክ ሒሳብ
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ኢዮብ መገለጫ, ብቃት ያስፈልጋል ወዘተ"
 DocType: Journal Entry Account,Account Balance,የመለያ ቀሪ ሂሳብ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ግብይቶች ለ የግብር ሕግ.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ያልተዘጋ በጀት ዓመት አ &amp; ኤል ሚዛን አሳይ
 DocType: Shipping Rule,Shipping Account,መላኪያ መለያ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: መለያ {2} ንቁ አይደለም
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,የሽያጭ ትዕዛዞች የእርስዎን ሥራ ዕቅድ ለመርዳት ላይ-ጊዜ ለማቅረብ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,የሽያጭ ትዕዛዞች የእርስዎን ሥራ ዕቅድ ለመርዳት ላይ-ጊዜ ለማቅረብ አድርግ
 DocType: Quality Inspection,Readings,ንባብ
 DocType: Stock Entry,Total Additional Costs,ጠቅላላ ተጨማሪ ወጪዎች
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,እሴት ወደ
 DocType: Asset Movement,Stock Manager,የክምችት አስተዳዳሪ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ምንጭ መጋዘን ረድፍ ግዴታ ነው {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ማሸጊያ የማያፈስ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,ማሸጊያ የማያፈስ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,የቢሮ ኪራይ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,አዋቅር ኤስ ፍኖት ቅንብሮች
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ማስመጣት አልተሳካም!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,ምንጭ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,አሳይ ተዘግቷል
 DocType: Leave Type,Is Leave Without Pay,ይክፈሉ ያለ ውጣ ነው
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,የንብረት ምድብ ቋሚ ንብረት ንጥል ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,የንብረት ምድብ ቋሚ ንብረት ንጥል ግዴታ ነው
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,በክፍያ ሠንጠረዥ ውስጥ አልተገኘም ምንም መዝገቦች
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ይህን {0} ግጭቶች {1} ለ {2} {3}
 DocType: Student Attendance Tool,Students HTML,ተማሪዎች ኤችቲኤምኤል
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,መተው ቀን
 DocType: Pricing Rule,For Price List,የዋጋ ዝርዝር ለ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,አስፈፃሚ ፍለጋ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,እርሳሶች ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,እርሳሶች ፍጠር
 DocType: Maintenance Schedule,Schedules,መርሐግብሮች
 DocType: Purchase Invoice Item,Net Amount,የተጣራ መጠን
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ዝርዝር የለም
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,ፕሮግራም የመመዝገቢያ
 DocType: Sales Invoice Item,Brand Name,የምርት ስም
 DocType: Purchase Receipt,Transporter Details,አጓጓዥ ዝርዝሮች
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ሳጥን
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,በተቻለ አቅራቢ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ድርጅቱ
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 ማንበብ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} ፕሮጀክት አልተገኘም ነባሪ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ኩባንያ ወጪ የይገባኛል.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ተማሪዎች ሥርዓት ልብ ላይ, ሁሉም ተማሪዎች ማከል ነው"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ተማሪዎች ሥርዓት ልብ ላይ, ሁሉም ተማሪዎች ማከል ነው"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},የረድፍ # {0}: የከፈሉ ቀን {1} ቼክ ቀን በፊት ሊሆን አይችልም {2}
 DocType: Company,Default Holiday List,የበዓል ዝርዝር ነባሪ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ረድፍ {0}: ታይም እና ወደ ጊዜ ጀምሮ {1} ጋር ተደራቢ ነው {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,እርስዎ ፈቃድ የሚያመለክቱ ናቸው ላይ ያለው ቀን (ዎች) በዓላት ናቸው. እናንተ ፈቃድን ለማግኘት ማመልከት አይገባም.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,የክፍያ ኢሜይል ላክ
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,አዲስ ተግባር
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ትዕምርተ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ትዕምርተ አድርግ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ሌሎች ሪፖርቶች
 DocType: Dependent Task,Dependent Task,ጥገኛ ተግባር
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},አይነት ፈቃድ {0} በላይ ሊሆን አይችልም {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,አስቀድሞ X ቀኖች ለ ቀዶ ዕቅድ ይሞክሩ.
 DocType: HR Settings,Stop Birthday Reminders,አቁም የልደት ቀን አስታዋሾች
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
 DocType: SMS Center,Receiver List,ተቀባይ ዝርዝር
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,የፍለጋ ንጥል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,የፍለጋ ንጥል
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ፍጆታ መጠን
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,በጥሬ ገንዘብ ውስጥ የተጣራ ለውጥ
 DocType: Assessment Plan,Grading Scale,አሰጣጥ በስምምነት
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ይለኩ {0} መለኪያ የልወጣ ምክንያቶች የርዕስ ማውጫ ውስጥ ከአንድ ጊዜ በላይ ገባ ተደርጓል
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ይለኩ {0} መለኪያ የልወጣ ምክንያቶች የርዕስ ማውጫ ውስጥ ከአንድ ጊዜ በላይ ገባ ተደርጓል
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ቀድሞውኑ ተጠናቋል
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},የክፍያ መጠየቂያ አስቀድሞ አለ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,የተሰጠው ንጥሎች መካከል ወጪ
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ይሰብስቡ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
 DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,አንተ መሰረዝ አይችሉም በጀት ዓመት {0}. በጀት ዓመት {0} አቀፍ ቅንብሮች ውስጥ እንደ ነባሪ ተዘጋጅቷል
 DocType: Journal Entry,Entry Type,ግቤት አይነት
 ,Customer Credit Balance,የደንበኛ የሥዕል ቀሪ
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,ተመሳሳይ ተቋም ውስጥ በማጥናት
 DocType: Territory,Territory Manager,ግዛት አስተዳዳሪ
 DocType: Packed Item,To Warehouse (Optional),መጋዘን ወደ (አማራጭ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; ብራንድ
 DocType: Payment Entry,Paid Amount (Company Currency),የሚከፈልበት መጠን (የኩባንያ የምንዛሬ)
 DocType: Purchase Invoice,Additional Discount,ተጨማሪ ቅናሽ
 DocType: Selling Settings,Selling Settings,ቅንብሮች መሸጥ
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ጨመር ውስጥ ይመልከቱ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,የገበያ ወጪ
 ,Item Shortage Report,ንጥል እጥረት ሪፖርት
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ቁሳዊ ጥያቄ ይህ የአክሲዮን የሚመዘገብ ለማድረግ ስራ ላይ የሚውለው
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ቀጣይ የእርጅና ቀን አዲስ ንብረት ግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ቀጣይ የእርጅና ቀን አዲስ ንብረት ግዴታ ነው
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,እያንዳንዱ ባች ለ የተለየ አካሄድ የተመሠረተ ቡድን
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,አንድ ንጥል ላይ ነጠላ አሃድ.
 DocType: Fee Category,Fee Category,ክፍያ ምድብ
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: የወጪ ማዕከል &#39;ትርፍ እና ኪሳራ&#39; መለያ ያስፈልጋል {2}. ካምፓኒው ነባሪ ዋጋ ማዕከል ያዘጋጁ.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,አንድ የደንበኛ ቡድን በተመሳሳይ ስም አለ ያለውን የደንበኛ ስም መቀየር ወይም የደንበኛ ቡድን ዳግም መሰየም እባክዎ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,አንድ የደንበኛ ቡድን በተመሳሳይ ስም አለ ያለውን የደንበኛ ስም መቀየር ወይም የደንበኛ ቡድን ዳግም መሰየም እባክዎ
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,አዲስ እውቂያ
 DocType: Territory,Parent Territory,የወላጅ ግዛት
 DocType: Quality Inspection Reading,Reading 2,2 ማንበብ
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ማስታረቅ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,በጣም ብዙ አምዶች. ሪፖርቱን ለመላክ እና የተመን መተግበሪያ በመጠቀም ያትሙ.
 DocType: Purchase Invoice Item,Batch No,የጅምላ የለም
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ለ ምንዛሬ ተመን ማግኘት አልተቻለም {0} ወደ {1} ቁልፍ ቀን {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,አንድ የደንበኛ የግዢ ትዕዛዝ ላይ በርካታ የሽያጭ ትዕዛዞች ፍቀድ
 DocType: Student Group Instructor,Student Group Instructor,የተማሪ ቡድን አስተማሪ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ተንቀሳቃሽ አይ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ዋና
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ተለዋጭ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ዋና
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ተለዋጭ
 DocType: Naming Series,Set prefix for numbering series on your transactions,በእርስዎ ግብይቶች ላይ ተከታታይ ቁጥር አዘጋጅ ቅድመ ቅጥያ
 DocType: Employee Attendance Tool,Employees HTML,ተቀጣሪዎች ኤችቲኤምኤል
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ነባሪ BOM ({0}) ይህ ንጥል ወይም አብነት ገባሪ መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ነባሪ BOM ({0}) ይህ ንጥል ወይም አብነት ገባሪ መሆን አለበት
 DocType: Employee,Leave Encashed?,Encashed ይውጡ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,መስክ ከ አጋጣሚ የግዴታ ነው
 DocType: Email Digest,Annual Expenses,ዓመታዊ ወጪዎች
 DocType: Item,Variants,ተለዋጮች
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
 DocType: SMS Center,Send To,ወደ ላክ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
 DocType: Payment Reconciliation Payment,Allocated amount,በጀት መጠን
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ማስተመኖች
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ተከታታይ ምንም ንጥል ገባ አባዛ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,አንድ መላኪያ አገዛዝ አንድ ሁኔታ
-DocType: Grading Structure,Grading Intervals,አሰጣጥ ጣልቃ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ያስገቡ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ረድፍ ውስጥ ንጥል {0} ለ overbill አይቻልም {1} ይልቅ {2}. በላይ-አከፋፈል መፍቀድ, ቅንብሮች መግዛት ውስጥ ለማዘጋጀት እባክዎ"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ንጥል ወይም መጋዘን ላይ የተመሠረተ ማጣሪያ ማዘጋጀት እባክዎ
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,ፈቀዳ ቁጥጥር
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},የረድፍ # {0}: መጋዘን አላገኘም ውድቅ ንጥል ላይ ግዴታ ነው {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ክፍያ
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,የእርስዎን ትዕዛዞች ያቀናብሩ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,የእርስዎን ትዕዛዞች ያቀናብሩ
 DocType: Production Order Operation,Actual Time and Cost,ትክክለኛው ጊዜ እና ወጪ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ከፍተኛው {0} ቁሳዊ ጥያቄ {1} የሽያጭ ትዕዛዝ ላይ ንጥል የተሰራ ሊሆን ይችላል {2}
 DocType: Employee,Salutation,ሰላምታ
 DocType: Course,Course Abbreviation,የኮርስ ምህፃረ ቃል
 DocType: Student Leave Application,Student Leave Application,የተማሪ ፈቃድ ማመልከቻ
 DocType: Item,Will also apply for variants,በተጨማሪም ተለዋጮች ማመልከት ይሆን
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ላይ ግማሽ ቀን ላይ ሠራተኛ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ጠቅላላ የሥራ ሰዓቶች ከፍተኛ የሥራ ሰዓት በላይ መሆን የለበትም {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ላይ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,በሽያጭ ጊዜ ላይ ጥቅል ንጥሎች.
 DocType: Quotation Item,Actual Qty,ትክክለኛ ብዛት
 DocType: Sales Invoice Item,References,ማጣቀሻዎች
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,አንተ የተባዙ ንጥሎች አስገብተዋል. ለማስተካከል እና እንደገና ይሞክሩ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,የሥራ ጓደኛ
 DocType: Asset Movement,Asset Movement,የንብረት ንቅናቄ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,አዲስ ጨመር
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,አዲስ ጨመር
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} ንጥል አንድ serialized ንጥል አይደለም
 DocType: SMS Center,Create Receiver List,ተቀባይ ዝርዝር ፍጠር
 DocType: Vehicle,Wheels,መንኮራኩሮች
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,የምርት ትዕዛዞች ላይ ጊዜ ምዝግብ መፍጠር ያሰናክላል. ክወናዎች የምርት ትዕዛዝ ላይ ክትትል የለበትም
 DocType: Student,Student Mobile Number,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
 DocType: Item,Has Variants,ተለዋጮች አለው
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ወደ ወርሃዊ ስርጭት ስም
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ባች መታወቂያ ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ባች መታወቂያ ግዴታ ነው
 DocType: Sales Person,Parent Sales Person,የወላጅ ሽያጭ ሰው
 DocType: Purchase Invoice,Recurring Invoice,ተደጋጋሚ ደረሰኝ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ፕሮጀክቶች ማስተዳደር
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,በጀት ዓመት
 DocType: Vehicle Log,Fuel Price,የነዳጅ ዋጋ
 DocType: Budget,Budget,ባጀት
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ይህ የገቢ ወይም የወጪ መለያ አይደለም እንደ በጀት, ላይ {0} ሊመደብ አይችልም"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,አሳክቷል
 DocType: Student Admission,Application Form Route,ማመልከቻ ቅጽ መስመር
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},የገንዘብ መጠን {0} {1} ላይ የሚቀነስ {2}
 DocType: Employee,Salary Information,ደመወዝ መረጃ
 DocType: Sales Person,Name and Employee ID,ስም እና የሰራተኛ መታወቂያ
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
 DocType: Website Item Group,Website Item Group,የድር ጣቢያ ንጥል ቡድን
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,ተግባርና ግብሮች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,የማጣቀሻ ቀን ያስገቡ
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ድገም የደንበኛ ገቢ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ሚና &#39;የወጪ አጽዳቂ&#39; ሊኖረው ይገባል
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ሁለት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
 DocType: Asset,Depreciation Schedule,የእርጅና ፕሮግራም
 DocType: Bank Reconciliation Detail,Against Account,መለያ ላይ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ግማሽ ቀን ቀን ቀን ጀምሮ እና ቀን ወደ መካከል መሆን አለበት
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
 ,Quotation Trends,በትዕምርተ ጥቅስ አዝማሚያዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ንጥል ቡድን ንጥል ንጥል ጌታ ውስጥ የተጠቀሰው አይደለም {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
 DocType: Shipping Rule Condition,Shipping Amount,መላኪያ መጠን
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,በመጠባበቅ ላይ ያለ መጠን
 DocType: Purchase Invoice Item,Conversion Factor,የልወጣ መንስኤ
 DocType: Purchase Order,Delivered,ደርሷል
 ,Vehicle Expenses,የተሽከርካሪ ወጪ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
+DocType: Serial No,Invoice Details,የደረሰኝ ዝርዝሮች
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
 DocType: Purchase Receipt,Vehicle Number,የተሽከርካሪ ቁጥር
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ተደጋጋሚ መጠየቂያ ማቆም ይሆናል ከተደረገባቸው ቀን
 DocType: Employee Loan,Loan Amount,የብድር መጠን
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,ተጨማሪ የቅናሽ መጠን
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
 DocType: Leave Block List Allow,Leave Block List Allow,አግድ ዝርዝር ፍቀድ ይነሱ
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ያልሆኑ ቡድን ቡድን
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ስፖርት
 DocType: Loan Type,Loan Name,ብድር ስም
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,የደንበኛ ማግኛ እና ታማኝነት
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,እናንተ ተቀባይነት ንጥሎች የአክሲዮን ጠብቆ የት መጋዘን
 DocType: Production Order,Skip Material Transfer,የቁስ ማስተላለፍ ዝለል
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ለ ምንዛሬ ተመን ማግኘት አልተቻለም {0} ወደ {1} ቁልፍ ቀን {2}. እራስዎ ምንዛሪ ልውውጥ መዝገብ ለመፍጠር እባክዎ
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,የፋይናንስ ዓመት ላይ ያበቃል
 DocType: POS Profile,Price List,የዋጋ ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ነባሪ በጀት ዓመት አሁን ነው. ለውጡ ተግባራዊ ለማግኘት እባክዎ አሳሽዎን ያድሱ.
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,ንጥል {0} አስቀድሞ ተመለሱ ተደርጓል
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** በጀት ዓመት ** አንድ የፋይናንስ ዓመት ይወክላል. ሁሉም የሂሳብ ግቤቶች እና ሌሎች ዋና ዋና ግብይቶች ** ** በጀት ዓመት ላይ ክትትል ነው.
 DocType: Opportunity,Customer / Lead Address,ደንበኛ / በእርሳስ አድራሻ
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},ማስጠንቀቂያ: አባሪ ላይ ልክ ያልሆነ SSL ሰርቲፊኬት {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ማስጠንቀቂያ: አባሪ ላይ ልክ ያልሆነ SSL ሰርቲፊኬት {0}
 DocType: Student Admission,Eligibility,የብቁነት
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","እርሳሶች የንግድ, ሁሉም እውቂያዎች እና ተጨማሪ ይመራል እንደ ለማከል ለማገዝ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","እርሳሶች የንግድ, ሁሉም እውቂያዎች እና ተጨማሪ ይመራል እንደ ለማከል ለማገዝ"
 DocType: Production Order Operation,Actual Operation Time,ትክክለኛው ኦፕሬሽን ሰዓት
 DocType: Authorization Rule,Applicable To (User),የሚመለከታቸው ለማድረግ (ተጠቃሚ)
 DocType: Purchase Taxes and Charges,Deduct,ቀነሰ
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ኩባንያ ይምረጡ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ሁሉም ክፍሎች እየታሰቡ ከሆነ ባዶውን ይተው
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
 DocType: Process Payroll,Fortnightly,በየሁለት ሳምንቱ
 DocType: Currency Exchange,From Currency,ምንዛሬ ከ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ቢያንስ አንድ ረድፍ ውስጥ የተመደበ መጠን, የደረሰኝ አይነት እና የደረሰኝ ቁጥር እባክዎ ይምረጡ"
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,የመጀመሪያውን ረድፍ ለ &#39;ቀዳሚ ረድፍ ጠቅላላ ላይ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; እንደ ክፍያ አይነት መምረጥ ወይም አይቻልም
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,የልጅ ንጥል አንድ ምርት ጥቅል መሆን የለበትም. ንጥል ለማስወገድ `{0}` እና ያስቀምጡ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ባንኪንግ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ያክሉ
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ያክሉ
 DocType: Vehicle Service,Service Item,የአገልግሎት ንጥል
 DocType: Bank Guarantee,Bank Guarantee,ባንክ ዋስትና
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ፕሮግራም ለማግኘት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,የዋጋ ዝርዝር ካልተዋቀረ ዋጋዎች አይታይም
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ለዚህ መላኪያ አገዛዝ አንድ አገር መግለጽ ወይም ዓለም አቀፍ መላኪያ ያረጋግጡ
 DocType: Stock Entry,Total Incoming Value,ጠቅላላ ገቢ ዋጋ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ዴት ወደ ያስፈልጋል
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ዴት ወደ ያስፈልጋል
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,የግዢ ዋጋ ዝርዝር
 DocType: Offer Letter Term,Offer Term,ቅናሽ የሚቆይበት ጊዜ
 DocType: Quality Inspection,Quality Manager,የጥራት ሥራ አስኪያጅ
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,የጠፋ ምክንያት
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,አዲስ አድራሻ
 DocType: Quality Inspection,Sample Size,የናሙና መጠን
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ደረሰኝ ሰነድ ያስገቡ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ሁሉም ንጥሎች ቀደም ሲል ደረሰኝ ተደርጓል
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ደረሰኝ ሰነድ ያስገቡ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ሁሉም ንጥሎች ቀደም ሲል ደረሰኝ ተደርጓል
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;የጉዳይ ቁጥር ከ&#39; አንድ ልክ ይግለጹ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ተጨማሪ ወጪ ማዕከላት ቡድኖች ስር ሊሆን ይችላል ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል
 DocType: Project,External,ውጫዊ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ተጠቃሚዎች እና ፈቃዶች
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},የምርት ትዕዛዞች ተፈጠረ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},የምርት ትዕዛዞች ተፈጠረ: {0}
 DocType: Branch,Branch,ቅርንጫፍ
 DocType: Guardian,Mobile Number,ስልክ ቁጥር
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ፕሪንቲንግ እና የምርት
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,አልተገኘም ተከታታይ ምንም {0}
 DocType: Scheduling Tool,Student Batch,የተማሪ ባች
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,የእርስዎ ደንበኞች
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,የተማሪ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,የተማሪ አድርግ
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},እርስዎ ፕሮጀክት ላይ ተባበር ተጋብዘዋል: {0}
 DocType: Leave Block List Date,Block Date,አግድ ቀን
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,አሁኑኑ ያመልክቱ
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,ወደ ተልኳል
 DocType: Payment Request,Make Sales Invoice,የሽያጭ ደረሰኝ አድርግ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ሶፍትዌሮችን
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ቀጣይ የእውቂያ ቀን ያለፈ መሆን አይችልም
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ቀጣይ የእውቂያ ቀን ያለፈ መሆን አይችልም
 DocType: Company,For Reference Only.,ማጣቀሻ ያህል ብቻ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,ምረጥ የጅምላ አይ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ልክ ያልሆነ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,የቅድሚያ ክፍያ መጠን
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,የጉዳይ ቁጥር 0 መሆን አይችልም
 DocType: Item,Show a slideshow at the top of the page,በገጹ ላይኛው ክፍል ላይ አንድ ስላይድ ትዕይንት አሳይ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,መደብሮች
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,መደብሮች
 DocType: Serial No,Delivery Time,የማስረከቢያ ቀን ገደብ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ላይ የተመሠረተ ጥበቃና
 DocType: Item,End of Life,የሕይወት መጨረሻ
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,አስተላልፍ ሐሳብ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","የ ክወናዎች, የክወና ወጪ ይጥቀሱ እና ቀዶ ሕክምና ምንም ልዩ ክወና መስጠት."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ይህ ሰነድ በ ገደብ በላይ ነው {0} {1} ንጥል {4}. እናንተ እያደረግን ነው በዚያው ላይ ሌላ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
 DocType: Purchase Invoice,Price List Currency,የዋጋ ዝርዝር ምንዛሬ
 DocType: Naming Series,User must always select,ተጠቃሚው ሁልጊዜ መምረጥ አለብዎ
 DocType: Stock Settings,Allow Negative Stock,አሉታዊ የአክሲዮን ፍቀድ
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,የበጀት መለያ
 DocType: Quality Inspection,Verified By,በ የተረጋገጡ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ነባር ግብይቶች አሉ ምክንያቱም, ኩባንያ ነባሪ ምንዛሬ መለወጥ አይቻልም. ግብይቶች ነባሪውን ምንዛሬ ለመቀየር ተሰርዟል አለበት."
-DocType: Grade Interval,Grade Description,ኛ መግለጫ
+DocType: Grading Scale Interval,Grade Description,ኛ መግለጫ
 DocType: Stock Entry,Purchase Receipt No,የግዢ ደረሰኝ የለም
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ልባዊ ገንዘብ
 DocType: Process Payroll,Create Salary Slip,የቀጣሪ ፍጠር
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,ቀን ወደ በስብሰባው
 DocType: Warranty Claim,Raised By,በ አስነስቷል
 DocType: Payment Gateway Account,Payment Account,የክፍያ መለያ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,መለያዎች የሚሰበሰብ ሂሳብ ውስጥ የተጣራ ለውጥ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,የማካካሻ አጥፋ
 DocType: Offer Letter,Accepted,ተቀባይነት አግኝቷል
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,መላኪያ ደንብ መሰየሚያ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,የተጠቃሚ መድረክ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ማንኛውም ንጥል agianst የተጠቀሰው ከሆነ መጠን መቀየር አይችሉም
 DocType: Employee,Previous Work Experience,ቀዳሚ የሥራ ልምድ
@@ -2285,7 +2285,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ውል እና Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ተቋሙ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ከዚህ ቀን ድረስ በበረዶ ዲግሪ ግቤት, ማንም / ማድረግ ከዚህ በታች በተጠቀሰው ሚና በስተቀር ግቤት መቀየር ይችላል."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,የጥገና ፕሮግራም ለማመንጨት በፊት ሰነዱን ያስቀምጡ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,የጥገና ፕሮግራም ለማመንጨት በፊት ሰነዱን ያስቀምጡ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,የፕሮጀክት ሁኔታ
 DocType: UOM,Check this to disallow fractions. (for Nos),ክፍልፋዮች እንዲከለክል ይህን ይመልከቱ. (ቁጥሮች ለ)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,የሚከተሉት የምርት ትዕዛዞች ተፈጥረው ነበር:
@@ -2308,6 +2308,7 @@
 DocType: Email Digest,How frequently?,ምን ያህል ጊዜ ነው?
 DocType: Purchase Receipt,Get Current Stock,የአሁኑ የአክሲዮን ያግኙ
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ዕቃዎች መካከል ቢል ዛፍ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; ብራንድ
 DocType: Student,Joining Date,በመቀላቀል ቀን
 ,Employees working on a holiday,አንድ በዓል ላይ የሚሰሩ ሰራተኞች
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ማርቆስ አቅርብ
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,መልቀቂያ ቀን የተጠቀሰው አይደለም
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ፕሮዳክሽን
 DocType: Guardian,Occupation,ሞያ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ረድፍ {0}: የመጀመሪያ ቀን ከመጨረሻ ቀን በፊት መሆን አለበት
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ረድፍ {0}: የመጀመሪያ ቀን ከመጨረሻ ቀን በፊት መሆን አለበት
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ጠቅላላ (ብዛት)
 DocType: Sales Invoice,This Document,ይህ ሰነድ
 DocType: Installation Note Item,Installed Qty,ተጭኗል ብዛት
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,የሽያጭ ትዕዛዝ መልዕክት
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ወዘተ ኩባንያ, የምንዛሬ, የአሁኑ የበጀት ዓመት, እንደ አዘጋጅ ነባሪ እሴቶች"
 DocType: Payment Entry,Payment Type,የክፍያ አይነት
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ንጥል አንድ ባች ይምረጡ {0}. ይህን መስፈርት በሚያሟላ አንድ ነጠላ ባች ማግኘት አልተቻለም
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ንጥል አንድ ባች ይምረጡ {0}. ይህን መስፈርት በሚያሟላ አንድ ነጠላ ባች ማግኘት አልተቻለም
 DocType: Process Payroll,Select Employees,ይምረጡ ሰራተኞች
 DocType: Opportunity,Potential Sales Deal,እምቅ የሽያጭ የስምምነት
 DocType: Payment Entry,Cheque/Reference Date,ቼክ / የማጣቀሻ ቀን
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ቀደም ሲል ኩባንያ የተፈጠሩ የአለም POS መገለጫ {0} {1}
 DocType: Purchase Order,Ref SQ,ማጣቀሻ ካሬ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ሁሉም BOMs ውስጥ ንጥል / BOM ተካ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ደረሰኝ ሰነድ ማቅረብ ይኖርባቸዋል
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ደረሰኝ ሰነድ ማቅረብ ይኖርባቸዋል
 DocType: Purchase Invoice Item,Received Qty,ተቀብሏል ብዛት
 DocType: Stock Entry Detail,Serial No / Batch,ተከታታይ አይ / ባች
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,አይደለም የሚከፈልበት እና ደርሷል አይደለም
@@ -2441,7 +2442,7 @@
 ,To Produce,ለማምረት
 apps/erpnext/erpnext/config/hr.py +93,Payroll,የመክፈል ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ረድፍ {0} ውስጥ {1}. ንጥል መጠን ውስጥ ከ {2} ማካተት, ረድፎች {3} ደግሞ መካተት አለበት"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ተጠቃሚ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ተጠቃሚ አድርግ
 DocType: Packing Slip,Identification of the package for the delivery (for print),የማቅረብ ያለውን ጥቅል መታወቂያ (የህትመት ለ)
 DocType: Bin,Reserved Quantity,የተያዘ ብዛት
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ልክ የሆነ የኢሜይል አድራሻ ያስገቡ
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,የተሰናከለ አብነት ነባሪ አብነት መሆን የለበትም
 DocType: Account,Income Account,የገቢ መለያ
 DocType: Payment Request,Amount in customer's currency,ደንበኛ ምንዛሬ መጠን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ርክክብ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,ርክክብ
 DocType: Stock Reconciliation Item,Current Qty,የአሁኑ ብዛት
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ተመልከት የኳንቲቲ ክፍል ውስጥ &quot;ቁሳቁሶች መሰረት ያደረገ ላይ ነው ይስጡት&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,የቀድሞው
 DocType: Appraisal Goal,Key Responsibility Area,ቁልፍ ኃላፊነት አካባቢ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","የተማሪ ቡድኖች እናንተ ተማሪዎች ክትትልን, ግምገማዎች እና ክፍያዎች ይከታተሉ ለመርዳት"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","የተማሪ ቡድኖች እናንተ ተማሪዎች ክትትልን, ግምገማዎች እና ክፍያዎች ይከታተሉ ለመርዳት"
 DocType: Payment Entry,Total Allocated Amount,ጠቅላላ የተመደበ መጠን
 DocType: Item Reorder,Material Request Type,ቁሳዊ ጥያቄ አይነት
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} ከ ደምወዝ ለ Accural ጆርናል የሚመዘገብ {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,የትራክ ኢንዱስትሪ ዓይነት ይመራል.
 DocType: Item Supplier,Item Supplier,ንጥል አቅራቢ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ሁሉም አድራሻዎች.
 DocType: Company,Stock Settings,የክምችት ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","የሚከተሉትን ባሕሪያት በሁለቱም መዝገቦች ላይ ተመሳሳይ ከሆነ ሕዋሶችን ብቻ ነው. ቡድን, ሥር ዓይነት, ኩባንያ ነው?"
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',ሁኔታ ጋር ሠራተኞች ክስተት ኢሜይል ይልካል &#39;Open&#39;
 DocType: Task,Depends on Tasks,ተግባራት ላይ ይመረኮዛል
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,የደንበኛ ቡድን ዛፍ ያቀናብሩ.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,አባሪዎች ወደ ግዢ ሳጥን ጨመር በማንቃት ያለ ሊታዩ ይችላሉ
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,አዲስ የወጪ ማዕከል ስም
 DocType: Leave Control Panel,Leave Control Panel,የመቆጣጠሪያ ፓነል ውጣ
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,ወደ ዴቢት
 DocType: Delivery Note,Required only for sample item.,ብቻ ናሙና ንጥል ያስፈልጋል.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ግብይት በኋላ ትክክለኛው ብዛት
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢ አይነት
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},መካከል ምንም ደመወዝ ወረቀት {0} እና {1}
 ,Pending SO Items For Purchase Request,የግዢ ጥያቄ ስለዚህ ንጥሎች በመጠባበቅ ላይ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,የተማሪ ምዝገባ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ተሰናክሏል
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ተሰናክሏል
 DocType: Supplier,Billing Currency,አከፋፈል ምንዛሬ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,በጣም ትልቅ
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,መነሻ ገጽ ተለይተው የቀረቡ ምርት
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ሁሉም የግምገማ ቡድኖች
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,አዲስ መጋዘን ስም
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ጠቅላላ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ጠቅላላ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ግዛት
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,የሚያስፈልግ ጉብኝቶች ምንም መጥቀስ እባክዎ
 DocType: Stock Settings,Default Valuation Method,ነባሪ ዋጋ ትመና ዘዴው
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,የዋጋ ዝርዝር መምህር
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ማዘጋጀት እና ዒላማዎች ለመከታተል እንዲችሉ ሁሉም የሽያጭ ግብይቶች በርካታ ** የሽያጭ አካላት ** ላይ መለያ ተሰጥተዋቸዋል ይችላል.
 ,S.O. No.,ምት ቁ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ቀዳሚ ከ ደንበኛ ለመፍጠር እባክዎ {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ቀዳሚ ከ ደንበኛ ለመፍጠር እባክዎ {0}
 DocType: Price List,Applicable for Countries,አገሮች የሚመለከታቸው
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ብቻ ማቅረብ ይችላሉ &#39;ተቀባይነት አላገኘም&#39; &#39;ጸድቋል »እና ሁኔታ ጋር መተግበሪያዎች ውጣ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},የተማሪ ቡድን ስም ረድፍ ላይ ግዴታ ነው {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,የአክሲዮን ለ አካውንቲንግ Entry
 DocType: Vehicle Service,Engine Oil,የሞተር ዘይት
 DocType: Sales Invoice,Sales Team1,የሽያጭ Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ንጥል {0} የለም
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ንጥል {0} የለም
 DocType: Sales Invoice,Customer Address,የደንበኛ አድራሻ
 DocType: Employee Loan,Loan Details,ብድር ዝርዝሮች
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ረድፍ {0}: ተጠናቋል ብዛት ከዜሮ በላይ መሆን አለበት.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,አሁን ያሉ ግብይት ጋር መጋዘኖችን ቡድን ሊቀየር አይችልም.
 DocType: Assessment Result Tool,Result HTML,ውጤት ኤችቲኤምኤል
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ጊዜው የሚያልፍበት
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ተማሪዎች ያክሉ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ተማሪዎች ያክሉ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},እባክዎ ይምረጡ {0}
 DocType: C-Form,C-Form No,ሲ-ቅጽ የለም
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ገደብ የምታገናኝ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ቬንቸር ካፒታል
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ይህ &#39;የትምህርት ዓመት&#39; ጋር አንድ የትምህርት ቃል {0} እና &#39;ተርም ስም «{1} አስቀድሞ አለ. እነዚህ ግቤቶችን ይቀይሩ እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",ንጥል {0} ላይ ነባር ግብይቶች አሉ እንደ አንተ ያለውን ዋጋ መለወጥ አይችሉም {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",ንጥል {0} ላይ ነባር ግብይቶች አሉ እንደ አንተ ያለውን ዋጋ መለወጥ አይችሉም {1}
 DocType: UOM,Must be Whole Number,ሙሉ ቁጥር መሆን አለበት
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(ቀኖች ውስጥ) የተመደበ አዲስ ቅጠሎች
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,ተከታታይ አይ {0} የለም
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,ወደ ቀጣዩ ወር የመጨረሻ ቀን
 DocType: Support Settings,Auto close Issue after 7 days,7 ቀናት በኋላ ራስ የቅርብ እትም
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","በፊት የተመደበ አይችልም ይተዉት {0}, ፈቃድ ቀሪ አስቀድሞ የማስቀመጫ-በሚተላለፈው ወደፊት ፈቃድ አመዳደብ መዝገብ ውስጥ ቆይቷል እንደ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,የተማሪ ማመልከቻ
 DocType: Asset Category Account,Accumulated Depreciation Account,ሲጠራቀሙ የእርጅና መለያ
 DocType: Stock Settings,Freeze Stock Entries,አርጋ Stock ግቤቶችን
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,ንጥል ኮድ
 DocType: Production Planning Tool,Create Production Orders,የምርት ትዕዛዞች ፍጠር
 DocType: Serial No,Warranty / AMC Details,የዋስትና / AMC ዝርዝሮች
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
 DocType: Journal Entry,User Remark,የተጠቃሚ አስተያየት
 DocType: Lead,Market Segment,ገበያ ክፍሉ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,ቁሳዊ ጥያቄዎች ፍጠር
 DocType: Employee Education,School/University,ትምህርት ቤት / ዩኒቨርስቲ
 DocType: Payment Request,Reference Details,የማጣቀሻ ዝርዝሮች
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ጠቃሚ ሕይወት በኋላ የሚጠበቀው ዋጋ ጠቅላላ የግዢ መጠን ያነሰ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ጠቃሚ ሕይወት በኋላ የሚጠበቀው ዋጋ ጠቅላላ የግዢ መጠን ያነሰ መሆን አለበት
 DocType: Sales Invoice Item,Available Qty at Warehouse,መጋዘን ላይ ይገኛል ብዛት
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,የሚከፈል መጠን
 DocType: Asset,Double Declining Balance,ድርብ ካልተቀበሉት ቀሪ
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},በመገኘቱ መጠን የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ንጥል ያስፈልጋል ትዕዛዝ ቁጥር ይግዙ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,የምርት ትዕዛዝ አልተፈጠረም
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,የምርት ትዕዛዝ አልተፈጠረም
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ቀን ጀምሮ&#39; በኋላ &#39;እስከ ቀን&#39; መሆን አለበት
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ተማሪ ሁኔታ መለወጥ አይቻልም {0} የተማሪ ማመልከቻ ጋር የተያያዘ ነው {1}
 DocType: Asset,Fully Depreciated,ሙሉ በሙሉ የቀነሰበት
 ,Stock Projected Qty,የክምችት ብዛት የታቀደበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ምልክት ተደርጎበታል ክትትል ኤችቲኤምኤል
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ጥቅሶች, የእርስዎ ደንበኞች ልከዋል ተጫራቾች ሀሳቦች ናቸው"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ጥቅሶች, የእርስዎ ደንበኞች ልከዋል ተጫራቾች ሀሳቦች ናቸው"
 DocType: Sales Order,Customer's Purchase Order,ደንበኛ የግዢ ትዕዛዝ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ተከታታይ የለም እና ባች
 DocType: Warranty Claim,From Company,ኩባንያ ከ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ግምገማ መስፈርት በበርካታ ድምር {0} መሆን አለበት.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ ማዘጋጀት እባክዎ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,እሴት ወይም ብዛት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ፕሮዳክሽን ትዕዛዞች ስለ ማጽደቅም የተነሣውን አይችልም:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ደቂቃ
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,የተማሪ ቡድን
 DocType: Shopping Cart Settings,Quotation Series,በትዕምርተ ጥቅስ ተከታታይ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","አንድ ንጥል በተመሳሳይ ስም አለ ({0}), ወደ ንጥል የቡድን ስም መቀየር ወይም ንጥል ዳግም መሰየም እባክዎ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,የደንበኛ ይምረጡ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,የደንበኛ ይምረጡ
 DocType: C-Form,I,እኔ
 DocType: Company,Asset Depreciation Cost Center,የንብረት ዋጋ መቀነስ ወጪ ማዕከል
 DocType: Sales Order Item,Sales Order Date,የሽያጭ ትዕዛዝ ቀን
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,ኢንሹራንስ ዝርዝሮች
 DocType: Account,Payable,ትርፍ የሚያስገኝ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,የሚያየን ክፍለ ጊዜዎች ያስገቡ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ተበዳሪዎች ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ተበዳሪዎች ({0})
 DocType: Pricing Rule,Margin,ህዳግ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,አዲስ ደንበኞች
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,አጠቃላይ ትርፍ%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,መልቀቂያ ቀን
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,አጠቃላይ የግዢ መጠን የግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,አጠቃላይ የግዢ መጠን የግዴታ ነው
 DocType: Lead,Address Desc,DESC አድራሻ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ፓርቲ የግዴታ ነው
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ርዕስ ስም
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,የ መሸጥ ወይም መግዛትና ውስጥ ቢያንስ አንድ መመረጥ አለበት
-DocType: Grading Structure,Grade Intervals,ኛ ጣልቃ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,የንግድ ተፈጥሮ ይምረጡ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"ባለማምረታቸው, ቀዶ የት ተሸክመው ነው."
 DocType: Asset Movement,Source Warehouse,ምንጭ መጋዘን
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ወርሃዊ ስርጭት መቶኛ
 DocType: Territory,Territory Targets,ግዛት ዒላማዎች
 DocType: Delivery Note,Transporter Info,አጓጓዥ መረጃ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},ኩባንያ ውስጥ ነባሪ {0} ለማዘጋጀት እባክዎ {1}
 DocType: Cheque Print Template,Starting position from top edge,ከላይ ጠርዝ እስከ ቦታ በመጀመር ላይ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ተመሳሳይ አቅራቢ በርካታ ጊዜ ገብቷል ታይቷል
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,አስይዝ ብዛት
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,የአሁኑ ክፍት የሥራ ቦታዎች
 DocType: Company,Stock Adjustment Account,የአክሲዮን የማስተካከያ መለያ
-DocType: Journal Entry,Write Off,ሰረዘ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ሰረዘ
 DocType: Timesheet Detail,Operation ID,ኦፕሬሽን መታወቂያ
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","የስርዓት የተጠቃሚ (መግቢያ) መታወቂያ. ከተዋቀረ ከሆነ, ለሁሉም የሰው ሃይል ቅጾች ነባሪ ይሆናል."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ከ {1}
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,አቅራቢው የደንበኛ ወደ ያድነዋል
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ፎርም / ንጥል / {0}) የአክሲዮን ውጭ ነው
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,ቀጣይ ቀን መለጠፍ ቀን የበለጠ መሆን አለበት
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,የውሂብ ያስመጡ እና ወደ ውጪ ላክ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","የአክሲዮን ግቤቶች በመሆኑም ዳግም መመደብ ወይም መቀየር አይችሉም, {0} መጋዘን ላይ የለም"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ምንም ተማሪዎች አልተገኙም
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
 DocType: Program Enrollment,School House,ትምህርት ቤት
 DocType: Serial No,Out of AMC,AMC ውጪ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ጥቅሶች ይምረጡ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ጥቅሶች ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
 DocType: Company,Default Cash Account,ነባሪ በጥሬ ገንዘብ መለያ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ኩባንያ (አይደለም የደንበኛ ወይም አቅራቢው) ጌታው.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ይህ የዚህ ተማሪ በስብሰባው ላይ የተመሠረተ ነው
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,ምንም ተማሪዎች ውስጥ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ተጨማሪ ንጥሎች ወይም ክፍት ሙሉ ቅጽ ያክሉ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;የሚጠበቀው የመላኪያ ቀን&#39; ያስገቡ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,የመላኪያ ማስታወሻዎች {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,እርቅ በፊት
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ወደ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ግብሮች እና ክፍያዎች ታክሏል (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ንጥል ግብር ረድፍ {0} አይነት ታክስ ወይም ገቢ ወይም የወጪ ወይም እንዳንከብድበት ምክንያት ሊኖረው ይገባል
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ንጥል ግብር ረድፍ {0} አይነት ታክስ ወይም ገቢ ወይም የወጪ ወይም እንዳንከብድበት ምክንያት ሊኖረው ይገባል
 DocType: Sales Order,Partly Billed,በከፊል የሚከፈል
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ንጥል {0} አንድ ቋሚ የንብረት ንጥል መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ንጥል {0} አንድ ቋሚ የንብረት ንጥል መሆን አለበት
 DocType: Item,Default BOM,ነባሪ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ዳግም-ዓይነት ኩባንያ ስም ለማረጋገጥ እባክዎ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ጠቅላላ ያልተወራረደ Amt
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,የዋጋ ዝርዝር ምንዛሪ ተመን
 DocType: Purchase Invoice Item,Rate,ደረጃ ይስጡ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,እሥረኛ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,አድራሻ ስም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,አድራሻ ስም
 DocType: Stock Entry,From BOM,BOM ከ
 DocType: Assessment Code,Assessment Code,ግምገማ ኮድ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,መሠረታዊ
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,የህትመት ቋንቋ
 DocType: Salary Slip,Total Working Hours,ጠቅላላ የሥራ ሰዓቶች
 DocType: Stock Entry,Including items for sub assemblies,ንዑስ አብያተ ክርስቲያናት ለ ንጥሎችን በማካተት ላይ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ሁሉም ግዛቶች
 DocType: Purchase Invoice,Items,ንጥሎች
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ተማሪው አስቀድሞ ተመዝግቧል.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,የመክፈቻ ሰዓት
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,እንዲሁም ያስፈልጋል ቀናት ወደ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ዋስትና እና ምርት ልውውጥ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
 DocType: Shipping Rule,Calculate Based On,የተመረኮዘ ላይ ማስላት
 DocType: Delivery Note Item,From Warehouse,መጋዘን ከ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
 DocType: Assessment Plan,Supervisor Name,ሱፐርቫይዘር ስም
 DocType: Program Enrollment Course,Program Enrollment Course,ፕሮግራም ምዝገባ ኮርስ
-DocType: Grading Structure,Grading Structure,አሰጣጥ መዋቅር
 DocType: Purchase Taxes and Charges,Valuation and Total,ግምቱ እና ጠቅላላ
 DocType: Tax Rule,Shipping City,የመርከብ ከተማ
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ይህ ንጥል {0} (መለጠፊያ) አንድ ተለዋጭ ነው. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ባህርያት ወደ አብነት ላይ ይገለበጣሉ
 DocType: Notification Control,Customize the Notification,የ ማሳወቂያ አብጅ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ክወናዎች ከ የገንዘብ ፍሰት
 DocType: Sales Invoice,Shipping Rule,መላኪያ ደንብ
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},ምንም ነባሪ BOM ንጥል የለም {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,በመጀመሪያ መለጠፍ ቀን ይምረጡ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ቀን በመክፈት ቀን መዝጋት በፊት መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ማዋቀር ቁጥር ተከታታይ&gt; Setup በኩል ክትትል ተከታታይ ቁጥር እባክዎ
 DocType: Leave Control Panel,Carry Forward,አስተላልፍ መሸከም
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል የሒሳብ መዝገብ ላይ ሊቀየር አይችልም
 DocType: Department,Days for which Holidays are blocked for this department.,ቀኖች ስለ በዓላት በዚህ ክፍል ታግደዋል.
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ጠቅላላ (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,መዝናኛ እና መዝናኛዎች
 DocType: Quality Inspection,Item Serial No,ንጥል ተከታታይ ምንም
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,የሰራተኛ መዛግብት ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,የሰራተኛ መዛግብት ፍጠር
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ጠቅላላ አቅርብ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,አካውንቲንግ መግለጫ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ሰአት
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,ምትክ በኋላ ወደ አዲሱ BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,የሽያጭ ነጥብ
 DocType: Payment Entry,Received Amount,የተቀበልከው መጠን
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ&gt; የሰው ሀብት ውስጥ HR ቅንብሮች ስርዓት እየሰየሙ ማዋቀር የሰራተኛ
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",ሙሉ ብዛት ይፍጠሩ ለ ትዕዛዝ ላይ አስቀድሞ ብዛት ችላ
 DocType: Account,Tax,ግብር
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ምልክት ተደርጎበታል አይደለም
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,ደረሰኞች
 DocType: Batch,Source Document Name,ምንጭ ሰነድ ስም
 DocType: Job Opening,Job Title,የስራ መደቡ መጠሪያ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ተጠቃሚዎች ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ተጠቃሚዎች ፍጠር
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ግራም
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ለማምረት ብዛት 0 የበለጠ መሆን አለበት.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,የጥገና ጥሪ ሪፖርት ይጎብኙ.
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ወጪ መለያ ንጥል ግዴታ ነው {0}
 DocType: BOM,Website Description,የድር ጣቢያ መግለጫ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ፍትህ ውስጥ የተጣራ ለውጥ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
 DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ደረሰኝ
 ,Sales Register,የሽያጭ መመዝገቢያ
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,አርትዕ ለማድረግ ምንም ነገር የለም.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,በዚህ ወር እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 DocType: Customer Group,Customer Group Name,የደንበኛ የቡድን ስም
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ገና ምንም ደንበኞች!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ፈቃድ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,እናንተ ደግሞ ካለፈው በጀት ዓመት ሚዛን በዚህ የበጀት ዓመት ወደ ቅጠሎች ማካተት የሚፈልጉ ከሆነ ወደፊት አኗኗራችሁ እባክዎ ይምረጡ
 DocType: GL Entry,Against Voucher Type,ቫውቸር አይነት ላይ
 DocType: Item,Attributes,ባህሪያት
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,መለያ ጠፍቷል ይጻፉ ያስገቡ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,የመጨረሻ ትዕዛዝ ቀን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
 DocType: Student,Guardian Details,አሳዳጊ ዝርዝሮች
 DocType: C-Form,C-Form,ሲ-ቅጽ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,በርካታ ሠራተኞች ምልክት ክትትል
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ረድፍ {0} # መለያ አይነት መሆን አለበት &#39;ቋሚ ንብረት&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ብዛት ውጪ
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ደንቦች አንድ የሚሸጥ የመላኪያ መጠን ለማስላት
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,ተከታታይ ግዴታ ነው
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,ተከታታይ ግዴታ ነው
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,የፋይናንስ አገልግሎቶች
 DocType: Student Sibling,Student ID,የተማሪ መታወቂያ
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ጊዜ ምዝግብ እንቅስቃሴዎች አይነቶች
 DocType: Tax Rule,Sales,የሽያጭ
 DocType: Stock Entry Detail,Basic Amount,መሰረታዊ መጠን
 DocType: Training Event,Exam,ፈተና
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
 DocType: Leave Allocation,Unused leaves,ያልዋለ ቅጠሎች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
 DocType: Tax Rule,Billing State,አከፋፈል መንግስት
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,መለያ ከ የሚከፈልበት
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ጥሬ ሐሳብ ያለው ንጥል ኮድ
 DocType: Journal Entry,Write Off Based On,ላይ የተመሠረተ ላይ ጠፍቷል ይጻፉ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ሊድ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ሊድ አድርግ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,አትም የጽህፈት
 DocType: Stock Settings,Show Barcode Field,አሳይ ባርኮድ መስክ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,ምላሽ በመጠባበቅ ላይ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ከላይ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,መጥቀስ መደበኛ ያልሆኑ ተከፋይ ሂሳብ ከሆነ
 DocType: Salary Slip,Earning & Deduction,ገቢ እና ተቀናሽ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ከተፈለገ. ይህ ቅንብር በተለያዩ ግብይቶችን ለማጣራት ጥቅም ላይ ይውላል.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,አሉታዊ ግምቱ ተመን አይፈቀድም
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,ከ ተማሪዎች ያግኙ
 DocType: Hub Settings,Seller Country,ሻጭ አገር
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ድህረ ገጽ ላይ ንጥሎች አትም
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ቀድመህ ቡድን የእርስዎን ተማሪዎች
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ቀድመህ ቡድን የእርስዎን ተማሪዎች
 DocType: Authorization Rule,Authorization Rule,የፈቃድ አሰጣጥ ደንብ
 DocType: Sales Invoice,Terms and Conditions Details,ውል እና ሁኔታዎች ዝርዝር
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,መግለጫዎች
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,የሥራ ልማድ የሚፈትን ጊዜ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ደመወዝ ክፍሎች
 DocType: Program Enrollment Tool,New Academic Year,አዲስ የትምህርት ዓመት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ተመለስ / ክሬዲት ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,ተመለስ / ክሬዲት ማስታወሻ
 DocType: Stock Settings,Auto insert Price List rate if missing,ራስ-ያስገቡ ዋጋ ዝርዝር መጠን ይጎድለዋል ከሆነ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ጠቅላላ የሚከፈልበት መጠን
 DocType: Production Order Item,Transferred Qty,ተላልፈዋል ብዛት
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,የሽያጭ ማጥለያ
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ምህጻረ ቃል የግዴታ ነው
 DocType: Project,Task Progress,ተግባር ሂደት
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ጋሪ
 ,Qty to Transfer,ያስተላልፉ ዘንድ ብዛት
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,የሚመራ ወይም ደንበኞች ወደ በመጥቀስ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ሚና የታሰረው የአክሲዮን አርትዕ ማድረግ ተፈቅዷል
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ብዛት ({0}) ረድፍ ውስጥ ክፍልፋይ ሊሆን አይችልም {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ክፍያዎች ሰብስብ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
 DocType: Lead,Add to calendar on this date,በዚህ ቀን ላይ ወደ ቀን መቁጠሪያ አክል
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,የመላኪያ ወጪዎች ለማከል ደንቦች.
 DocType: Item,Opening Stock,በመክፈት ላይ የአክሲዮን
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,ሊድ ከ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ትዕዛዞች ምርት ከእስር.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,በጀት ዓመት ይምረጡ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
 DocType: Program Enrollment Tool,Enroll Students,ተማሪዎች ይመዝገቡ
 DocType: Hub Settings,Name Token,ስም ማስመሰያ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,መደበኛ ሽያጭ
@@ -3645,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} የሽያጭ ደረሰኝ ላይ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,የፕሮጀክት ስም
-DocType: Supplier,Mention if non-standard receivable account,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ከሆነ
+DocType: Customer,Mention if non-standard receivable account,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ከሆነ
 DocType: Journal Entry Account,If Income or Expense,ገቢ ወይም የወጪ ከሆነ
 DocType: Production Order,Required Items,ተፈላጊ ንጥሎች
 DocType: Stock Ledger Entry,Stock Value Difference,የአክሲዮን ዋጋ ያለው ልዩነት
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,ግብሮች
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,የሚከፈልበት እና ደርሷል አይደለም
 DocType: Project,Default Cost Center,ነባሪ ዋጋ ማዕከል
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; የስያሜ ተከታታይ ለ ተከታታይ የስያሜ ለማዘጋጀት እባክዎ
 DocType: Bank Guarantee,End Date,የመጨረሻ ቀን
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,የክምችት ግብይቶች
 DocType: Budget,Budget Accounts,በጀት መለያዎች
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,የሽያጭ አጋር እና ኮሚሽን
 DocType: Employee Loan,Rate of Interest (%) / Year,በፍላጎት ላይ (%) / የዓመቱ ይስጡት
 ,Project Quantity,የፕሮጀክት ብዛት
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ጠቅላላ {0} ሁሉም ንጥሎች እናንተ &#39;ላይ የተመሠረተ ክፍያዎች ያሰራጩ&#39; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ጠቅላላ {0} ሁሉም ንጥሎች እናንተ &#39;ላይ የተመሠረተ ክፍያዎች ያሰራጩ&#39; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው"
 DocType: Opportunity,To Discuss,ለመወያየት
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ክፍሎች {1} {2} ይህን ግብይት ለማጠናቀቅ ያስፈልጋል.
 DocType: Loan Type,Rate of Interest (%) Yearly,የወለድ ምጣኔ (%) ዓመታዊ
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ማርቆስ የተዉ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ረድፍ {0}: ወደ BOM # ምንዛሬ {1} በተመረጠው ምንዛሬ እኩል መሆን አለበት {2}
 DocType: Journal Entry Account,Exchange Rate,የመለወጫ ተመን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
 DocType: Homepage,Tag Line,መለያ መስመር
 DocType: Fee Component,Fee Component,የክፍያ ክፍለ አካል
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,መርከቦች አስተዳደር
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,መጋዘን {0} የለም
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext ማዕከል ለማግኘት ይመዝገቡ
 DocType: Monthly Distribution,Monthly Distribution Percentages,ወርሃዊ የስርጭት መቶኛ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,የተመረጠው ንጥል ባች ሊኖረው አይችልም
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,የተመረጠው ንጥል ባች ሊኖረው አይችልም
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ግምቱ መጠን ለ የሂሳብ ግቤቶች ማድረግ ያስፈልጋል ይህም ንጥል {0}, ለ አልተገኘም {1} {2}. ንጥል ውስጥ ናሙና ንጥል እንደ ልውውጥ ከሆነ {1} ን, {1} ንጥል ሠንጠረዥ ውስጥ መጥቀስ እባክህ. አለበለዚያ, / ካስረከቡ ይሞክሩ ይህን ግቤት በመሰረዝ ከዚያም ንጥል መዝገብ ውስጥ ንጥል ወይም የተጠቀሰ ነገር ግምቱ መጠን አንድ ገቢ የአክሲዮን ግብይት መፍጠር, እና እባክህ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ቁሳቁሶችን% ይህን የመላኪያ ማስታወሻ ላይ አሳልፎ
 DocType: Project,Customer Details,የደንበኛ ዝርዝሮች
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,የተረከቡት ትዕዛዞች ሊሰረዝ አይችልም
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","አስቀድሞ ዴቢት ውስጥ ቀሪ ሒሳብ, አንተ &#39;ምንጭ&#39; እንደ &#39;ሚዛናዊ መሆን አለብህ&#39; እንዲያዘጋጁ ያልተፈቀደላቸው ነው"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,የጥራት ሥራ አመራር
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} ንጥል ተሰናክሏል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} ንጥል ተሰናክሏል
 DocType: Employee Loan,Repay Fixed Amount per Period,ክፍለ ጊዜ በአንድ ቋሚ መጠን ብድራትን
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ንጥል ለ ብዛት ያስገቡ {0}
 DocType: Employee External Work History,Employee External Work History,የተቀጣሪ ውጫዊ የስራ ታሪክ
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,የተማሪ የኢሜይል መታወቂያ
 DocType: Employee,Notice (days),ማስታወቂያ (ቀናት)
 DocType: Tax Rule,Sales Tax Template,የሽያጭ ግብር አብነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
 DocType: Employee,Encashment Date,Encashment ቀን
 DocType: Training Event,Internet,በይነመረብ
 DocType: Account,Stock Adjustment,የአክሲዮን ማስተካከያ
@@ -3855,6 +3861,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ዴት ማስታወሻ ቀርቧል
 DocType: Production Order,Warehouses,መጋዘኖችን
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ንብረት ማስተላለፍ አይቻልም
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ይህ ንጥል {0} (አብነት) የሆነ ተለዋጭ ነው.
 DocType: Workstation,per hour,በ ሰዓት
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,የግዥ
 DocType: Announcement,Announcement,ማስታወቂያ
@@ -3870,7 +3877,7 @@
 DocType: Account,Receivable,የሚሰበሰብ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,የረድፍ # {0}: የግዢ ትዕዛዝ አስቀድሞ አለ እንደ አቅራቢው ለመለወጥ አይፈቀድም
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ካልተዋቀረ የብድር ገደብ መብለጥ መሆኑን ግብይቶችን ማቅረብ አይፈቀድም ነው ሚና.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
 DocType: Item,Material Issue,ቁሳዊ ችግር
 DocType: Hub Settings,Seller Description,ሻጭ መግለጫ
@@ -3883,7 +3890,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,የዕቃው መረጃ
 DocType: Salary Detail,Component,ክፍል
 DocType: Assessment Criteria,Assessment Criteria Group,የግምገማ መስፈርት ቡድን
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ክምችት የእርጅና በመክፈት ጋር እኩል ያነሰ መሆን አለበት {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ክምችት የእርጅና በመክፈት ጋር እኩል ያነሰ መሆን አለበት {0}
 DocType: Warehouse,Warehouse Name,የመጋዘን ስም
 DocType: Naming Series,Select Transaction,ይምረጡ የግብይት
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ሚና በማፅደቅ ወይም የተጠቃሚ በማፅደቅ ያስገቡ
@@ -3917,7 +3924,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ነባሪ በዚህ በጀት ዓመት ለማዘጋጀት &#39;ነባሪ አዘጋጅ »ላይ ጠቅ ያድርጉ"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ተቀላቀል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,እጥረት ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
 DocType: Employee Loan,Repay from Salary,ደመወዝ ከ ልከፍለው
 DocType: Leave Application,LAP/,ጭን /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ላይ ክፍያ በመጠየቅ ላይ {0} {1} መጠን ለ {2}
@@ -3935,7 +3942,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ግምገማ ውጤት ዝርዝር
 DocType: Employee Education,Employee Education,የሰራተኛ ትምህርት
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ንጥል ቡድን ሠንጠረዥ ውስጥ አልተገኘም አባዛ ንጥል ቡድን
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
 DocType: Salary Slip,Net Pay,የተጣራ ክፍያ
 DocType: Account,Account,ሒሳብ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,ተከታታይ አይ {0} አስቀድሞ ደርሷል
@@ -3944,7 +3951,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",መጋዘን {0} ማንኛውም መለያ ጋር የተገናኘ አይደለም; / መጋዘን ለ ተጓዳኝ (ንብረት) መለያ አገናኝ ፍጠር.
 DocType: Purchase Invoice,Recurring Id,ተደጋጋሚ መታወቂያ
 DocType: Customer,Sales Team Details,የሽያጭ ቡድን ዝርዝሮች
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,እስከመጨረሻው ይሰረዝ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,እስከመጨረሻው ይሰረዝ?
 DocType: Expense Claim,Total Claimed Amount,ጠቅላላ የቀረበበት የገንዘብ መጠን
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,መሸጥ የሚሆን እምቅ ዕድል.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ልክ ያልሆነ {0}
@@ -3955,13 +3962,14 @@
 DocType: Warehouse,PIN,ፒን
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext ውስጥ ማዋቀር ትምህርት ቤት
 DocType: Sales Invoice,Base Change Amount (Company Currency),የመሠረት ለውጥ መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,የሚከተሉትን መጋዘኖችን ምንም የሂሳብ ግቤቶች
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,የሚከተሉትን መጋዘኖችን ምንም የሂሳብ ግቤቶች
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,በመጀመሪያ ሰነዱን አስቀምጥ.
 DocType: Account,Chargeable,እንዳንከብድበት
 DocType: Company,Change Abbreviation,ለውጥ ምህፃረ ቃል
 DocType: Expense Claim Detail,Expense Date,የወጪ ቀን
 DocType: Item,Max Discount (%),ከፍተኛ ቅናሽ (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,የመጨረሻ ትዕዛዝ መጠን
+DocType: Task,Is Milestone,ያበረከተ ነው
 DocType: Daily Work Summary,Email Sent To,ኢሜይል ተልኳል
 DocType: Budget,Warn,አስጠንቅቅ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ሌሎች ማንኛውም አስተያየት, መዝገቦች ውስጥ መሄድ ዘንድ ትኩረት የሚስብ ጥረት."
@@ -3994,11 +4002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`እሰር አክሲዮኖች የቆየ Than`% d ቀኖች ያነሰ መሆን ይኖርበታል.
 DocType: Tax Rule,Purchase Tax Template,የግብር አብነት ግዢ
 ,Project wise Stock Tracking,ፕሮጀክት ጥበበኛ የአክሲዮን ክትትል
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ጥገና ፕሮግራም {0} ላይ አለ {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(ምንጭ / ዒላማ ላይ) ትክክለኛ ብዛት
 DocType: Item Customer Detail,Ref Code,ማጣቀሻ ኮድ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,የሰራተኛ መዝገቦች.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
 DocType: HR Settings,Payroll Settings,ከደመወዝ ክፍያ ቅንብሮች
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ያልሆኑ የተገናኘ ደረሰኞች እና ክፍያዎች አዛምድ.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ቦታ አያያዝ
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques እና ተቀማጭ ትክክል ጸድቷል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,መለያ {0}: አንተ ወላጅ መለያ ራሱን እንደ መመደብ አይችሉም
 DocType: Purchase Invoice Item,Price List Rate,የዋጋ ዝርዝር ተመን
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,የደንበኛ ጥቅሶችን ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,የደንበኛ ጥቅሶችን ፍጠር
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;ክምችት ላይ አለ&quot; ወይም በዚህ መጋዘን ውስጥ ይገኛል በክምችት ላይ የተመሠረተ &quot;አይደለም የአክሲዮን ውስጥ&quot; አሳይ.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ዕቃዎች መካከል ቢል (BOM)
 DocType: Item,Average time taken by the supplier to deliver,አቅራቢው የተወሰደው አማካይ ጊዜ ለማቅረብ
@@ -4043,7 +4050,7 @@
 DocType: Asset,Disposal Date,ማስወገድ ቀን
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","እነርሱ በዓል ከሌለዎት ኢሜይሎችን, በተሰጠው ሰዓት ላይ ኩባንያ ሁሉ ንቁ ሠራተኞች ይላካል. ምላሾች ማጠቃለያ እኩለ ሌሊት ላይ ይላካል."
 DocType: Employee Leave Approver,Employee Leave Approver,የሰራተኛ ፈቃድ አጽዳቂ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ትዕምርተ ተደርጓል ምክንያቱም, እንደ የጠፋ ማወጅ አይቻልም."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ስልጠና ግብረ መልስ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ትዕዛዝ {0} መቅረብ አለበት ፕሮዳክሽን
@@ -4051,7 +4058,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ኮርስ ረድፍ ላይ ግዴታ ነው {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ቀን ወደ ቀን ጀምሮ በፊት መሆን አይችልም
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ አርትዕ ዋጋዎች አክል
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ አርትዕ ዋጋዎች አክል
 DocType: Batch,Parent Batch,የወላጅ ባች
 DocType: Cheque Print Template,Cheque Print Template,ቼክ የህትመት አብነት
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ወጪ ማዕከላት ገበታ
@@ -4095,7 +4102,7 @@
 DocType: Item,Variant Based On,ተለዋጭ የተመረኮዘ ላይ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% መሆን አለበት የተመደበ ጠቅላላ weightage. ይህ ነው {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,የእርስዎ አቅራቢዎች
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ ነው እንደ የጠፋ እንደ ማዘጋጀት አልተቻለም.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ ነው እንደ የጠፋ እንደ ማዘጋጀት አልተቻለም.
 DocType: Request for Quotation Item,Supplier Part No,አቅራቢው ክፍል የለም
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',በምድብ «ግምቱ &#39;ወይም&#39; Vaulation እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ከ ተቀብሏል
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ከ {0} ለ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},የረድፍ # {0}: ንጥል አዘጋጅ አቅራቢው {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ረድፍ {0}: ሰዓቶች ዋጋ ከዜሮ በላይ መሆን አለበት.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
 DocType: Issue,Content Type,የይዘት አይነት
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ኮምፕዩተር
 DocType: Item,List this Item in multiple groups on the website.,ድር ላይ በርካታ ቡድኖች ውስጥ ይህን ንጥል ዘርዝር.
@@ -4114,20 +4121,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,አንተ ቀጥ እሴት ለማዘጋጀት ፍቃድ አይደለም
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ግቤቶችን ያግኙ
 DocType: Payment Reconciliation,From Invoice Date,የደረሰኝ ቀን ጀምሮ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,አከፋፈል ምንዛሬ ወይም ነባሪ comapany ምንዛሬ ወይም ወገን መለያ ምንዛሬ ጋር እኩል መሆን አለባቸው
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,አከፋፈል ምንዛሬ ወይም ነባሪ comapany ምንዛሬ ወይም ወገን መለያ ምንዛሬ ጋር እኩል መሆን አለባቸው
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Encashment ውጣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ምን ያደርጋል?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,መጋዘን ወደ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ሁሉም የተማሪ ምዝገባ
 ,Average Commission Rate,አማካኝ ኮሚሽን ተመን
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,በስብሰባው ወደፊት ቀናት ምልክት ሊሆን አይችልም
 DocType: Pricing Rule,Pricing Rule Help,የዋጋ አሰጣጥ ደንብ እገዛ
 DocType: School House,House Name,ቤት ስም
 DocType: Purchase Taxes and Charges,Account Head,መለያ ኃላፊ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ንጥሎች አርፏል ወጪ ማስላት ተጨማሪ ወጪዎች ያዘምኑ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ኤሌክትሪክ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,የእርስዎ ተጠቃሚዎች እንደ ድርጅት የቀረውን ያክሉ. በተጨማሪም አድራሻዎች ከእነርሱ በማከል ፖርታል ወደ ደንበኞች መጋበዝ ማከል ይችላሉ
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,የእርስዎ ተጠቃሚዎች እንደ ድርጅት የቀረውን ያክሉ. በተጨማሪም አድራሻዎች ከእነርሱ በማከል ፖርታል ወደ ደንበኞች መጋበዝ ማከል ይችላሉ
 DocType: Stock Entry,Total Value Difference (Out - In),ጠቅላላ ዋጋ ያለው ልዩነት (ውጭ - ውስጥ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,ረድፍ {0}: ምንዛሪ ተመን የግዴታ ነው
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},የተጠቃሚ መታወቂያ ሰራተኛ ለ ካልተዋቀረ {0}
@@ -4136,7 +4143,7 @@
 DocType: Item,Customer Code,የደንበኛ ኮድ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ለ የልደት አስታዋሽ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,የመጨረሻ ትዕዛዝ ጀምሮ ቀናት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
 DocType: Buying Settings,Naming Series,መሰየምን ተከታታይ
 DocType: Leave Block List,Leave Block List Name,አግድ ዝርዝር ስም ውጣ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ኢንሹራንስ የመጀመሪያ ቀን መድን የመጨረሻ ቀን ያነሰ መሆን አለበት
@@ -4151,7 +4158,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
 DocType: Vehicle Log,Odometer,ቆጣሪው
 DocType: Sales Order Item,Ordered Qty,የዕቃው መረጃ ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ንጥል {0} ተሰናክሏል
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ንጥል {0} ተሰናክሏል
 DocType: Stock Settings,Stock Frozen Upto,የክምችት Frozen እስከሁለት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ጀምሮ እና ክፍለ ጊዜ ተደጋጋሚ ግዴታ ቀናት ወደ ጊዜ {0}
@@ -4164,7 +4171,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),መጠን ጠፍቷል ጻፍ (የኩባንያ የምንዛሬ)
 DocType: Sales Invoice Timesheet,Billing Hours,አከፋፈል ሰዓቶች
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} አልተገኘም ነባሪ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,እዚህ ላይ ማከል ንጥሎችን መታ
 DocType: Fees,Program Enrollment,ፕሮግራም ምዝገባ
 DocType: Landed Cost Voucher,Landed Cost Voucher,አረፈ ወጪ ቫውቸር
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ማዘጋጀት እባክዎ {0}
@@ -4261,7 +4269,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,በችርቻሮ እና የጅምላ
 DocType: Issue,First Responded On,መጀመሪያ ላይ ምላሽ ሰጥተዋል
 DocType: Website Item Group,Cross Listing of Item in multiple groups,በርካታ ቡድኖች ውስጥ ንጥል መስቀል ዝርዝር
-DocType: Grade Interval,Grade Interval,ኛ ክፍል ክፍተት
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},በጀት ዓመት የመጀመሪያ ቀን እና በጀት ዓመት መጨረሻ ቀን አስቀድሞ በጀት ዓመት ውስጥ ነው የሚዘጋጁት {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,መልቀቂያ ቀን ዘምኗል
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ክፈል ባች
@@ -4269,6 +4276,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF አውርድ
 DocType: Production Order,Planned End Date,የታቀደ የማብቂያ ቀን
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,ንጥሎች የት ይከማቻሉ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢ አይነት
 DocType: Request for Quotation,Supplier Detail,በአቅራቢዎች ዝርዝር
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ ስህተት: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,በደረሰኝ የተቀመጠው መጠን
@@ -4313,7 +4321,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ማዋቀር የእኔ ድርጅት ለማግኘት ቀላል ድር ጣቢያ
 DocType: Payment Reconciliation,Receivable / Payable Account,የሚሰበሰብ / ሊከፈል መለያ
 DocType: Delivery Note Item,Against Sales Order Item,የሽያጭ ትዕዛዝ ንጥል ላይ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
 DocType: Item,Default Warehouse,ነባሪ መጋዘን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},በጀት ቡድን መለያ ላይ ሊመደብ አይችልም {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ወላጅ የወጪ ማዕከል ያስገቡ
@@ -4370,7 +4378,7 @@
 ,Items To Be Requested,ንጥሎች ተጠይቋል መሆን ወደ
 DocType: Purchase Order,Get Last Purchase Rate,የመጨረሻው ግዢ ተመን ያግኙ
 DocType: Company,Company Info,የኩባንያ መረጃ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,በወጪ ማዕከል አንድ ወጪ የይገባኛል ጥያቄ መያዝ ያስፈልጋል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ፈንድ (ንብረት) ውስጥ ማመልከቻ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ይህ የዚህ ሰራተኛ መካከል በስብሰባው ላይ የተመሠረተ ነው
@@ -4383,13 +4391,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,በሚቀጥሉት ቀኖች ላይ ፈቃድ መተግበሪያዎች በማድረጉ ተጠቃሚዎች አቁም.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,የግዢ መጠን
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,አቅራቢው ትዕምርተ {0} ተፈጥሯል
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},የታሸጉ የብዛት ረድፍ ውስጥ ንጥል {0} ለ ብዛት ጋር እኩል መሆን አለባቸው {1}
 DocType: Production Order,Manufactured Qty,የሚመረተው ብዛት
 DocType: Purchase Receipt Item,Accepted Quantity,ተቀባይነት ብዛት
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ነው አይደለም አለ
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ነው አይደለም አለ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ደንበኞች ከሞት ደረሰኞች.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,የፕሮጀክት መታወቂያ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ረድፍ አይ {0}: መጠን የወጪ የይገባኛል ጥያቄ {1} ላይ የገንዘብ መጠን በመጠባበቅ በላይ ሊሆን አይችልም. በመጠባበቅ መጠን ነው {2}
@@ -4398,15 +4406,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 ማንበብ
 ,Hub,ማዕከል
 DocType: GL Entry,Voucher Type,የቫውቸር አይነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
 DocType: Employee Loan Application,Approved,ጸድቋል
 DocType: Pricing Rule,Price,ዋጋ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} መዘጋጀት አለበት ላይ እፎይታ ሠራተኛ &#39;ግራ&#39; እንደ
 DocType: Guardian,Guardian,ሞግዚት
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ግምገማ {0} {1} በተሰጠው ቀን ክልል ውስጥ የሰራተኛ የተፈጠሩ
 DocType: Employee,Education,ትምህርት
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,በ የዘመቻ አሰያየም
 DocType: Employee,Current Address Is,የአሁኑ አድራሻ ነው
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,የተቀየረው
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ከተፈለገ. ካልተገለጸ ከሆነ, ኩባንያ ነባሪ ምንዛሬ ያዘጋጃል."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,ዲግሪ መጽሔት ግቤቶች.
 DocType: Delivery Note Item,Available Qty at From Warehouse,መጋዘን ከ ላይ ይገኛል ብዛት
@@ -4443,7 +4453,7 @@
 DocType: Hub Settings,Hub Settings,ማዕከል ቅንብሮች
 DocType: Project,Gross Margin %,ግዙፍ ኅዳግ %
 DocType: BOM,With Operations,ክወናዎች ጋር
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ዲግሪ ግቤቶች አስቀድሞ ምንዛሬ ተደርገዋል {0} ድርጅት {1}. ምንዛሬ ጋር አንድ እንደተቀበለ ወይም ተከፋይ ሂሳብ ይምረጡ {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ዲግሪ ግቤቶች አስቀድሞ ምንዛሬ ተደርገዋል {0} ድርጅት {1}. ምንዛሬ ጋር አንድ እንደተቀበለ ወይም ተከፋይ ሂሳብ ይምረጡ {0}.
 DocType: Asset,Is Existing Asset,ንብረት አሁን ነው
 DocType: Salary Detail,Statistical Component,ስታስቲክስ ክፍለ አካል
 ,Monthly Salary Register,ወርሃዊ ደመወዝ ይመዝገቡ
@@ -4497,7 +4507,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,አርማ ያያይዙ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,የክምችት ደረጃዎች
 DocType: Customer,Commission Rate,ኮሚሽን ተመን
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ተለዋጭ አድርግ
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ተለዋጭ አድርግ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,መምሪያ አግድ ፈቃድ መተግበሪያዎች.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","የክፍያ ዓይነት, ተቀበል አንዱ መሆን ይክፈሉ እና የውስጥ ትልልፍ አለበት"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ትንታኔ
@@ -4510,6 +4520,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,በዓላት ላይ ምርት ፍቀድ
 DocType: Sales Order,Customer's Purchase Order Date,ደንበኛ የግዢ ትዕዛዝ ቀን
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,አቢይ Stock
+DocType: Shopping Cart Settings,Show Public Attachments,የህዝብ አባሪዎች አሳይ
 DocType: Packing Slip,Package Weight Details,የጥቅል ክብደት ዝርዝሮች
 DocType: Payment Gateway Account,Payment Gateway Account,ክፍያ ፍኖት መለያ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,የክፍያ ማጠናቀቂያ በኋላ የተመረጠውን ገጽ ተጠቃሚ አቅጣጫ አዙር.
@@ -4534,7 +4545,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ምንዛሬዎች ወደ ወዘተ $ እንደ ማንኛውም ምልክት ቀጥሎ አታሳይ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ግማሽ ቀን)
 DocType: Supplier,Credit Days,የሥዕል ቀኖች
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,የተማሪ ባች አድርግ
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,የተማሪ ባች አድርግ
 DocType: Leave Type,Is Carry Forward,አስተላልፍ አኗኗራችሁ ነው
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ሰዓት ቀኖች ሊመራ
@@ -4553,7 +4564,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ማዕቀብ መጠን
 DocType: GL Entry,Is Opening,በመክፈት ላይ ነው
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ረድፍ {0}: ዴት ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ማዋቀር ቁጥር ተከታታይ&gt; Setup በኩል ክትትል ተከታታይ ቁጥር እባክዎ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,መለያ {0} የለም
 DocType: Account,Cash,ጥሬ ገንዘብ
 DocType: Employee,Short biography for website and other publications.,ድር ጣቢያ እና ሌሎች ጽሑፎች አጭር የሕይወት ታሪክ.
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index ca6f37d..1087c5b 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,دفعة وضع البند انتهاء الصلاحية
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,مسودة بنك
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,اظهار المتغيرات
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,اظهار المتغيرات
 DocType: Academic Term,Academic Term,الفصل الدراسي
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مادة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,كمية
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,الرعاية الصحية
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),التأخير في الدفع (أيام)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,نفقات الخدمة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,السنة المالية {0} مطلوب
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,إعلان
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,يتم إدخال نفس الشركة أكثر من مرة
 DocType: Employee,Married,متزوج
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لا يجوز لل{0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},لا يجوز لل{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,الحصول على البنود من
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},المنتج {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,لم يتم إدراج أية عناصر
 DocType: Payment Reconciliation,Reconcile,توفيق
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 DocType: Process Payroll,Make Bank Entry,أنشئ قيد محاسبي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق التقاعد
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,الاستهلاك المقبل التاريخ لا يمكن أن يكون قبل تاريخ الشراء
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,الاستهلاك المقبل التاريخ لا يمكن أن يكون قبل تاريخ الشراء
 DocType: SMS Center,All Sales Person,كل مندوبى البيع
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** التوزيع الشهري ** يساعدك على توزيع  الهدف أو الميزانية على مدى عدة شهور إذا كان لديك موسمية في عملك.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,لا وجدت وحدات
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,لا وجدت وحدات
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,هيكلية راتب مفقودة
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Invoice Item,Sales Invoice Item,فاتورة مبيعات السلعة
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",على سبيل المثال &quot;المدرسة الابتدائية&quot; أو &quot;جامعة&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,تقارير المخزون
 DocType: Warehouse,Warehouse Detail,تفاصيل المستودع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاريخ نهاية المدة لا يمكن أن يكون في وقت لاحق من تاريخ نهاية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""هل الأصول ثابتة"" لا يمكن إزالة اختياره, لأن سجل الأصول  موجود ضد هذا البند"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""هل الأصول ثابتة"" لا يمكن إزالة اختياره, لأن سجل الأصول  موجود ضد هذا البند"
 DocType: Vehicle Service,Brake Oil,زيت الفرامل
 DocType: Tax Rule,Tax Type,نوع الضريبة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
 DocType: BOM,Item Image (if not slideshow),صورة البند (إن لم يكن عرض الشرائح)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,موجود على العملاء مع نفس الاسم
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,حدد مكتب الإدارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,حدد مكتب الإدارة
 DocType: SMS Log,SMS Log,SMS سجل رسائل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,تكلفة البنود المسلمة
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,عطلة على {0} ليست بين من تاريخ وإلى تاريخ
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,درجة
 DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل المورد
 DocType: SMS Center,All Contact,جميع الاتصالات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,أمر الإنتاج التي تم إنشاؤها بالفعل لجميع البنود مع مكتب الإدارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,أمر الإنتاج التي تم إنشاؤها بالفعل لجميع البنود مع مكتب الإدارة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,الراتب السنوي
 DocType: Daily Work Summary,Daily Work Summary,ملخص العمل اليومي
 DocType: Period Closing Voucher,Closing Fiscal Year,إغلاق السنة المالية
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} غير المجمدة
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} غير المجمدة
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,يرجى تحديد الشركة الحالية لإنشاء مخطط الحسابات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,مصاريف المخزون
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,حدد مستودع الهدف
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,الدخول كونترا
 DocType: Journal Entry Account,Credit in Company Currency,الائتمان في الشركة العملات
 DocType: Delivery Note,Installation Status,حالة تثبيت
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",هل تريد تحديث الحضور؟ <br> الحاضر: {0} \ <br> غائبة: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,توريد مواد خام للشراء
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,مطلوب واسطة واحدة على الأقل من دفع لنقاط البيع فاتورة.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,مطلوب واسطة واحدة على الأقل من دفع لنقاط البيع فاتورة.
 DocType: Products Settings,Show Products as a List,عرض المنتجات كقائمة
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","تنزيل نموذج، وملء البيانات المناسبة وإرفاق الملف المعدل.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,انشئ مدخل استهلاك
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,طلب نوع
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,أنشئ موظف
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,أنشئ موظف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,إذاعة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,إعدام
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,حملت تفاصيل العمليات بها.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,خطة للزيارات الصيانة.
 DocType: SMS Settings,Enter url parameter for message,ادخل معمل العنوان للرسالة
 DocType: POS Profile,Customer Groups,المجموعات العملاء
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,القوائم المالية
 DocType: Guardian,Students,الطلاب
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,قواعد لتطبيق التسعير والخصم .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب أن تكون قائمة الأسعار المعمول بها لشراء أو بيع
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
 DocType: Company,Default Payroll Payable Account,افتراضي المرتبات حساب المدفوعات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,تحديث البريد الإلكتروني من مجموعة
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,تحديث البريد الإلكتروني من مجموعة
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
 DocType: Course Schedule,Instructor Name,اسم المدرب
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,صافي النقد من التمويل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",التخزين المحلي كامل، لم ينقذ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",التخزين المحلي كامل، لم ينقذ
 DocType: Lead,Address & Contact,معلومات الاتصال والعنوان
 DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الاجازات غير المستخدمة من المخصصات السابقة
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),إجمالي حساب التكاليف المبلغ (عبر ورقة الوقت)
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,إجازة محظورة
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,مدخلات البنك
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,جرد عناصر المخزون
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,نشر في المحور
 DocType: Student Admission,Student Admission,قبول الطلاب
 ,Terretory,إقليم
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,البند {0} تم إلغاء
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
 DocType: Journal Entry,Multi Currency,متعدد العملات
 DocType: Payment Reconciliation Invoice,Invoice Type,نوع الفاتورة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ملاحظة التسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,ملاحظة التسليم
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,إعداد الضرائب
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,تكلفة الأصول المباعة
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
-DocType: Grade Interval,Min Score,دقيقة نتيجة
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
 DocType: Student Applicant,Admitted,قُبل
 DocType: Workstation,Rent Cost,الإيجار التكلفة
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ثمن الطلب
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,المعاملات المصرفية / النقدية ضد طرف أو لنقل الداخلي
 DocType: Shipping Rule,Valid for Countries,صالحة للبلدان
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين ""لا نسخ '"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين ""لا نسخ '"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,إجمالي الطلب المعتبر
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,ضريبة
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} مخصصة أصلا للموظف {1} للفترة من {2} إلى {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,اختر البند
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,رقم المجموعة للصنف
 DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
 DocType: GL Entry,Debit Amount,قيمة الخصم
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,يرجى الإطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,إنشاء مجموعات الطلاب
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,طلب للحصول على الاقتباس
 DocType: Salary Slip Timesheet,Working Hours,ساعات العمل
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغيير رقم تسلسل بدء / الحالي من سلسلة الموجودة.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,إنشاء العملاء جديد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,إنشاء العملاء جديد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",إذا استمرت قواعد التسعير متعددة أن تسود، يطلب من المستخدمين تعيين الأولوية يدويا لحل الصراع.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,إنشاء أوامر الشراء
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,إنشاء أوامر الشراء
 ,Purchase Register,سجل شراء
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,إعدادات العالمية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتى
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,العطلة الرئيسية
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,من رقم حزمة
 DocType: Item Attribute,To Range,تتراوح
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,الأوراق المالية و الودائع
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",لا یمکن تغییر طریقة التقییم حیث أن ھناك معاملات مقابل بعض البنود التي لیس لدیھا طریقة تقییم خاصة
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع الإجازات المخصصة إلزامية
 DocType: Job Opening,Description of a Job Opening,وصف وظيفة شاغرة
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,الأنشطة في انتظار لهذا اليوم
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
 DocType: Production Order,Additional Operating Cost,تكاليف تشغيل  اضافية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,مستحضرات التجميل
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,يشترى
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,يرجى تحديد الدرجة لعتبة 0٪
 DocType: Sales Order,To Deliver,لتسليم
 DocType: Purchase Invoice Item,Item,بند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
 DocType: Account,Profit and Loss,الربح والخسارة
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,إدارة التعاقد من الباطن
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
 DocType: Production Plan Item,Pending Qty,الكمية التي قيد الانتظار
 DocType: Budget,Ignore,تجاهل
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} غير نشطة
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} غير نشطة
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},رسائل SMS أرسلت الى الارقام التالية: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,أبعاد الاختيار الإعداد للطباعة
 DocType: Salary Slip,Salary Slip Timesheet,كشف راتب معتمد علي سجل التوقيت
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,مجموع العمولة
 DocType: Pricing Rule,Sales Partner,شريك المبيعات
 DocType: Buying Settings,Purchase Receipt Required,مطلوب إيصال الشراء
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,تقييم أسعار إلزامي إذا فتح المخزون دخل
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,تقييم أسعار إلزامي إذا فتح المخزون دخل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,المالية / المحاسبة العام.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,القيم المتراكمة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",عذراَ ، ارقام المسلسل لا يمكن دمجها
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,أنشئ طلب بيع
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,أنشئ طلب بيع
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,السيرة الذاتية
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,العملاء المكررين
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,مبيعات المعاده
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,مبيعات المعاده
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ملاحظة: مجموع الأوراق المخصصة {0} لا ينبغي أن يكون أقل من الأوراق وافق بالفعل {1} للفترة
 DocType: Announcement,Posted By,منشور من طرف
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مزود (هبوط السفينة)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,الدخل المتوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,يرجى تعيين الشركة
 DocType: Purchase Order Item,Billed Amt,فوترة AMT
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاتورة المبيعات الجدول الزمني
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,اختار الحساب الذي سوف تدفع منه
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",إنشاء سجلات الموظفين لإدارة الإجازات ، ومطالبات النفقات والرواتب
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",إنشاء سجلات الموظفين لإدارة الإجازات ، ومطالبات النفقات والرواتب
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,إضافة إلى قاعدة المعارف
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,الكتابة الاقتراح
 DocType: Payment Entry Deduction,Payment Entry Deduction,دفع الاشتراك خصم
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,العلاقة مع Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدير
 DocType: Payment Entry,Payment From / To,الدفع من / إلى
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,نطاق الموعد
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد الائتماني الجديد هو أقل من المبلغ المستحق الحالي للعميل. الحد الائتماني يجب أن يكون أتلست {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد الائتماني الجديد هو أقل من المبلغ المستحق الحالي للعميل. الحد الائتماني يجب أن يكون أتلست {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
 DocType: SMS Settings,Receiver Parameter,معامل المستقبل
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,تاريخ القرار
 DocType: Student Batch Name,Batch Name,اسم دفعة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,الجدول الزمني الانشاء:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,تسجل
 DocType: Selling Settings,Customer Naming By,تسمية العملاء بواسطة
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,سوف تظهر الطالب كما موجود في طالب تقرير الحضور الشهري
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,الحضور طالب
 DocType: Sales Invoice Timesheet,Time Sheet,ورقة الوقت
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush المواد الخام مبني على
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,يرجى إدخال تفاصيل البند
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,يرجى إدخال تفاصيل البند
 DocType: Interest,Interest,فائدة
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,قبل المبيعات
 DocType: Purchase Receipt,Other Details,تفاصيل أخرى
@@ -727,7 +730,7 @@
 ,Absent Student Report,تقرير طالب متغيب
 DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكتروني التالي على:
 DocType: Offer Letter Term,Offer Letter Term,تقديم رسالة الأجل
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,قيمة المخزون
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,لا توجد شركة {0}
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,ضمان تاريخ الانتهاء
 DocType: Material Request Item,Quantity and Warehouse,الكمية والنماذج
 DocType: Sales Invoice,Commission Rate (%),نسبة العمولة (٪)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,يرجى تحديد البرنامج
 DocType: Project,Estimated Cost,التكلفة التقديرية
 DocType: Purchase Order,Link to material requests,رابط لطلبات المادية
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ليس من نوع المخزون
 DocType: Mode of Payment Account,Default Account,الافتراضي حساب
 DocType: Payment Entry,Received Amount (Company Currency),تلقى المبلغ (شركة العملات)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,الرجاء اختيار يوم عطلة أسبوعي
 DocType: Production Order Operation,Planned End Time,وقت الانتهاء المخطط له
 ,Sales Person Target Variance Item Group-Wise,الشخص المبيعات المستهدفة الفرق البند المجموعة الحكيم
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,معلومات عن العائلة
 DocType: Request for Quotation Supplier,Send Email,إرسال بريد الإلكتروني
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,لا يوجد تصريح
 DocType: Company,Default Bank Account,حساب البنك الافتراضي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,لا يوجد موظف
 DocType: Supplier Quotation,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,تم تحديث مجموعة الطلاب بالفعل.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,تم تحديث مجموعة الطلاب بالفعل.
 DocType: SMS Center,All Customer Contact,جميع العملاء الاتصال
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,تحميل المال عن طريق التوازن CSV.
 DocType: Warehouse,Tree Details,تفاصيل شجرة
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,الحد الأدنى للمبلغ الفاتورة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: مركز التكلفة {2} لا تنتمي إلى شركة {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: الحساب {2} لا يمكن أن تكون المجموعة
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,البند الصف {IDX}: {DOCTYPE} {} DOCNAME لا وجود له في أعلاه &#39;{DOCTYPE} المائدة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,البند الصف {IDX}: {DOCTYPE} {} DOCNAME لا وجود له في أعلاه &#39;{DOCTYPE} المائدة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,أية مهام
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء فاتورة السيارات سبيل المثال 05، 28 الخ
 DocType: Asset,Opening Accumulated Depreciation,فتح الاستهلاك المتراكم
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,الانتقال متوسط معدل
 DocType: Production Planning Tool,Select Items,اختر العناصر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,الجدول الدراسي
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,الجدول الدراسي
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: HR Settings,Enter retirement age in years,أدخل سن التقاعد بالسنوات
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,المستودع المستهدف
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,سجل الحضور
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,جميع مجموعات الصنف
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,جميع مجموعات الصنف
 DocType: Process Payroll,Activity Log,سجل النشاط
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,صافي الربح / الخسارة
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,شكل رسالة تلقائياً عند تثبيت المعاملة
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,أمر الشراء إلى الدفع
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,الكمية المتوقعة
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;فتح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,توسيع المهام
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,إعادة ترتيب الكميه
 DocType: Leave Block List Date,Leave Block List Date,تواريخ الإجازات المحظورة
 DocType: Pricing Rule,Price or Discount,السعر أو الخصم
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع الرسوم المطبقة في شراء طاولة إيصال عناصر يجب أن يكون نفس مجموع الضرائب والرسوم
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع الرسوم المطبقة في شراء طاولة إيصال عناصر يجب أن يكون نفس مجموع الضرائب والرسوم
 DocType: Sales Team,Incentives,الحوافز
 DocType: SMS Log,Requested Numbers,أرقام طلب
 DocType: Production Planning Tool,Only Obtain Raw Materials,الحصول فقط مواد أولية
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Fee Structure,Components,مكونات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,لا يمكن {0} {1} {2} من دون أي فاتورة المعلقة السلبية
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,مادة كيميائية
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,البنك الافتراضي / سيتم تحديث الحساب النقدي تلقائيا في الراتب دفتر اليومية عندما يتم تحديد هذا الوضع.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",وتيرة كود العلمية {0} يتداخل مع فترات الصف للصفوف الأخرى. يرجى التحقق من فترات {0} و {1} وحاول مرة أخرى
 DocType: BOM,Raw Material Cost(Company Currency),الخام المواد التكلفة (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},الصف # {0}: لا يمكن أن يكون المعدل أكبر من المعدل المستخدم في {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM موقع البند
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
 DocType: Timesheet Detail,Bill,فاتورة حساب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,يتم إدخال الاستهلاك المقبل التاريخ كتاريخ الماضي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,يتم إدخال الاستهلاك المقبل التاريخ كتاريخ الماضي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,أبيض
 DocType: SMS Center,All Lead (Open),جميع العملاء المحتملين (فتح)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: الكمية لا تتوفر لل{4} في مستودع {1} في بالإرسال وقت دخول ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},يجب أن يكون النظام نوع واحد من {0}
 DocType: Lead,Next Contact Date,تاريخ جهة الاتصال التالية
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,فتح الكمية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
 DocType: Student Batch Name,Student Batch Name,طالب اسم دفعة
 DocType: Holiday List,Holiday List Name,اسم قائمة العطلات
 DocType: Repayment Schedule,Balance Loan Amount,التوازن مبلغ القرض
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},الرجاء تحديد {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر البيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,خصم
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,خصم
 DocType: Asset,Total Number of Depreciations,إجمالي عدد التلفيات
 DocType: Sales Invoice Item,Rate With Margin,معدل مع الهامش
 DocType: Workstation,Wages,أجور
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,اسم المنظمة
 DocType: Tax Rule,Shipping State,الدولة الشحن
 ,Projected Quantity as Source,المتوقع الكمية كمصدر
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
 DocType: Employee,A-,أ-
 DocType: Production Planning Tool,Include non-stock items,وتشمل البنود غير المالية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,مصاريف المبيعات
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,شريك التنفيذ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,الرمز البريدي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,الرمز البريدي
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},اوامر البيع {0} {1}
 DocType: Opportunity,Contact Info,معلومات الاتصال
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,جعل الأسهم مقالات
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
 ,Ordered Items To Be Billed,أمرت البنود التي يتعين صفت
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,من المدى يجب أن يكون أقل من أن تتراوح
 DocType: Global Defaults,Global Defaults,افتراضيات العالمية
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,الرجاء إدخال رمز المدينة للحصول على رقم الدفعة
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية للمواد
 DocType: Employee Loan,Partially Disbursed,المصروفة جزئيا
-DocType: Grading Structure,Grading System Name,اسم نظام الدرجات
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,مزود قاعدة البيانات.
 DocType: Account,Balance Sheet,الميزانية العمومية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",لم يتم تكوين طريقة الدفع. يرجى مراجعة، وإذا كان قد تم إعداد الحساب على طريقة الدفع أو على الملف الشخصي نقاط البيع.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",لم يتم تكوين طريقة الدفع. يرجى مراجعة، وإذا كان قد تم إعداد الحساب على طريقة الدفع أو على الملف الشخصي نقاط البيع.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,سيرسل تذكير لمندوب المبيعات الخاص بك في هذا التاريخ ليتصل بالعميل
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,لا يمكن إدخال البند نفسه عدة مرات.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",حسابات أخرى يمكن أن يتم ضمن مجموعات، ولكن يمكن أن يتم مقالات ضد المجموعات غير-
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,يرجى تحديد سمة واحدة على الأقل في الجدول سمات
 DocType: Announcement,All Students,جميع الطلاب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,البند {0} يجب أن يكون البند غير الأسهم
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,البند {0} يجب أن يكون البند غير الأسهم
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,عرض ليدجر
 DocType: Grading Scale,Intervals,فترات
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,اسبق
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,رقم الطالب موبايل
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على فواتير معلقة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط والمتابعة على مشترياتك
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط والمتابعة على مشترياتك
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,صغير
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,مزامنة البيانات الرئيسية
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,فاتورة المواد
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,رقم لفة المجموعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,معدات العاصمة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",يتم تحديد قاعدة الأسعار على أساس حقل 'تطبق في' ، التي يمكن أن تكون بند، مجموعة بنود او علامة التجارية.
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,إدخال دفتر اليومية
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} البنود قيد الأستخدام
 DocType: Workstation,Workstation Name,اسم محطة العمل
-DocType: Grade Interval,Grade Code,كود الصف
+DocType: Grading Scale Interval,Grade Code,كود الصف
 DocType: POS Item Group,POS Item Group,POS البند المجموعة
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,أرسل دايجست:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,خردوات
 DocType: Sales Order,Recurring Upto,المتكررة لغاية
 DocType: Attendance,HR Manager,مدير الموارد البشرية
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,الرجاء اختيار الشركة
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,الرجاء اختيار الشركة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,امتياز الإجازة
 DocType: Purchase Invoice,Supplier Invoice Date,المورد فاتورة التسجيل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,طعام
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,العمر مدى 3
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,علامة إن حضور
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,علامة إن حضور
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},جدول الصيانة {0} موجود ضد {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,طالب انتساب
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},يجب أن تكون عملة الحساب الختامي {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع النقاط لجميع الأهداف يجب أن يكون 100. ومن {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,الشروط والأحكام المحتوى
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,مالك
 DocType: Salary Detail,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
 DocType: Pricing Rule,"Higher the number, higher the priority",الرقم الأعلى له أولوية أكبر
 ,Purchase Invoice Trends,شراء اتجاهات الفاتورة
 DocType: Employee,Better Prospects,آفاق أفضل
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",الصف # {0}: الدفعة {1} فقط {2} الكمية. يرجى تحديد دفعة أخرى توفر {3} الكمية أو تقسيم الصف إلى صفوف متعددة، لتسليم / إصدار من دفعات متعددة
 DocType: Vehicle,License Plate,لوحة معدنية
 DocType: Appraisal,Goals,الغايات
 DocType: Warranty Claim,Warranty / AMC Status,الضمان / AMC الحالة
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,الموظف لا يمكن أن يقدم تقريرا إلى نفسه.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",إذا تم تجميد الحساب، ويسمح للمستخدمين إدخالات مقيدة.
 DocType: Email Digest,Bank Balance,الرصيد المصرفي
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} يمكن إجراؤه بالعملة: {2} فقط
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} يمكن إجراؤه بالعملة: {2} فقط
 DocType: Job Opening,"Job profile, qualifications required etc.",الملف الوظيفي ، المؤهلات المطلوبة الخ
 DocType: Journal Entry Account,Account Balance,رصيد حسابك
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,تظهر P &amp; L أرصدة السنة المالية غير مغلق ل
 DocType: Shipping Rule,Shipping Account,حساب الشحن
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: الحساب {2} غير نشط
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,جعل أوامر البيع لمساعدتك على خطة العمل الخاصة بك وتسليم في الوقت المحدد
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,جعل أوامر البيع لمساعدتك على خطة العمل الخاصة بك وتسليم في الوقت المحدد
 DocType: Quality Inspection,Readings,قراءات
 DocType: Stock Entry,Total Additional Costs,مجموع التكاليف الإضافية
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Asset Movement,Stock Manager,مدير المخزن
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,زلة التعبئة
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,زلة التعبئة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,مكتب للإيجار
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,إعدادات العبارة  SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,فشل الاستيراد !
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,المصدر
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,مشاهدة مغلقة
 DocType: Leave Type,Is Leave Without Pay,إجازة بدون راتب
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,الأصول الفئة إلزامي للبند الأصول الثابتة
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,الأصول الفئة إلزامي للبند الأصول الثابتة
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,لا توجد في جدول الدفع السجلات
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},هذا {0} يتعارض مع {1} عن {2} {3}
 DocType: Student Attendance Tool,Students HTML,طلاب HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,تاريخ مغادرة
 DocType: Pricing Rule,For Price List,لائحة الأسعار
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,البحث التنفيذي
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,إنشاء العروض
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,إنشاء العروض
 DocType: Maintenance Schedule,Schedules,جداول
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفاصيل لا
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,التسجيلات برنامج
 DocType: Sales Invoice Item,Brand Name,العلامة التجارية اسم
 DocType: Purchase Receipt,Transporter Details,تفاصيل نقل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,المخزن الافتراضي مطلوب للمادة المختارة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,المخزن الافتراضي مطلوب للمادة المختارة
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,صندوق
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,مزود الممكن
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,منظمة
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM الافتراضي ل{0} لم يتم العثور على مشروع {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,مطالبات لحساب الشركة.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",الطلاب في قلب النظام، إضافة كل ما تبذلونه من الطلاب
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",الطلاب في قلب النظام، إضافة كل ما تبذلونه من الطلاب
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},الصف # {0}: تاريخ التخليص {1} لا يمكن أن يكون قبل تاريخ شيكات {2}
 DocType: Company,Default Holiday List,قائمة العطل الافتراضية
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: من الوقت وإلى وقت {1} ومتداخلة مع {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (أيام) التي تقدم بطلب للحصول على إجازة هي العطل.لا تحتاج إلى تقديم طلب للحصول الإجازة.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,إعادة إرسال البريد الإلكتروني الدفع
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,مهمة جديدة
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,جعل الاقتباس
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,جعل الاقتباس
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,تقارير أخرى
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,محاولة التخطيط لعمليات لX أيام مقدما.
 DocType: HR Settings,Stop Birthday Reminders,ايقاف التذكير بأعياد الميلاد
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},الرجاء تعيين الحساب الافتراضي لدفع الرواتب في الشركة {0}
 DocType: SMS Center,Receiver List,قائمة المرسل اليهم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,بحث البند
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,بحث البند
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,الكمية المستهلكة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,صافي التغير في النقد
 DocType: Assessment Plan,Grading Scale,مقياس الدرجات
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,أنجزت بالفعل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},دفع طلب بالفعل {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة عناصر صدر
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,سجل حركة الأصول {0} خُلق
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,سجل حركة الأصول {0} خُلق
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,لا يمكنك حذف السنة المالية {0}. تم تعيين السنة المالية {0} كما الافتراضي في إعدادات العالمية
 DocType: Journal Entry,Entry Type,نوع الدخول
 ,Customer Credit Balance,رصيد العميل
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,الذين يدرسون في نفس المعهد
 DocType: Territory,Territory Manager,مدير إقليمي
 DocType: Packed Item,To Warehouse (Optional),إلى مستودع (اختياري)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة المنتجات&gt; العلامة التجارية
 DocType: Payment Entry,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,إعدادات البيع
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,عرض في العربة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لانشاء الحركة المخزنية
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,الاستهلاك المقبل التاريخ إلزامي للأصول جديدة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,الاستهلاك المقبل التاريخ إلزامي للأصول جديدة
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,مجموعة منفصلة بالطبع مقرها لكل دفعة
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,واحد وحدة من عنصر.
 DocType: Fee Category,Fee Category,رسوم الفئة
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,الوزن
 DocType: Packing Slip,PS-,ملحوظة:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: مطلوب مركز التكلفة ل &#39;الربح والخسارة &quot;حساب {2}. يرجى انشاء مركز التكلفة الافتراضية للشركة.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,اتصال جديد
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,المصالحة JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 DocType: Purchase Invoice Item,Batch No,رقم دفعة
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},تعذر العثور سعر الصرف ل{0} إلى {1} لتاريخ الرئيسي {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,السماح بعدة أوامر البيع ضد طلب شراء العميل
 DocType: Student Group Instructor,Student Group Instructor,مجموعة الطالب
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 رقم الجوال
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,رئيسي
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,مختلف
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,رئيسي
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,مختلف
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 DocType: Employee Attendance Tool,Employees HTML,الموظفين HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
 DocType: Employee,Leave Encashed?,إجازات مصروفة نقداً؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Email Digest,Annual Expenses,المصروفات السنوية
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,انشئ طلب شراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,انشئ طلب شراء
 DocType: SMS Center,Send To,أرسل إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من توازن إجازة لإجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
@@ -1764,7 +1761,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,تقييمات
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,شرط للحصول على قانون الشحن
-DocType: Grading Structure,Grading Intervals,فترات الدرجات
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,تفضل
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",لا يمكن overbill عن البند {0} في الصف {1} أكثر من {2}. للسماح على الفواتير، يرجى ضبط إعدادات في شراء
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,الرجاء تعيين مرشح بناء على البند أو مستودع
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,دفع
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,إدارة طلباتك
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,إدارة طلباتك
 DocType: Production Order Operation,Actual Time and Cost,الوقت الفعلي والتكلفة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},طلب المواد من الحد الأقصى {0} يمكن إجراء القطعة ل {1} ضد ترتيب المبيعات {2}
 DocType: Employee,Salutation,تحية
 DocType: Course,Course Abbreviation,اختصار بالطبع
 DocType: Student Leave Application,Student Leave Application,طالب ترك التطبيق
 DocType: Item,Will also apply for variants,سوف تطبق أيضا على المتغيرات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، كما هو بالفعل {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، كما هو بالفعل {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},موظف {0} في نصف يوم في{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},عدد ساعات العمل الكلي يجب ألا يكون أكثر من العدد الأقصى لساعات العمل {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,في
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,حزمة الأصناف في وقت البيع.
 DocType: Quotation Item,Actual Qty,الكمية الفعلية
 DocType: Sales Invoice Item,References,المراجع
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,لقد دخلت عناصر مكررة . يرجى تصحيح و حاول مرة أخرى.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,مساعد
 DocType: Asset Movement,Asset Movement,حركة الأصول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,سلة جديدة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,سلة جديدة
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,البند {0} ليس البند المتسلسلة
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
 DocType: Vehicle,Wheels,عجلات
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,تعطيل إنشاء سجلات المرة ضد أوامر الإنتاج. لا يجوز تعقب عمليات ضد ترتيب الإنتاج
 DocType: Student,Student Mobile Number,طالب عدد موبايل
 DocType: Item,Has Variants,يحتوي على متغيرات
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,معرف الدفعة إلزامي
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,معرف الدفعة إلزامي
 DocType: Sales Person,Parent Sales Person,رجل المبيعات الرئيسي
 DocType: Purchase Invoice,Recurring Invoice,فاتورة المتكررة
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,إدارة المشاريع
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,السنة المالية
 DocType: Vehicle Log,Fuel Price,أسعار الوقود
 DocType: Budget,Budget,ميزانية
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,يجب أن تكون ثابتة البند الأصول عنصر غير الأسهم.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,يجب أن تكون ثابتة البند الأصول عنصر غير الأسهم.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",الموازنة لا يمكن تحديدها مقابل {0}، لانها ليست حساب الإيرادات أوالمصروفات
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,حقق
 DocType: Student Admission,Application Form Route,مسار إستمارة التقديم
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},مبلغ {0} {1} خصم ضد {2}
 DocType: Employee,Salary Information,معلومات عن الراتب
 DocType: Sales Person,Name and Employee ID,الاسم والرقم الوظيفي
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
 DocType: Website Item Group,Website Item Group,مجموعة الأصناف للموقع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,الرسوم والضرائب
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,الإيرادات العملاء المكررين
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (موافق النفقات)
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,زوج
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
 DocType: Asset,Depreciation Schedule,جدول الاستهلاك
 DocType: Bank Reconciliation Detail,Against Account,ضد الحساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,يجب أن يكون تاريخ نصف يوم ما بين التاريخ والتاريخ
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},مبلغ {0} {1} من {2} {3}
 ,Quotation Trends,مجرى التسعيرات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
 DocType: Shipping Rule Condition,Shipping Amount,مبلغ الشحن
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
 DocType: Purchase Order,Delivered,تسليم
 ,Vehicle Expenses,مصاريف السيارة
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},يجب أن تكون القيمة المتوقعة بعد العمر الإنتاجي أكبر من أو يساوي {0}
+DocType: Serial No,Invoice Details,تفاصيل الفاتورة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},يجب أن تكون القيمة المتوقعة بعد العمر الإنتاجي أكبر من أو يساوي {0}
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
 DocType: Employee Loan,Loan Amount,مبلغ القرض
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,مقدار الخصم الاضافي
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن يكون العدد 1، والبند هو أصل ثابت. الرجاء استخدام صف منفصل عن الكمية متعددة.
 DocType: Leave Block List Allow,Leave Block List Allow,تفعيل قائمة الإجازات المحظورة
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,مجموعة لغير المجموعه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,الرياضة
 DocType: Loan Type,Loan Name,اسم قرض
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,اكتساب العملاء و الولاء
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
 DocType: Production Order,Skip Material Transfer,تخطي نقل المواد
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,تعذر العثور على سعر الصرف من {0} إلى {1} لتاريخ المفتاح {2}. يرجى إنشاء سجل صرف العملات يدويا
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,السنة المالية تنتهي في الخاص
 DocType: POS Profile,Price List,قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} هي السنة المالية الافتراضية الآن،  يرجى تحديث المتصفح ليصبح التغيير نافذ المفعول.
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,البند {0} تم بالفعل عاد
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**السنة المالية** تمثل سنة مالية. يتم تعقب كل القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل **السنة المالية**.
 DocType: Opportunity,Customer / Lead Address,العميل/ عنوان الدليل
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
 DocType: Student Admission,Eligibility,جدارة
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",يؤدي مساعدتك في الحصول على العمل، إضافة كافة جهات الاتصال الخاصة بك وأكثر من ذلك كما يؤدي بك
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",يؤدي مساعدتك في الحصول على العمل، إضافة كافة جهات الاتصال الخاصة بك وأكثر من ذلك كما يؤدي بك
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركها فارغه اذا كنت تريد تطبيقها لجميع الأقسام
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائم أو عقد او متدرب الخ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Process Payroll,Fortnightly,مرة كل اسبوعين
 DocType: Currency Exchange,From Currency,من العملات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي "" ل لصف الأول"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,طفل البند لا ينبغي أن يكون حزمة المنتج. الرجاء إزالة البند `{0}` وحفظ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,مصرفي
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,إضافة الجداول الزمنية
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,إضافة الجداول الزمنية
 DocType: Vehicle Service,Service Item,خدمة البند
 DocType: Bank Guarantee,Bank Guarantee,ضمان بنكي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,الرجاء انقر على ' إنشاء الجدول ' للحصول على الجدول الزمني
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,لن تظهر الأسعار إذا لم يتم تعيين قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,يرجى تحديد بلد لهذا الشحن القاعدة أو تحقق من جميع أنحاء العالم الشحن
 DocType: Stock Entry,Total Incoming Value,إجمالي القيمة الواردة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,مطلوب الخصم ل
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,مطلوب الخصم ل
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,شراء قائمة الأسعار
 DocType: Offer Letter Term,Offer Term,عرض عمل
 DocType: Quality Inspection,Quality Manager,مدير الجودة
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,فقد السبب
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,عنوان جديد
 DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,الرجاء إدخال الوثيقة إيصال
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,الرجاء إدخال الوثيقة إيصال
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',الرجاء تحديد صالح &#39;من القضية رقم&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
 DocType: Project,External,خارجي
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,المستخدمين والأذونات
 DocType: Vehicle Log,VLOG.,مدونة فيديو.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},أوامر إنتاج المنشأة: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},أوامر إنتاج المنشأة: {0}
 DocType: Branch,Branch,فرع
 DocType: Guardian,Mobile Number,رقم الهاتف المحمول
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,الطباعة و العلامات التجارية
@@ -2176,7 +2175,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,المسلسل لا {0} لم يتم العثور
 DocType: Scheduling Tool,Student Batch,دفعة طالب
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,العملاء
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,جعل الطلاب
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,جعل الطلاب
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}
 DocType: Leave Block List Date,Block Date,تاريخ الحظر
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,قدم الآن
@@ -2199,8 +2198,9 @@
 DocType: SMS Log,Sent To,يرسل الى
 DocType: Payment Request,Make Sales Invoice,أنشئ فاتورة مبيعات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,برامج
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,التالي اتصل بنا التسجيل لا يمكن أن يكون في الماضي
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,التالي اتصل بنا التسجيل لا يمكن أن يكون في الماضي
 DocType: Company,For Reference Only.,للاشارة فقط.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,حدد الدفعة رقم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},باطلة {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,المبلغ مقدما
@@ -2214,7 +2214,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,القضية رقم لا يمكن أن يكون 0
 DocType: Item,Show a slideshow at the top of the page,تظهر الشرائح في أعلى الصفحة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,مخازن
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,مخازن
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,العمر بناءا على
 DocType: Item,End of Life,نهاية الحياة
@@ -2230,8 +2230,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,نقل المواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,حساب كمية حدد التغيير
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,حساب كمية حدد التغيير
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,السماح بالقيم السالبة للمخزون
@@ -2242,7 +2242,7 @@
 DocType: Budget Account,Budget Account,حساب الميزانية
 DocType: Quality Inspection,Verified By,التحقق من
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",لا يمكن تغيير العملة الافتراضية الشركة ، وذلك لأن هناك معاملات القائمة. يجب أن يتم إلغاء المعاملات لتغيير العملة الافتراضية.
-DocType: Grade Interval,Grade Description,الصف الوصف
+DocType: Grading Scale Interval,Grade Description,الصف الوصف
 DocType: Stock Entry,Purchase Receipt No,لا شراء استلام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,العربون
 DocType: Process Payroll,Create Salary Slip,إنشاء كشف الرواتب
@@ -2280,7 +2280,7 @@
 DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Gateway Account,Payment Account,حساب الدفع
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,صافي التغير في حسابات المقبوضات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,التعويضية
 DocType: Offer Letter,Accepted,مقبول
@@ -2293,7 +2293,7 @@
 DocType: Shipping Rule,Shipping Rule Label,ملصق قاعدة الشحن
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,المنتدى المستعمل
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، فاتورة تحتوي انخفاض الشحن البند.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، فاتورة تحتوي انخفاض الشحن البند.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,خيارات مجلة الدخول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير المعدل إذا BOM اشير اليها مقابل أي بند
 DocType: Employee,Previous Work Experience,خبرة العمل السابقة
@@ -2307,7 +2307,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,1 الشروط والأحكام
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,اسم المعهد الذي كنت تقوم بإعداد هذا النظام.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",موقوف - فيما عدا الدور الموضح بأسفل / لا يمكن لأحد عمل حركات محاسبية حتى هذا التاريخ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,الرجاء حفظ المستند قبل إنشاء جدول الصيانة
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,الرجاء حفظ المستند قبل إنشاء جدول الصيانة
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,حالة المشروع
 DocType: UOM,Check this to disallow fractions. (for Nos),الاختيار هذه لكسور عدم السماح بها. (لNOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,تم إنشاء أوامر الإنتاج التالية:
@@ -2330,6 +2330,7 @@
 DocType: Email Digest,How frequently?,كيف كثير من الأحيان؟
 DocType: Purchase Receipt,Get Current Stock,الحصول على المخزون الحالي
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,شجرة فواتير المواد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة المنتجات&gt; العلامة التجارية
 DocType: Student,Joining Date,تاريخ الانضمام
 ,Employees working on a holiday,الموظفون يعملون في يوم العطلة
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,حدد الحاضر
@@ -2430,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,الإنتاج
 DocType: Guardian,Occupation,الاحتلال
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
 DocType: Sales Invoice,This Document,هذا المستند
 DocType: Installation Note Item,Installed Qty,الكميات الثابتة
@@ -2453,7 +2454,7 @@
 DocType: Notification Control,Sales Order Message,رسالة اوامر البيع
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تعيين القيم الافتراضية مثل الشركة، والعملة، والسنة المالية الحالية، وما إلى ذلك.
 DocType: Payment Entry,Payment Type,الدفع نوع
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,الرجاء تحديد دفعة للعنصر {0}. تعذر العثور على دفعة واحدة تستوفي هذا المطلب
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,الرجاء تحديد دفعة للعنصر {0}. تعذر العثور على دفعة واحدة تستوفي هذا المطلب
 DocType: Process Payroll,Select Employees,حدد الموظفين
 DocType: Opportunity,Potential Sales Deal,المبيعات المحتملة صفقة
 DocType: Payment Entry,Cheque/Reference Date,تاريخ الصك / السند المرجع
@@ -2470,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},الملف POS العالمي {0} تم إنشاؤها مسبقا لشركة {1}
 DocType: Purchase Order,Ref SQ,المرجع SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,استبدال السلعة / BOM في جميع BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,يجب تقديم وثيقة استلام
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,يجب تقديم وثيقة استلام
 DocType: Purchase Invoice Item,Received Qty,تلقى الكمية
 DocType: Stock Entry Detail,Serial No / Batch,رقم المسلسل / الدفعة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,لا المدفوع ويتم تسليم
@@ -2483,7 +2484,7 @@
 ,To Produce,لإنتاج
 apps/erpnext/erpnext/config/hr.py +93,Payroll,دفع الرواتب
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لصف {0} في {1}. لتشمل {2} في سعر البند، {3} يجب أيضا أن يدرج الصفوف
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,جعل العضو
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,جعل العضو
 DocType: Packing Slip,Identification of the package for the delivery (for print),تحديد حزمة لتسليم (للطباعة)
 DocType: Bin,Reserved Quantity,الكمية المحجوزة
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,الرجاء إدخال عنوان بريد إلكتروني صالح
@@ -2495,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,لا يجب أن يكون قالب تعطيل القالب الافتراضي
 DocType: Account,Income Account,دخل الحساب
 DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,تسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,تسليم
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",انظر &quot;نسبة المواد على أساس&quot; التكلفة في القسم
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,السابق
 DocType: Appraisal Goal,Key Responsibility Area,معيار التقييم
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",دفعات طالب تساعدك على تتبع الحضور، وتقييمات والرسوم للطلاب
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",دفعات طالب تساعدك على تتبع الحضور، وتقييمات والرسوم للطلاب
 DocType: Payment Entry,Total Allocated Amount,إجمالي المبلغ المخصص
 DocType: Item Reorder,Material Request Type,طلب نوع المواد
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural إدخال دفتر اليومية للرواتب من {0} إلى {1}
@@ -2522,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
 DocType: Item Supplier,Item Supplier,البند مزود
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات المخزون
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
@@ -2532,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"سيتم إرسال البريد الإلكتروني حول الحدث إلى الموظفين مع وضع حالة ""فتح"";"
 DocType: Task,Depends on Tasks,يعتمد على المهام
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,يمكن عرض المرفقات بدون تمكين سلة التسوق
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,اسم مركز تكلفة جديد
 DocType: Leave Control Panel,Leave Control Panel,لوحة تحكم الأجازات
@@ -2544,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,الخصم ل
 DocType: Delivery Note,Required only for sample item.,المطلوب فقط لمادة العينة.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; المورد نوع
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},لا قسيمة الراتب وجدت بين {0} و {1}
 ,Pending SO Items For Purchase Request,العناصر المعلقة وذلك لطلب الشراء
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,قبول الطلاب
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} معطل {1}
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} معطل {1}
 DocType: Supplier,Billing Currency,الفواتير العملات
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,كبير جدا
@@ -2565,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,الصفحة الرئيسية المنتج المميز
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,جميع المجموعات التقييم
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,الجديد اسم المخزن
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),إجمالي {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),إجمالي {0} ({1})
 DocType: C-Form Invoice Detail,Territory,إقليم
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
@@ -2583,7 +2585,7 @@
 DocType: Price List,Price List Master,قائمة الأسعار ماستر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,جميع معاملات البيع يمكن ان تكون مشارة لعدة ** موظفين مبيعات** بحيث يمكنك تعيين و مراقبة اهداف البيع المحددة
 ,S.O. No.,S.O. رقم
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"يمكن فقط الموافقة علي طلب ايجازة في الحالة ""مقبولة"" و ""مرفوض"""
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},طالب اسم المجموعة هو إلزامي في الصف {0}
@@ -2675,7 +2677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,القيود المحاسبية لمخزون
 DocType: Vehicle Service,Engine Oil,زيت المحرك
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,عنوان العميل
 DocType: Employee Loan,Loan Details,تفاصيل القرض
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,صف {0}: يجب أن تكتمل الكمية أكبر من الصفر.
@@ -2739,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى المجموعة.
 DocType: Assessment Result Tool,Result HTML,نتيجة HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,تنتهي صلاحيته في
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,إضافة الطلاب
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,إضافة الطلاب
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},الرجاء اختيار {0}
 DocType: C-Form,C-Form No,رقم النموذج - س
 DocType: BOM,Exploded_items,Exploded_items
@@ -2803,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,الحد عبرت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,رأس المال الاستثماري
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,والفصل الدراسي مع هذا &#39;السنة الأكاديمية&#39; {0} و &quot;اسم مصطلح &#39;{1} موجود بالفعل. يرجى تعديل هذه الإدخالات وحاول مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",كما أن هناك المعاملات الموجودة على البند {0}، لا يمكنك تغيير قيمة {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",كما أن هناك المعاملات الموجودة على البند {0}، لا يمكنك تغيير قيمة {1}
 DocType: UOM,Must be Whole Number,يجب أن يكون عدد صحيح
 DocType: Leave Control Panel,New Leaves Allocated (In Days),الإجازات الجديدة المخصصة (بالأيام)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,رقم المسلسل {0} غير موجود
@@ -2846,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
 DocType: Support Settings,Auto close Issue after 7 days,السيارات العدد قريبة بعد 7 أيام
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",إجازة لا يمكن تخصيصها قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,مقدم الطلب طالب
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب الاهلاك المتراكم
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
@@ -2874,7 +2876,7 @@
 DocType: Asset,Item Code,رمز البند
 DocType: Production Planning Tool,Create Production Orders,إنشاء أوامر الإنتاج
 DocType: Serial No,Warranty / AMC Details,الضمان / AMC تفاصيل
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
@@ -2892,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,إنشاء طلبات المواد
 DocType: Employee Education,School/University,مدرسة / جامعة
 DocType: Payment Request,Reference Details,إشارة تفاصيل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,القيمة المتوقعة بعد حياة مفيدة يجب أن يكون أقل من إجمالي شراء المبلغ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,القيمة المتوقعة بعد حياة مفيدة يجب أن يكون أقل من إجمالي شراء المبلغ
 DocType: Sales Invoice Item,Available Qty at Warehouse,الكمية المتاحة في مستودع
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,مبلغ الفاتورة
 DocType: Asset,Double Declining Balance,الرصيد المتناقص المزدوج
@@ -2913,19 +2915,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ صرف لا يمكن أن يكون أكبر من مبلغ القرض {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,إنتاج النظام لم يخلق
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,إنتاج النظام لم يخلق
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الوضع كما طالب {0} يرتبط مع تطبيق طالب {1}
 DocType: Asset,Fully Depreciated,استهلكت بالكامل
 ,Stock Projected Qty,كمية المخزون المتوقعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},العميل{0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},العميل{0} لا تنتمي لمشروع {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,تم تسجيل حضور HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",الاقتباسات هي المقترحات، والعطاءات التي تم إرسالها لعملائك
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",الاقتباسات هي المقترحات، والعطاءات التي تم إرسالها لعملائك
 DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,رقم المسلسل و الدفعة
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,مجموع العشرات من معايير التقييم يجب أن يكون {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,الرجاء تعيين عدد من التلفيات حجز
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,الرجاء تعيين عدد من التلفيات حجز
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,القيمة أو الكمية
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,دقيقة
@@ -3054,7 +3056,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,المجموعة الطلابية
 DocType: Shopping Cart Settings,Quotation Series,سلسلة تسعيرات
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,الرجاء تحديد العملاء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,الرجاء تحديد العملاء
 DocType: C-Form,I,أنا
 DocType: Company,Asset Depreciation Cost Center,مركز تكلفة إستهلاك الأصول
 DocType: Sales Order Item,Sales Order Date,تاريخ اوامر البيع
@@ -3073,19 +3075,18 @@
 DocType: Vehicle,Insurance Details,تفاصيل التأمين
 DocType: Account,Payable,المستحقة
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,الرجاء إدخال فترات السداد
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),المدينين ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),المدينين ({0})
 DocType: Pricing Rule,Margin,هامش
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,الزبائن الجدد
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,الربح الإجمالي٪
 DocType: Appraisal Goal,Weightage (%),الوزن(٪)
 DocType: Bank Reconciliation Detail,Clearance Date,إزالة التاريخ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,الإجمالي المبلغ شراء إلزامي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,الإجمالي المبلغ شراء إلزامي
 DocType: Lead,Address Desc,معالجة التفاصيل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,حزب إلزامي
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,اسم الموضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,يجب اختيار واحدة على الاقل من المبيعات او المشتريات
-DocType: Grading Structure,Grade Intervals,فترات الصف
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,حدد طبيعة عملك.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,حيث تتم عمليات التصنيع.
 DocType: Asset Movement,Source Warehouse,مصدر مستودع
@@ -3114,6 +3115,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,الشهرية توزيع النسبة المئوية
 DocType: Territory,Territory Targets,الاقاليم المستهدفة
 DocType: Delivery Note,Transporter Info,نقل معلومات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},الرجاء تعيين الافتراضي {0} في شركة {1}
 DocType: Cheque Print Template,Starting position from top edge,بدءا من موقف من أعلى الحافة
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,تم إدخال المورد نفسه عدة مرات
@@ -3165,7 +3167,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,إعادة ترتيب الكميه
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,فرص العمل الحالية
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
-DocType: Journal Entry,Write Off,لا تصلح
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لا تصلح
 DocType: Timesheet Detail,Operation ID,عملية ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",هوية مستخدم النظام (تسجيل الدخول). إذا وضع، وسوف تصبح الافتراضية لكافة أشكال HR.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} من {1}
@@ -3176,8 +3178,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,المورد يسلم للعميل
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# نموذج / البند / {0}) هو من المخزون
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,يجب أن يكون التاريخ القادم أكبر من تاريخ النشر
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,مشاهدة الضرائب تفكك
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,استيراد وتصدير البيانات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",توجد مدخلات المخزون ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديله
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,أي طالب يتم العثور
@@ -3189,13 +3191,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,يرجى تحديد تاريخ النشر قبل اختيار الحزب
 DocType: Program Enrollment,School House,مدرسة دار
 DocType: Serial No,Out of AMC,من AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,يرجى تحديد عروض الأسعار
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد من التلفيات حجز لا يمكن أن يكون أكبر من إجمالي عدد من التلفيات
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,انشئ زيارة صيانة
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,يرجى تحديد عروض الأسعار
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد من التلفيات حجز لا يمكن أن يكون أكبر من إجمالي عدد من التلفيات
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,انشئ زيارة صيانة
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
 DocType: Company,Default Cash Account,الحساب النقدي الافتراضي
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ويستند هذا على حضور هذا الطالب
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,لا يوجد طلاب في
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,إضافة المزيد من العناصر أو إستمارة كاملة مفتوح
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
@@ -3241,9 +3244,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,قبل المصالحة
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},إلى {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),الضرائب والرسوم المضافة (عملة الشركة)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
 DocType: Sales Order,Partly Billed,وصفت جزئيا
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,البند {0} يجب أن تكون ثابتة بند الأصول
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,البند {0} يجب أن تكون ثابتة بند الأصول
 DocType: Item,Default BOM,الافتراضي BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,إجمالي المعلقة AMT
@@ -3265,7 +3268,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
 DocType: Purchase Invoice Item,Rate,معدل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,المتدرب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,اسم عنوان
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,اسم عنوان
 DocType: Stock Entry,From BOM,من BOM
 DocType: Assessment Code,Assessment Code,كود التقييم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,الأساسية
@@ -3290,7 +3293,7 @@
 DocType: Purchase Invoice,Print Language,لغة الطباعة
 DocType: Salary Slip,Total Working Hours,مجموع ساعات العمل
 DocType: Stock Entry,Including items for sub assemblies,بما في ذلك البنود عن المجالس الفرعية
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,يجب أن يكون إدخال قيمة ايجابية
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,يجب أن يكون إدخال قيمة ايجابية
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,جميع الأقاليم
 DocType: Purchase Invoice,Items,البنود
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,والتحق بالفعل طالب.
@@ -3309,16 +3312,14 @@
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,من و إلى مواعيد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية والبورصات
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من مستودع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,لا الأصناف مع بيل من مواد لتصنيع
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,لا الأصناف مع بيل من مواد لتصنيع
 DocType: Assessment Plan,Supervisor Name,اسم المشرف
 DocType: Program Enrollment Course,Program Enrollment Course,دورة التسجيل في البرنامج
-DocType: Grading Structure,Grading Structure,هيكل الدرجات
 DocType: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
 DocType: Tax Rule,Shipping City,مدينة الشحن
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"هذا البند هو البديل من {0} (قالب). سيتم نسخ سمات على من القالب ما لم يتم تعيين ""لا نسخ '"
 DocType: Notification Control,Customize the Notification,تخصيص تنبيهات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,التدفق النقدي من العمليات
 DocType: Sales Invoice,Shipping Rule,قواعد الشحن
@@ -3341,6 +3342,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,يجب فتح التسجيل يكون قبل تاريخ الإنتهاء
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد&gt; سلسلة الترقيم
 DocType: Leave Control Panel,Carry Forward,المضي قدما
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى دفتر الأستاذ
 DocType: Department,Days for which Holidays are blocked for this department.,أيام العطلات غير المسموح بأخذ إجازة فيها لهذا القسم
@@ -3368,7 +3370,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),إجمالي (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,الترفيه والترويح
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,إنشاء سجلات الموظفين
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,إنشاء سجلات الموظفين
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,إجمالي الحضور
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,القوائم المالية
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,الساعة
@@ -3383,7 +3385,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,نقطة بيع
 DocType: Payment Entry,Received Amount,المبلغ الوارد
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",إنشاء لكمية كاملة، وتجاهل كمية بالفعل على النظام
 DocType: Account,Tax,ضريبة
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,لم يتم وضع علامة
@@ -3394,7 +3395,7 @@
 DocType: C-Form,Invoices,الفواتير
 DocType: Batch,Source Document Name,اسم المستند المصدر
 DocType: Job Opening,Job Title,المسمى الوظيفي
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,إنشاء المستخدمين
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,إنشاء المستخدمين
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,قرام
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,تقرير زيارة للدعوة الصيانة.
@@ -3405,8 +3406,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
 DocType: BOM,Website Description,وصف الموقع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,صافي التغير في حقوق المساهمين
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,يرجى إلغاء شراء الفاتورة {0} لأول مرة
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريدة من نوعها، موجود بالفعل ل{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,يرجى إلغاء شراء الفاتورة {0} لأول مرة
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريدة من نوعها، موجود بالفعل ل{0}
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,إيصال
 ,Sales Register,سجل مبيعات
@@ -3417,16 +3418,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,لا يوجد شيء لتحريره
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
 DocType: Customer Group,Customer Group Name,أسم مجموعة العميل
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,لا العملاء حتى الآن!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,بيان التدفقات النقدية
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},مبلغ القرض لا يمكن أن يتجاوز مبلغ القرض الحد الأقصى ل{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,رخصة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,الرجاء تحديد المضي قدما إذا كنت تريد ان تتضمن اجازات السنة السابقة
 DocType: GL Entry,Against Voucher Type,مقابل نوع قسيمة
 DocType: Item,Attributes,سمات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,الرجاء إدخال شطب الحساب
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاريخ آخر أمر
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
 DocType: Student,Guardian Details,تفاصيل ولي الأمر
 DocType: C-Form,C-Form,نموذج C-
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,وضع علامة الحضور لعدة موظفين
@@ -3451,14 +3454,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',صف {0} يجب أن يكون # حساب من نوع &quot;الأصول الثابتة&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,من الكمية
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,الترقيم المتسلسل إلزامي
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,الترقيم المتسلسل إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,الخدمات المالية
 DocType: Student Sibling,Student ID,هوية الطالب
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,أنواع الأنشطة لسجلات الوقت
 DocType: Tax Rule,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
 DocType: Training Event,Exam,امتحان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,إجازات غير مستخدمة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,كر
 DocType: Tax Rule,Billing State,الدولة الفواتير
@@ -3491,7 +3494,7 @@
 DocType: Payment Entry,Account Paid From,حساب مدفوع من
 DocType: Purchase Order Item Supplied,Raw Material Item Code,قانون المواد الخام المدينة
 DocType: Journal Entry,Write Off Based On,شطب بناء على
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,جعل الرصاص
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,جعل الرصاص
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,طباعة وقرطاسية
 DocType: Stock Settings,Show Barcode Field,مشاهدة الباركود الميدان
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
@@ -3506,6 +3509,7 @@
 DocType: Offer Letter,Awaiting Response,انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,فوق
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},السمة غير صالحة {0} {1}
+DocType: Supplier,Mention if non-standard payable account,أذكر إذا كان الحساب غير القياسي مستحق الدفع
 DocType: Salary Slip,Earning & Deduction,الكسب و الخصم
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
@@ -3539,7 +3543,7 @@
 DocType: Program Enrollment Tool,Get Students From,الحصول على الطلاب من
 DocType: Hub Settings,Seller Country,بلد البائع
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,نشر عناصر على الموقع
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,مجموعة الطلاب على دفعات
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,مجموعة الطلاب على دفعات
 DocType: Authorization Rule,Authorization Rule,قاعدة السماح
 DocType: Sales Invoice,Terms and Conditions Details,تفاصيل الشروط والأحكام
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,مواصفات
@@ -3598,7 +3602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,امتحان
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,مكون الراتب
 DocType: Program Enrollment Tool,New Academic Year,العام الدراسي الجديد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,عودة / الائتمان ملاحظة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,عودة / الائتمان ملاحظة
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج تلقائي لقائمة الأسعار إن لم تكن موجودة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,إجمالي المبلغ المدفوع
 DocType: Production Order Item,Transferred Qty,نقل الكمية
@@ -3639,6 +3643,7 @@
 ,Sales Funnel,قمع المبيعات
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,الاسم المختصر إلزامي
 DocType: Project,Task Progress,تقدم مهمة
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,عربة
 ,Qty to Transfer,الكمية للنقل
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,اقتباسات لعروض أو العملاء.
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
@@ -3671,7 +3676,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},الكمية ({0}) لا يمكن أن تكون جزءا من الصف {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,جمع الرسوم
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 DocType: Item,Opening Stock,فتح المخزون
@@ -3690,7 +3695,7 @@
 DocType: Customer,From Lead,من العميل المحتمل
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,أوامر الإفراج عن الإنتاج.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,اختر السنة المالية ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Program Enrollment Tool,Enroll Students,تسجيل الطلاب
 DocType: Hub Settings,Name Token,اسم رمز
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,البيع القياسية
@@ -3701,7 +3706,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,اسم المشروع
-DocType: Supplier,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
+DocType: Customer,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
 DocType: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
 DocType: Production Order,Required Items,الأصناف المطلوبة
 DocType: Stock Ledger Entry,Stock Value Difference,فرق قيمة المخزون
@@ -3731,6 +3736,7 @@
 DocType: Item,Taxes,الضرائب
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,دفعت ولم يتم تسليمها
 DocType: Project,Default Cost Center,مركز التكلفة الافتراضي
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 DocType: Bank Guarantee,End Date,نهاية التاريخ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,قيود المخزون
 DocType: Budget,Budget Accounts,حسابات الميزانية
@@ -3795,7 +3801,7 @@
 DocType: Customer,Sales Partner and Commission,مبيعات الشريك واللجنة
 DocType: Employee Loan,Rate of Interest (%) / Year,معدل الفائدة (٪) / السنة
 ,Project Quantity,مشروع الكمية
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",إجمالي {0} لجميع المواد والصفر، قد يكون عليك تغيير &quot;توزيع التكاليف على أساس &#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",إجمالي {0} لجميع المواد والصفر، قد يكون عليك تغيير &quot;توزيع التكاليف على أساس &#39;
 DocType: Opportunity,To Discuss,لمناقشة
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} الوحدات التي في {1} مطلوبة في {2} لإتمام هذه العمليه.
 DocType: Loan Type,Rate of Interest (%) Yearly,معدل الفائدة (٪) سنوي
@@ -3818,7 +3824,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,حدد الغائب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},صف {0}: عملة BOM # {1} يجب أن تكون مساوية العملة المختارة {2}
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
 DocType: Homepage,Tag Line,شعار
 DocType: Fee Component,Fee Component,مكون رسوم
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,إدارة سريعة
@@ -3835,7 +3841,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,مستودع {0} غير موجود
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,سجل للحصول على ERPNext المحور
 DocType: Monthly Distribution,Monthly Distribution Percentages,النسب المئوية لتوزيع الشهرية
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",معدل التقييم لم يتم العثور على هذا البند {0}، وهو مطلوب للقيام القيود المحاسبية لل{1} {2}. إذا كان العنصر هو يتعاملون كبند عينة في {1}، يرجى ذكر ذلك في {1} الجدول البند. خلاف ذلك، يرجى إنشاء معاملة الأسهم واردة بالنسبة لمعدل تقييم البند أو ذكر في السجل عنصر، ثم حاول سوبميتنغ / إلغاء هذا الدخول
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة  سلمت من أمر التوصيل
 DocType: Project,Customer Details,تفاصيل العميل
@@ -3852,7 +3858,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,لا يمكن حذف أوامر المقدمة
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","رصيد حساب بالفعل في الخصم، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'ك' الائتمان '"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,إدارة الجودة
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,تم تعطيل البند {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,تم تعطيل البند {0}
 DocType: Employee Loan,Repay Fixed Amount per Period,سداد مبلغ ثابت في الفترة
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,تاريخ عمل الموظف خارج الشركة
@@ -3878,7 +3884,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,طالب معرف البريد الإلكتروني
 DocType: Employee,Notice (days),إشعار (أيام )
 DocType: Tax Rule,Sales Tax Template,قالب ضريبة المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
 DocType: Employee,Encashment Date,تاريخ التحصيل
 DocType: Training Event,Internet,الإنترنت
 DocType: Account,Stock Adjustment,الأسهم التكيف
@@ -3911,6 +3917,7 @@
 DocType: Purchase Invoice,Debit Note Issued,الخصم مذكرة صادرة
 DocType: Production Order,Warehouses,المستودعات
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} الأصول لا يمكن نقلها
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,هذا العنصر هو متغير {0} (قالب).
 DocType: Workstation,per hour,كل ساعة
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,المشتريات
 DocType: Announcement,Announcement,إعلان
@@ -3926,7 +3933,7 @@
 DocType: Account,Receivable,القبض
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: غير مسموح لتغيير مورد السلعة كما طلب شراء موجود بالفعل
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الذي يسمح بتقديم المعاملات التي تتجاوز حدود الائتمان تعيين.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,حدد العناصر لتصنيع
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,حدد العناصر لتصنيع
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",مزامنة البيانات الرئيسية، قد يستغرق بعض الوقت
 DocType: Item,Material Issue,صرف مواد
 DocType: Hub Settings,Seller Description,وصف البائع
@@ -3939,7 +3946,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,أمر
 DocType: Salary Detail,Component,مكون
 DocType: Assessment Criteria,Assessment Criteria Group,معايير تقييم المجموعة
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},فتح الاستهلاك المتراكم يجب أن يكون أقل من يساوي {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},فتح الاستهلاك المتراكم يجب أن يكون أقل من يساوي {0}
 DocType: Warehouse,Warehouse Name,اسم المستودع
 DocType: Naming Series,Select Transaction,حدد المعاملات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,الرجاء إدخال الموافقة أو الموافقة دور العضو
@@ -3973,7 +3980,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","لتعيين هذه السنة المالية كما الافتراضي، انقر على ' تعيين كافتراضي """
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,انضم
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Employee Loan,Repay from Salary,سداد من الراتب
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},طلب دفع مقابل {0} {1} لمبلغ {2}
@@ -3991,7 +3998,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,تقييم النتيجة التفاصيل
 DocType: Employee Education,Employee Education,المستوى التعليمي للموظف
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,مجموعة البند مكررة موجودة في جدول المجموعة البند
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
 DocType: Salary Slip,Net Pay,صافي الراتب
 DocType: Account,Account,حساب
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,رقم المسلسل {0} وقد وردت بالفعل
@@ -4000,7 +4007,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",لا يرتبط مستودع {0} إلى أي حساب، الرجاء إنشاء / ربط (الأصول) حساب المقابل للمستودع.
 DocType: Purchase Invoice,Recurring Id,رقم المتكررة
 DocType: Customer,Sales Team Details,تفاصيل فريق المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,حذف بشكل دائم؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,حذف بشكل دائم؟
 DocType: Expense Claim,Total Claimed Amount,إجمالي المبلغ المطالب به
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرص محتملة للبيع.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},باطلة {0}
@@ -4011,13 +4018,14 @@
 DocType: Warehouse,PIN,دبوس
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,إعداد مدرستك في ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),مدى تغيير المبلغ الأساسي (عملة الشركة )
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,حفظ المستند أولا.
 DocType: Account,Chargeable,تحمل
 DocType: Company,Change Abbreviation,تغيير اختصار
 DocType: Expense Claim Detail,Expense Date,تاريخ النفقات
 DocType: Item,Max Discount (%),أعلى خصم (٪)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,كمية آخر طلب
+DocType: Task,Is Milestone,هو معلم
 DocType: Daily Work Summary,Email Sent To,تم ارسال الايميل الي
 DocType: Budget,Warn,تحذير
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، والجهود الجديرة بالذكر التي ينبغي أن تذهب في السجلات.
@@ -4050,11 +4058,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
 DocType: Tax Rule,Purchase Tax Template,شراء قالب الضرائب
 ,Project wise Stock Tracking,مشروع تتبع حركة الأسهم الحكمة
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},جدول الصيانة {0} موجود ضد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),الكمية الفعلية (في المصدر / الهدف)
 DocType: Item Customer Detail,Ref Code,الرمز المرجعي
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سجلات الموظفين
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,الرجاء ضبط الاستهلاك المقبل التاريخ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,الرجاء ضبط الاستهلاك المقبل التاريخ
 DocType: HR Settings,Payroll Settings,إعدادات دفع الرواتب
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,طلب مكان
@@ -4077,7 +4084,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,الشيكات والودائع مسح غير صحيح
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,الحساب {0}: لا يمكنك جعله حساباً رئيسياً لنفسه
 DocType: Purchase Invoice Item,Price List Rate,قائمة الأسعار قيم
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,خلق ونقلت العملاء
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,خلق ونقلت العملاء
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","تظهر ""في المخزن"" أو ""ليس في المخزن"" على أساس التواجد  في هذا المخزن."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),مشروع القانون المواد (BOM)
 DocType: Item,Average time taken by the supplier to deliver,متوسط الوقت المستغرق من قبل المورد للتسليم
@@ -4099,7 +4106,7 @@
 DocType: Asset,Disposal Date,التخلص من التسجيل
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",سيتم إرسال رسائل البريد الإلكتروني لجميع الموظفين العاملين في الشركة في ساعة معينة، إذا لم يكن لديهم عطلة. سيتم إرسال ملخص ردود في منتصف الليل.
 DocType: Employee Leave Approver,Employee Leave Approver,الموافق علي اجازة الموظف
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ملاحظات تدريب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
@@ -4107,7 +4114,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},بالطبع إلزامي في الصف {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,حتى الآن لا يمكن أن يكون قبل تاريخ من
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,إضافة / تحرير الأسعار
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,إضافة / تحرير الأسعار
 DocType: Batch,Parent Batch,دفعة الأم
 DocType: Cheque Print Template,Cheque Print Template,قالب طباعة الشيكات
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,دليل مراكز التكلفة
@@ -4151,7 +4158,7 @@
 DocType: Item,Variant Based On,البديل القائم على
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,الموردون
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
 DocType: Request for Quotation Item,Supplier Part No,رقم قطعة المورد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',لا يمكن أن تقتطع عند الفئة هي ل &#39;تقييم&#39; أو &#39;Vaulation وتوتال&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,مستلم من
@@ -4161,7 +4168,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0} من {0} ب {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة ساعات أكبر من الصفر.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
 DocType: Issue,Content Type,نوع المحتوى
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,الكمبيوتر
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
@@ -4170,20 +4177,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مدخلات لم تتم تسويتها
 DocType: Payment Reconciliation,From Invoice Date,من تاريخ الفاتورة
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,يجب أن تكون عملة الفواتير تساوي عملة الشركة او عملة حساب الطرف
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,يجب أن تكون عملة الفواتير تساوي عملة الشركة او عملة حساب الطرف
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,إجازات صرفت نقدا
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,مجال عمل الشركة؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,لمستودع
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,قبولات كل الطلبة
 ,Average Commission Rate,متوسط العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات قاعدة التسعير
 DocType: School House,House Name,اسم المنزل
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,تحديث تكاليف إضافية لحساب تكلفة هبطت من البنود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,كهربائي
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,تضاف بقية المؤسسة أن المستخدمين لديك. يمكنك أيضا إضافة تدعو العملاء إلى موقع البوابة عن طريق إضافتها من اتصالات
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,تضاف بقية المؤسسة أن المستخدمين لديك. يمكنك أيضا إضافة تدعو العملاء إلى موقع البوابة عن طريق إضافتها من اتصالات
 DocType: Stock Entry,Total Value Difference (Out - In),إجمالي قيمة الفرق (خارج - في)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},هوية المستخدم لم يتم تعيين موظف ل {0}
@@ -4192,7 +4199,7 @@
 DocType: Item,Customer Code,كود العميل
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,عدد الأيام منذ آخر أمر
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
 DocType: Buying Settings,Naming Series,تسمية تسلسلية
 DocType: Leave Block List,Leave Block List Name,اسم قائمة الإجازات المحظورة
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,يجب أن يكون تاريخ بدء التأمين أقل من تاريخ التأمين النهاية
@@ -4207,7 +4214,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},كشف راتب الموظف {0} تم إنشاؤه مسبقا على سجل التوقيت {1}
 DocType: Vehicle Log,Odometer,عداد المسافات
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,المخزون المجمدة لغاية
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM لا يحتوي على أي بند الأوراق المالية
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
@@ -4220,7 +4227,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعات الفواتير
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM الافتراضي ل{0} لم يتم العثور
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,انقر على العناصر لإضافتها هنا
 DocType: Fees,Program Enrollment,برنامج التسجيل
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},الرجاء تعيين {0}
@@ -4318,7 +4326,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,تجارة بالجملة والتجزئة
 DocType: Issue,First Responded On,أجاب أولا على
 DocType: Website Item Group,Cross Listing of Item in multiple groups,قائمة صليب البند في مجموعات متعددة
-DocType: Grade Interval,Grade Interval,الصف الفاصل
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},تم تعيين تاريخ بدء السنة المالية و تاريخ انتهاء السنة المالية  بالفعل في السنة المالية {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,إزالة تاريخ تحديث
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,تقسيم دفعة
@@ -4326,6 +4333,7 @@
 DocType: Request for Quotation Supplier,Download PDF,تحميل PDF
 DocType: Production Order,Planned End Date,تاريخ الانتهاء المخطط لها
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,حيث يتم تخزين العناصر.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; المورد نوع
 DocType: Request for Quotation,Supplier Detail,المورد التفاصيل
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},خطأ في الصيغة أو الشرط: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,مبلغ بفاتورة
@@ -4370,7 +4378,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,إعداد موقع بسيط لمنظمتي
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
 DocType: Delivery Note Item,Against Sales Order Item,مقابل عنصر أمر المبيعات
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},الميزانيه لا يمكن تحديدها مقابل حساب جماعي{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأصل
@@ -4427,7 +4435,7 @@
 ,Items To Be Requested,البنود يمكن طلبه
 DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر تسعيرة شراء
 DocType: Company,Company Info,معلومات عن الشركة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,تحديد أو إضافة عميل جديد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,تحديد أو إضافة عميل جديد
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,مطلوب مراكز التكلفة لحجز مطالبة حساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),تطبيق الأموال (الأصول )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ويستند هذا على حضور هذا الموظف
@@ -4440,13 +4448,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,وقف المستخدمين من طلب إجازة في الأيام التالية.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,شراء المبلغ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,فوائد الموظف
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} وشركة {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} {1} غير موجود
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} {1} غير موجود
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,رفعت فواتير للعملاء.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
@@ -4455,15 +4463,17 @@
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
 DocType: Employee Loan Application,Approved,وافق
 DocType: Pricing Rule,Price,السعر
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',الموظف معفى على {0} يجب أن يتم تعيينه ' مغادر '
 DocType: Guardian,Guardian,وصي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,التقييم {0} تم إنشاؤه للموظف {1} في النطاق الزمني المحدد
 DocType: Employee,Education,تعليم
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ديل
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,تم التعديل
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختياري. ضبط العملة الافتراضية للشركة، إذا لم يكن محددا.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,القيود المحاسبية
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
@@ -4500,7 +4510,7 @@
 DocType: Hub Settings,Hub Settings,إعدادات المحور
 DocType: Project,Gross Margin %,هامش إجمالي٪
 DocType: BOM,With Operations,مع عمليات
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,تم إجراء القيود المحاسبية بالعملة {0} مسبقاً لشركة {1}. يرجى تحديد حساب يمكن استلامه أو دفعه بالعملة {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,تم إجراء القيود المحاسبية بالعملة {0} مسبقاً لشركة {1}. يرجى تحديد حساب يمكن استلامه أو دفعه بالعملة {0}.
 DocType: Asset,Is Existing Asset,والقائمة الأصول
 DocType: Salary Detail,Statistical Component,العنصر الإحصائي
 ,Monthly Salary Register,سجل الراتب الشهري
@@ -4554,7 +4564,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,تحديد المستوى
 DocType: Customer,Commission Rate,نسبة العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,أنشئ متغير
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,أنشئ متغير
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,إجازة محجوزة من قبل الأدارة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",يجب أن يكون نوع دفعة واحدة من استلام والدفع ونقل الداخلي
 apps/erpnext/erpnext/config/selling.py +179,Analytics,التحليلات
@@ -4567,6 +4577,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,السماح الإنتاج على عطلات
 DocType: Sales Order,Customer's Purchase Order Date,تاريخ طلب شراء العميل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,أسهم رأس المال
+DocType: Shopping Cart Settings,Show Public Attachments,عرض المرفقات العامة
 DocType: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
 DocType: Payment Gateway Account,Payment Gateway Account,دفع حساب البوابة
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,اعاده توجيه المستخدم الى الصفحات المحدده بعد اكتمال عمليه الدفع
@@ -4591,7 +4602,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $ الخ بجانب العملات.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,جعل دفعة الطلبة
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,جعل دفعة الطلبة
 DocType: Leave Type,Is Carry Forward,هل تضاف في العام التالي
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM الحصول على أصناف من
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,يوم ووقت مبادرة البيع
@@ -4610,7 +4621,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,القيمة المقرر صرفه
 DocType: GL Entry,Is Opening,وفتح
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد&gt; سلسلة الترقيم
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,حساب {0} غير موجود
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,نبذة على موقع الويب وغيره من المنشورات.
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 0bef084..db6159c 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Партида - Статус на срок на годност
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банков чек
 DocType: Mode of Payment Account,Mode of Payment Account,Вид на разплащателна сметка
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Покажи Варианти
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Покажи Варианти
 DocType: Academic Term,Academic Term,Академик Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материал
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Количество
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Грижа за здравето
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Забавяне на плащане (дни)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} се изисква
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Същата фирма се вписват повече от веднъж
 DocType: Employee,Married,Омъжена
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не е разрешен за {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не е разрешен за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Вземете елементи от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Каталог на {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Няма изброени елементи
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Хранителни стоки
 DocType: Quality Inspection Reading,Reading 1,Четене 1
 DocType: Process Payroll,Make Bank Entry,Направи Bank Влизане
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионни фондове
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следваща дата на амортизация не може да бъде преди датата на покупка
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следваща дата на амортизация не може да бъде преди датата на покупка
 DocType: SMS Center,All Sales Person,Всички продажби Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Месечно Разпределение ** ви помага да разпределите бюджета / целеви разходи през месеците, ако имате сезонност в бизнеса си."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Не са намерени
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Не са намерени
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Заплата Структура Липсващ
 DocType: Lead,Person Name,Лице Име
 DocType: Sales Invoice Item,Sales Invoice Item,Фактурата за продажба - позиция
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",например &quot;Основно училище&quot; или &quot;университет&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Сток Доклади
 DocType: Warehouse,Warehouse Detail,Скалд - Детайли
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е бил надхвърлен за клиенти {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е бил надхвърлен за клиенти {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term крайна дата не може да бъде по-късно от края на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Е фиксиран актив"" не може да бъде размаркирано, докато съществува запис за елемента"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Е фиксиран актив"" не може да бъде размаркирано, докато съществува запис за елемента"
 DocType: Vehicle Service,Brake Oil,Спирачна течност
 DocType: Tax Rule,Tax Type,Данъчна тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
 DocType: BOM,Item Image (if not slideshow),Позиция - снимка (ако не слайдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Съществува Customer със същото име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(надница на час / 60) * действително отработено време
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Изберете BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Изберете BOM
 DocType: SMS Log,SMS Log,SMS Журнал
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Разходи за доставени изделия
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Отпускът на {0} не е между От Дата и До  дата
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Клас
 DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: SMS Center,All Contact,Всички контакти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производство Поръчка вече е създаден за всички артикули с BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Производство Поръчка вече е създаден за всички артикули с BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годишна заплата
 DocType: Daily Work Summary,Daily Work Summary,Ежедневната работа Резюме
 DocType: Period Closing Voucher,Closing Fiscal Year,Приключване на финансовата година
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} е замразен
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} е замразен
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Моля изберете съществуващо дружество за създаване на сметкоплан
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Сток Разходи
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Изберете Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Обратно записване
 DocType: Journal Entry Account,Credit in Company Currency,Кредит във валута на фирмата
 DocType: Delivery Note,Installation Status,Монтаж - Статус
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Искате ли да се актуализира и обслужване? <br> Подарък: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прието + Отхвърлено Количество трябва да бъде равно на Получено количество за {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Доставка на суровини за поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,се изисква най-малко един режим на плащане за POS фактура.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,се изисква най-малко един режим на плащане за POS фактура.
 DocType: Products Settings,Show Products as a List,Показване на продукти като Списък
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Изтеглете шаблони, попълнете необходимите данни и се прикрепва на текущото изображение. Всички дати и служител комбинация в избрания период ще дойде в шаблона, със съществуващите записи посещаемост"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Направи Амортизация Влизане
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Заявка Тип
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Направи Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Направи Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радиопредаване
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Изпълнение
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Подробности за извършените операции.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План за посещения за поддръжка.
 DocType: SMS Settings,Enter url parameter for message,Въведете URL параметър за съобщение
 DocType: POS Profile,Customer Groups,Групи клиенти
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Финансови отчети
 DocType: Guardian,Students,Ученици
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила за прилагане на ценообразуване и отстъпка.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Цена списък трябва да бъде приложимо за покупка или продажба
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Адванс сума не може да бъде по-голяма от {0} {1}
 DocType: Naming Series,Series List for this Transaction,Списък с номерации за тази транзакция
 DocType: Company,Default Payroll Payable Account,По подразбиране ТРЗ Задължения сметка
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Актуализация Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Актуализация Email Group
 DocType: Sales Invoice,Is Opening Entry,Се отваря Влизане
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Споменете, ако нестандартно вземане предвид приложимо"
 DocType: Course Schedule,Instructor Name,инструктор Име
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Срещу ред от фактура за продажба
 ,Production Orders in Progress,Производствени поръчки в процес на извършване
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Net Cash от Финансиране
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage е пълен, не беше записан"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage е пълен, не беше записан"
 DocType: Lead,Address & Contact,Адрес и контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Общо Остойностяване сума (чрез Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банкови записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,Публикувай в Hub
 DocType: Student Admission,Student Admission,прием на студенти
 ,Terretory,Територия
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Точка {0} е отменена
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Точка {0} е отменена
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Заявка за материал
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Изкупните Детайли
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматично искане за материали
 DocType: Journal Entry,Multi Currency,Много валути
 DocType: Payment Reconciliation Invoice,Invoice Type,Вид фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Складова разписка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Складова разписка
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Разходи за продадения актив
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} е въведен два пъти в данък за позиция
-DocType: Grade Interval,Min Score,Минимален рейтинг
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} е въведен два пъти в данък за позиция
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
 DocType: Student Applicant,Admitted,Допуснати
 DocType: Workstation,Rent Cost,Разход за наем
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Стойност на поръчката
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банкови / Касови операции по партньор или за вътрешно прехвърляне
 DocType: Shipping Rule,Valid for Countries,Важи за Държави
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Общо Поръчка Смятан
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Моля, въведете &quot;Повторение на Ден на месец поле стойност"
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,Данъчна Ставка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},"{0} вече разпределена за Служител {1} за период {2} {3}, за да"
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Изберете Точка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Конвертиране в не-Група
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Партида на дадена позиция.
 DocType: C-Form Invoice Detail,Invoice Date,Дата на фактура
 DocType: GL Entry,Debit Amount,Дебит сума
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Може да има само един акаунт нза тази фирма в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Може да има само един акаунт нза тази фирма в {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Създаване на ученически групи
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Запитване за оферта
 DocType: Salary Slip Timesheet,Working Hours,Работно Време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промяна на изходния / текущия номер за последователност на съществуваща серия.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Създаване на нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Създаване на нов клиент
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако няколко ценови правила продължават да преобладават, потребителите се приканват да се настрои приоритет ръчно да разрешите конфликт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Създаване на поръчки за покупка
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Създаване на поръчки за покупка
 ,Purchase Register,Покупка Регистрация
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Приложимите цени
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Основен празник
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,От Пакет номер
 DocType: Item Attribute,To Range,До диапазон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценни книжа и депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да се промени методът на оценка, тъй като има транзакции срещу някои позиции, които нямат собствен метод за оценка"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Общо отсъствия разпределени е задължително
 DocType: Job Opening,Description of a Job Opening,Описание на позиция за работа
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Предстоящите дейности за днес
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
 DocType: Production Order,Additional Operating Cost,Допълнителна експлоатационни разходи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Купи
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Моля, определете степен за Threshold 0%"
 DocType: Sales Order,To Deliver,Да достави
 DocType: Purchase Invoice Item,Item,Артикул
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Сериен № - позиция не може да бъде част
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Сериен № - позиция не може да бъде част
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
 DocType: Account,Profit and Loss,Приходи и разходи
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управление Подизпълнители
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 DocType: Production Plan Item,Pending Qty,Чакащо Количество
 DocType: Budget,Ignore,Игнорирай
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не е активен
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не е активен
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS изпратен на следните номера: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Проверете настройките размери за печат
 DocType: Salary Slip,Salary Slip Timesheet,Заплата Slip график
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,Общо комисионна
 DocType: Pricing Rule,Sales Partner,Търговски партньор
 DocType: Buying Settings,Purchase Receipt Required,Покупка Квитанция Задължително
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Оценка процент е задължително, ако влезе Откриване Фондова"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Оценка процент е задължително, ако влезе Откриване Фондова"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не са намерени записи в таблицата с фактури
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Моля изберете Company и Party Type първи
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Натрупаните стойности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Направи поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Направи поръчка за продажба
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Потенциален клиент - Номер
 DocType: C-Form Invoice Detail,Grand Total,Общо
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повторете клиенти
 DocType: Leave Control Panel,Allocate,Разпределяйте
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продажбите Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Продажбите Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Забележка: Общо отпуснати листа {0} не трябва да бъдат по-малки от вече одобрените листа {1} за периода
 DocType: Announcement,Posted By,Публикувано от
 DocType: Item,Delivered by Supplier (Drop Ship),Доставени от доставчик (Drop Ship)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Оферта до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Моля, задайте фирмата"
 DocType: Purchase Order Item,Billed Amt,Фактурирана Сума
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Фактурата за продажба - График
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Референтен номер по &amp; Референтен Дата се изисква за {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Изберете профил на плащане, за да се направи Bank Влизане"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Създаване на записи на наети да управляват листа, претенции за разходи и заплати"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Създаване на записи на наети да управляват листа, претенции за разходи и заплати"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Добави в базата знания
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Предложение за писане
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плащането Влизане Приспадане
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Връзка с Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Мениджър
 DocType: Payment Entry,Payment From / To,Плащане от / към
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Период от време
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е по-малко от сегашната изключително количество за клиента. Кредитен лимит трябва да бъде поне {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е по-малко от сегашната изключително количество за клиента. Кредитен лимит трябва да бъде поне {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Същата позиция е въведена много пъти.
 DocType: SMS Settings,Receiver Parameter,Приемник на параметъра
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Въз основа на"" и ""Групиране По"" не могат да бъдат еднакви"
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,Резолюция Дата
 DocType: Student Batch Name,Batch Name,Партида Име
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,График създаден:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Записване
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ще покажем на студента като настояще в Студентски Месечен Присъствие Доклад
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,Student Присъствие
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Изписване на суровини въз основа на
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Моля, въведете данните т"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Моля, въведете данните т"
 DocType: Interest,Interest,Лихва
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предварителни продажби
 DocType: Purchase Receipt,Other Details,Други детайли
@@ -726,7 +729,7 @@
 ,Absent Student Report,Доклад за отсъствия на учащи се
 DocType: Email Digest,Next email will be sent on:,Следващият имейл ще бъде изпратен на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта - Писмо - Условия
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Позицията има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Позицията има варианти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е намерена
 DocType: Bin,Stock Value,Стойността на акциите
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компания {0} не съществува
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,Гаранция - Дата на изтичане
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
 DocType: Sales Invoice,Commission Rate (%),Комисионен процент (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Моля, изберете Програма"
 DocType: Project,Estimated Cost,Очаквани разходи
 DocType: Purchase Order,Link to material requests,Препратка към материални искания
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не е в наличност
 DocType: Mode of Payment Account,Default Account,Сметка по подрозбиране
 DocType: Payment Entry,Received Amount (Company Currency),Получената сума (фирмена валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Потенциален клиент трябва да се настрои, ако възможност е създадена за потенциален клиент"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Потенциален клиент трябва да се настрои, ако възможност е създадена за потенциален клиент"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Моля изберете седмичен почивен ден
 DocType: Production Order Operation,Planned End Time,Планирано Крайно време
 ,Sales Person Target Variance Item Group-Wise,Продажбите Person Target Вариацията т Group-Wise
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Request for Quotation Supplier,Send Email,Изпрати е-мейл
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Внимание: Невалиден прикачен файл {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Внимание: Невалиден прикачен файл {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Няма разрешение
 DocType: Company,Default Bank Account,Банкова сметка по подразб.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Няма намерен служител
 DocType: Supplier Quotation,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студентската група вече е актуализирана.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студентската група вече е актуализирана.
 DocType: SMS Center,All Customer Contact,Всички клиенти Контакти
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Качване на наличности на склад чрез CSV.
 DocType: Warehouse,Tree Details,Дърво - Детайли
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимална сума на фактурата
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Разходен център {2} не принадлежи на компания {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Сметка {2} не може да бъде група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка Row {IDX}: {DOCTYPE} {DOCNAME} не съществува в по-горе &quot;{DOCTYPE}&quot; на маса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,График {0} вече е завършено или анулирано
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка Row {IDX}: {DOCTYPE} {DOCNAME} не съществува в по-горе &quot;{DOCTYPE}&quot; на маса
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,График {0} вече е завършено или анулирано
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Няма задачи
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматичната фактура ще бъде генерирана например 05, 28 и т.н."
 DocType: Asset,Opening Accumulated Depreciation,Откриване на начислената амортизация
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,Пълзяща средна стойност - Курс
 DocType: Production Planning Tool,Select Items,Изберете артикули
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,График на курса
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,График на курса
 DocType: Maintenance Visit,Completion Status,Статус на Завършване
 DocType: HR Settings,Enter retirement age in years,Въведете пенсионна възраст в години
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целеви склад
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Импорт - Присъствие
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Всички стокови групи
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Всички стокови групи
 DocType: Process Payroll,Activity Log,Журнал на дейностите
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Нетна печалба / загуба
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Поръчка за покупка на плащане
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Начален баланс"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Складова разписка - Съобщение
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Поръчка Количество
 DocType: Leave Block List Date,Leave Block List Date,Оставете Block List Дата
 DocType: Pricing Rule,Price or Discount,Цена или Discount
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Общо приложими такси в Покупка получаване артикули маса трябва да са същите, както Общо данъци и такси"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Общо приложими такси в Покупка получаване артикули маса трябва да са същите, както Общо данъци и такси"
 DocType: Sales Team,Incentives,Стимули
 DocType: SMS Log,Requested Numbers,Желани номера
 DocType: Production Planning Tool,Only Obtain Raw Materials,Снабдете Само суровини
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Fee Structure,Components,Компоненти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химически
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Cash сметка ще се актуализира автоматично в Заплата вестник Влизане когато е избран този режим.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Интервалите за Grade Код {0} се припокрива с интервалите клас за други класове. Вашето интервали {0} и {1} и опитайте отново
 DocType: BOM,Raw Material Cost(Company Currency),Разходи за суровини (фирмена валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Ред # {0}: Процентът не може да бъде по-голям от курса, използван в {1} {2}"
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website позиция
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Качете ваш дизайн за заглавно писмо и лого. (Можете да ги редактирате по-късно).
 DocType: Timesheet Detail,Bill,Фактура
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следваща дата на амортизация е въведена като минала дата
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следваща дата на амортизация е въведена като минала дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Бял
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Кол не е на разположение за {4} в склад {1} при публикуване време на влизането ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Тип поръчка трябва да е един от {0}
 DocType: Lead,Next Contact Date,Следваща дата за контакт
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Начално Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
 DocType: Student Batch Name,Student Batch Name,Student Batch Име
 DocType: Holiday List,Holiday List Name,Име на списък на празниците
 DocType: Repayment Schedule,Balance Loan Amount,Баланс на заема
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},"Моля, посочете {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи поръчките за продажби
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може да бъде отрицателно
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Отстъпка
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Отстъпка
 DocType: Asset,Total Number of Depreciations,Общ брой на амортизации
 DocType: Sales Invoice Item,Rate With Margin,Оцени с марджин
 DocType: Workstation,Wages,Заплати
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,Наименование на организацията
 DocType: Tax Rule,Shipping State,Доставка - състояние
 ,Projected Quantity as Source,Прогнозно количество като Източник
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Позициите трябва да се добавят с помощта на ""Вземи от поръчка за покупки"" бутона"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Позициите трябва да се добавят с помощта на ""Вземи от поръчка за покупки"" бутона"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Включване на неналични продукти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Продажби Разходи
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Разходен център за продажби по подразбиране
 DocType: Sales Partner,Implementation Partner,Партньор за внедряване
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Пощенски код
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Пощенски код
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Поръчка за продажба {0} е {1}
 DocType: Opportunity,Contact Info,Информация за контакт
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Въвеждане на складови записи
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,Дистрибутор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка за пазаруване - Правила за доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
 ,Ordered Items To Be Billed,"Поръчани артикули, които да се фактурират"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,От диапазон трябва да бъде по-малко от До диапазон
 DocType: Global Defaults,Global Defaults,Глобални настройки по подразбиране
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Моля, въведете Код, за да получите Batch Номер"
 DocType: Stock Settings,Default Item Group,Група елементи по подразбиране
 DocType: Employee Loan,Partially Disbursed,Частично Изплатени
-DocType: Grading Structure,Grading System Name,Наименование на оценъчната система
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Доставчик на база данни.
 DocType: Account,Balance Sheet,Баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Разходен център за позиция с Код '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Разходен център за позиция с Код '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Вашият търговец ще получи напомняне на тази дата, за да се свърже с клиента"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Същата позиция не може да бъде въведена  няколко пъти.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,"Работата, извършена"
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Моля, посочете поне един атрибут в таблицата с атрибути"
 DocType: Announcement,All Students,Всички студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,"Позиция {0} трябва да е позиция, която не се с наличности"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,"Позиция {0} трябва да е позиция, която не се с наличности"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Виж Ledger
 DocType: Grading Scale,Intervals,Интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продуктът {0} не може да има партида
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Поръчка за продажба {0} не е валидна
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Поръчки помогнат да планирате и проследяване на вашите покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Поръчки помогнат да планирате и проследяване на вашите покупки
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Малък
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Синхронизиране на основни данни
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,Номер на ролката в групата
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Общо за всички работни тежести трябва да бъде 1. Моля, коригира теглото на всички задачи по проекта съответно"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Позиция {0} трябва да бъде позиция за подизпълнители
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капиталови Активи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,Вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} артикула са в производство
 DocType: Workstation,Workstation Name,Workstation Име
-DocType: Grade Interval,Grade Code,Код на клас
+DocType: Grading Scale Interval,Grade Code,Код на клас
 DocType: POS Item Group,POS Item Group,POS Позиция Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към позиция {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Хардуер
 DocType: Sales Order,Recurring Upto,повтарящо Upto
 DocType: Attendance,HR Manager,ЧР мениджър
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Моля изберете фирма
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Моля изберете фирма
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege отпуск
 DocType: Purchase Invoice,Supplier Invoice Date,Доставчик Дата Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Трябва да се активира функционалността за количка за пазаруване
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Застаряването на населението Range 3
 DocType: Maintenance Schedule Item,No of Visits,Брои на Посещения
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Маркирай като присъстващ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Маркирай като присъстващ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Графикът за поддръжка {0} съществува срещу {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,записване на студентите
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на Затварянето Сметката трябва да е {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума от точки за всички цели трябва да бъде 100. Това е {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Правила и условия - съдържание
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може да бъде по-голямо от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи от неплатен отпуск
 DocType: Pricing Rule,"Higher the number, higher the priority","По-голямо число, по-висок приоритет"
 ,Purchase Invoice Trends,Фактурата за покупка Trends
 DocType: Employee,Better Prospects,По-добри перспективи
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Партидата {1} има само {2} qty. Моля, изберете друга партида, която има {3} qty на разположение или разделете реда на няколко реда, за да достави / издаде от няколко партиди"
 DocType: Vehicle,License Plate,Регистрационен номер
 DocType: Appraisal,Goals,Цели
 DocType: Warranty Claim,Warranty / AMC Status,Гаранция / AMC Status
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замразено, записи право да ограничават потребителите."
 DocType: Email Digest,Bank Balance,Баланс на банка
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на работа, необходими квалификации и т.н."
 DocType: Journal Entry Account,Account Balance,Баланс на Сметка
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Данъчно правило за транзакции.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Покажи незатворен фискална година L баланси P &amp;
 DocType: Shipping Rule,Shipping Account,Доставка Акаунт
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивна
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Направи Поръчки за продажби да ви помогнат да планират работата си и доставят по-време
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Направи Поръчки за продажби да ви помогнат да планират работата си и доставят по-време
 DocType: Quality Inspection,Readings,Четения
 DocType: Stock Entry,Total Additional Costs,Общо допълнителни разходи
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,До стойност
 DocType: Asset Movement,Stock Manager,Склад за мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Източник склад е задължително за ред {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Приемо-предавателен протокол
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Приемо-предавателен протокол
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Офис под наем
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Setup SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Импортирането неуспешно!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,Източник
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Покажи затворен
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Категория е задължително за Фиксирана позиция в актива
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Категория е задължително за Фиксирана позиция в актива
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не са намерени в таблицата за плащане записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Този {0} е в конфликт с {1} за {2} {3}
 DocType: Student Attendance Tool,Students HTML,"Студентите, HTML"
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,Дата на напускане
 DocType: Pricing Rule,For Price List,За Ценовата листа
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Създаване потенциален клиент
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Създаване потенциален клиент
 DocType: Maintenance Schedule,Schedules,Графици
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Детайли Номер
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Програмни записвания
 DocType: Sales Invoice Item,Brand Name,Марка Име
 DocType: Purchase Receipt,Transporter Details,Превозвач Детайли
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Изисква се склад по подразбиране за избрания елемент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Изисква се склад по подразбиране за избрания елемент
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Кутия
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Възможен доставчик
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организацията
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,Четене 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM по подразбиране за {0} не е намерен за проект {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Искане за фирмен разход.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Учениците са в основата на системата, добавят всички вашите ученици"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Учениците са в основата на системата, добавят всички вашите ученици"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row {0}: дата Клирънсът {1} не може да бъде преди Чек Дата {2}
 DocType: Company,Default Holiday List,Списък на почивни дни по подразбиране
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: От време и До време на {1} се припокрива с {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Деня (и), на който кандидатствате за отпуск е празник. Не е нужно да кандидатствате за отпуск."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно изпращане на плащане Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Нова задача
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Направи оферта
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Направи оферта
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Други справки
 DocType: Dependent Task,Dependent Task,Зависима задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Моля, задайте по подразбиране ТРЗ Задължения профил в Company {0}"
 DocType: SMS Center,Receiver List,Списък Receiver
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Търсене позиция
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Търсене позиция
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Консумирана Сума
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нетна промяна в Cash
 DocType: Assessment Plan,Grading Scale,Оценъчна скала
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,вече приключи
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Вече съществува заявка за плащане {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за изписани стоки
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,събирам
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Ценоразпис по подразбиране
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,запис Движение Asset {0} е създаден
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,запис Движение Asset {0} е създаден
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вие не можете да изтривате фискална година {0}. Фискална година {0} е зададена по подразбиране в Global Settings
 DocType: Journal Entry,Entry Type,Влизане Type
 ,Customer Credit Balance,Клиентско кредитно салдо
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,Обучение в същия институт
 DocType: Territory,Territory Manager,Мениджър на територия
 DocType: Packed Item,To Warehouse (Optional),До склад (по избор)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 DocType: Payment Entry,Paid Amount (Company Currency),Платената сума (фирмена валути)
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продажби - Настройка
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Виж в кошницата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материал Заявка използва за направата на този запас Влизане
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следваща дата на амортизация е задължителна за нов актив
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следваща дата на амортизация е задължителна за нов актив
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Разделна курсова група за всяка партида
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Единична единица на дадена позиция.
 DocType: Fee Category,Fee Category,Категория Такса
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Не се изисква Разходен Център за сметка ""Печалби и загуби"" {2}. Моля, задайте  Разходен Център по подразбиране за компанията."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група Клиенти съществува със същото име. Моля, променете името на Клиента или преименувайте Група Клиенти"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група Клиенти съществува със същото име. Моля, променете името на Клиента или преименувайте Група Клиенти"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нова контакт
 DocType: Territory,Parent Territory,Територия - Родител
 DocType: Quality Inspection Reading,Reading 2,Четене 2
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Равнение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Твърде много колони. Износ на доклада и да го отпечатате с помощта на приложение за електронни таблици.
 DocType: Purchase Invoice Item,Batch No,Партиден №
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Не може да се намери на обменния курс за {0} до {1} за ключова дата {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Оставя множество Продажби Поръчки срещу поръчка на клиента,"
 DocType: Student Group Instructor,Student Group Instructor,Инструктор на група студенти
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Не
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Основен
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Вариант
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Основен
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
 DocType: Employee Attendance Tool,Employees HTML,Служители на HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM по подразбиране ({0}) трябва да бъде активен за тази позиция или шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM по подразбиране ({0}) трябва да бъде активен за тази позиция или шаблон
 DocType: Employee,Leave Encashed?,Отсъствието е платено?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Възможност - От"" полето е задължително"
 DocType: Email Digest,Annual Expenses,годишните разходи
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,оценки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дублиран Пореден № за позиция {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие за Правило за Доставка
-DocType: Grading Structure,Grading Intervals,Интервали на окачествяването
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Моля, въведете"
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не може да се overbill за позиция {0} в ред {1} повече от {2}. За да позволите на свръх-фактуриране, моля, задайте в Купуването Настройки"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Моля, задайте филтър на базата на т или Warehouse"
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Плащане
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Управление на вашите поръчки
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Управление на вашите поръчки
 DocType: Production Order Operation,Actual Time and Cost,Действителното време и разходи
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Искане на максимална {0} може да се направи за позиция {1} срещу Продажби Поръчка {2}
 DocType: Employee,Salutation,Поздрав
 DocType: Course,Course Abbreviation,Курс - Съкращение
 DocType: Student Leave Application,Student Leave Application,Student оставите приложението
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Служител {0} на половин ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Общо работно време не трябва да са по-големи от работното време макс {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Пакетни позиции в момент на продажба.
 DocType: Quotation Item,Actual Qty,Действително Количество
 DocType: Sales Invoice Item,References,Препратки
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Въвели сте дублиращи се елементи. Моля, поправи и опитай отново."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Сътрудник
 DocType: Asset Movement,Asset Movement,Asset движение
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Нова пазарска количка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Нова пазарска количка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Позиция {0} не е сериализирани позиция
 DocType: SMS Center,Create Receiver List,Създаване на списък за получаване
 DocType: Vehicle,Wheels,Колела
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Забранява създаването на времеви трупи срещу производствени поръчки. Операциите не се проследяват срещу производствена поръчка
 DocType: Student,Student Mobile Number,Student мобилен номер
 DocType: Item,Has Variants,Има варианти
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Идентификационният номер на партидата е задължителен
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификационният номер на партидата е задължителен
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
 DocType: Purchase Invoice,Recurring Invoice,Повтарящо Invoice
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управление на Проекти
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,Фискална Година
 DocType: Vehicle Log,Fuel Price,цена на гориво
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не могат да бъдат причислени към {0}, тъй като това не е сметка за приход или разход"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнато
 DocType: Student Admission,Application Form Route,Заявление форма Път
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Сума {0} {1} приспада срещу {2}
 DocType: Employee,Salary Information,Заплата
 DocType: Sales Person,Name and Employee ID,Име и Employee ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди дата на осчетоводяване"
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди дата на осчетоводяване"
 DocType: Website Item Group,Website Item Group,Website т Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Мита и такси
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Моля, въведете Референтна дата"
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете Приходи Customer
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) трябва да има роля ""Одобряващ разходи"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Двойка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Изберете BOM и Количество за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Изберете BOM и Количество за производство
 DocType: Asset,Depreciation Schedule,Амортизационен план
 DocType: Bank Reconciliation Detail,Against Account,Срещу Сметка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,"Половин ден Дата трябва да бъде между ""От Дата"" и ""До дата"""
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
 ,Quotation Trends,Оферта Тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефициент на преобразуване
 DocType: Purchase Order,Delivered,Доставени
 ,Vehicle Expenses,Камион Разходи
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
+DocType: Serial No,Invoice Details,Данни за фактурите
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
 DocType: Purchase Receipt,Vehicle Number,Номер на превозно средство
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Датата, на която повтарящите се фактури ще бъдат спрени"
 DocType: Employee Loan,Loan Amount,Заета сума
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група към не-група
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортове
 DocType: Loan Type,Loan Name,Заем - Име
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,Спечелени и лоялност на клиенти
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, в койт се поддържа запас от отхвърлените артикули"
 DocType: Production Order,Skip Material Transfer,Пропуснете прехвърлянето на материали
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Не може да се намери валутен курс за {0} до {1} за ключова дата {2}. Моля, създайте ръчно запис на валута"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Вашата финансовата година приключва на
 DocType: POS Profile,Price List,Ценова Листа
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} сега е по подразбиране фискална година. Моля, опреснете браузъра си за да влезе в сила промяната."
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Позиция {0} вече е върната
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискална година ** представлява финансова година. Всички счетоводни записвания и други големи движения се записват към ** Фискална година **.
 DocType: Opportunity,Customer / Lead Address,Клиент / Потенциален клиент - Адрес
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 DocType: Student Admission,Eligibility,избираемост
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads ви помогне да получите бизнес, добавете всичките си контакти и повече като си клиенти"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads ви помогне да получите бизнес, добавете всичките си контакти и повече като си клиенти"
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изберете компания ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако важи за всички отдели"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
 DocType: Process Payroll,Fortnightly,всеки две седмици
 DocType: Currency Exchange,From Currency,От валута
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можете да изберете тип заряд като &quot;На предишния ред Сума&quot; или &quot;На предишния ред Total&quot; за първи ред
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Дете позиция не трябва да бъде пакетен продукт. Моля, премахнете позиция `{0}` и запишете"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банки и разплащания
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Добави графици
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Добави графици
 DocType: Vehicle Service,Service Item,Service точка
 DocType: Bank Guarantee,Bank Guarantee,Банкова гаранция
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да получите график"
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цените няма да се показват, ако ценова листа не е настроено"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Моля, посочете държава за тази доставка правило или проверете Worldwide Доставка"
 DocType: Stock Entry,Total Incoming Value,Общо Incoming Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебит сметка се изисква
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването за занимания, извършени от вашия екип"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебит сметка се изисква
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването за занимания, извършени от вашия екип"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Ценоразпис
 DocType: Offer Letter Term,Offer Term,Оферта Условия
 DocType: Quality Inspection,Quality Manager,Мениджър по качеството
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,Причина за загубата
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нов адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Моля, въведете Получаване на документация"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Всички елементи вече са фактурирани
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Моля, въведете Получаване на документация"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Всички елементи вече са фактурирани
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Моля, посочете валиден &quot;От Case No.&quot;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Project,External,Външен
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Потребители и права
 DocType: Vehicle Log,VLOG.,ВЛОГ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производствени поръчки Създаден: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Производствени поръчки Създаден: {0}
 DocType: Branch,Branch,Клон
 DocType: Guardian,Mobile Number,Мобилен номер
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печат и Branding
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Сериен № {0} не е намерен
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Направи Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Направи Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Вие сте били поканени да си сътрудничат по проекта: {0}
 DocType: Leave Block List Date,Block Date,Блокиране - Дата
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Запиши се сега
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,Изпратени На
 DocType: Payment Request,Make Sales Invoice,Направи фактурата за продажба
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,софтуери
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следваща дата за контакт не може да е в миналото
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следваща дата за контакт не може да е в миналото
 DocType: Company,For Reference Only.,Само за справка.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Изберете партида №
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Авансова сума
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Дело Номер не може да бъде 0
 DocType: Item,Show a slideshow at the top of the page,Покажи на слайдшоу в горната част на страницата
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,списъците с материали
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазини
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазини
 DocType: Serial No,Delivery Time,Време За Доставка
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Застаряването на населението на базата на
 DocType: Item,End of Life,Края на живота
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Прехвърляне на материал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Този документ е над ограничението от {0} {1} за елемент {4}. Възможно ли е да направи друг {3} срещу същите {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,количество сметка Select промяна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,количество сметка Select промяна
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да избере
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,Сметка за бюджет
 DocType: Quality Inspection,Verified By,Проверени от
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени валута по подразбиране на фирмата, защото има съществуващи операции. Те трябва да бъдат отменени, за да промените валута по подразбиране."
-DocType: Grade Interval,Grade Description,Клас - Описание
+DocType: Grading Scale Interval,Grade Description,Клас - Описание
 DocType: Stock Entry,Purchase Receipt No,Покупка Квитанция номер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задатък
 DocType: Process Payroll,Create Salary Slip,Създаване на фиш за заплата
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,Присъствие към днешна дата
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Gateway Account,Payment Account,Разплащателна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Моля, посочете фирма, за да продължите"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Моля, посочете фирма, за да продължите"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Нетна промяна в Вземания
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсаторни Off
 DocType: Offer Letter,Accepted,Приет
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Доставка Правило Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,потребителски форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
 DocType: Employee,Previous Work Experience,Предишен трудов опит
@@ -2285,7 +2285,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Условия за ползване - 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Името на института, за който искате да създадете тази система."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Счетоводен запис, замразени до тази дата, никой не може да направи / промени  записите с изключение на ролята посочена по-долу"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Моля, запишете документа преди да генерира план за поддръжка"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Моля, запишете документа преди да генерира план за поддръжка"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Маркирайте това да забраниш фракции. (За NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Създадени са следните производствени поръчки:
@@ -2308,6 +2308,7 @@
 DocType: Email Digest,How frequently?,Колко често?
 DocType: Purchase Receipt,Get Current Stock,Вземи наличности
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дърво на Спецификация на материали (BOM)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 DocType: Student,Joining Date,Постъпване - Дата
 ,Employees working on a holiday,"Служителите, които работят на почивка"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Отбележи присъствие
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Дата на клирънс не е определена
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
 DocType: Guardian,Occupation,Професия
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Общо (количество)
 DocType: Sales Invoice,This Document,Този документ
 DocType: Installation Note Item,Installed Qty,Инсталирано количество
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,Поръчка за продажба - Съобщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Задайте стойности по подразбиране, като Company, валути, текущата фискална година, и т.н."
 DocType: Payment Entry,Payment Type,Вид на плащане
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Моля, изберете партида за елемент {0}. Не може да се намери една партида, която отговаря на това изискване"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Моля, изберете партида за елемент {0}. Не може да се намери една партида, която отговаря на това изискване"
 DocType: Process Payroll,Select Employees,Изберете Служители
 DocType: Opportunity,Potential Sales Deal,Потенциални Продажби Deal
 DocType: Payment Entry,Cheque/Reference Date,Чек / Референция Дата
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобален POS профил {0} вече е създаден за компанията {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Заменете т / BOM във всички спецификации на материали
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,трябва да се представи разписка документ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,трябва да се представи разписка документ
 DocType: Purchase Invoice Item,Received Qty,Получено количество
 DocType: Stock Entry Detail,Serial No / Batch,Сериен № / Партида
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не е платен и не е доставен
@@ -2441,7 +2442,7 @@
 ,To Produce,Да Произвежда
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ведомост
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За ред {0} в {1}. За да {2} включат в курс ред, редове {3} трябва да се включат и те"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Създаване на потребител
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Създаване на потребител
 DocType: Packing Slip,Identification of the package for the delivery (for print),Наименование на пакета за доставка (за печат)
 DocType: Bin,Reserved Quantity,Запазено Количество
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Моля, въведете валиден имейл адрес"
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Забраненият шаблон не трябва да е този по подразбиране
 DocType: Account,Income Account,Сметка за доход
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущо количество
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Вижте &quot;Курсове на материали на основата на&quot; в Остойностяване Раздел
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Предишна
 DocType: Appraisal Goal,Key Responsibility Area,Ключова област на отговорност
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
 DocType: Payment Entry,Total Allocated Amount,Общата отпусната сума
 DocType: Item Reorder,Material Request Type,Заявка за материал - тип
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Начисляване на заплати от {0} до {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Изводи от Industry Type.
 DocType: Item Supplier,Item Supplier,Позиция - Доставчик
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ще изпрати съобщение за събитието на служители със статут на &quot;Open&quot;
 DocType: Task,Depends on Tasks,Зависи от Задачи
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управление на дърво с групи на клиенти.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,"Прикачените файлове могат да се показват, без да се разрешава кошчето за пазаруване"
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Име на нов разходен център
 DocType: Leave Control Panel,Leave Control Panel,Контролен панел - отстъствия
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,Дебит към
 DocType: Delivery Note,Required only for sample item.,Изисква се само за проба т.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Действително Количество След Трансакция
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Няма фишове за заплата намерени между {0} и {1}
 ,Pending SO Items For Purchase Request,Чакащи позиции от поръчки за продажба по искане за покупка
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Учебен
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} е деактивиран
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} е деактивиран
 DocType: Supplier,Billing Currency,(Фактура) Валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Много Голям
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Начална страница Featured Каталог
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Всички оценка Групи
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нов Склад Име
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Общо {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Общо {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територия
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
 DocType: Stock Settings,Default Valuation Method,Метод на оценка по подразбиране
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,Ценоразпис магистър
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всички продажби Сделки могат да бъдат маркирани с множество ** продавачи **, така че можете да настроите и да наблюдават цели."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само приложения със статут &quot;Одобрен&quot; и &quot;Отхвърлени&quot; може да бъде подадено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Име на групата е задължително в ред {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Счетоводен запис за Складова наличност
 DocType: Vehicle Service,Engine Oil,Моторно масло
 DocType: Sales Invoice,Sales Team1,Търговски отдел1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Клиент - Адрес
 DocType: Employee Loan,Loan Details,Заем - Детайли
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Завършен во трябва да е по-голяма от нула.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Складове с действащото сделка не може да се превърнат в група.
 DocType: Assessment Result Tool,Result HTML,Резултати HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Изтича на
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Добави студенти
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Добави студенти
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Моля изберете {0}
 DocType: C-Form,C-Form No,Си-форма номер
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Преминат лимит
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Един учебен план с това &quot;Учебна година&quot; {0} и &quot;Срок име&quot; {1} вече съществува. Моля, променете тези записи и опитайте отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Тъй като има съществуващи операции срещу т {0}, не можете да промените стойността на {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Тъй като има съществуващи операции срещу т {0}, не можете да промените стойността на {1}"
 DocType: UOM,Must be Whole Number,Трябва да е цяло число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови листа Отпуснати (в дни)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Сериен № {0} не съществува
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,Последен ден на следващия месец
 DocType: Support Settings,Auto close Issue after 7 days,Auto близо Issue след 7 дни
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отпуск не могат да бъдат разпределени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Заявител
 DocType: Asset Category Account,Accumulated Depreciation Account,Сметка за Натрупана амортизация
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,Код
 DocType: Production Planning Tool,Create Production Orders,Създаване на производствени поръчки
 DocType: Serial No,Warranty / AMC Details,Гаранция / AMC Детайли
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
 DocType: Journal Entry,User Remark,Потребителска забележка
 DocType: Lead,Market Segment,Пазарен сегмент
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,Създаване на искане за материали
 DocType: Employee Education,School/University,Училище / Университет
 DocType: Payment Request,Reference Details,Референтен Детайли
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Очакваната стойност След полезния живот трябва да бъде по-малко от Gross Сума на покупката
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очакваната стойност След полезния живот трябва да бъде по-малко от Gross Сума на покупката
 DocType: Sales Invoice Item,Available Qty at Warehouse,В наличност Количество в склада
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Фактурирана Сума
 DocType: Asset,Double Declining Balance,Двоен неснижаем остатък
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Платената сума не може да бъде по-голяма от кредит сума {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производство Поръчка не е създаден
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Производство Поръчка не е създаден
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""От дата"" трябва да е преди ""До дата"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Не може да се промени статута си на студент {0} е свързан с прилагането студент {1}
 DocType: Asset,Fully Depreciated,напълно амортизирани
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Маркирано като присъствие HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Оферта са предложения, оферти, изпратени до клиентите"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Оферта са предложения, оферти, изпратени до клиентите"
 DocType: Sales Order,Customer's Purchase Order,Поръчка на Клиента
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Сериен № и Партида
 DocType: Warranty Claim,From Company,От фирма
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Сума на рекордите на критериите за оценка трябва да бъде {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Моля, задайте Брой амортизации Резервирано"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Моля, задайте Брой амортизации Резервирано"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Стойност или Количество
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Минута
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Оферта Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Моля изберете клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Моля изберете клиент
 DocType: C-Form,I,аз
 DocType: Company,Asset Depreciation Cost Center,Център за амортизация на разходите Асет
 DocType: Sales Order Item,Sales Order Date,Поръчка за продажба - Дата
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,Застраховка Детайли
 DocType: Account,Payable,Платим
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Моля, въведете Възстановяване Периоди"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Длъжници ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Длъжници ({0})
 DocType: Pricing Rule,Margin,марж
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Брутна Печалба %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Клирънсът Дата
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Брутна Сума на покупката е задължителна
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Брутна Сума на покупката е задължителна
 DocType: Lead,Address Desc,Адрес Описание
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Компания е задължителна
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Тема Наименование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Поне една от продажба или закупуване трябва да бъдат избрани
-DocType: Grading Structure,Grade Intervals,Интервали на клас
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изберете естеството на вашия бизнес.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Когато се извършват производствени операции.
 DocType: Asset Movement,Source Warehouse,Източник Склад
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечено процентно разпределение
 DocType: Territory,Territory Targets,Територия Цели
 DocType: Delivery Note,Transporter Info,Превозвач Информация
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},"Моля, задайте по подразбиране {0} в Company {1}"
 DocType: Cheque Print Template,Starting position from top edge,Начална позиция от горния ръб
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Същият доставчик е бил въведен няколко пъти
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Пренареждане Количество
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Текущи свободни работни места
 DocType: Company,Stock Adjustment Account,Склад за приспособяване Акаунт
-DocType: Journal Entry,Write Off,Отписвам
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписвам
 DocType: Timesheet Detail,Operation ID,Операция ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Потребител (вход) ID. Ако е зададено, че ще стане по подразбиране за всички форми на човешките ресурси."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: От {1}
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Доставчик доставя на Клиента
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Форма / позиция / {0}) е изчерпана
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Следваща дата за контакт трябва да е по-голяма от датата на публикуване
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Покажи данък разпадането
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Внос и експорт на данни
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Сток записи съществуват срещу Warehouse {0}, затова не можете да прехвърляте повторно или да го модифицирате"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Няма намерени студенти
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
 DocType: Program Enrollment,School House,училище Къща
 DocType: Serial No,Out of AMC,Няма AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Моля, изберете Цитати"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Направи поддръжка посещение
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Моля, изберете Цитати"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Направи поддръжка посещение
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
 DocType: Company,Default Cash Account,Каса - сметка по подразбиране
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Това се основава на присъствието на този Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Няма студенти в
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Добавете още предмети или отворен пълна форма
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Складовата разписка {0} трябва да се отмени преди да анулирате тази поръчка за продажба
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Преди изравняване
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},За  {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Данъци и такси - Добавени (фирмена валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
 DocType: Sales Order,Partly Billed,Частично фактурирани
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Позиция {0} трябва да е дълготраен актив
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Позиция {0} трябва да е дълготраен актив
 DocType: Item,Default BOM,BOM по подразбиране
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общият размер на неизплатените Amt
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
 DocType: Purchase Invoice Item,Rate,Ед. Цена
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Интерниран
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адрес Име
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Адрес Име
 DocType: Stock Entry,From BOM,От BOM
 DocType: Assessment Code,Assessment Code,Код за оценка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основен
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,Print Език
 DocType: Salary Slip,Total Working Hours,Общо работни часове
 DocType: Stock Entry,Including items for sub assemblies,Включително артикули за под събрания
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,"Въведете стойност, която да бъде положителна"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,"Въведете стойност, която да бъде положителна"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Всички територии
 DocType: Purchase Invoice,Items,Позиции
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student вече е регистриран.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,Наличност - Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,От и до датите са задължителни
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете на основата на
 DocType: Delivery Note Item,From Warehouse,От склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
 DocType: Assessment Plan,Supervisor Name,Наименование на надзорник
 DocType: Program Enrollment Course,Program Enrollment Course,Курс за записване на програмата
-DocType: Grading Structure,Grading Structure,Оценъчна - Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Обща сума
 DocType: Tax Rule,Shipping City,Доставка Град
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Тази позиция е вариант на {0} (по образец). Атрибути ще бъдат копирани от шаблона, освен ако &quot;Не Copy&quot; е зададен"
 DocType: Notification Control,Customize the Notification,Персонализиране на Notification
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Парични потоци от операции
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Няма спецификация на материал по подразбиране за позиция {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Моля, изберете първо счетоводна дата"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Откриване Дата трябва да е преди крайната дата
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране за участие чрез настройка&gt; Серия за номериране"
 DocType: Leave Control Panel,Carry Forward,Пренасяне
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Разходен център със съществуващи операции не може да бъде превърнат в книга
 DocType: Department,Days for which Holidays are blocked for this department.,Дни за които Holidays са блокирани за този отдел.
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Общо (сума)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забавление и отдих
 DocType: Quality Inspection,Item Serial No,Позиция Сериен №
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Създаване на запис на нает персонал
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Създаване на запис на нает персонал
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Общо Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Счетоводни отчети
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Новият BOM след подмяна
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Точка на продажба
 DocType: Payment Entry,Received Amount,получената сума
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Създаване на пълен количество, без да обръща внимание количество вече по поръчка"
 DocType: Account,Tax,Данък
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Не е маркирано
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,Фактури
 DocType: Batch,Source Document Name,Име на изходния документ
 DocType: Job Opening,Job Title,Длъжност
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Създаване на потребители
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Създаване на потребители
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетете доклад за поддръжка повикване.
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: BOM,Website Description,Website Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нетна промяна в собствения капитал
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Касова бележка
 ,Sales Register,Продажбите Регистрация
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Няма нищо, за да редактирате."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
 DocType: Customer Group,Customer Group Name,Група клиенти - Име
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Все още няма клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Отчет за паричните потоци
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем  {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Разрешително
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Моля изберете прехвърляне, ако и вие искате да се включат предходната фискална година баланс оставя на тази фискална година"
 DocType: GL Entry,Against Voucher Type,Срещу ваучер Вид
 DocType: Item,Attributes,Атрибутите
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последна Поръчка Дата
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
 DocType: Student,Guardian Details,Guardian Детайли
 DocType: C-Form,C-Form,Cи-Форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Маркирай присъствие за множество служители
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # партида трябва да е от тип &quot;дълготраен актив&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Изх. Количество
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила за изчисляване на сумата на пратката за продажба
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Номерацията е задължителна
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Номерацията е задължителна
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансови Услуги
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Видове дейности за времето за Logs
 DocType: Tax Rule,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основна сума
 DocType: Training Event,Exam,Изпит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,(Фактура) Състояние
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,Сметка за плащане от
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина - Код
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Направи Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Направи Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Печат и консумативи
 DocType: Stock Settings,Show Barcode Field,Покажи Barcode Невярно
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Изпрати Доставчик имейли
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,Очаква Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Горе
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Посочете дали е нестандартна платима сметка
 DocType: Salary Slip,Earning & Deduction,Приходи & Удръжки
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,Вземете студентите от
 DocType: Hub Settings,Seller Country,Продавач - Държава
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Публикуване Теми на Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група вашите ученици в партиди
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група вашите ученици в партиди
 DocType: Authorization Rule,Authorization Rule,Разрешение Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия за ползване - Детайли
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Спецификации
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Изпитание
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Заплата Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новата учебна година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Връщане / кредитно известие
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Връщане / кредитно известие
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Общо платената сума
 DocType: Production Order Item,Transferred Qty,Прехвърлено Количество
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,Продажбите на фунията
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Съкращението е задължително
 DocType: Project,Task Progress,Задача Прогрес
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Количка
 ,Qty to Transfer,Количество за прехвърляне
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Оферта до потенциални клиенти или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количеството ({0}) не може да бъде част от реда {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Такса за събиране
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Баркод {0} вече се използва в ред {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Баркод {0} вече се използва в ред {1}
 DocType: Lead,Add to calendar on this date,Добави в календара на тази дата
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
 DocType: Item,Opening Stock,Начална наличност
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,От потенциален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поръчки пуснати за производство.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изберете фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Program Enrollment Tool,Enroll Students,приемат студенти
 DocType: Hub Settings,Name Token,Име Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3645,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} по Фактура за продажба {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Име на проекта
-DocType: Supplier,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
+DocType: Customer,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
 DocType: Journal Entry Account,If Income or Expense,Ако приход или разход
 DocType: Production Order,Required Items,Необходими неща
 DocType: Stock Ledger Entry,Stock Value Difference,Склад за Value Разлика
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,Данъци
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Платени и недоставени
 DocType: Project,Default Cost Center,Разходен център по подразбиране
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 DocType: Bank Guarantee,End Date,Крайна Дата
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,сделки с акции
 DocType: Budget,Budget Accounts,бюджетни сметки
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,Търговски партньор и комисионни
 DocType: Employee Loan,Rate of Interest (%) / Year,Лихвен процент (%) / Година
 ,Project Quantity,Проект Количество
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да е необходимо да се промени &quot;Разпределете такси на базата на&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да е необходимо да се промени &quot;Разпределете такси на базата на&quot;"
 DocType: Opportunity,To Discuss,Да обсъдим
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} единици от {1} необходимо в {2}, за да завършите тази транзакция."
 DocType: Loan Type,Rate of Interest (%) Yearly,Лихвен процент (%) Годишен
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Маркирай като отсъстващ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Валута на BOM # {1} трябва да бъде равна на избраната валута {2}
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Такса Компонент
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управление на автопарка
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Склад {0} не съществува
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирайте се за ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечено процентно разпределение
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Избраният елемент не може да има партида
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Избраният елемент не може да има партида
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","скорост на оценка не е намерен за позицията от {0}, което е необходимо да направите, счетоводни записвания за {1} {2}. Ако елементът е сключване на сделки като елемент проба в {1}, моля се спомене, че в {1} таблицата елемент. В противен случай, моля, създайте входящо фондова сделка за скоростта на оценка елемент или споменава в регистъра на т, и след това опитайте да изпращате / анулиране на този пост"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% от материали доставени по тази Бележка за доставка
 DocType: Project,Customer Details,Клиент - Детайли
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Подадените поръчки не могат да бъдат изтрити
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Баланса на сметката вече е в 'Дебит'. Не е позволено да задавате 'Балансът задължително трябва да бъде в Кребит'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Управление на качеството
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Позиция {0} е деактивирана
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Позиция {0} е деактивирана
 DocType: Employee Loan,Repay Fixed Amount per Period,Погасяване фиксирана сума за Период
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Известие (дни)
 DocType: Tax Rule,Sales Tax Template,Данъка върху продажбите Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Изберете артикули, за да запазите фактурата"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Изберете артикули, за да запазите фактурата"
 DocType: Employee,Encashment Date,Инкасо Дата
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Склад за приспособяване
@@ -3855,6 +3861,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Дебитно известие - Издадено
 DocType: Production Order,Warehouses,Складове
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} активът не може да се прехвърля
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Тази позиция е вариант на {0} (шаблон).
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупуване
 DocType: Announcement,Announcement,обявление
@@ -3870,7 +3877,7 @@
 DocType: Account,Receivable,За получаване
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Не е позволено да се промени Доставчик като вече съществува поръчка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роля, която е оставена да се представят сделки, които надвишават кредитни лимити, определени."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Изберете артикули за Производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Изберете артикули за Производство
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
 DocType: Item,Material Issue,Изписване на материал
 DocType: Hub Settings,Seller Description,Продавач Описание
@@ -3883,7 +3890,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии за оценка Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Откриване на начислената амортизация трябва да бъде по-малко от равна на {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Откриване на начислената амортизация трябва да бъде по-малко от равна на {0}
 DocType: Warehouse,Warehouse Name,Склад - Име
 DocType: Naming Series,Select Transaction,Изберете транзакция
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Моля, въведете Приемане Role или одобряването на потребителя"
@@ -3917,7 +3924,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Присъедини
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Employee Loan,Repay from Salary,Погасяване от Заплата
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Искане за плащане срещу {0} {1} за количество {2}
@@ -3935,7 +3942,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Оценка Резултати Подробности
 DocType: Employee Education,Employee Education,Служител - Образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate група т намерена в таблицата на т група
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Сериен № {0} е бил вече получен
@@ -3944,7 +3951,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не е свързана с всяка сметка, моля, създайте / свързване на съответния (Asset) сметка за склада."
 DocType: Purchase Invoice,Recurring Id,Повтарящо Id
 DocType: Customer,Sales Team Details,Търговски отдел - Детайли
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Изтриете завинаги?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Изтриете завинаги?
 DocType: Expense Claim,Total Claimed Amount,Общо заявена Сума
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциалните възможности за продажби.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Невалиден {0}
@@ -3955,13 +3962,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Настройте своето училище в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базовата ресто сума (Валута на компанията)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Няма счетоводни записвания за следните складове
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Няма счетоводни записвания за следните складове
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Записване на документа на първо място.
 DocType: Account,Chargeable,Платим
 DocType: Company,Change Abbreviation,Промени Съкращение
 DocType: Expense Claim Detail,Expense Date,Expense Дата
 DocType: Item,Max Discount (%),Максимална отстъпка (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последна Поръчка Сума
+DocType: Task,Is Milestone,Е Milestone
 DocType: Daily Work Summary,Email Sent To,"Писмо, изпратено до"
 DocType: Budget,Warn,Предупреждавам
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
@@ -3994,11 +4002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази наличности по-стари от` трябва да бъде по-малък от %d дни.
 DocType: Tax Rule,Purchase Tax Template,Покупка Tax Template
 ,Project wise Stock Tracking,Проект мъдър фондова Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Съществува план за поддръжка {0} срещу {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Действително Количество (at source/target)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Записи на служителите.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
 DocType: HR Settings,Payroll Settings,Настройки ТРЗ
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Съвпадение без свързана фактури и плащания.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Направи поръчка
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекове Депозити и неправилно изчистени
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Сметка {0}: Не можете да назначите себе си за родителска сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценоразпис Курсове
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Създаване на оферти на клиенти
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Създаване на оферти на клиенти
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Покажи &quot;В наличност&quot; или &quot;Не е в наличност&quot; на базата на склад налични в този склад.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Спецификация на материал (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Средното време взети от доставчика да достави
@@ -4043,7 +4050,7 @@
 DocType: Asset,Disposal Date,Отписване - Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Имейли ще бъдат изпратени на всички активни служители на компанията в даден час, ако те не разполагат с почивка. Обобщение на отговорите ще бъдат изпратени в полунощ."
 DocType: Employee Leave Approver,Employee Leave Approver,Служител одобряващ отпуски
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не може да се обяви като загубена, защото е направена оферта."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обучение Обратна връзка
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
@@ -4051,7 +4058,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курс е задължителен на ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Добавяне / Редактиране на цените
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Добавяне / Редактиране на цените
 DocType: Batch,Parent Batch,Родителска партида
 DocType: Cheque Print Template,Cheque Print Template,Чек шаблони за печат
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Списък на Разходни центрове
@@ -4095,7 +4102,7 @@
 DocType: Item,Variant Based On,Вариант на базата на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Вашите доставчици
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Не може да се определи като загубена тъй като поръчка за продажба е направена.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се определи като загубена тъй като поръчка за продажба е направена.
 DocType: Request for Quotation Item,Supplier Part No,Доставчик Част номер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Vaulation и Total&quot;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Получени от
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: От {0} за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Часове стойност трябва да е по-голяма от нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
 DocType: Issue,Content Type,Съдържание Тип
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
@@ -4114,20 +4121,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи неизравнени записвания
 DocType: Payment Reconciliation,From Invoice Date,От Дата на фактура
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Валутата за фактуриране трябва да бъде същата като валута на фирмата или на клиентската сметка
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Валутата за фактуриране трябва да бъде същата като валута на фирмата или на клиентската сметка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставете Инкасо
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Какво прави?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,До склад
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Всички Учебен
 ,Average Commission Rate,Средна Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
 DocType: School House,House Name,Наименование Къща
 DocType: Purchase Taxes and Charges,Account Head,Главна Сметка
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,"Актуализиране на допълнителни разходи, за да се изчисли приземи разходи за предмети"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Електрически
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавете останалата част от вашата организация, както на потребителите си. Можете да добавите и покани на клиентите да си портал, като ги добавите от Контакти"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавете останалата част от вашата организация, както на потребителите си. Можете да добавите и покани на клиентите да си портал, като ги добавите от Контакти"
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика (Изх - Вх)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Ред {0}: Валутен курс е задължителен
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID не е конфигуриран за служител {0}
@@ -4136,7 +4143,7 @@
 DocType: Item,Customer Code,Клиент - Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Напомняне за рожден ден за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни след последната поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
 DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Застраховка Начална дата трябва да бъде по-малка от застраховка Крайна дата
@@ -4151,7 +4158,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
 DocType: Vehicle Log,Odometer,одометър
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Точка {0} е деактивирана
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Точка {0} е деактивирана
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM не съдържа материали / стоки
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},"Период От и Период До, са задължителни за повтарящи записи {0}"
@@ -4164,7 +4171,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Сума за отписване (фирмена валута)
 DocType: Sales Invoice Timesheet,Billing Hours,Фактурирани часове
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM по подразбиране за {0} не е намерен
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Докоснете елементи, за да ги добавите тук"
 DocType: Fees,Program Enrollment,програма за записване
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Моля, задайте {0}"
@@ -4261,7 +4269,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Търговия на дребно и едро
 DocType: Issue,First Responded On,Първо отговорили на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
-DocType: Grade Interval,Grade Interval,Клас - интервал
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Начални дата и фискална година Крайна дата вече са определени в Фискална година {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Дата на клирънсът е актуализирана
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Разделна партида
@@ -4269,6 +4276,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Изтегляне на PDF
 DocType: Production Order,Planned End Date,Планирана Крайна дата
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Когато елементите са съхранени.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: Request for Quotation,Supplier Detail,Доставчик - детайли
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Грешка във формула или състояние: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Фактурирана сума
@@ -4313,7 +4321,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup прост сайт за моята организация
 DocType: Payment Reconciliation,Receivable / Payable Account,Вземания / дължими суми Акаунт
 DocType: Delivery Note Item,Against Sales Order Item,Срещу ред от поръчка за продажба
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Склад по подразбиране
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Моля, въведете разходен център майка"
@@ -4370,7 +4378,7 @@
 ,Items To Be Requested,Позиции които да бъдат поискани
 DocType: Purchase Order,Get Last Purchase Rate,Вземи курс от последна покупка
 DocType: Company,Company Info,Информация за компанията
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Изберете или добавите нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Изберете или добавите нов клиент
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,"Разходен център е необходим, за да осчетоводите разход"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Това се основава на присъствието на този служител
@@ -4383,13 +4391,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Спрете потребители от извършване Оставете Заявленията за следните дни.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,сума на покупката
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Оферта на доставчик  {0} е създадена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Край година не може да бъде преди Start Година
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Край година не може да бъде преди Start Година
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Доходи на наети лица
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Опакованото количество трябва да е равно на количество за артикул {0} на ред {1}
 DocType: Production Order,Manufactured Qty,Произведено Количество
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не съществува
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не съществува
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Фактури издадени на клиенти.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
@@ -4398,15 +4406,17 @@
 DocType: Quality Inspection Reading,Reading 3,Четене 3
 ,Hub,Главина
 DocType: GL Entry,Voucher Type,Тип Ваучер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ценова листа не е намерен или инвалиди
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Ценова листа не е намерен или инвалиди
 DocType: Employee Loan Application,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
 DocType: Guardian,Guardian,пазач
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} е създадена за Employee {1} в даден период от време
 DocType: Employee,Education,Образование
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Дел
 DocType: Selling Settings,Campaign Naming By,Задаване на име на кампания
 DocType: Employee,Current Address Is,Настоящият адрес е
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модифициран
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Счетоводни записи в дневник
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
@@ -4443,7 +4453,7 @@
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Брутна печалба %
 DocType: BOM,With Operations,С Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
 DocType: Asset,Is Existing Asset,Е съществуваща дълготр.актив
 DocType: Salary Detail,Statistical Component,Статистически компонент
 ,Monthly Salary Register,Месечна заплата Регистрация
@@ -4497,7 +4507,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикрепете Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,запасите
 DocType: Customer,Commission Rate,Комисионен Курс
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Направи вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Направи вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блокиране на молби за отсъствия по отдел.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Вид на плащане трябва да бъде един от получаване, плащане или вътрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,анализ
@@ -4510,6 +4520,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Допусне производство на празници
 DocType: Sales Order,Customer's Purchase Order Date,Поръчка на Клиента - Дата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал
+DocType: Shopping Cart Settings,Show Public Attachments,Показване на публичните прикачени файлове
 DocType: Packing Slip,Package Weight Details,Тегло на пакет - Детайли
 DocType: Payment Gateway Account,Payment Gateway Account,Плащане Портал Акаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,След плащане завършване пренасочи потребителското към избраната страница.
@@ -4534,7 +4545,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Да не се показва символи като $ и т.н. до валути.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Дни - Кредит
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Направи Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Направи Student Batch
 DocType: Leave Type,Is Carry Forward,Е пренасяне
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Вземи позициите от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за въвеждане - Дни
@@ -4553,7 +4564,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: GL Entry,Is Opening,Се отваря
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране за участие чрез настройка&gt; Серия за номериране"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Сметка {0} не съществува
 DocType: Account,Cash,Каса (Пари в брой)
 DocType: Employee,Short biography for website and other publications.,Кратка биография на уебсайт и други публикации.
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 1bf0fb3..4a9e6d8 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -32,7 +32,7 @@
 DocType: Bank Guarantee,Customer,ক্রেতা
 DocType: Purchase Receipt Item,Required By,ক্সসে
 DocType: Delivery Note,Return Against Delivery Note,হুণ্ডি বিরুদ্ধে ফিরে
-DocType: Purchase Order,% Billed,% দেখানো হয়েছিল
+DocType: Purchase Order,% Billed,% চালান করা হয়েছে
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),এক্সচেঞ্জ রেট হিসাবে একই হতে হবে {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ক্রেতার নাম
 DocType: Vehicle,Natural Gas,প্রাকৃতিক গ্যাস
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,ব্যাচ আইটেম মেয়াদ শেষ হওয়ার স্থিতি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ব্যাংক খসড়া
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,দেখান রুপভেদ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,দেখান রুপভেদ
 DocType: Academic Term,Academic Term,একাডেমিক টার্ম
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,উপাদান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,পরিমাণ
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,পরিষেবা ব্যায়ের
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,অর্থবছরের {0} প্রয়োজন বোধ করা হয়
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,বিজ্ঞাপন
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,একই কোম্পানীর একবারের বেশি প্রবেশ করানো হয়
 DocType: Employee,Married,বিবাহিত
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},অনুমোদিত নয় {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},অনুমোদিত নয় {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,থেকে আইটেম পান
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,দয়া করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিং
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},প্রোডাক্ট {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,তালিকাভুক্ত কোনো আইটেম
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,মুদিখানা
 DocType: Quality Inspection Reading,Reading 1,1 পঠন
 DocType: Process Payroll,Make Bank Entry,ব্যাংক এন্ট্রি করতে
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** মাসিক বিতরণ ** আপনি যদি আপনার ব্যবসার মধ্যে ঋতু আছে আপনি মাস জুড়ে বাজেট / উদ্দিষ্ট বিতরণ করতে সাহায্য করে.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,না আইটেম পাওয়া যায়নি
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,না আইটেম পাওয়া যায়নি
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Sales Invoice Item,Sales Invoice Item,বিক্রয় চালান আইটেম
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","যেমন, &quot;প্রাথমিক স্কুল&quot; বা &quot;বিশ্ববিদ্যালয়&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,স্টক রিপোর্ট
 DocType: Warehouse,Warehouse Detail,ওয়ারহাউস বিস্তারিত
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,টার্ম শেষ তারিখ পরে একাডেমিক ইয়ার বছর শেষ তারিখ যা শব্দটি সংযুক্ত করা হয় না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান &quot;ফিক্সড সম্পদ&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান &quot;ফিক্সড সম্পদ&quot;"
 DocType: Vehicle Service,Brake Oil,ব্রেক অয়েল
 DocType: Tax Rule,Tax Type,ট্যাক্স ধরন
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: BOM,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,একটি গ্রাহক এই একই নামের
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / ৬০) * প্রকৃত অপারেশন টাইম
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOM নির্বাচন
 DocType: SMS Log,SMS Log,এসএমএস লগ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,বিতরণ আইটেম খরচ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,এ {0} ছুটির মধ্যে তারিখ থেকে এবং তারিখ থেকে নয়
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,শ্রেণী
 DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,উত্পাদনের অর্ডার ইতিমধ্যে BOM সঙ্গে সব আইটেম জন্য সৃষ্টি
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,উত্পাদনের অর্ডার ইতিমধ্যে BOM সঙ্গে সব আইটেম জন্য সৃষ্টি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,বার্ষিক বেতন
 DocType: Daily Work Summary,Daily Work Summary,দৈনন্দিন কাজ সারাংশ
 DocType: Period Closing Voucher,Closing Fiscal Year,ফিস্ক্যাল বছর সমাপ্তি
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} হিমায়িত হয়
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} হিমায়িত করা
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,দয়া করে হিসাব চার্ট তৈরি করার জন্য বিদ্যমান কোম্পানী নির্বাচন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,স্টক খরচ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,নির্বাচন উদ্দিষ্ট ওয়্যারহাউস
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,বিরূদ্ধে এণ্ট্রি
 DocType: Journal Entry Account,Credit in Company Currency,কোম্পানি একক ঋণ
 DocType: Delivery Note,Installation Status,ইনস্টলেশনের অবস্থা
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",আপনি উপস্থিতি আপডেট করতে চান না? <br> বর্তমান: {0} \ <br> অনুপস্থিত: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,সাপ্লাই কাঁচামালের ক্রয় জন্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,পেমেন্ট অন্তত একটি মোড পিওএস চালান জন্য প্রয়োজন বোধ করা হয়.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,পেমেন্ট অন্তত একটি মোড পিওএস চালান জন্য প্রয়োজন বোধ করা হয়.
 DocType: Products Settings,Show Products as a List,দেখান পণ্য একটি তালিকা হিসাবে
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", টেমপ্লেট ডাউনলোড উপযুক্ত তথ্য পূরণ করুন এবং পরিবর্তিত ফাইল সংযুক্ত. আপনার নির্বাচিত সময়ের মধ্যে সব তারিখগুলি এবং কর্মচারী সমন্বয় বিদ্যমান উপস্থিতি রেকর্ড সঙ্গে, টেমপ্লেট আসবে"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,অবচয় এণ্ট্রি করুন
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,অনুরোধ টাইপ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,কর্মচারী করুন
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,কর্মচারী করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,সম্প্রচার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,সম্পাদন
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,অপারেশনের বিবরণ সম্পন্ন.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,রক্ষণাবেক্ষণ পরিদর্শন জন্য পরিকল্পনা.
 DocType: SMS Settings,Enter url parameter for message,বার্তা জন্য URL প্যারামিটার লিখুন
 DocType: POS Profile,Customer Groups,গ্রাহকের গ্রুপ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,আর্থিক বিবৃতি
 DocType: Guardian,Students,শিক্ষার্থীরা
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,প্রাইসিং এবং ডিসকাউন্ট প্রয়োগের জন্য বিধি.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,মূল্যতালিকা কেনা বা বিক্রি জন্য প্রযোজ্য হতে হবে
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
 DocType: Naming Series,Series List for this Transaction,এই লেনদেনে সিরিজ তালিকা
 DocType: Company,Default Payroll Payable Account,ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,আপডেট ইমেল গ্রুপ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,আপডেট ইমেল গ্রুপ
 DocType: Sales Invoice,Is Opening Entry,এন্ট্রি খোলা হয়
 DocType: Customer Group,Mention if non-standard receivable account applicable,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য যদি প্রযোজ্য
 DocType: Course Schedule,Instructor Name,প্রশিক্ষক নাম
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,বিক্রয় চালান আইটেমটি বিরুদ্ধে
 ,Production Orders in Progress,প্রগতি উৎপাদন আদেশ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,অর্থায়ন থেকে নিট ক্যাশ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
 DocType: Lead,Address & Contact,ঠিকানা ও যোগাযোগ
 DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),মোট খোয়াতে পরিমাণ (টাইম শিট মাধ্যমে)
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ব্যাংক দাখিলা
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,হাব প্রকাশ
 DocType: Student Admission,Student Admission,ছাত্র-ছাত্রী ভর্তি
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,স্বয়ংক্রিয় উপাদান অনুরোধ নির্মাণের ইমেইল দ্বারা সূচিত
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
 DocType: Payment Reconciliation Invoice,Invoice Type,চালান প্রকার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,চালান পত্র
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,চালান পত্র
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,বিক্রি অ্যাসেট খরচ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
-DocType: Grade Interval,Min Score,ন্যূনতম স্কোর
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্সে দুইবার প্রবেশ করা হয়েছে
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Student Applicant,Admitted,ভর্তি
 DocType: Workstation,Rent Cost,ভাড়া খরচ
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,আদেশ মান
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ব্যাংক / ক্যাশ দলের বিরুদ্ধে বা অভ্যন্তরীণ স্থানান্তরের জন্য লেনদেন
 DocType: Shipping Rule,Valid for Countries,দেশ সমূহ জন্য বৈধ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"এই আইটেমটি একটি টেমপ্লেট এবং লেনদেনের ক্ষেত্রে ব্যবহার করা যাবে না. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আইটেম বৈশিষ্ট্যাবলী ভিন্নতা মধ্যে ধরে কপি করা হবে"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"এই আইটেমটি একটি টেমপ্লেট এবং লেনদেনের ক্ষেত্রে ব্যবহার করা যাবে না. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আইটেম বৈশিষ্ট্যাবলী ভিন্নতা মধ্যে ধরে কপি করা হবে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,বিবেচিত মোট আদেশ
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,প্রবেশ ক্ষেত্রের মান &#39;দিন মাস পুনরাবৃত্তি&#39; দয়া করে
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,করের হার
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ইতিমধ্যে কর্মচারী জন্য বরাদ্দ {1} সময়ের {2} জন্য {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,পছন্দ করো
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,অ দলের রূপান্তর
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,একটি আইটেম এর ব্যাচ (অনেক).
 DocType: C-Form Invoice Detail,Invoice Date,চালান তারিখ
 DocType: GL Entry,Debit Amount,ডেবিট পরিমাণ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ছাত্র সংগঠনগুলো তৈরি করুন
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,উদ্ধৃতি জন্য অনুরোধ
 DocType: Salary Slip Timesheet,Working Hours,কর্মঘন্টা
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,একটি বিদ্যমান সিরিজের শুরু / বর্তমান ক্রম সংখ্যা পরিবর্তন করুন.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",একাধিক দামে ব্যাপা চলতে থাকে তবে ব্যবহারকারীরা সংঘাতের সমাধান করতে নিজে অগ্রাধিকার সেট করতে বলা হয়.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ক্রয় আদেশ তৈরি করুন
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ক্রয় আদেশ তৈরি করুন
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,চার্জ প্রযোজ্য
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,হলিডে মাস্টার.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,প্যাকেজ নং থেকে
 DocType: Item Attribute,To Range,পরিসীমা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,সিকিউরিটিজ এবং আমানত
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","মূল্যনির্ধারণ পদ্ধতি পরিবর্তন করা যাবে না, যেহেতু কিছু আইটেম বিরুদ্ধে লেনদেনের যার ফলে এটি নেই হয় নিজের মূল্যনির্ধারণ পদ্ধতি"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,বরাদ্দ মোট পাতার বাধ্যতামূলক
 DocType: Job Opening,Description of a Job Opening,একটি কাজের খোলার বর্ণনা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,আজকের জন্য মুলতুবি কার্যক্রম
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
 DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,অঙ্গরাগ
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,কেনা
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,দয়া করে প্রারম্ভিক মান 0% গ্রেড নির্ধারণ
 DocType: Sales Order,To Deliver,প্রদান করা
 DocType: Purchase Invoice Item,Item,আইটেম
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ম্যানেজিং প্রণীত
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 DocType: Production Plan Item,Pending Qty,মুলতুবি Qty
 DocType: Budget,Ignore,উপেক্ষা করা
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} সক্রিয় নয়
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} সক্রিয় নয়
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},এসএমএস নিম্নলিখিত সংখ্যা পাঠানো: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,সেটআপ চেক মুদ্রণের জন্য মাত্রা
 DocType: Salary Slip,Salary Slip Timesheet,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,মোট কমিশন
 DocType: Pricing Rule,Sales Partner,বিক্রয় অংশীদার
 DocType: Buying Settings,Purchase Receipt Required,কেনার রসিদ প্রয়োজনীয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,যদি খোলা স্টক প্রবেশ মূল্যনির্ধারণ হার বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,যদি খোলা স্টক প্রবেশ মূল্যনির্ধারণ হার বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,সঞ্চিত মূল্যবোধ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,পুনঃসূচনা সংযুক্তি
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,পুনরাবৃত্ত গ্রাহকদের
 DocType: Leave Control Panel,Allocate,বরাদ্দ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,সেলস প্রত্যাবর্তন
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,দ্রষ্টব্য: মোট বরাদ্দ পাতা {0} ইতিমধ্যে অনুমোদন পাতার চেয়ে কম হওয়া উচিত নয় {1} সময়ের জন্য
 DocType: Announcement,Posted By,কারো দ্বারা কোন কিছু ডাকঘরে পাঠানো
 DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,কোম্পানির সেট করুন
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,সেলস চালান শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,নির্বাচন পেমেন্ট একাউন্ট ব্যাংক এণ্ট্রি করতে
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","পাতা, ব্যয় দাবী এবং মাইনে পরিচালনা করতে কর্মচারী রেকর্ড তৈরি করুন"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","পাতা, ব্যয় দাবী এবং মাইনে পরিচালনা করতে কর্মচারী রেকর্ড তৈরি করুন"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,নলেজ বেস জুড়ুন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,প্রস্তাবনা লিখন
 DocType: Payment Entry Deduction,Payment Entry Deduction,পেমেন্ট এণ্ট্রি সিদ্ধান্তগ্রহণ
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 সাথে সর্ম্পক
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ম্যানেজার
 DocType: Payment Entry,Payment From / To,পেমেন্ট থেকে / প্রতি
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,তারিখের পরিসীমা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},নতুন ক্রেডিট সীমা গ্রাহকের জন্য বর্তমান অসামান্য রাশির চেয়ে কম হয়. ক্রেডিট সীমা অন্তত হতে হয়েছে {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},নতুন ক্রেডিট সীমা গ্রাহকের জন্য বর্তমান অসামান্য রাশির চেয়ে কম হয়. ক্রেডিট সীমা অন্তত হতে হয়েছে {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
 DocType: SMS Settings,Receiver Parameter,রিসিভার পরামিতি
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'গ্রুপ দ্বারা' এবং 'উপর ভিত্তি করে' একই হতে পারে না
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,রেজোলিউশন তারিখ
 DocType: Student Batch Name,Batch Name,ব্যাচ নাম
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,নথিভুক্ত করা
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ছাত্র ছাত্র মাসের এ্যাটেনডেন্স প্রতিবেদন হিসেবে বর্তমান দেখাবে
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,ছাত্র এ্যাটেনডেন্স
 DocType: Sales Invoice Timesheet,Time Sheet,টাইম শিট
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush কাঁচামালের ভিত্তিতে
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,আইটেম বিবরণ লিখুন দয়া করে
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,আইটেম বিবরণ লিখুন দয়া করে
 DocType: Interest,Interest,স্বার্থ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,প্রাক সেলস
 DocType: Purchase Receipt,Other Details,অন্যান্য বিস্তারিত
@@ -726,7 +729,7 @@
 ,Absent Student Report,অনুপস্থিত শিক্ষার্থীর প্রতিবেদন
 DocType: Email Digest,Next email will be sent on:,পরবর্তী ইমেলে পাঠানো হবে:
 DocType: Offer Letter Term,Offer Letter Term,পত্র টার্ম প্রস্তাব
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,কোম্পানির {0} অস্তিত্ব নেই
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,পাটা মেয়াদ শেষ হওয়ার তারিখ
 DocType: Material Request Item,Quantity and Warehouse,পরিমাণ এবং ওয়্যারহাউস
 DocType: Sales Invoice,Commission Rate (%),কমিশন হার (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,দয়া করে নির্বাচন করুন প্রোগ্রাম
 DocType: Project,Estimated Cost,আনুমানিক খরচ
 DocType: Purchase Order,Link to material requests,উপাদান অনুরোধ লিংক
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} একটি স্টক আইটেম নয়
 DocType: Mode of Payment Account,Default Account,ডিফল্ট একাউন্ট
 DocType: Payment Entry,Received Amount (Company Currency),প্রাপ্তঃ পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,সাপ্তাহিক ছুটির দিন নির্বাচন করুন
 DocType: Production Order Operation,Planned End Time,পরিকল্পনা শেষ সময়
 ,Sales Person Target Variance Item Group-Wise,সেলস পারসন উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Request for Quotation Supplier,Send Email,বার্তা পাঠাও
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,অনুমতি নেই
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,কোন কর্মচারী পাওয়া
 DocType: Supplier Quotation,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,শিক্ষার্থীর গোষ্ঠী ইতিমধ্যেই আপডেট করা হয়।
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,শিক্ষার্থীর গোষ্ঠী ইতিমধ্যেই আপডেট করা হয়।
 DocType: SMS Center,All Customer Contact,সব গ্রাহকের যোগাযোগ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV মাধ্যমে স্টক ব্যালেন্স আপলোড করুন.
 DocType: Warehouse,Tree Details,বৃক্ষ বিস্তারিত
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,নূন্যতম চালান পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: খরচ কেন্দ্র {2} কোম্পানির অন্তর্গত নয় {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: অ্যাকাউন্ট {2} একটি গ্রুপ হতে পারে না
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,আইটেম সারি {idx}: {DOCTYPE} {DOCNAME} উপরে বিদ্যমান নেই &#39;{DOCTYPE}&#39; টেবিল
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,আইটেম সারি {idx}: {DOCTYPE} {DOCNAME} উপরে বিদ্যমান নেই &#39;{DOCTYPE}&#39; টেবিল
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,কোন কর্ম
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","অটো চালান 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 DocType: Asset,Opening Accumulated Depreciation,খোলা সঞ্চিত অবচয়
@@ -857,8 +859,8 @@
 DocType: HR Settings,Retirement Age,কর্ম - ত্যাগ বয়ম
 DocType: Bin,Moving Average Rate,গড় হার মুভিং
 DocType: Production Planning Tool,Select Items,আইটেম নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,কোর্স সুচী
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} বিল বিপরীতে {1} তারিখের {2}
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,কোর্স সুচী
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
 DocType: HR Settings,Enter retirement age in years,বছরে অবসরের বয়স লিখুন
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,সকল আইটেম গ্রুপ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,সকল আইটেম গ্রুপ
 DocType: Process Payroll,Activity Log,কার্য বিবরণ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,নিট লাভ / ক্ষতি
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',' শুরু'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,কি জন্য উন্মুক্ত
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,পুনরায় আদেশ Qty
 DocType: Leave Block List Date,Leave Block List Date,ব্লক তালিকা তারিখ ত্যাগ
 DocType: Pricing Rule,Price or Discount,দাম বা ডিসকাউন্ট
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ক্রয় রশিদ সামগ্রী টেবিলের মোট প্রযোজ্য চার্জ মোট কর ও চার্জ হিসাবে একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ক্রয় রশিদ সামগ্রী টেবিলের মোট প্রযোজ্য চার্জ মোট কর ও চার্জ হিসাবে একই হতে হবে
 DocType: Sales Team,Incentives,ইনসেনটিভ
 DocType: SMS Log,Requested Numbers,অনুরোধ করা নাম্বার
 DocType: Production Planning Tool,Only Obtain Raw Materials,শুধু তাই কাঁচামালের
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Fee Structure,Components,উপাদান
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,রাসায়নিক
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ডিফল্ট ব্যাংক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে যখন এই মোড নির্বাচন করা হয় বেতন জার্নাল এন্ট্রিতে আপডেট করা হবে.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",গ্রেড কোড অন্তর {0} অন্যান্য বাংলাদেশের জন্য গ্রেড অন্তর সাথে ওভারল্যাপ করে. অনুগ্রহ করে পরীক্ষা করুন অন্তর {0} এবং {1} এবং আবার চেষ্টা করুন
 DocType: BOM,Raw Material Cost(Company Currency),কাঁচামাল খরচ (কোম্পানির মুদ্রা)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},সারি # {0}: হার ব্যবহৃত হার তার চেয়ে অনেক বেশী হতে পারে না {1} {2}
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM ওয়েবসাইট আইটেম
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
 DocType: Timesheet Detail,Bill,বিল
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,সাদা
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),সারি {0}: Qty জন্য পাওয়া যায় না {4} গুদামে {1} এন্ট্রির সময় পোস্টিং এ ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},যাতে টাইপ এক হতে হবে {0}
 DocType: Lead,Next Contact Date,পরের যোগাযোগ তারিখ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty খোলা
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
 DocType: Student Batch Name,Student Batch Name,ছাত্র ব্যাচ নাম
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
 DocType: Repayment Schedule,Balance Loan Amount,ব্যালেন্স ঋণের পরিমাণ
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},উল্লেখ করুন একটি {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ডিসকাউন্ট
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ডিসকাউন্ট
 DocType: Asset,Total Number of Depreciations,মোট Depreciations সংখ্যা
 DocType: Sales Invoice Item,Rate With Margin,মার্জিন সঙ্গে হার
 DocType: Workstation,Wages,মজুরি
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,প্রতিষ্ঠানের নাম
 DocType: Tax Rule,Shipping State,শিপিং রাজ্য
 ,Projected Quantity as Source,উত্স হিসাবে অভিক্ষিপ্ত পরিমাণ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
 DocType: Employee,A-,এ-
 DocType: Production Planning Tool,Include non-stock items,অ স্টক আইটেম অন্তর্ভুক্ত
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,সেলস খরচ
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,জিপ কোড
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,জিপ কোড
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,শেয়ার দাখিলা তৈরীর
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
 ,Ordered Items To Be Billed,আদেশ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,বিন্যাস কম হতে হয়েছে থেকে চেয়ে পরিসীমা
 DocType: Global Defaults,Global Defaults,আন্তর্জাতিক ডিফল্ট
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ব্যাচ নম্বর পেতে আইটেম কোড লিখুন দয়া করে
 DocType: Stock Settings,Default Item Group,ডিফল্ট আইটেম গ্রুপ
 DocType: Employee Loan,Partially Disbursed,আংশিকভাবে বিতরণ
-DocType: Grading Structure,Grading System Name,গ্রেডিং সিস্টেম নাম
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,সরবরাহকারী ডাটাবেস.
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","পেমেন্ট মোড কনফিগার করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন, কিনা অ্যাকাউন্ট পেমেন্ট মোড বা পিওএস প্রোফাইল উপর স্থাপন করা হয়েছে."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","পেমেন্ট মোড কনফিগার করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন, কিনা অ্যাকাউন্ট পেমেন্ট মোড বা পিওএস প্রোফাইল উপর স্থাপন করা হয়েছে."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,আপনার বিক্রয় ব্যক্তির গ্রাহকের পরিচিতি এই তারিখে একটি অনুস্মারক পাবেন
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,একই আইটেম একাধিক বার প্রবেশ করানো যাবে না.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,কাজ শেষ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,আরোপ করা টেবিলের মধ্যে অন্তত একটি বৈশিষ্ট্য উল্লেখ করুন
 DocType: Announcement,All Students,সকল শিক্ষার্থীরা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,দেখুন লেজার
 DocType: Grading Scale,Intervals,অন্তর
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,শিক্ষার্থীর মোবাইল নং
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
@@ -1252,14 +1250,14 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ক্রয় আদেশ আপনি পরিকল্পনা সাহায্য এবং আপনার ক্রয়ের উপর ফলোআপ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ক্রয় আদেশ আপনি পরিকল্পনা সাহায্য এবং আপনার ক্রয়ের উপর ফলোআপ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ছোট
 DocType: Employee,Employee Number,চাকুরিজীবী সংখ্যা
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
-DocType: Project,% Completed,% সম্পন্ন
+DocType: Project,% Completed,% সম্পন্ন হয়েছে
 ,Invoiced Amount (Exculsive Tax),Invoiced পরিমাণ (Exculsive ট্যাক্স)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,আইটেম 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,সিঙ্ক মাস্টার ডেটা
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
 DocType: Student Applicant,AP,পি
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,গ্রুপ রোল নম্বর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,সব কাজের ওজন মোট হওয়া উচিত 1. অনুযায়ী সব প্রকল্পের কাজগুলো ওজন নিয়ন্ত্রন করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ক্যাপিটাল উপকরণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} প্রগতিতে আইটেম
 DocType: Workstation,Workstation Name,ওয়ার্কস্টেশন নাম
-DocType: Grade Interval,Grade Code,গ্রেড কোড
+DocType: Grading Scale Interval,Grade Code,গ্রেড কোড
 DocType: POS Item Group,POS Item Group,পিওএস আইটেম গ্রুপ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ডাইজেস্ট ইমেল:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,হার্ডওয়্যারের
 DocType: Sales Order,Recurring Upto,পুনরাবৃত্ত পর্যন্ত
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,একটি কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,একটি কোম্পানি নির্বাচন করুন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,সুবিধা বাতিল ছুটি
 DocType: Purchase Invoice,Supplier Invoice Date,সরবরাহকারী চালান তারিখ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,আপনি শপিং কার্ট সক্রিয় করতে হবে
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,খাদ্য
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,বুড়ো রেঞ্জ 3
 DocType: Maintenance Schedule Item,No of Visits,ভিজিট কোন
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,মার্ক উপস্থিতি
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,মার্ক উপস্থিতি
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},রক্ষণাবেক্ষণ সূচি {0} বিরুদ্ধে বিদ্যমান {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,নথিভুক্ত হচ্ছে ছাত্র
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},অ্যাকাউন্ট বন্ধ মুদ্রা হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},সব লক্ষ্য জন্য পয়েন্ট সমষ্টি এটা হয় 100 হতে হবে {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Detail,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
 DocType: Pricing Rule,"Higher the number, higher the priority","উচ্চ নম্বর, উচ্চ অগ্রাধিকার"
 ,Purchase Invoice Trends,চালান প্রবণতা ক্রয়
 DocType: Employee,Better Prospects,ভাল সম্ভাবনা
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","সারি # {0}: ব্যাচ {1} শুধুমাত্র {2} Qty এ হয়েছে। দয়া করে অন্য একটি ব্যাচ যা {3} Qty এ উপলব্ধ নির্বাচন করুন অথবা একাধিক সারি মধ্যে সারি বিভক্ত, একাধিক ব্যাচ থেকে আমাদের প্রদান / সমস্যাটি"
 DocType: Vehicle,License Plate,অনুমতি ফলক
 DocType: Appraisal,Goals,গোল
 DocType: Warranty Claim,Warranty / AMC Status,পাটা / এএমসি স্থিতি
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,কর্মচারী নিজেকে প্রতিবেদন করতে পারবে না.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","অ্যাকাউন্ট নিথর হয় তাহলে, এন্ট্রি সীমিত ব্যবহারকারীদের অনুমতি দেওয়া হয়."
 DocType: Email Digest,Bank Balance,অধিকোষস্থিতি
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","পেশা প্রফাইল, যোগ্যতা প্রয়োজন ইত্যাদি"
 DocType: Journal Entry Account,Account Balance,হিসাবের পরিমান
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,বন্ধ না অর্থবছরে পি &amp; এল ভারসাম্যকে দেখান
 DocType: Shipping Rule,Shipping Account,শিপিং অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: অ্যাকাউন্ট {2} নিষ্ক্রীয়
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,সেলস আদেশ আপনি আপনার কাজ পরিকল্পনা সাহায্য এবং আপনার জন্য-সময় বিলি করুন
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,সেলস আদেশ আপনি আপনার কাজ পরিকল্পনা সাহায্য এবং আপনার জন্য-সময় বিলি করুন
 DocType: Quality Inspection,Readings,রিডিং
 DocType: Stock Entry,Total Additional Costs,মোট অতিরিক্ত খরচ
 DocType: Course Schedule,SH,শুট আউট
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,মান
 DocType: Asset Movement,Stock Manager,স্টক ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,প্যাকিং স্লিপ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,প্যাকিং স্লিপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,অফিস ভাড়া
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,আমদানি ব্যর্থ!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,উত্স
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,দেখান বন্ধ
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,অ্যাসেট শ্রেণী ফিক্সড অ্যাসেট আইটেমের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,অ্যাসেট শ্রেণী ফিক্সড অ্যাসেট আইটেমের জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},এই {0} সঙ্গে দ্বন্দ্ব {1} জন্য {2} {3}
 DocType: Student Attendance Tool,Students HTML,শিক্ষার্থীরা এইচটিএমএল
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,ছেড়ে যাওয়া তারিখ
 DocType: Pricing Rule,For Price List,মূল্য তালিকা জন্য
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,বাড়ে তৈরি করুন
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,বাড়ে তৈরি করুন
 DocType: Maintenance Schedule,Schedules,সূচী
 DocType: Purchase Invoice Item,Net Amount,থোক
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,প্রোগ্রাম enrollments
 DocType: Sales Invoice Item,Brand Name,পরিচিতিমুলক নাম
 DocType: Purchase Receipt,Transporter Details,স্থানান্তরকারী বিস্তারিত
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,বক্স
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,সম্ভাব্য সরবরাহকারী
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,প্রতিষ্ঠান
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},জন্য {0} প্রকল্পের জন্য পাওয়া যায়নি ডিফল্ট BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","শিক্ষার্থীরা সিস্টেম অন্তরে হয়, আপনার সব ছাত্র যোগ"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","শিক্ষার্থীরা সিস্টেম অন্তরে হয়, আপনার সব ছাত্র যোগ"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},সারি # {0}: পরিস্কারের তারিখ {1} আগে চেক তারিখ হতে পারে না {2}
 DocType: Company,Default Holiday List,হলিডে তালিকা ডিফল্ট
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},সারি {0}: থেকে সময় এবং টাইম {1} সঙ্গে ওভারল্যাপিং হয় {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,পেমেন্ট ইমেইল পুনরায় পাঠান
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ত্যে
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,উদ্ধৃতি করা
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,উদ্ধৃতি করা
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,অন্যান্য রিপোর্ট
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,অনুসন্ধান আইটেম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,অনুসন্ধান আইটেম
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Assessment Plan,Grading Scale,শূন্য স্কেল
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ইতিমধ্যে সম্পন্ন
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যেই বিদ্যমান {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
@@ -1593,13 +1593,13 @@
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
 DocType: Sales Invoice,Reference Document,রেফারেন্স নথি
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা
 DocType: Accounts Settings,Credit Controller,ক্রেডিট কন্ট্রোলার
 DocType: Delivery Note,Vehicle Dispatch Date,যানবাহন ডিসপ্যাচ তারিখ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
 DocType: Company,Default Payable Account,ডিফল্ট প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% দেখানো হয়েছিল
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% চালান করা হয়েছে
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,মানব সম্পদ
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,সংগ্রহ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,আপনি মুছে ফেলতে পারবেন না অর্থবছরের {0}. অর্থবছরের {0} গ্লোবাল সেটিংস এ ডিফল্ট হিসাবে সেট করা হয়
 DocType: Journal Entry,Entry Type,এন্ট্রি টাইপ
 ,Customer Credit Balance,গ্রাহকের ক্রেডিট ব্যালেন্স
@@ -1628,7 +1628,7 @@
 DocType: Project,Total Sales Cost (via Sales Order),মোট বিক্রয় খরচ (বিক্রয় আদেশ এর মাধ্যমে)
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} এই ছাত্র দলের জন্য ছাত্রদের তুলনায় আরো নথিভুক্ত করা যায় না.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,লিড কাউন্ট
-apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 অনেক বেশী হতে হবে
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 থেকে বেশী হতে হবে"
 DocType: Manufacturing Settings,Capacity Planning For (Days),(দিন) জন্য ক্ষমতা পরিকল্পনা
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,আসাদন
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
@@ -1647,7 +1647,7 @@
 DocType: Sales Invoice,Packed Items,বস্তাবন্দী আইটেম
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ক্রমিক নং বিরুদ্ধে পাটা দাবি
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM",এটি ব্যবহার করা হয় যেখানে অন্য সব BOMs একটি বিশেষ BOM প্রতিস্থাপন. এটা পুরানো BOM লিঙ্কটি প্রতিস্থাপন খরচ আপডেট এবং নতুন BOM অনুযায়ী &quot;Bom বিস্ফোরণ আইটেম&quot; টেবিলের পুনর্জীবিত হবে
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total',&#39;টোটাল&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total',সর্বমোট
 DocType: Shopping Cart Settings,Enable Shopping Cart,শপিং কার্ট সক্রিয়
 DocType: Employee,Permanent Address,স্থায়ী ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,একই ইনস্টিটিউটে অধ্যয়নরত
 DocType: Territory,Territory Manager,আঞ্চলিক ব্যবস্থাপক
 DocType: Packed Item,To Warehouse (Optional),গুদাম থেকে (ঐচ্ছিক)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম code&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Payment Entry,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,কার্ট দেখুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,উপাদানের জন্য অনুরোধ এই স্টক এন্ট্রি করতে ব্যবহৃত
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,পরবর্তী অবচয় তারিখ নতুন সম্পদের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,পরবর্তী অবচয় তারিখ নতুন সম্পদের জন্য বাধ্যতামূলক
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,প্রত্যেক ব্যাচ জন্য আলাদা কোর্স ভিত্তিক গ্রুপ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,একটি আইটেম এর একক.
 DocType: Fee Category,Fee Category,ফি শ্রেণী
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,গুরুত্ব
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: খরচ কেন্দ্র &#39;লাভ-ক্ষতির&#39; অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {2}. অনুগ্রহ করে এখানে ক্লিক করুন জন্য একটি ডিফল্ট মূল্য কেন্দ্র স্থাপন করা.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,নতুন কন্টাক্ট
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,রিকনসিলিয়েশন JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 DocType: Purchase Invoice Item,Batch No,ব্যাচ নাম্বার
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},জন্য বিনিময় হার খুঁজে পেতে অসমর্থ {0} থেকে {1} মূল তারিখ জন্য {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,একটি গ্রাহকের ক্রয় আদেশের বিরুদ্ধে একাধিক বিক্রয় আদেশ মঞ্জুরি
 DocType: Student Group Instructor,Student Group Instructor,শিক্ষার্থীর গ্রুপ প্রশিক্ষক
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 মোবাইল কোন
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,প্রধান
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,বৈকল্পিক
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,প্রধান
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,বৈকল্পিক
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
 DocType: Employee Attendance Tool,Employees HTML,এমপ্লয়িজ এইচটিএমএল
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Email Digest,Annual Expenses,বার্ষিক খরচ
 DocType: Item,Variants,রুপভেদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,appraisals
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,একটি শিপিং শাসনের জন্য একটি শর্ত
-DocType: Grading Structure,Grading Intervals,শূন্য অন্তরাল
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,অনুগ্রহ করে প্রবেশ করুন
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","সারিতে আইটেম {0} এর জন্য overbill করা যাবে না {1} চেয়ে আরো অনেক কিছু {2}। ওভার বিলিং অনুমতি দিতে, সেটিংস কেনার সেট করুন"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,দয়া করে আইটেম বা গুদাম উপর ভিত্তি করে ফিল্টার সেট
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,প্রদান
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,আপনার আদেশ পরিচালনা
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,আপনার আদেশ পরিচালনা
 DocType: Production Order Operation,Actual Time and Cost,প্রকৃত সময় এবং খরচ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},সর্বাধিক {0} এর উপাদানের জন্য অনুরোধ {1} সেলস আদেশের বিরুদ্ধে আইটেম জন্য তৈরি করা যেতে পারে {2}
 DocType: Employee,Salutation,অভিবাদন
 DocType: Course,Course Abbreviation,কোর্সের সমাহার
 DocType: Student Leave Application,Student Leave Application,শিক্ষার্থীর ছুটি আবেদন
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},কর্মচারী {0} হাফ দিনে {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},মোট কাজ ঘন্টা সর্বোচ্চ কর্মঘন্টা চেয়ে বেশী করা উচিত হবে না {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,উপর
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,বিক্রয়ের সময়ে সমষ্টি জিনিস.
 DocType: Quotation Item,Actual Qty,প্রকৃত স্টক
 DocType: Sales Invoice Item,References,তথ্যসূত্র
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,আপনি ডুপ্লিকেট জিনিস প্রবেশ করে. ত্রুটিমুক্ত এবং আবার চেষ্টা করুন.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,সহযোগী
 DocType: Asset Movement,Asset Movement,অ্যাসেট আন্দোলন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,নিউ কার্ট
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,নিউ কার্ট
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} আইটেম ধারাবাহিকভাবে আইটেম নয়
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
 DocType: Vehicle,Wheels,চাকা
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,উত্পাদনের অবাধ্য সময় লগ সৃষ্টি নিষ্ক্রিয় করা হয়. অপারেশনস উত্পাদনের আদেশের বিরুদ্ধে ট্র্যাক করা হবে না
 DocType: Student,Student Mobile Number,শিক্ষার্থীর মোবাইল নম্বর
 DocType: Item,Has Variants,ধরন আছে
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ব্যাচ আইডি বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ব্যাচ আইডি বাধ্যতামূলক
 DocType: Sales Person,Parent Sales Person,মূল সেলস পারসন
 DocType: Purchase Invoice,Recurring Invoice,পুনরাবৃত্ত চালান
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,প্রকল্প পরিচালনার
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,অর্থবছর
 DocType: Vehicle Log,Fuel Price,জ্বালানীর দাম
 DocType: Budget,Budget,বাজেট
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",এটি একটি আয় বা ব্যয় অ্যাকাউন্ট না হিসাবে বাজেট বিরুদ্ধে {0} নিয়োগ করা যাবে না
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,অর্জন
 DocType: Student Admission,Application Form Route,আবেদনপত্র রুট
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},পরিমাণ {0} {1} বিরুদ্ধে কাটা {2}
 DocType: Employee,Salary Information,বেতন তথ্য
 DocType: Sales Person,Name and Employee ID,নাম ও কর্মী ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
 DocType: Website Item Group,Website Item Group,ওয়েবসাইট আইটেমটি গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,কর্তব্য এবং কর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,পুনরাবৃত্ত গ্রাহক রাজস্ব
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,জুড়ি
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
 DocType: Asset,Depreciation Schedule,অবচয় সূচি
 DocType: Bank Reconciliation Detail,Against Account,অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,অর্ধদিবস তারিখ তারিখ থেকে এবং তারিখ থেকে মধ্যবর্তী হওয়া উচিত
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
 DocType: Purchase Order,Delivered,নিষ্কৃত
 ,Vehicle Expenses,গাড়ির খরচ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
+DocType: Serial No,Invoice Details,চালান বিস্তারিত
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,আবর্তক চালান বন্ধ করা হবে কোন তারিখে
 DocType: Employee Loan,Loan Amount,ঋণের পরিমাণ
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,অ-গ্রুপ গ্রুপ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,স্পোর্টস
 DocType: Loan Type,Loan Name,ঋণ নাম
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,গ্রাহক অধিগ্রহণ ও বিশ্বস্ততা
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,অগ্রাহ্য আইটেম শেয়ার রয়েছে সেখানে ওয়্যারহাউস
 DocType: Production Order,Skip Material Transfer,কর উপাদান স্থানান্তর
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,জন্য বিনিময় হার খুঁজে পাওয়া যায়নি {0} এ {1} কী তারিখের জন্য {2}। একটি মুদ্রা বিনিময় রেকর্ড ম্যানুয়ালি তৈরি করুন
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,তোমার আর্থিক বছরের শেষ
 DocType: POS Profile,Price List,মূল্য তালিকা
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ডিফল্ট অর্থবছরের এখন হয়. পরিবর্তন কার্যকর করার জন্য আপনার ব্রাউজার রিফ্রেশ করুন.
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** অর্থবছরের ** একটি অর্থবছরে প্রতিনিধিত্ব করে. সব হিসাব ভুক্তি এবং অন্যান্য প্রধান লেনদেন ** ** অর্থবছরের বিরুদ্ধে ট্র্যাক করা হয়.
 DocType: Opportunity,Customer / Lead Address,গ্রাহক / লিড ঠিকানা
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
 DocType: Student Admission,Eligibility,নির্বাচিত হইবার যোগ্যতা
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","বিশালাকার আপনি ব্যবসা, আপনার বিশালাকার হিসাবে সব আপনার পরিচিতি এবং আরো যোগ পেতে সাহায্য"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","বিশালাকার আপনি ব্যবসা, আপনার বিশালাকার হিসাবে সব আপনার পরিচিতি এবং আরো যোগ পেতে সাহায্য"
 DocType: Production Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,কোম্পানি নির্বাচন ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Process Payroll,Fortnightly,পাক্ষিক
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,প্রথম সারির &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; হিসেবে অভিযোগ টাইপ নির্বাচন করা বা না করা
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,শিশু আইটেম একটি প্রোডাক্ট বান্ডেল করা উচিত হবে না. আইটেম অপসারণ `{0} &#39;এবং সংরক্ষণ করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ব্যাংকিং
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets যোগ করুন
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets যোগ করুন
 DocType: Vehicle Service,Service Item,সেবা আইটেম
 DocType: Bank Guarantee,Bank Guarantee,ব্যাংক গ্যারান্টি
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
@@ -2068,7 +2067,7 @@
 DocType: Production Order,In Process,প্রক্রিয়াধীন
 DocType: Authorization Rule,Itemwise Discount,Itemwise ছাড়
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,আর্থিক হিসাব বৃক্ষ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} সেলস আদেশের বিপরীতে {1}
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
 apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 DocType: Employee Loan,Account Info,অ্যাকাউন্ট তথ্য
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,দাম দেখানো হবে না যদি মূল্য তালিকা নির্ধারণ করা হয় না
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,এই নৌ-শাসনের জন্য একটি দেশ উল্লেখ বা বিশ্বব্যাপী শিপিং চেক করুন
 DocType: Stock Entry,Total Incoming Value,মোট ইনকামিং মূল্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ক্রয়মূল্য তালিকা
 DocType: Offer Letter Term,Offer Term,অপরাধ টার্ম
 DocType: Quality Inspection,Quality Manager,গুনগতমান ব্যবস্থাপক
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,লস্ট কারণ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,নতুন ঠিকানা
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,রশিদ ডকুমেন্ট লিখুন দয়া করে
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,রশিদ ডকুমেন্ট লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;কেস নং থেকে&#39; একটি বৈধ উল্লেখ করুন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
 DocType: Project,External,বহিরাগত
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ব্যবহারকারী এবং অনুমতি
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},উত্পাদনের আদেশ তৈরী করা হয়েছে: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},উত্পাদনের আদেশ তৈরী করা হয়েছে: {0}
 DocType: Branch,Branch,শাখা
 DocType: Guardian,Mobile Number,মোবাইল নম্বর
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ছাপানো ও ব্র্যান্ডিং
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
 DocType: Scheduling Tool,Student Batch,ছাত্র ব্যাচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,তোমার গ্রাহকরা
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,স্টুডেন্ট করুন
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,স্টুডেন্ট করুন
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},আপনি প্রকল্পের সহযোগীতা করার জন্য আমন্ত্রণ জানানো হয়েছে: {0}
 DocType: Leave Block List Date,Block Date,ব্লক তারিখ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,এখন আবেদন কর
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,প্রেরিত
 DocType: Payment Request,Make Sales Invoice,বিক্রয় চালান করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,সফটওয়্যার
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,পরবর্তী যোগাযোগ তারিখ অতীতে হতে পারে না
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,পরবর্তী যোগাযোগ তারিখ অতীতে হতে পারে না
 DocType: Company,For Reference Only.,শুধুমাত্র রেফারেন্সের জন্য.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,ব্যাচ নির্বাচন কোন
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},অকার্যকর {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,অগ্রিম পরিমাণ
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,মামলা নং 0 হতে পারবেন না
 DocType: Item,Show a slideshow at the top of the page,পৃষ্ঠার উপরের একটি স্লাইডশো প্রদর্শন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,দোকান
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,দোকান
 DocType: Serial No,Delivery Time,প্রসবের সময়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,উপর ভিত্তি করে বুড়ো
 DocType: Item,End of Life,জীবনের শেষে
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ট্রান্সফার উপাদান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,এই দস্তাবেজটি দ্বারা সীমা উত্তীর্ণ {0} {1} আইটেমের জন্য {4}. আপনি তৈরি করছেন আরেকটি {3} একই বিরুদ্ধে {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,বাজেট অ্যাকাউন্ট
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","বিদ্যমান লেনদেন আছে, কারণ, কোম্পানির ডিফল্ট মুদ্রা পরিবর্তন করতে পারবেন. লেনদেন ডিফল্ট মুদ্রা পরিবর্তন বাতিল করতে হবে."
-DocType: Grade Interval,Grade Description,গ্রেড বর্ণনা
+DocType: Grading Scale Interval,Grade Description,গ্রেড বর্ণনা
 DocType: Stock Entry,Purchase Receipt No,কেনার রসিদ কোন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,অগ্রিক
 DocType: Process Payroll,Create Salary Slip,বেতন স্লিপ তৈরি
@@ -2228,7 +2228,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),তহবিলের উৎস (দায়)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +380,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
 DocType: Appraisal,Employee,কর্মচারী
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল করা হয়েছে
 DocType: Training Event,End Time,শেষ সময়
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,সক্রিয় বেতন কাঠামো {0} দেওয়া তারিখগুলি জন্য কর্মচারী {1} পাওয়া যায়নি
 DocType: Payment Entry,Payment Deductions or Loss,পেমেন্ট Deductions বা হ্রাস
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থিতি
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Gateway Account,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,পূরক অফ
 DocType: Offer Letter,Accepted,গৃহীত
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ব্যবহারকারী ফোরাম
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
 DocType: Employee,Previous Work Experience,আগের কাজের অভিজ্ঞতা
@@ -2280,12 +2280,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} রিটার্ন নথিতে নেতিবাচক হবে
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} রিটার্ন নথিতে অবশ্যই নেতিবাচক হতে হবে
 ,Minutes to First Response for Issues,সমস্যার জন্য প্রথম প্রতিক্রিয়া মিনিট
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"ইনস্টিটিউটের নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","এই ডেট নিথর অ্যাকাউন্টিং এন্ট্রি, কেউ / না নিম্নোল্লিখিত শর্ত ভূমিকা ছাড়া এন্ট্রি পরিবর্তন করতে পারেন."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,রক্ষণাবেক্ষণ সময়সূচী উৎপাদিত আগে নথি সংরক্ষণ করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,রক্ষণাবেক্ষণ সময়সূচী উৎপাদিত আগে নথি সংরক্ষণ করুন
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,প্রোজেক্ট অবস্থা
 DocType: UOM,Check this to disallow fractions. (for Nos),ভগ্নাংশ অননুমোদন এই পরীক্ষা. (আমরা জন্য)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,নিম্নলিখিত উত্পাদনের আদেশ তৈরি করা হয়েছে:
@@ -2304,10 +2304,11 @@
 DocType: Operation,Default Workstation,ডিফল্ট ওয়ার্কস্টেশন
 DocType: Notification Control,Expense Claim Approved Message,ব্যয় দাবি অনুমোদিত পাঠান
 DocType: Payment Entry,Deductions or Loss,Deductions বা হ্রাস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} বন্ধ হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} বন্ধ করা
 DocType: Email Digest,How frequently?,কত তারাতারি?
 DocType: Purchase Receipt,Get Current Stock,বর্তমান স্টক পান
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,উপকরণ বিল বৃক্ষ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম code&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Student,Joining Date,যোগদান তারিখ
 ,Employees working on a holiday,একটি ছুটিতে কাজ এমপ্লয়িজ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,মার্ক বর্তমান
@@ -2336,7 +2337,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,একটি কমিশন জন্য কোম্পানি পণ্য বিক্রি একটি তৃতীয় পক্ষের যারা পরিবেশক / ব্যাপারী / কমিশন এজেন্ট / অধিভুক্ত / রিসেলার.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিপরীতে {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","এখানে স্ট্যাটিক URL পরামিতি লিখুন (যেমন. প্রেরকের = ERPNext, ব্যবহারকারীর নাম = ERPNext, পাসওয়ার্ড = 1234 ইত্যাদি)"
 DocType: Task,Actual Start Date (via Time Sheet),প্রকৃত স্টার্ট তারিখ (টাইম শিট মাধ্যমে)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,উত্পাদনের
 DocType: Guardian,Occupation,পেশা
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),মোট (Qty)
 DocType: Sales Invoice,This Document,এই নথীটি
 DocType: Installation Note Item,Installed Qty,ইনস্টল Qty
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,বিক্রয় আদেশ পাঠান
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ইত্যাদি কোম্পানি, মুদ্রা, চলতি অর্থবছরে, মত ডিফল্ট মান"
 DocType: Payment Entry,Payment Type,শোধের ধরণ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,দয়া করে আইটেমটি জন্য একটি ব্যাচ নির্বাচন {0}। একটি একক ব্যাচ যে এই প্রয়োজনীয়তা পরিপূর্ণ খুঁজে পাওয়া যায়নি
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,দয়া করে আইটেমটি জন্য একটি ব্যাচ নির্বাচন {0}। একটি একক ব্যাচ যে এই প্রয়োজনীয়তা পরিপূর্ণ খুঁজে পাওয়া যায়নি
 DocType: Process Payroll,Select Employees,নির্বাচন এমপ্লয়িজ
 DocType: Opportunity,Potential Sales Deal,সম্ভাব্য বিক্রয় ডীল
 DocType: Payment Entry,Cheque/Reference Date,চেক / রেফারেন্স তারিখ
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ইতিমধ্যে কোম্পানির জন্য তৈরি গ্লোবাল পিওএস প্রোফাইল {0} {1}
 DocType: Purchase Order,Ref SQ,সুত্র সাকা
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,সব BOMs আইটেম / BOM প্রতিস্থাপন
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,রশিদ ডকুমেন্ট দাখিল করতে হবে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,রশিদ ডকুমেন্ট দাখিল করতে হবে
 DocType: Purchase Invoice Item,Received Qty,গৃহীত Qty
 DocType: Stock Entry Detail,Serial No / Batch,সিরিয়াল কোন / ব্যাচ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,না দেওয়া এবং বিতরিত হয় নি
@@ -2441,7 +2442,7 @@
 ,To Produce,উৎপাদন করা
 apps/erpnext/erpnext/config/hr.py +93,Payroll,বেতনের
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","সারিতে জন্য {0} মধ্যে {1}. আইটেম হার {2} অন্তর্ভুক্ত করার জন্য, সারি {3} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,করুন নিচে
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,করুন নিচে
 DocType: Packing Slip,Identification of the package for the delivery (for print),প্রসবের জন্য প্যাকেজের আইডেন্টিফিকেশন (প্রিন্ট জন্য)
 DocType: Bin,Reserved Quantity,সংরক্ষিত পরিমাণ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,বৈধ ইমেইল ঠিকানা লিখুন
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,অক্ষম করা হয়েছে টেমপ্লেট ডিফল্ট টেমপ্লেট হবে না
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,বিলি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,বিলি
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",দেখুন খোয়াতে বিভাগে &quot;সামগ্রী ভিত্তি করে হার&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,পূর্ববর্তী
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ছাত্র ব্যাচ আপনি উপস্থিতি, মূল্যায়ন এবং ছাত্রদের জন্য ফি ট্র্যাক সাহায্য"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ছাত্র ব্যাচ আপনি উপস্থিতি, মূল্যায়ন এবং ছাত্রদের জন্য ফি ট্র্যাক সাহায্য"
 DocType: Payment Entry,Total Allocated Amount,সর্বমোট পরিমাণ
 DocType: Item Reorder,Material Request Type,উপাদান অনুরোধ টাইপ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},থেকে {0} বেতন জন্য Accural জার্নাল এন্ট্রি {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',অবস্থা কর্মচারীদের ঘটনা সম্পর্কে একটি ইমেল পাঠাতে হবে &#39;ওপেন&#39;
 DocType: Task,Depends on Tasks,কার্যগুলি উপর নির্ভর করে
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,গ্রাহক গ্রুপ গাছ পরিচালনা.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,সংযুক্তি শপিং কার্ট সক্রিয় না করেও দেখানো যেতে পারে
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
 DocType: Leave Control Panel,Leave Control Panel,কন্ট্রোল প্যানেল ছেড়ে চলে
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,ডেবিট
 DocType: Delivery Note,Required only for sample item.,শুধুমাত্র নমুনা আইটেমের জন্য প্রয়োজনীয়.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},কোন বেতন স্লিপ মধ্যে পাওয়া {0} এবং {1}
 ,Pending SO Items For Purchase Request,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,স্টুডেন্ট অ্যাডমিশন
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,অতি বৃহদাকার
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,হোম পেজ বৈশিষ্ট্যযুক্ত পণ্য
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,সকল অ্যাসেসমেন্ট গোষ্ঠীসমূহ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,নতুন গুদাম নাম
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),মোট {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),মোট {0} ({1})
 DocType: C-Form Invoice Detail,Territory,এলাকা
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,মূল্য তালিকা মাস্টার
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
 ,S.O. No.,তাই নং
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
 DocType: Price List,Applicable for Countries,দেশ সমূহ জন্য প্রযোজ্য
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,শুধু ত্যাগ অবস্থা অ্যাপ্লিকেশন অনুমোদিত &#39;&#39; এবং &#39;প্রত্যাখ্যাত&#39; জমা করা যেতে পারে
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},স্টুডেন্ট গ্রুপের নাম সারিতে বাধ্যতামূলক {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 DocType: Vehicle Service,Engine Oil,ইঞ্জিনের তেল
 DocType: Sales Invoice,Sales Team1,সেলস team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
 DocType: Employee Loan,Loan Details,ঋণ বিবরণ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,সারি {0}: সমাপ্ত Qty শূন্য অনেক বেশী হতে হবে.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,বিদ্যমান লেনদেনের সঙ্গে গুদাম গ্রুপে রূপান্তর করা যাবে না.
 DocType: Assessment Result Tool,Result HTML,ফল এইচটিএমএল
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,মেয়াদ শেষ
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,শিক্ষার্থীরা যোগ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,শিক্ষার্থীরা যোগ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},দয়া করে নির্বাচন করুন {0}
 DocType: C-Form,C-Form No,সি-ফরম কোন
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,সীমা অতিক্রম
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,এই &#39;একাডেমিক ইয়ার&#39; দিয়ে একটি একাডেমিক শব্দটি {0} এবং &#39;টার্ম নাম&#39; {1} আগে থেকেই আছে. এই এন্ট্রি পরিবর্তন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","আইটেম {0} বিরুদ্ধে বিদ্যমান লেনদেন আছে, আপনার মান পরিবর্তন করতে পারবেন না {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","আইটেম {0} বিরুদ্ধে বিদ্যমান লেনদেন আছে, আপনার মান পরিবর্তন করতে পারবেন না {1}"
 DocType: UOM,Must be Whole Number,গোটা সংখ্যা হতে হবে
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(দিন) বরাদ্দ নতুন পাতার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,সিরিয়াল কোন {0} অস্তিত্ব নেই
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,পরবর্তী মাসের শেষ দিন
 DocType: Support Settings,Auto close Issue after 7 days,7 দিন পরে অটো বন্ধ ইস্যু
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","আগে বরাদ্দ করা না যাবে ছেড়ে {0}, ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ছাত্র আবেদনকারীর
 DocType: Asset Category Account,Accumulated Depreciation Account,সঞ্চিত অবচয় অ্যাকাউন্ট
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
@@ -2807,7 +2809,7 @@
 DocType: Quality Inspection,Outgoing,বহির্গামী
 DocType: Material Request,Requested For,জন্য অনুরোধ করা
 DocType: Quotation Item,Against Doctype,Doctype বিরুদ্ধে
-apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1} বাতিল বা বন্ধ করা
 DocType: Delivery Note,Track this Delivery Note against any Project,কোন প্রকল্পের বিরুদ্ধে এই হুণ্ডি সন্ধান
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,বিনিয়োগ থেকে নিট ক্যাশ
 ,Is Primary Address,প্রাথমিক ঠিকানা
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,পণ্য সংকেত
 DocType: Production Planning Tool,Create Production Orders,উত্পাদনের আদেশ করুন
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
 DocType: Lead,Market Segment,মার্কেটের অংশ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,উপাদান অনুরোধ করুন
 DocType: Employee Education,School/University,স্কুল / বিশ্ববিদ্যালয়
 DocType: Payment Request,Reference Details,রেফারেন্স বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
 DocType: Sales Invoice Item,Available Qty at Warehouse,ওয়্যারহাউস এ উপলব্ধ Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,বিলের পরিমাণ
 DocType: Asset,Double Declining Balance,ডাবল পড়ন্ত ব্যালেন্স
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},বিতরণ পরিমাণ ঋণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,উত্পাদনের অর্ডার তৈরি করা না
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,উত্পাদনের অর্ডার তৈরি করা না
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ছাত্র হিসাবে অবস্থা পরিবর্তন করা যাবে না {0} ছাত্র আবেদনপত্রের সাথে সংযুক্ত করা হয় {1}
 DocType: Asset,Fully Depreciated,সম্পূর্ণরূপে মূল্যমান হ্রাস
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,চিহ্নিত এ্যাটেনডেন্স এইচটিএমএল
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","উদ্ধৃতি প্রস্তাব, দর আপনি আপনার গ্রাহকদের কাছে পাঠানো হয়েছে"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","উদ্ধৃতি প্রস্তাব, দর আপনি আপনার গ্রাহকদের কাছে পাঠানো হয়েছে"
 DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ক্রমিক নং এবং ব্যাচ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,মূল্যায়ন মানদণ্ড স্কোর যোগফল {0} হতে হবে.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations সংখ্যা বুক নির্ধারণ করুন
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations সংখ্যা বুক নির্ধারণ করুন
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,মূল্য বা স্টক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,মিনিট
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,শিক্ষার্থীর গ্রুপ
 DocType: Shopping Cart Settings,Quotation Series,উদ্ধৃতি সিরিজের
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,দয়া করে গ্রাহক নির্বাচন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,দয়া করে গ্রাহক নির্বাচন
 DocType: C-Form,I,আমি
 DocType: Company,Asset Depreciation Cost Center,অ্যাসেট অবচয় মূল্য কেন্দ্র
 DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,বীমা বিবরণ
 DocType: Account,Payable,প্রদেয়
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,পরিশোধ সময়কাল প্রবেশ করুন
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ঋণ গ্রহিতা ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ঋণ গ্রহিতা ({0})
 DocType: Pricing Rule,Margin,মার্জিন
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,নতুন গ্রাহকরা
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,পুরো লাভ %
 DocType: Appraisal Goal,Weightage (%),গুরুত্ব (%)
 DocType: Bank Reconciliation Detail,Clearance Date,পরিস্কারের তারিখ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
 DocType: Lead,Address Desc,নিম্নক্রমে ঠিকানার
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,পার্টির বাধ্যতামূলক
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,টপিক নাম
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,বিক্রি বা কেনার অন্তত একটি নির্বাচন করতে হবে
-DocType: Grading Structure,Grade Intervals,গ্রেড অন্তরাল
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,আপনার ব্যবসার প্রকৃতি নির্বাচন করুন.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,উত্পাদন অপারেশন কোথায় সম্পন্ন হয়.
 DocType: Asset Movement,Source Warehouse,উত্স ওয়্যারহাউস
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},ডিফল্ট {0} কোম্পানি নির্ধারণ করুন {1}
 DocType: Cheque Print Template,Starting position from top edge,উপরের প্রান্ত থেকে অবস্থান শুরু
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,একই সরবরাহকারী একাধিক বার প্রবেশ করানো হয়েছে
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,রেকর্ডার Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,বর্তমান জব
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
-DocType: Journal Entry,Write Off,খরচ লেখা
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,খরচ লেখা
 DocType: Timesheet Detail,Operation ID,অপারেশন আইডি
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","সিস্টেম ব্যবহারকারী (লগইন) আইডি. সেট, এটি সব এইচআর ফরম জন্য ডিফল্ট হয়ে যাবে."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} থেকে
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,সরবরাহকারী গ্রাহক যাও বিতরণ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ফরম / আইটেম / {0}) স্টক আউট
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,পরবর্তী তারিখ পোস্টিং তারিখ অনেক বেশী হতে হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ডেটা আমদানি ও রপ্তানি
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","স্টক এন্ট্রি, {0} ওয়্যারহাউস বিরুদ্ধে অস্তিত্ব অত: পর আপনি পুনরায় দায়িত্ব অর্পণ করা বা এটা পরিবর্তন করতে পারেন"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,কোন ছাত্র পাওয়া
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
 DocType: Program Enrollment,School House,স্কুল হাউস
 DocType: Serial No,Out of AMC,এএমসি আউট
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,উদ্ধৃতি দয়া করে নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,উদ্ধৃতি দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
 DocType: Company,Default Cash Account,ডিফল্ট নগদ অ্যাকাউন্ট
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,এই শিক্ষার্থী উপস্থিতির উপর ভিত্তি করে
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,কোন শিক্ষার্থীরা
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,আরো আইটেম বা খোলা পূর্ণ ফর্ম যোগ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,পুনর্মিলন আগে
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},করুন {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),কর ও চার্জ যোগ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
 DocType: Sales Order,Partly Billed,আংশিক দেখানো হয়েছিল
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,আইটেম {0} একটি ফিক্সড অ্যাসেট আইটেম হতে হবে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,আইটেম {0} একটি ফিক্সড অ্যাসেট আইটেম হতে হবে
 DocType: Item,Default BOM,ডিফল্ট BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
 DocType: Purchase Invoice Item,Rate,হার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,অন্তরীণ করা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ঠিকানা নাম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,ঠিকানা নাম
 DocType: Stock Entry,From BOM,BOM থেকে
 DocType: Assessment Code,Assessment Code,অ্যাসেসমেন্ট কোড
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,মৌলিক
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,প্রিন্ট ভাষা
 DocType: Salary Slip,Total Working Hours,মোট ওয়ার্কিং ঘন্টা
 DocType: Stock Entry,Including items for sub assemblies,সাব সমাহারকে জিনিস সহ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,লিখুন মান ধনাত্মক হবে
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,লিখুন মান ধনাত্মক হবে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,সমস্ত অঞ্চল
 DocType: Purchase Invoice,Items,চলছে
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ছাত্র ইতিমধ্যে নথিভুক্ত করা হয়.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
 DocType: Assessment Plan,Supervisor Name,সুপারভাইজার নাম
 DocType: Program Enrollment Course,Program Enrollment Course,প্রোগ্রাম তালিকাভুক্তি কোর্সের
-DocType: Grading Structure,Grading Structure,শূন্য গঠন
 DocType: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
 DocType: Tax Rule,Shipping City,শিপিং সিটি
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"এই আইটেম {0} (টেমপ্লেট) একটি বৈকল্পিক. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আরোপ টেমপ্লেট থেকে কপি করা হবে"
 DocType: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,অপারেশন থেকে নগদ প্রবাহ
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স জন্য সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
 DocType: Leave Control Panel,Carry Forward,সামনে আগাও
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র খতিয়ান রূপান্তরিত করা যাবে না
 DocType: Department,Days for which Holidays are blocked for this department.,"দিন, যার জন্য ছুটির এই বিভাগের জন্য ব্লক করা হয়."
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),মোট (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল কোন
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,কর্মচারী রেকর্ডস তৈরি করুন
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,কর্মচারী রেকর্ডস তৈরি করুন
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,মোট বর্তমান
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,অ্যাকাউন্টিং বিবৃতি
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ঘন্টা
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,প্রতিস্থাপন পরে নতুন BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,বিক্রয় বিন্দু
 DocType: Payment Entry,Received Amount,প্রাপ্তঃ পরিমাণ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,দয়া করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিং
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","পূর্ণ পরিমাণ জন্য তৈরি করুন, যাতে উপর ইতিমধ্যে পরিমাণ উপেক্ষা"
 DocType: Account,Tax,কর
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,চিহ্নিত করা
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,চালান
 DocType: Batch,Source Document Name,উত্স দস্তাবেজের নাম
 DocType: Job Opening,Job Title,কাজের শিরোনাম
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,তৈরি করুন ব্যবহারকারীরা
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,তৈরি করুন ব্যবহারকারীরা
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,গ্রাম
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,রক্ষণাবেক্ষণ কল জন্য প্রতিবেদন দেখুন.
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: BOM,Website Description,ওয়েবসাইট বর্ণনা
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,প্রাপ্তি
 ,Sales Register,সেলস নিবন্ধন
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,সম্পাদনা করার কিছুই নেই.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,এখনও কোন গ্রাহকরা!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,লাইসেন্স
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,এছাড়াও আপনি আগের অর্থবছরের ভারসাম্য এই অর্থবছরের ছেড়ে অন্তর্ভুক্ত করতে চান তাহলে এগিয়ে দয়া করে নির্বাচন করুন
 DocType: GL Entry,Against Voucher Type,ভাউচার টাইপ বিরুদ্ধে
 DocType: Item,Attributes,আরোপ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,শেষ আদেশ তারিখ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
 DocType: Student,Guardian Details,গার্ডিয়ান বিবরণ
 DocType: C-Form,C-Form,সি-ফরম
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,একাধিক কর্মীদের জন্য মার্ক এ্যাটেনডেন্স
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',সারি {0} # অ্যাকাউন্ট ধরনের হতে হবে &#39;ফিক্সড অ্যাসেট&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty আউট
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,বিধি একটি বিক্রয়ের জন্য শিপিং পরিমাণ নিরূপণ করা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,সিরিজ বাধ্যতামূলক
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,সিরিজ বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
 DocType: Student Sibling,Student ID,শিক্ষার্থী আইডি
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,টাইম লগ জন্য ক্রিয়াকলাপ প্রকারভেদ
 DocType: Tax Rule,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
 DocType: Training Event,Exam,পরীক্ষা
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,অ্যাকাউন্ট থেকে অর্থ প্রদান করা
 DocType: Purchase Order Item Supplied,Raw Material Item Code,কাঁচামাল আইটেম কোড
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,লিড করুন
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,লিড করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,মুদ্রণ করুন এবং স্টেশনারি
 DocType: Stock Settings,Show Barcode Field,দেখান বারকোড ফিল্ড
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,উপরে
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
+DocType: Supplier,Mention if non-standard payable account,উল্লেখ করো যদি অ-মানক প্রদেয় অ্যাকাউন্ট
 DocType: Salary Slip,Earning & Deduction,রোজগার &amp; সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,থেকে শিক্ষার্থীরা পান
 DocType: Hub Settings,Seller Country,বিক্রেতা দেশ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ওয়েবসাইটে আইটেম প্রকাশ
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ব্যাচে Group আপনার ছাত্র
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ব্যাচে Group আপনার ছাত্র
 DocType: Authorization Rule,Authorization Rule,অনুমোদন রুল
 DocType: Sales Invoice,Terms and Conditions Details,শর্তাবলী বিস্তারিত
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,বিশেষ উল্লেখ
@@ -3519,7 +3523,7 @@
 DocType: Vehicle,Last Carbon Check,সর্বশেষ কার্বন চেক
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,আইনি খরচ
 DocType: Purchase Invoice,Posting Time,পোস্টিং সময়
-DocType: Timesheet,% Amount Billed,% পরিমাণ দেখানো হয়েছিল
+DocType: Timesheet,% Amount Billed,% পরিমাণ চালান করা হয়েছে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,টেলিফোন খরচ
 DocType: Sales Partner,Logo,লোগো
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,আপনি সংরক্ষণের আগে একটি সিরিজ নির্বাচন করুন ব্যবহারকারীর বাধ্য করতে চান তাহলে এই পরীক্ষা. আপনি এই পরীক্ষা যদি কোন ডিফল্ট থাকবে.
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,পরীক্ষাকাল
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,বেতন উপাদান
 DocType: Program Enrollment Tool,New Academic Year,নতুন শিক্ষাবর্ষ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,রিটার্ন / ক্রেডিট নোট
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,রিটার্ন / ক্রেডিট নোট
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,মোট প্রদত্ত পরিমাণ
 DocType: Production Order Item,Transferred Qty,স্থানান্তর করা Qty
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,বিক্রয় ফানেল
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
 DocType: Project,Task Progress,টাস্ক অগ্রগতি
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,কার্ট
 ,Qty to Transfer,স্থানান্তর করতে Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},পরিমাণ ({0}) সারিতে ভগ্নাংশ হতে পারে না {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ফি সংগ্রহ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
 DocType: Lead,Add to calendar on this date,এই তারিখে ক্যালেন্ডারে যোগ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
 DocType: Item,Opening Stock,খোলা স্টক
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,আদেশ উৎপাদনের জন্য মুক্তি.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Program Enrollment Tool,Enroll Students,শিক্ষার্থীরা তালিকাভুক্ত
 DocType: Hub Settings,Name Token,নাম টোকেন
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,স্ট্যান্ডার্ড বিক্রি
@@ -3642,10 +3647,10 @@
 DocType: Serial No,Out of Warranty,পাটা আউট
 DocType: BOM Replace Tool,Replace,প্রতিস্থাপন করা
 DocType: Production Order,Unstopped,মুক্ত
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিপরীতে {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,প্রকল্পের নাম
-DocType: Supplier,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
+DocType: Customer,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
 DocType: Production Order,Required Items,প্রয়োজনীয় সামগ্রী
 DocType: Stock Ledger Entry,Stock Value Difference,শেয়ার মূল্য পার্থক্য
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,কর
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,প্রদত্ত এবং বিতরিত হয় নি
 DocType: Project,Default Cost Center,ডিফল্ট খরচের কেন্দ্র
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
 DocType: Bank Guarantee,End Date,শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,শেয়ার লেনদেন
 DocType: Budget,Budget Accounts,বাজেট হিসাব
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,বিক্রয় অংশীদার এবং কমিশন
 DocType: Employee Loan,Rate of Interest (%) / Year,ইন্টারেস্ট (%) / বর্ষসেরা হার
 ,Project Quantity,প্রকল্প পরিমাণ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য শূন্য, আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত হতে পারে"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য শূন্য, আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত হতে পারে"
 DocType: Opportunity,To Discuss,আলোচনা করতে
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} একক {1} {2} এই লেনদেন সম্পন্ন করার জন্য প্রয়োজন.
 DocType: Loan Type,Rate of Interest (%) Yearly,সুদের হার (%) বাত্সরিক
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,মার্ক অনুপস্থিত
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},সারি {0}: BOM # মুদ্রা {1} নির্বাচিত মুদ্রার সমান হতে হবে {2}
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 DocType: Homepage,Tag Line,ট্যাগ লাইন
 DocType: Fee Component,Fee Component,ফি কম্পোনেন্ট
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ওয়ারহাউস {0} অস্তিত্ব নেই
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext হাব জন্য নিবন্ধন
 DocType: Monthly Distribution,Monthly Distribution Percentages,মাসিক বন্টন শতকরা
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","মূল্যনির্ধারণ হার আইটেম {0}, যার জন্য অ্যাকাউন্টিং এন্ট্রি করতে প্রয়োজন বোধ করা হয় জন্য পাওয়া যায়নি {1} {2}. আইটেম একটি নমুনা আইটেম হিসাবে লেনদেন করা হলে {1}, যে {1} আইটেম টেবিলে উল্লেখ করুন. অন্যথায়, দয়া করে আইটেম রেকর্ডে আইটেমটি বা উল্লেখ মূল্যনির্ধারণ হার জন্য একটি ইনকামিং স্টক লেনদেনের তৈরি করুন এবং তারপর / সাবমিট চেষ্টা এই এন্ট্রি বাতিলের"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,উপকরণ% এই হুণ্ডি বিরুদ্ধে বিতরণ
 DocType: Project,Customer Details,কাস্টমার বিস্তারিত
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,জমা করা অফার মোছা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,গুনমান ব্যবস্থাপনা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,আইটেম {0} অক্ষম করা হয়েছে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,আইটেম {0} অক্ষম করা হয়েছে
 DocType: Employee Loan,Repay Fixed Amount per Period,শোধ সময়কাল প্রতি নির্দিষ্ট পরিমাণ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,স্টুডেন্ট ইমেইল আইডি
 DocType: Employee,Notice (days),নোটিশ (দিন)
 DocType: Tax Rule,Sales Tax Template,সেলস ট্যাক্স টেমপ্লেট
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
 DocType: Employee,Encashment Date,নগদীকরণ তারিখ
 DocType: Training Event,Internet,ইন্টারনেটের
 DocType: Account,Stock Adjustment,শেয়ার সামঞ্জস্য
@@ -3855,6 +3861,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ডেবিট নোট ইস্যু
 DocType: Production Order,Warehouses,ওয়ারহাউস
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} সম্পদ স্থানান্তরিত করা যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,এই আইটেম {0} (টেমপ্লেট) এর ভেরিয়েন্ট হয়।
 DocType: Workstation,per hour,প্রতি ঘণ্টা
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ক্রয়
 DocType: Announcement,Announcement,ঘোষণা
@@ -3870,7 +3877,7 @@
 DocType: Account,Receivable,প্রাপ্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,সারি # {0}: ক্রয় আদেশ ইতিমধ্যেই বিদ্যমান হিসাবে সরবরাহকারী পরিবর্তন করার অনুমতি নেই
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,সেট ক্রেডিট সীমা অতিক্রম লেনদেন জমা করার অনুমতি দেওয়া হয় যে ভূমিকা.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
 DocType: Item,Material Issue,উপাদান ইস্যু
 DocType: Hub Settings,Seller Description,বিক্রেতা বিবরণ
@@ -3883,7 +3890,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,আদেশ
 DocType: Salary Detail,Component,উপাদান
 DocType: Assessment Criteria,Assessment Criteria Group,অ্যাসেসমেন্ট নির্ণায়ক গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},খোলা সঞ্চিত অবচয় সমান চেয়ে কম হতে হবে {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},খোলা সঞ্চিত অবচয় সমান চেয়ে কম হতে হবে {0}
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ভূমিকা অনুমোদন বা ব্যবহারকারী অনুমদন লিখুন দয়া করে
@@ -3917,7 +3924,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,যোগদান
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Employee Loan,Repay from Salary,বেতন থেকে শুধা
 DocType: Leave Application,LAP/,ভাঁজ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},বিরুদ্ধে পেমেন্ট অনুরোধ {0} {1} পরিমাণ জন্য {2}
@@ -3935,7 +3942,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,অ্যাসেসমেন্ট রেজাল্ট বিস্তারিত
 DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ডুপ্লিকেট আইটেম গ্রুপ আইটেম গ্রুপ টেবিল অন্তর্ভুক্ত
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
 DocType: Salary Slip,Net Pay,নেট বেতন
 DocType: Account,Account,হিসাব
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,সিরিয়াল কোন {0} ইতিমধ্যে গৃহীত হয়েছে
@@ -3944,7 +3951,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","গুদাম {0} কোনো অ্যাকাউন্ট সংযুক্ত করা হয় না, মনে রাখবেন / গুদাম জন্য সংশ্লিষ্ট (অ্যাসেট) অ্যাকাউন্ট লিঙ্ক তৈরি করুন."
 DocType: Purchase Invoice,Recurring Id,পুনরাবৃত্ত আইডি
 DocType: Customer,Sales Team Details,সেলস টিম বিবরণ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,স্থায়ীভাবে মুছে ফেলতে চান?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,স্থায়ীভাবে মুছে ফেলতে চান?
 DocType: Expense Claim,Total Claimed Amount,দাবি মোট পরিমাণ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,বিক্রি জন্য সম্ভাব্য সুযোগ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},অকার্যকর {0}
@@ -3955,13 +3962,14 @@
 DocType: Warehouse,PIN,পিন
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,সেটআপ ERPNext আপনার স্কুল
 DocType: Sales Invoice,Base Change Amount (Company Currency),বেস পরিবর্তন পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
 DocType: Account,Chargeable,প্রদেয়
 DocType: Company,Change Abbreviation,পরিবর্তন সমাহার
 DocType: Expense Claim Detail,Expense Date,ব্যয় তারিখ
 DocType: Item,Max Discount (%),সর্বোচ্চ ছাড় (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,শেষ আদেশ পরিমাণ
+DocType: Task,Is Milestone,মাইলফলক
 DocType: Daily Work Summary,Email Sent To,ইমেইল পাঠানো
 DocType: Budget,Warn,সতর্ক করো
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
@@ -3994,11 +4002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
 DocType: Tax Rule,Purchase Tax Template,ট্যাক্স টেমপ্লেট ক্রয়
 ,Project wise Stock Tracking,প্রকল্প জ্ঞানী স্টক ট্র্যাকিং
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},রক্ষণাবেক্ষণ সূচি {0} বিরুদ্ধে বিদ্যমান {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(উৎস / লক্ষ্য) প্রকৃত স্টক
 DocType: Item Customer Detail,Ref Code,সুত্র কোড
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,কর্মচারী রেকর্ড.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
 DocType: HR Settings,Payroll Settings,বেতনের সেটিংস
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,অ লিঙ্ক চালান এবং পেমেন্টস্ মেলে.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,প্লেস আদেশ
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,চেক এবং আমানত ভুল সাফ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
 DocType: Purchase Invoice Item,Price List Rate,মূল্যতালিকা হার
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,গ্রাহকের কোট তৈরি করুন
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,গ্রাহকের কোট তৈরি করুন
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;শেয়ার&quot; অথবা এই গুদাম পাওয়া স্টক উপর ভিত্তি করে &quot;না স্টক&quot; প্রদর্শন করা হবে.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),উপকরণ বিল (BOM)
 DocType: Item,Average time taken by the supplier to deliver,সরবরাহকারী কর্তৃক গৃহীত মাঝামাঝি সময় বিলি
@@ -4043,7 +4050,7 @@
 DocType: Asset,Disposal Date,নিষ্পত্তি তারিখ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ইমেল দেওয়া ঘন্টা এ কোম্পানির সব সক্রিয় এমপ্লয়িজ পাঠানো হবে, যদি তারা ছুটির দিন না. প্রতিক্রিয়া সংক্ষিপ্তসার মধ্যরাতে পাঠানো হবে."
 DocType: Employee Leave Approver,Employee Leave Approver,কর্মী ছুটি রাজসাক্ষী
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,প্রশিক্ষণ প্রতিক্রিয়া
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
@@ -4051,7 +4058,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},কোর্সের সারিতে বাধ্যতামূলক {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
 DocType: Batch,Parent Batch,মূল ব্যাচ
 DocType: Cheque Print Template,Cheque Print Template,চেক প্রিন্ট টেমপ্লেট
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট
@@ -4095,7 +4102,7 @@
 DocType: Item,Variant Based On,ভেরিয়েন্ট উপর ভিত্তি করে
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,আপনার সরবরাহকারীদের
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
 DocType: Request for Quotation Item,Supplier Part No,সরবরাহকারী পার্ট কোন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',কেটে যাবে না যখন আরো মূল্যনির্ধারণ &#39;বা&#39; Vaulation এবং মোট &#39;জন্য নয়
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,থেকে পেয়েছি
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,সারি {0}: ঘন্টা মান শূন্য থেকে বড় হওয়া উচিত.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
 DocType: Issue,Content Type,কোন ধরনের
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
@@ -4114,20 +4121,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
 DocType: Payment Reconciliation,From Invoice Date,চালান তারিখ থেকে
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা পক্ষের অ্যাকাউন্টে মুদ্রার সমান হতে হবে
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা পক্ষের অ্যাকাউন্টে মুদ্রার সমান হতে হবে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,নগদীকরণ ত্যাগ
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,এটার কাজ কি?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,গুদাম থেকে
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,সকল স্টুডেন্ট অ্যাডমিশন
 ,Average Commission Rate,গড় কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
 DocType: School House,House Name,হাউস নাম
 DocType: Purchase Taxes and Charges,Account Head,অ্যাকাউন্ট হেড
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,আইটেম অবতরণ খরচ নিরূপণ করার জন্য অতিরিক্ত খরচ আপডেট
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,বৈদ্যুতিক
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,আপনার প্রতিষ্ঠানের বাকি আপনার ব্যবহারকারী হিসেবে যুক্ত করো. এছাড়াও আপনি তাদের পরিচিতি থেকে যোগ করে আপনার পোর্টাল গ্রাহকরা আমন্ত্রণ যোগ করতে পারেন
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,আপনার প্রতিষ্ঠানের বাকি আপনার ব্যবহারকারী হিসেবে যুক্ত করো. এছাড়াও আপনি তাদের পরিচিতি থেকে যোগ করে আপনার পোর্টাল গ্রাহকরা আমন্ত্রণ যোগ করতে পারেন
 DocType: Stock Entry,Total Value Difference (Out - In),মোট মূল্য পার্থক্য (আউট - ইন)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ইউজার আইডি কর্মচারী জন্য নির্ধারণ করে না {0}
@@ -4136,7 +4143,7 @@
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,বীমা তারিখ শুরু তুলনায় বীমা শেষ তারিখ কম হওয়া উচিত
@@ -4151,7 +4158,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
 DocType: Vehicle Log,Odometer,দূরত্বমাপণী
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
@@ -4164,12 +4171,13 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
 DocType: Sales Invoice Timesheet,Billing Hours,বিলিং ঘন্টা
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,জন্য {0} পাওয়া ডিফল্ট BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,তাদের এখানে যোগ করার জন্য আইটেম ট্যাপ
 DocType: Fees,Program Enrollment,প্রোগ্রাম তালিকাভুক্তি
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্রী
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্র-ছাত্রী
 DocType: Employee,Health Details,স্বাস্থ্য বিবরণ
 DocType: Offer Letter,Offer Letter Terms,পত্র ব্যাপারে প্রস্তাব
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,একটি পেমেন্ট অনুরোধ রেফারেন্স ডকুমেন্ট প্রয়োজন বোধ করা হয় তৈরি করতে
@@ -4261,7 +4269,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
 DocType: Issue,First Responded On,প্রথম প্রতিক্রিয়া
 DocType: Website Item Group,Cross Listing of Item in multiple groups,একাধিক গ্রুপ আইটেমের ক্রস তালিকা
-DocType: Grade Interval,Grade Interval,গ্রেড ব্যবধান
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},অর্থবছরের আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ ইতিমধ্যে অর্থবছরে নির্ধারণ করা হয় {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,পরিস্কারের তারিখ আপডেট
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,স্প্লিট ব্যাচ
@@ -4269,6 +4276,7 @@
 DocType: Request for Quotation Supplier,Download PDF,ডাউনলোড পিডিএফ
 DocType: Production Order,Planned End Date,পরিকল্পনা শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,আইটেম কোথায় সংরক্ষণ করা হয়.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Request for Quotation,Supplier Detail,সরবরাহকারী বিস্তারিত
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},সূত্র বা অবস্থায় ত্রুটি: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Invoiced পরিমাণ
@@ -4313,7 +4321,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,সেটআপ আমার প্রতিষ্ঠানের জন্য একটি সহজ ওয়েবসাইট
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ঊর্ধ্বতন খরচ কেন্দ্র লিখুন দয়া করে
@@ -4370,7 +4378,7 @@
 ,Items To Be Requested,চলছে অনুরোধ করা
 DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,খরচ কেন্দ্র একটি ব্যয় দাবি বুক করতে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,এই কর্মচারী উপস্থিতি উপর ভিত্তি করে
@@ -4383,13 +4391,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,নিম্নলিখিত দিন ছুটি অ্যাপ্লিকেশন তৈরি করা থেকে ব্যবহারকারীদের বিরত থাকুন.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ক্রয় মূল
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,কর্মচারীর সুবিধা
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Production Order,Manufactured Qty,শিল্পজাত Qty
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,প্রকল্প আইডি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
@@ -4398,15 +4406,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 পড়া
 ,Hub,হাব
 DocType: GL Entry,Voucher Type,ভাউচার ধরন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Employee Loan Application,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
 DocType: Guardian,Guardian,অভিভাবক
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,মূল্যায়ন {0} {1} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
 DocType: Employee,Education,শিক্ষা
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,দেল
 DocType: Selling Settings,Campaign Naming By,প্রচারে নেমিং
 DocType: Employee,Current Address Is,বর্তমান ঠিকানা
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,পরিবর্তিত
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
@@ -4443,7 +4453,7 @@
 DocType: Hub Settings,Hub Settings,হাব সেটিংস
 DocType: Project,Gross Margin %,গ্রস মার্জিন%
 DocType: BOM,With Operations,অপারেশন সঙ্গে
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
 DocType: Asset,Is Existing Asset,বিদ্যমান সম্পদ
 DocType: Salary Detail,Statistical Component,পরিসংখ্যানগত কম্পোনেন্ট
 ,Monthly Salary Register,মাসিক বেতন নিবন্ধন
@@ -4497,7 +4507,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,লোগো সংযুক্ত
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,স্টক মাত্রা
 DocType: Customer,Commission Rate,কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ভেরিয়েন্ট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","পেমেন্ট টাইপ, জখন এক হতে হবে বেতন ও ইন্টারনাল ট্রান্সফার"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,বৈশ্লেষিক ন্যায়
@@ -4510,6 +4520,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,ছুটির উৎপাদন মঞ্জুরি
 DocType: Sales Order,Customer's Purchase Order Date,গ্রাহকের ক্রয় আদেশ তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,মূলধন
+DocType: Shopping Cart Settings,Show Public Attachments,জন সংযুক্তিসমূহ দেখান
 DocType: Packing Slip,Package Weight Details,প্যাকেজ ওজন বিস্তারিত
 DocType: Payment Gateway Account,Payment Gateway Account,পেমেন্ট গেটওয়ে অ্যাকাউন্টে
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,পেমেন্ট সম্পন্ন করার পর নির্বাচিত পৃষ্ঠাতে ব্যবহারকারী পুনর্নির্দেশ.
@@ -4534,7 +4545,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,মুদ্রা ইত্যাদি $ মত কোন প্রতীক পরের প্রদর্শন না.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,স্টুডেন্ট ব্যাচ করুন
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,স্টুডেন্ট ব্যাচ করুন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM থেকে জানানোর পান
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,সময় দিন লিড
@@ -4553,7 +4564,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: GL Entry,Is Opening,খোলার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স জন্য সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
 DocType: Account,Cash,নগদ
 DocType: Employee,Short biography for website and other publications.,ওয়েবসাইট ও অন্যান্য প্রকাশনা সংক্ষিপ্ত জীবনী.
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 58c2321..6a19218 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Stavka Status isteka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show Varijante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Varijante
 DocType: Academic Term,Academic Term,akademski Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materijal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Količina
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Zdravstvena zaštita
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servis rashodi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista firma je ušao više od jednom
 DocType: Employee,Married,Oženjen
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dozvoljeno za {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nije dozvoljeno za {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Get stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da postavljanje zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No stavke navedene
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 DocType: Process Payroll,Make Bank Entry,Make Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,mirovinskim fondovima
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija datum ne može biti prije Datum kupovine
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija datum ne može biti prije Datum kupovine
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Mjesečna distribucija ** će Vam pomoći distribuirati budžeta / Target preko mjeseca ako imate sezonalnost u vaše poslovanje.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nije pronađenim predmetima
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nije pronađenim predmetima
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plaća Struktura Missing
 DocType: Lead,Person Name,Ime osobe
 DocType: Sales Invoice Item,Sales Invoice Item,Stavka fakture prodaje
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Univerzitet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Izvještaji
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Završni datum ne može biti kasnije od kraja godine Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Da li je osnovno sredstvo&quot; ne može biti označeno, kao rekord imovine postoji u odnosu na stavku"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Da li je osnovno sredstvo&quot; ne može biti označeno, kao rekord imovine postoji u odnosu na stavku"
 DocType: Vehicle Service,Brake Oil,Brake ulje
 DocType: Tax Rule,Tax Type,Vrste poreza
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Satnica / 60) * Puna radno vrijeme
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Izaberite BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Izaberite BOM
 DocType: SMS Log,SMS Log,SMS log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih Predmeti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Na odmor na {0} nije između Od datuma i Do datuma
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,razred
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučuje dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Proizvodnog naloga već stvorena za sve stavke sa BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Proizvodnog naloga već stvorena za sve stavke sa BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Godišnja zarada
 DocType: Daily Work Summary,Daily Work Summary,Svakodnevni rad Pregled
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je smrznuto
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je smrznuto
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Molimo odaberite postojećeg društva za stvaranje Kontni plan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Troškovi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Odaberite Target Skladište
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company valuta
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Da li želite da ažurirate prisustvo? <br> Prisutni: {0} \ <br> Odsutni: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Supply sirovine za kupovinu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Najmanje jedan način plaćanja je potreban za POS računa.
 DocType: Products Settings,Show Products as a List,Prikaži proizvode kao listu
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite Template, popunite odgovarajuće podatke i priložite modifikovani datoteku.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Amortizacija Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Make zaposlenih
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Make zaposlenih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifuzija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalji o poslovanju obavlja.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan održavanja posjeta.
 DocType: SMS Settings,Enter url parameter for message,Unesite URL parametar za poruke
 DocType: POS Profile,Customer Groups,Customer grupe
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finansijski izvještaji
 DocType: Guardian,Students,studenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravila za primjenu cijene i popust .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Company,Default Payroll Payable Account,Uobičajeno zarade plaćaju nalog
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update-mail Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update-mail Group
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenite ako nestandardnih potraživanja računa važećim
 DocType: Course Schedule,Instructor Name,instruktor ime
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje fakture Item
 ,Production Orders in Progress,Radni nalozi u tijeku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto gotovine iz aktivnosti finansiranja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorišteni lišće iz prethodnog izdvajanja
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno Costing Iznos (preko Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,banka unosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Objavite u Hub
 DocType: Student Admission,Student Admission,student Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Artikal {0} je otkazan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijesti putem e-pošte na stvaranje automatskog Materijal Zahtjeva
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Poreza
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Troškovi prodate imovine
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Plaćanje Entry je izmijenjena nakon što ste ga izvukao. Molimo vas da se ponovo povucite.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
 DocType: Student Applicant,Admitted,Prihvaćen
 DocType: Workstation,Rent Cost,Rent cost
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Da bi vrijednost
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,transakcije protiv stranke ili za internu Transakcija / Cash
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ovaj proizvod predložak i ne može se koristiti u transakcijama. Stavka atributi će se kopirati u više varijanti, osim 'Ne Copy ""je postavljena"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ovaj proizvod predložak i ne može se koristiti u transakcijama. Stavka atributi će se kopirati u više varijanti, osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Order Smatran
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Zvanje zaposlenog ( npr. CEO , direktor i sl. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje do {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Odaberite Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvoriti u non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum fakture
 DocType: GL Entry,Debit Amount,Debit Iznos
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Primljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Napravi studentske grupe
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Salary Slip Timesheet,Working Hours,Radno vrijeme
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Kreiranje novog potrošača
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Kreiranje novog potrošača
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Napravi Narudžbenice
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Napravi Narudžbenice
 ,Purchase Register,Kupnja Registracija
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Mjerodavno Optužbe
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Zapis o radniku je kreiran odabirom polja .
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Iz paketa broj
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ne možete promijeniti način vrednovanja, jer postoje transakcije protiv nekih stvari koje nemaju svoj vlastiti način vrednovanja"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće dodijeljena je obavezno
 DocType: Job Opening,Description of a Job Opening,Opis posla Otvaranje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivnostima na čekanju za danas
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Hitna Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kupiti
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Molimo vas da definirati razred za Threshold 0%
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Artikl
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje Subcontracting
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U očekivanju Količina
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nije aktivan
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslati na sljedeće brojeve: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimenzije ček setup za štampanje
 DocType: Salary Slip,Salary Slip Timesheet,Plaća Slip Timesheet
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 DocType: Buying Settings,Purchase Receipt Required,Kupnja Potvrda Obvezno
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje Rate je obavezno ako ušla Otvaranje Stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje Rate je obavezno ako ušla Otvaranje Stock
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,akumulirani Vrijednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Provjerite prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Provjerite prodajnog naloga
 DocType: Project Task,Project Task,Projektni zadatak
 ,Lead Id,Lead id
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Nastavi Prilog
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Kupci
 DocType: Leave Control Panel,Allocate,Dodijeli
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Povrat robe
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Povrat robe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Napomena: Ukupna izdvojena lišće {0} ne smije biti manja od već odobrenih lišće {1} za period
 DocType: Announcement,Posted By,Postavljeno od
 DocType: Item,Delivered by Supplier (Drop Ship),Isporučuje Dobavljač (Drop Ship)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),P.S. (Pot)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Molimo vas da postavite poduzeća
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Izaberite plaćanje računa da banke Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Kreiranje evidencije zaposlenih za upravljanje lišće, trošak potraživanja i platnom spisku"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Kreiranje evidencije zaposlenih za upravljanje lišće, trošak potraživanja i platnom spisku"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj u bazi znanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Entry Odbitak
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Odnos sa Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,menadžer
 DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datum Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manje od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manje od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Istu stavku je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' Temelji se na' i 'Grupisanje po ' ne mogu biti isti
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Rezolucija Datum
 DocType: Student Batch Name,Batch Name,Batch ime
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet created:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,upisati
 DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Će pokazati student kao sadašnjost u Studentskom Mjesečni Posjeta izvještaj
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,student Posjeta
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush sirovine na osnovu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Unesite Detalji
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Ostali detalji
@@ -727,7 +730,7 @@
 ,Absent Student Report,Odsutan Student Report
 DocType: Email Digest,Next email will be sent on:,Sljedeća e-mail će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda Pismo Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Kompanija {0} ne postoji
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,Datum isteka jamstva
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Postavljanje&gt; Postavke&gt; Imenovanje serije
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Molimo odaberite program
 DocType: Project,Estimated Cost,Procijenjeni troškovi
 DocType: Purchase Order,Link to material requests,Link za materijal zahtjeva
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ne postoji na zalihama.
 DocType: Mode of Payment Account,Default Account,Podrazumjevani konto
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni Iznos (Company Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Prodaja Osoba Target varijance artikla Group - Wise
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Bez dozvole
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Niti jedan zaposlenik pronađena
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Student Grupa je već ažurirana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Student Grupa je već ažurirana.
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 DocType: Warehouse,Tree Details,Tree Detalji
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} ne pripada kompaniji {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Račun {2} ne može biti Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka Row {idx}: {doctype} {docname} ne postoji u gore &#39;{doctype}&#39; sto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka Row {idx}: {doctype} {docname} ne postoji u gore &#39;{doctype}&#39; sto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No zadataka
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto faktura će biti generiran npr 05, 28 itd"
 DocType: Asset,Opening Accumulated Depreciation,Otvaranje Ispravka vrijednosti
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,Premještanje prosječna stopa
 DocType: Production Planning Tool,Select Items,Odaberite artikle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} protiv placanje {1}  od {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Raspored za golf
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Raspored za golf
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za odlazak u penziju u godinama
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljana galerija
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Sve grupe artikala
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Sve grupe artikala
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Purchase Order na isplatu
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projektovana kolicina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Otvaranje&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Količina
 DocType: Leave Block List Date,Leave Block List Date,Ostavite Date Popis Block
 DocType: Pricing Rule,Price or Discount,Cijena i popust
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno Primjenjivo Optužbe na račun za prodaju Predmeti sto mora biti isti kao Ukupni porezi i naknada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno Primjenjivo Optužbe na račun za prodaju Predmeti sto mora biti isti kao Ukupni porezi i naknada
 DocType: Sales Team,Incentives,Poticaji
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Nabavite samo sirovine
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Radnik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Narudzbine avans
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Hemijski
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Uobičajeno Banka / Cash račun će se automatski ažurirati u Plaća Journal Entry kada je izabran ovaj režim.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervale za razred Kod {0} preklapa sa intervalima razred za ostale razrede. Molimo provjerite intervalima {0} i {1} i pokušajte ponovo
 DocType: BOM,Raw Material Cost(Company Currency),Sirovina troškova (poduzeća Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Rate ne može biti veća od stope koristi u {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Web Stavka
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
 DocType: Timesheet Detail,Bill,račun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Sljedeća Amortizacija datum se unosi kao proteklih dana
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sljedeća Amortizacija datum se unosi kao proteklih dana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bijel
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Količina nije dostupan za {4} u skladištu {1} na postavljanje trenutku stupanja ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Datum sledeceg kontaktiranja
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Unesite račun za promjene Iznos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Unesite račun za promjene Iznos
 DocType: Student Batch Name,Student Batch Name,Student Batch Ime
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
 DocType: Repayment Schedule,Balance Loan Amount,Balance Iznos kredita
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Navedite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj Amortizacija
 DocType: Sales Invoice Item,Rate With Margin,Stopu sa margina
 DocType: Workstation,Wages,Plata
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,Naziv organizacije
 DocType: Tax Rule,Shipping State,State dostava
 ,Projected Quantity as Source,Projektovanih količina kao izvor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Uključuju ne-stanju proizvodi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodajni troškovi
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poštanski broj
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Izrada Stock unosi
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Shipping pravilo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Unesite Šifra da Batch Broj
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
 DocType: Employee Loan,Partially Disbursed,djelomično Isplaćeno
-DocType: Grading Structure,Grading System Name,Pravilo System Ime
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Šifarnik dobavljača
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Način plaćanja nije konfiguriran. Molimo provjerite da li račun je postavljena o načinu plaćanja ili na POS profilu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Način plaćanja nije konfiguriran. Molimo provjerite da li račun je postavljena o načinu plaćanja ili na POS profilu.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti stavka ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalje računa može biti pod Grupe, ali unosa može biti protiv ne-Grupe"
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Molimo navedite barem jedan atribut atribute tabeli
 DocType: Announcement,All Students,Svi studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock stavka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock stavka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Pogledaj Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na kupovinu
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na kupovinu
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupne emisije / Transfer količina {0} u Industrijska Zahtjev {1} \ ne može biti veća od tražene količine {2} za Stavka {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mali
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Grupa Roll Broj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupno sve težine zadatka treba da bude 1. Molimo prilagodite težine svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,Časopis Stupanje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
-DocType: Grade Interval,Grade Code,Grade Kod
+DocType: Grading Scale Interval,Grade Code,Grade Kod
 DocType: POS Item Group,POS Item Group,POS Stavka Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,Ponavljajući Upto
 DocType: Attendance,HR Manager,Šef ljudskih resursa
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Molimo odaberite poduzeća
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Molimo odaberite poduzeća
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Trebate omogućiti Košarica
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Range 3
 DocType: Maintenance Schedule Item,No of Visits,Bez pregleda
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Održavanje Raspored {0} postoji protiv {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,upisa student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbir bodova za sve ciljeve bi trebao biti 100. To je {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Šifarnik konta
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
 DocType: Pricing Rule,"Higher the number, higher the priority","Veći broj, veći prioritet"
 ,Purchase Invoice Trends,Trendovi kupnje proizvoda
 DocType: Employee,Better Prospects,Bolji izgledi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Odgovor batch {1} ima samo {2} Količina. Molimo odaberite neku drugu seriju koja ima {3} Količina dostupna ili podijeliti red u više redova, za isporuku / pitanje iz više serija"
 DocType: Vehicle,License Plate,registarska tablica
 DocType: Appraisal,Goals,Golovi
 DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposleni ne može prijaviti samog sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla , kvalifikacijama i sl."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Porez pravilo za transakcije.
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaži Neriješeni fiskalnu godinu P &amp; L salda
 DocType: Shipping Rule,Shipping Account,Konto transporta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktivan
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Make Prodajni nalozi će vam pomoći da planirate svoj rad i dostaviti na vreme
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Make Prodajni nalozi će vam pomoći da planirate svoj rad i dostaviti na vreme
 DocType: Quality Inspection,Readings,Očitavanja
 DocType: Stock Entry,Total Additional Costs,Ukupno dodatnih troškova
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Odreskom
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,najam ureda
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio!
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,Izvor
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show zatvoren
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ovo {0} sukobe sa {1} za {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenti HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,Datum odlaska
 DocType: Pricing Rule,For Price List,Za Cjeniku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Napravi Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Napravi Leads
 DocType: Maintenance Schedule,Schedules,Rasporedi
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Upis
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kutija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,moguće dobavljač
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Uobičajeno sastavnice za {0} nije pronađen za projektne {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti su u srcu sistema, dodajte sve svoje studente"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti su u srcu sistema, dodajte sve svoje studente"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: datum razmak {1} ne može biti prije Ček Datum {2}
 DocType: Company,Default Holiday List,Uobičajeno Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Red {0}: Od vremena i do vremena od {1} je preklapaju s {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovo pošaljite mail plaćanja
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,novi zadatak
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Make ponudu
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Make ponudu
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostali izveštaji
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Molimo podesite Uobičajeno plaće plaćaju račun poduzeća {0}
 DocType: SMS Center,Receiver List,Lista primalaca
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Traži Stavka
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,Pravilo Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Plaćanje Zahtjev već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,prikupiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati fiskalnu godinu {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
 DocType: Journal Entry,Entry Type,Entry Tip
 ,Customer Credit Balance,Customer Credit Balance
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studiranje u istom institutu
 DocType: Territory,Territory Manager,Manager teritorije
 DocType: Packed Item,To Warehouse (Optional),Da Warehouse (Opcionalno)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra&gt; stavka Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Uplaćeni iznos (poduzeća Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Pogledaj u košaricu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materijal Zahtjev se koristi da bi se ova Stock unos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum je obavezan za nove imovine
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum je obavezan za nove imovine
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Poseban grupe na osnovu naravno za svaku seriju
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Jedna jedinica stavku.
 DocType: Fee Category,Fee Category,naknada Kategorija
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Troškovi Centar je potreban za &quot;dobiti i gubitka računa {2}. Molimo vas da se uspostavi default troškova Centra za kompanije.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupu korisnika&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novi kontakt
 DocType: Territory,Parent Territory,Roditelj Regija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopustite više prodajnih naloga protiv narudžbenicu Kupca
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instruktor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Nema
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Glavni
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varijanta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Glavni
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
 DocType: Employee,Leave Encashed?,Ostavite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika iz polja je obavezna
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Provjerite narudžbenice
 DocType: SMS Center,Send To,Pošalji na adresu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Izdvojena iznosu
@@ -1764,7 +1761,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Appraisals
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj je unešen za artikl {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A uvjet za Shipping Pravilo
-DocType: Grading Structure,Grading Intervals,Pravilo Intervali
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molimo unesite
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ne može overbill za Stavka {0} u redu {1} više od {2}. Kako bi se omogućilo preko-računa, molimo vas da postavite u kupovini Postavke"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Molimo podesite filter na osnovu Item ili Skladište
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Odbijena Skladište je obavezno protiv odbijen Stavka {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Plaćanje
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Upravljanje narudžbe
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Upravljanje narudžbe
 DocType: Production Order Operation,Actual Time and Cost,Stvarno vrijeme i troškovi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materijal Zahtjev maksimalno {0} može biti za točku {1} od prodajnog naloga {2}
 DocType: Employee,Salutation,Pozdrav
 DocType: Course,Course Abbreviation,Skraćenica za golf
 DocType: Student Leave Application,Student Leave Application,Student Leave aplikacije
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na Poludnevni na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Ukupno radnog vremena ne smije biti veća od max radnog vremena {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bala stavke na vrijeme prodaje.
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli duple stavke . Molimo ispraviti i pokušajte ponovno .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Pomoćnik
 DocType: Asset Movement,Asset Movement,Asset pokret
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,novi Košarica
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,novi Košarica
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Stavka {0} nijeserijaliziranom predmeta
 DocType: SMS Center,Create Receiver List,Kreiraj listu primalaca
 DocType: Vehicle,Wheels,Wheels
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Onemogućava stvaranje vremena za rezanje protiv nalozi. Operacije neće biti bager protiv proizvodnog naloga
 DocType: Student,Student Mobile Number,Student Broj mobilnog
 DocType: Item,Has Variants,Ima Varijante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID je obavezno
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID je obavezno
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Vehicle Log,Fuel Price,Cena goriva
 DocType: Budget,Budget,Budžet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžet se ne može dodijeliti protiv {0}, jer to nije prihod ili rashod račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareni
 DocType: Student Admission,Application Form Route,Obrazac za prijavu Route
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Broj {0} {1} oduzeti protiv {2}
 DocType: Employee,Salary Information,Plaća informacije
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Web stranica artikla Grupa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer prihoda
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati rolu 'odobravanje troskova'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Poludnevni datum treba biti između Od datuma i Do datuma
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 ,Vehicle Expenses,Troškovi vozila
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
+DocType: Serial No,Invoice Details,Račun Detalji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
 DocType: Employee Loan,Loan Amount,Iznos kredita
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupa Non-grupa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 DocType: Loan Type,Loan Name,kredit ime
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Skladište gdje ste održavanju zaliha odbijenih stavki
 DocType: Production Order,Skip Material Transfer,Preskočite Prijenos materijala
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}. Molimo vas da ručno stvoriti Mjenjačnica rekord
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je podrazumijevana Fiskalna godina . Osvježite svoj browserda bi se izmjene primijenile.
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
 DocType: Opportunity,Customer / Lead Address,Kupac / Adresa Lead-a
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 DocType: Student Admission,Eligibility,kvalifikovanost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads biste se lakše poslovanje, dodati sve svoje kontakte i još kao vodi"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads biste se lakše poslovanje, dodati sve svoje kontakte i još kao vodi"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Odaberite preduzeće...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako smatra za sve odjele
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
 DocType: Process Payroll,Fortnightly,četrnaestodnevni
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Molimo vas da uklonite stavku `{0}` i uštedite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj Timesheets
 DocType: Vehicle Service,Service Item,Servis Stavka
 DocType: Bank Guarantee,Bank Guarantee,Bankarska garancija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazan ako nije postavljena Cjenik
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Molimo navedite zemlju za ovaj Dostava pravilo ili provjeriti dostavom diljem svijeta
 DocType: Stock Entry,Total Incoming Value,Ukupna vrijednost Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,To je potrebno Debit
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,To je potrebno Debit
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupoprodajna cijena List
 DocType: Offer Letter Term,Offer Term,Ponuda Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Unesite dokument o prijemu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Svi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Unesite dokument o prijemu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Svi artikli su već fakturisani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 DocType: Project,External,Vanjski
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Radne naloge Napisano: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Radne naloge Napisano: {0}
 DocType: Branch,Branch,Ogranak
 DocType: Guardian,Mobile Number,Broj mobitela
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje
@@ -2176,7 +2175,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nije pronađena
 DocType: Scheduling Tool,Student Batch,student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Make Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Make Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Vi ste pozvani da surađuju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Blok Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Prijavite se sada
@@ -2199,8 +2198,9 @@
 DocType: SMS Log,Sent To,Poslati
 DocType: Payment Request,Make Sales Invoice,Ostvariti prodaju fakturu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softvera
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Sljedeća Kontakt datum ne može biti u prošlosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sljedeća Kontakt datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za referencu samo.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Izaberite serijski br
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},{1}: Invalid {0}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Iznos avansa
@@ -2214,7 +2214,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,prodavaonice
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,prodavaonice
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
@@ -2230,8 +2230,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Prijenos materijala
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Da li što još {3} u odnosu na isti {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Izaberite promjene iznos računa
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Izaberite promjene iznos računa
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2242,7 +2242,7 @@
 DocType: Budget Account,Budget Account,računa budžeta
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
-DocType: Grade Interval,Grade Description,Grade Opis
+DocType: Grading Scale Interval,Grade Description,Grade Opis
 DocType: Stock Entry,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
@@ -2280,7 +2280,7 @@
 DocType: Upload Attendance,Attendance To Date,Gledatelja do danas
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Plaćanje računa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto promjena u Potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,kompenzacijski Off
 DocType: Offer Letter,Accepted,Prihvaćeno
@@ -2293,7 +2293,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
 DocType: Employee,Previous Work Experience,Radnog iskustva
@@ -2307,7 +2307,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,U ime Instituta za koju se postavljanje ovog sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,stvoreni su sljedeći nalozi:
@@ -2330,6 +2330,7 @@
 DocType: Email Digest,How frequently?,Koliko često?
 DocType: Purchase Receipt,Get Current Stock,Kreiraj trenutne zalihe
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drvo Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra&gt; stavka Group&gt; Brand
 DocType: Student,Joining Date,spajanje Datum
 ,Employees working on a holiday,Radnici koji rade na odmoru
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
@@ -2430,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Razmak Datum nije spomenuo
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,proizvodnja
 DocType: Guardian,Occupation,okupacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
 DocType: Sales Invoice,This Document,ovaj dokument
 DocType: Installation Note Item,Installed Qty,Instalirana kol
@@ -2453,7 +2454,7 @@
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Zadane vrijednosti kao što su tvrtke , valute , tekuće fiskalne godine , itd."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Molimo odaberite serijom za Stavka {0}. Nije moguće pronaći jednu seriju koja ispunjava ovaj zahtjev
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Molimo odaberite serijom za Stavka {0}. Nije moguće pronaći jednu seriju koja ispunjava ovaj zahtjev
 DocType: Process Payroll,Select Employees,Odaberite Zaposleni
 DocType: Opportunity,Potential Sales Deal,Potencijalni Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
@@ -2470,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS profil {0} već kreirali za poduzeće {1}
 DocType: Purchase Order,Ref SQ,Ref. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zamijenite predmet / BOM u svim sastavnicama
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,mora biti dostavljen dokument o prijemu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,mora biti dostavljen dokument o prijemu
 DocType: Purchase Invoice Item,Received Qty,Pozicija Kol
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ne plaća i ne dostave
@@ -2483,7 +2484,7 @@
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/config/hr.py +93,Payroll,platni spisak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} u {1}. Uključiti {2} u tačka stope, redova {3} mora biti uključena"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Make korisnika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Make korisnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Molimo vas da unesete važeću e-mail adresu
@@ -2495,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,predložak invaliditetom ne smije biti zadani predložak
 DocType: Account,Income Account,Konto prihoda
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Količina
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Paketi pomoći da pratiti prisustvo, procjene i naknade za studente"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Paketi pomoći da pratiti prisustvo, procjene i naknade za studente"
 DocType: Payment Entry,Total Allocated Amount,Ukupan dodijeljeni iznos
 DocType: Item Reorder,Material Request Type,Materijal Zahtjev Tip
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry za plate od {0} do {1}
@@ -2522,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Pratite Potencijalnog kupca prema tip industrije .
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
@@ -2532,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Hoće li poslati e-mail o događaju zaposlenima sa statusom &#39;Open&#39;
 DocType: Task,Depends on Tasks,Ovisi o Zadaci
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Upravljanje vrstama djelatnosti
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Priloge mogu biti prikazani bez omogućavanje košarica
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novi troška Naziv
 DocType: Leave Control Panel,Leave Control Panel,Ostavite Upravljačka ploča
@@ -2544,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; dobavljač Tip
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Bez plaće slip pronađena između {0} i {1}
 ,Pending SO Items For Purchase Request,Otvorena SO Proizvodi za zahtjev za kupnju
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,student Prijemni
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je onemogućena
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je onemogućena
 DocType: Supplier,Billing Currency,Valuta plaćanja
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra veliki
@@ -2565,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Istaknuti proizvoda
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Sve procjene Grupe
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo skladište Ime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Ukupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Regija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
@@ -2583,7 +2585,7 @@
 DocType: Price List,Price List Master,Cjenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve Sales Transakcije mogu biti označena protiv više osoba ** ** Sales, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,S.O. Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Kreirajte Kupca iz Poslovne prilike {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Kreirajte Kupca iz Poslovne prilike {0}
 DocType: Price List,Applicable for Countries,Za zemlje u
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ostavite samo Prijave sa statusom &quot;Odobreno &#39;i&#39; Odbijena &#39;se može podnijeti
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Ime grupe je obavezno u redu {0}
@@ -2675,7 +2677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Računovodstvo Entry za Stock
 DocType: Vehicle Service,Engine Oil,Motorno ulje
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Employee Loan,Loan Details,kredit Detalji
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završena Količina mora biti veća od nule.
@@ -2739,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Skladišta sa postojećim transakcija se ne može pretvoriti u grupi.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ističe
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj Studenti
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj Studenti
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-Obrazac br
 DocType: BOM,Exploded_items,Exploded_items
@@ -2803,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Preduzetnički kapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademski pojam sa ovim &quot;akademska godina&quot; {0} i &#39;Term Ime&#39; {1} već postoji. Molimo vas da mijenjati ove stavke i pokušati ponovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što je već postoje transakcije protiv stavku {0}, ne možete promijeniti vrijednost {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što je već postoje transakcije protiv stavku {0}, ne možete promijeniti vrijednost {1}"
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijski Ne {0} ne postoji
@@ -2846,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,Zadnji dan narednog mjeseca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu izdanje nakon 7 dana
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student zahtjeva
 DocType: Asset Category Account,Accumulated Depreciation Account,Ispravka vrijednosti računa
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
@@ -2874,7 +2876,7 @@
 DocType: Asset,Item Code,Šifra artikla
 DocType: Production Planning Tool,Create Production Orders,Stvaranje radne naloge
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
@@ -2892,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,Stvaranje materijalni zahtijevi
 DocType: Employee Education,School/University,Škola / Univerzitet
 DocType: Payment Request,Reference Details,Reference Detalji
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost Nakon Korisni Život mora biti manja od bruto Kupovina Iznos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost Nakon Korisni Život mora biti manja od bruto Kupovina Iznos
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Naplaćeni iznos
 DocType: Asset,Double Declining Balance,Double degresivne
@@ -2913,19 +2915,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni iznos ne može biti veći od Iznos kredita {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Proizvodnog naloga kreiranu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Proizvodnog naloga kreiranu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' Do datuma"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ne može promijeniti status studenta {0} je povezana s primjenom student {1}
 DocType: Asset,Fully Depreciated,potpuno je oslabio
 ,Stock Projected Qty,Projektovana kolicina na zalihama
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Posjećenost HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali svojim kupcima"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali svojim kupcima"
 DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijski broj i Batch
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Zbir desetine Kriteriji procjene treba da bude {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Molimo podesite Broj Amortizacija Booked
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Molimo podesite Broj Amortizacija Booked
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,"Vrijednost, ili kol"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
@@ -3053,7 +3055,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Citat serije
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Molimo odaberite kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Molimo odaberite kupac
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Asset Amortizacija troškova Center
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe kupca
@@ -3072,19 +3074,18 @@
 DocType: Vehicle,Insurance Details,osiguranje Detalji
 DocType: Account,Payable,Plativ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Unesite rokovi otplate
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dužnici ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi Kupci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto dobit%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto Kupovina Iznos je obavezno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Kupovina Iznos je obavezno
 DocType: Lead,Address Desc,Adresa silazno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je obavezno
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
-DocType: Grading Structure,Grade Intervals,Grade Intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Odaberite priroda vašeg poslovanja.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Gdje se obavljaju proizvodne operacije.
 DocType: Asset Movement,Source Warehouse,Izvorno skladište
@@ -3113,6 +3114,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupu korisnika&gt; Territory
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Molimo podesite default {0} u kompaniji {1}
 DocType: Cheque Print Template,Starting position from top edge,Početne pozicije od gornje ivice
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Istog dobavljača je ušao više puta
@@ -3164,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Ponovno red Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Trenutni Otvori Posao
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
-DocType: Journal Entry,Write Off,Otpisati
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
 DocType: Timesheet Detail,Operation ID,Operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ID korisnika sustava. Ako je postavljen, postat će zadani za sve HR oblike."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} Od
@@ -3175,8 +3177,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja kupaca
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# obrazac / Stavka / {0}) je out of stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od Datum knjiženja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Pokaži porez break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Podataka uvoz i izvoz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","unosa Stock postoje protiv Skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No studenti Found
@@ -3188,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Molimo odaberite Citati
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Molimo odaberite Citati
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,No Studenti u
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodaj više stavki ili otvoreni punu formu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
@@ -3240,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prije nego pomirenje
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično Naplaćeno
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti osnovna sredstva stavka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti osnovna sredstva stavka
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Molimo vas da ponovno tipa naziv firme za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupno Outstanding Amt
@@ -3264,7 +3267,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,stažista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adresa ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adresa ime
 DocType: Stock Entry,From BOM,Iz BOM
 DocType: Assessment Code,Assessment Code,procjena Kod
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Osnovni
@@ -3289,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,print Jezik
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Stock Entry,Including items for sub assemblies,Uključujući i stavke za pod sklopova
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Unesite vrijednost mora biti pozitivan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Unesite vrijednost mora biti pozitivan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Artikli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je već upisana.
@@ -3308,16 +3311,14 @@
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
 DocType: Assessment Plan,Supervisor Name,Supervizor ime
 DocType: Program Enrollment Course,Program Enrollment Course,Program Upis predmeta
-DocType: Grading Structure,Grading Structure,Pravilo Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ovaj proizvod varijanta {0} (Template). Atributi će se kopirati preko iz predloška, osim 'Ne Copy ""je postavljena"
 DocType: Notification Control,Customize the Notification,Prilagodite Obavijest
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Novčani tok iz poslovanja
 DocType: Sales Invoice,Shipping Rule,Pravilo transporta
@@ -3340,6 +3341,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije zatvaranja datum
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo vas da postavljanje broji serija za prisustvo na Setup&gt; numeracije serije
 DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
 DocType: Department,Days for which Holidays are blocked for this department.,Dani za koje su praznici blokirani za ovaj odjel.
@@ -3367,7 +3369,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Quality Inspection,Item Serial No,Serijski broj artikla
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Kreiranje zaposlenih Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Kreiranje zaposlenih Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Ukupno Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,knjigovodstvene isprave
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Sat
@@ -3382,7 +3384,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Primljeni Iznos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da postavljanje zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Napravite za punu količinu, već ignoriranje količina po narudžbi"
 DocType: Account,Tax,Porez
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neobilježen
@@ -3393,7 +3394,7 @@
 DocType: C-Form,Invoices,Fakture
 DocType: Batch,Source Document Name,Izvor Document Name
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,kreiranje korisnika
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,kreiranje korisnika
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Posjetite izvješće za održavanje razgovora.
@@ -3404,8 +3405,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Web stranica Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,priznanica
 ,Sales Register,Prodaja Registracija
@@ -3416,16 +3417,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
 DocType: Customer Group,Customer Group Name,Naziv vrste djelatnosti Kupca
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ne Kupci još!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanim tokovima
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Atributi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Datum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
 DocType: Student,Guardian Details,Guardian Detalji
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Prisustvo za više zaposlenih
@@ -3450,14 +3453,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;osnovna sredstva&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,financijske usluge
 DocType: Student Sibling,Student ID,student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Trupci
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
 DocType: Training Event,Exam,ispit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,State billing
@@ -3490,7 +3493,7 @@
 DocType: Payment Entry,Account Paid From,Računa isplaćuju iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Make Olovo
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Make Olovo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print i pribora
 DocType: Stock Settings,Show Barcode Field,Pokaži Barcode Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Pošalji dobavljač Email
@@ -3505,6 +3508,7 @@
 DocType: Offer Letter,Awaiting Response,Čeka se odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Iznad
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Navesti ukoliko nestandardnog plaća račun
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
@@ -3538,7 +3542,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get Studenti iz
 DocType: Hub Settings,Seller Country,Prodavač Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite Artikli na sajtu
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa svojim učenicima u serijama
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa svojim učenicima u serijama
 DocType: Authorization Rule,Authorization Rule,Autorizacija Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,tehnički podaci
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Povratak / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Povratak / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: Production Order Item,Transferred Qty,prebačen Kol
@@ -3638,6 +3642,7 @@
 ,Sales Funnel,Tok prodaje (Funnel)
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skraćenica je obavezno
 DocType: Project,Task Progress,zadatak Napredak
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kolica
 ,Qty to Transfer,Količina za prijenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
@@ -3670,7 +3675,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u nizu {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,naplatu naknada
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravila za dodavanjem troškove prijevoza .
 DocType: Item,Opening Stock,otvaranje Stock
@@ -3689,7 +3694,7 @@
 DocType: Customer,From Lead,Od Lead-a
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
 DocType: Hub Settings,Name Token,Ime Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
@@ -3700,7 +3705,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Naziv projekta
-DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
+DocType: Customer,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Production Order,Required Items,potrebna Predmeti
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
@@ -3730,6 +3735,7 @@
 DocType: Item,Taxes,Porezi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Platio i nije dostavila
 DocType: Project,Default Cost Center,Standard Cost Center
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Postavljanje&gt; Postavke&gt; Imenovanje serije
 DocType: Bank Guarantee,End Date,Datum završetka
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transakcije
 DocType: Budget,Budget Accounts,računa budžeta
@@ -3794,7 +3800,7 @@
 DocType: Customer,Sales Partner and Commission,Prodajnog partnera i Komisije
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatnu stopu (%) / godina
 ,Project Quantity,projekt Količina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke je nula, možda biste trebali promijeniti &#39;Rasporedite Optužbe na osnovu&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke je nula, možda biste trebali promijeniti &#39;Rasporedite Optužbe na osnovu&#39;"
 DocType: Opportunity,To Discuss,Za diskusiju
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinicama {1} potrebno {2} za završetak ove transakcije.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatnu stopu (%) Godišnji
@@ -3817,7 +3823,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnicu # {1} treba da bude jednaka odabrane valute {2}
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,naknada Komponenta
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
@@ -3834,7 +3840,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Skladište {0} ne postoji
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracije ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni Distribucija Procenat
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","stopa vrednovanja nije pronađen za Stavka {0}, koja je potrebna da uradi unosa računovodstvo za {1} {2}. Ako je stavka transakcijama kao uzorak stavka u {1}, molimo Vas da spomenuti da je u {1} Stavka stola. U suprotnom, molim te stvoriti dolazni zaliha transakcija za stopa vrednovanja stavku ili spominje u Stavka zapisnik, a zatim pokušajte podnošenja i popunjavanja / otkazivanje ovaj unos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materijala dostavljenih protiv ove otpremnici
 DocType: Project,Customer Details,Korisnički podaci
@@ -3851,7 +3857,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,upravljanja kvalitetom
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Stavka {0} je onemogućena
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućena
 DocType: Employee Loan,Repay Fixed Amount per Period,Otplatiti fiksni iznos po periodu
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Istorija rada zaposlenog izvan preduzeća
@@ -3877,7 +3883,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student-mail ID
 DocType: Employee,Notice (days),Obavijest (dani )
 DocType: Tax Rule,Sales Tax Template,Porez na promet Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Odaberite stavke za spremanje fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Odaberite stavke za spremanje fakture
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Podešavanje
@@ -3910,6 +3916,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Napomena Zadani
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} imovine ne može se prenositi
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ovaj artikal je varijanta {0} (Template).
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 DocType: Announcement,Announcement,objava
@@ -3925,7 +3932,7 @@
 DocType: Account,Receivable,potraživanja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Odaberi stavke za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Odaberi stavke za proizvodnju
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
 DocType: Item,Material Issue,Materijal Issue
 DocType: Hub Settings,Seller Description,Prodavač Opis
@@ -3938,7 +3945,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Salary Detail,Component,sastavni
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji procjene Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje Ispravka vrijednosti mora biti manji od jednak {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje Ispravka vrijednosti mora biti manji od jednak {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
@@ -3972,7 +3979,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pristupiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Employee Loan,Repay from Salary,Otplatiti iz Plata
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Tražeći isplatu protiv {0} {1} za iznos {2}
@@ -3990,7 +3997,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Procjena Rezultat Detail
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenog
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplikat stavka grupa naći u tabeli stavka grupa
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3999,7 +4006,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Skladište {0} nije vezan za bilo koji račun, kreirajte / link odgovarajući (Asset) račun za skladište."
 DocType: Purchase Invoice,Recurring Id,Ponavljajući Id
 DocType: Customer,Sales Team Details,Prodaja Team Detalji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Obrisati trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Obrisati trajno?
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4010,13 +4017,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Podešavanje vaše škole u ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Promijeni Iznos (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni Skraćenica
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Max rabat (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Last Order Iznos
+DocType: Task,Is Milestone,je Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail poslat
 DocType: Budget,Warn,Upozoriti
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji."
@@ -4049,11 +4057,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`blokiraj zalihe starije od podrazumijevanog manje od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Porez na promet Template
 ,Project wise Stock Tracking,Supervizor pracenje zaliha
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Stvarna kol (na izvoru/cilju)
 DocType: Item Customer Detail,Ref Code,Ref. Šifra
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaposlenih evidencija.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
 DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Place Order
@@ -4076,7 +4083,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekovi i depoziti pogrešno spašava
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
 DocType: Purchase Invoice Item,Price List Rate,Cjenik Stopa
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Napravi citati kupac
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Napravi citati kupac
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Show &quot;na lageru&quot; ili &quot;Nije u skladištu&quot; temelji se na skladištu dostupna u tom skladištu.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Sastavnice (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme koje je dobavljač isporuči
@@ -4098,7 +4105,7 @@
 DocType: Asset,Disposal Date,odlaganje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E će biti poslana svim aktivnih radnika kompanije u datom sat, ako nemaju odmor. Sažetak odgovora će biti poslan u ponoć."
 DocType: Employee Leave Approver,Employee Leave Approver,Osoba koja odobrava izlaske zaposlenima
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
@@ -4106,7 +4113,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurs je obavezno u redu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Uredi cijene
 DocType: Batch,Parent Batch,roditelja Batch
 DocType: Cheque Print Template,Cheque Print Template,Ček Ispis Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
@@ -4150,7 +4157,7 @@
 DocType: Item,Variant Based On,Varijanta na osnovu
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši dobavljači
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač dio br
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada kategorija je za &#39;Vrednovanje&#39; ili &#39;Vaulation i Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Dobili od
@@ -4160,7 +4167,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} {1} za
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set dobavljač za stavku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Red {0}: Radno vrijednost mora biti veća od nule.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
@@ -4169,20 +4176,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Payment Reconciliation,From Invoice Date,Iz Datum računa
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Billing valuti mora biti jednak ili default comapany valuta ili stranka račun valuti
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Billing valuti mora biti jednak ili default comapany valuta ili stranka račun valuti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Ostavite unovčenja
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Što učiniti ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladište
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Svi Student Prijemni
 ,Average Commission Rate,Prosječna stopa komisija
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
 DocType: School House,House Name,nazivu
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Update dodatne troškove za izračun troškova spustio stavki
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Električna
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak organizacije kao korisnika. Također možete dodati pozvati kupce da vaš portal dodavanjem iz kontakata
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak organizacije kao korisnika. Također možete dodati pozvati kupce da vaš portal dodavanjem iz kontakata
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
@@ -4191,7 +4198,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum osiguranje Početak bi trebao biti manji od datuma osiguranje Kraj
@@ -4206,7 +4213,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Plaća listić od zaposlenika {0} već kreirali za vrijeme stanja {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
@@ -4219,7 +4226,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Uobičajeno sastavnice za {0} nije pronađen
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Dodirnite stavke da biste ih dodali ovdje
 DocType: Fees,Program Enrollment,Upis program
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
@@ -4317,7 +4325,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvi put odgovorio dana
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Oglas tačke u više grupa
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Razmak Datum ažurira
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4325,6 +4332,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Preuzmi PDF
 DocType: Production Order,Planned End Date,Planirani Završni datum
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Gdje predmeti su pohranjeni.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; dobavljač Tip
 DocType: Request for Quotation,Supplier Detail,dobavljač Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Fakturisanog
@@ -4369,7 +4377,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup jednostavan website za moju organizaciju
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Account plaćaju
 DocType: Delivery Note Item,Against Sales Order Item,Protiv naloga prodaje Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Unesite roditelj troška
@@ -4426,7 +4434,7 @@
 ,Items To Be Requested,Potraživani artikli
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o preduzeću
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Odaberite ili dodati novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Odaberite ili dodati novi kupac
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Troška je potrebno rezervirati trošak tvrdnju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo ovog zaposlenih
@@ -4439,13 +4447,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Kupovina Iznos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Kraja godine ne može biti prije početka godine
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Kraja godine ne može biti prije početka godine
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Production Order,Manufactured Qty,Proizvedeno Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite default odmor Lista za zaposlenog {0} ili kompanije {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne postoji
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ne postoji
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
@@ -4454,15 +4462,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Čvor
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Employee Loan Application,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Guardian,Guardian,staratelj
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificirani
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcionalno. Postavlja kompanije Zadana valuta, ako nije navedeno."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Računovodstvene stavke
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
@@ -4499,7 +4509,7 @@
 DocType: Hub Settings,Hub Settings,Hub Settings
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
 DocType: Asset,Is Existing Asset,Je Postojeći imovine
 DocType: Salary Detail,Statistical Component,statistička komponenta
 ,Monthly Salary Register,Mjesečna plaća Registracija
@@ -4553,7 +4563,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Priložiti logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Nivoi
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Plaćanje Tip mora biti jedan od Primi, Pay i unutrašnje Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitika
@@ -4566,6 +4576,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite Production o praznicima
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitala
+DocType: Shopping Cart Settings,Show Public Attachments,Pokaži Javna Prilozi
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway računa
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka uplate preusmjeriti korisnika na odabrani stranicu.
@@ -4590,7 +4601,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol poput $ iza valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
@@ -4609,7 +4620,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo vas da postavljanje broji serija za prisustvo na Setup&gt; numeracije serije
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i druge publikacije.
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index ee779d1..effeea4 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Lots article Estat de caducitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Lletra bancària
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostra variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra variants
 DocType: Academic Term,Academic Term,període acadèmic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantitat
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard en el pagament (dies)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,despesa servei
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Any fiscal {0} és necessari
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitat
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company s&#39;introdueix més d&#39;una vegada
 DocType: Employee,Married,Casat
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No està permès per {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},No està permès per {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obtenir articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració Empleat Sistema de noms de Recursos Humans&gt; Configuració de recursos humans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producte {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hi ha elements que s&#39;enumeren
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 DocType: Process Payroll,Make Bank Entry,Feu entrada del banc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribució mensual ajuda a distribuir el pressupost / Target a través de mesos si té l&#39;estacionalitat del seu negoci.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,No articles trobats
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,No articles trobats
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta Estructura salarial
 DocType: Lead,Person Name,Nom de la Persona
 DocType: Sales Invoice Item,Sales Invoice Item,Factura Sales Item
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","per exemple, &quot;escola primària&quot; o &quot;Universitat&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Informes d&#39;arxiu
 DocType: Warehouse,Warehouse Detail,Detall Magatzem
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La data final de durada no pot ser posterior a la data de cap d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
 DocType: Vehicle Service,Brake Oil,oli dels frens
 DocType: Tax Rule,Tax Type,Tipus d&#39;Impostos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
 DocType: BOM,Item Image (if not slideshow),Imatge de l'article (si no hi ha presentació de diapositives)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Hi ha un client amb el mateix nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Temps real de l&#39;Operació
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Seleccioneu la llista de materials
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Seleccioneu la llista de materials
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost dels articles lliurats
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El dia de festa en {0} no és entre De la data i Fins a la data
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,grau
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salari Anual
 DocType: Daily Work Summary,Daily Work Summary,Resum diari de Treball
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} està congelat
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} està congelat
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Despeses d'estoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecciona una destinació de dipòsit
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Entrada Contra
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vols actualitzar l'assistència? <br> Present: {0} \ <br> Absents: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Materials Subministrament primeres per a la Compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,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.
 DocType: Products Settings,Show Products as a List,Mostrar els productes en forma de llista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descarregueu la plantilla, omplir les dades adequades i adjuntar l'arxiu modificat.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Fer l&#39;entrada de Depreciació
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipus de sol·licitud
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,fer Empleat
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,fer Empleat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifusió
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Execució
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Els detalls de les operacions realitzades.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Pla de visites de manteniment.
 DocType: SMS Settings,Enter url parameter for message,Introdueixi paràmetre url per al missatge
 DocType: POS Profile,Customer Groups,Grups de clients
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Estats financers
 DocType: Guardian,Students,els estudiants
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regles per a l'aplicació de preus i descomptes.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Llista de preus ha de ser aplicable per comprar o vendre
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Company,Default Payroll Payable Account,La nòmina per defecte del compte per pagar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Grup alerta per correu electrònic
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Grup alerta per correu electrònic
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Esmenteu si compta per cobrar no estàndard aplicable
 DocType: Course Schedule,Instructor Name,nom instructor
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
 ,Production Orders in Progress,Ordres de producció en Construcció
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectiu net de Finançament
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
 DocType: Lead,Address & Contact,Direcció i Contacte
 DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Càlcul del cost total Monto (a través de fulla d&#39;hores)
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,entrades bancàries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,L'article {0} està cancel·lat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Nota de lliurament
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost d&#39;actiu venut
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
-DocType: Grade Interval,Min Score,puntuació min
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Student Applicant,Admitted,acceptat
 DocType: Workstation,Rent Cost,Cost de lloguer
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valor de l&#39;ordre
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Operacions bancàries / efectiu contra la part que pertanyin a
 DocType: Shipping Rule,Valid for Countries,Vàlid per als Països
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la comanda Considerat
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Si us plau, introdueixi 'Repetiu el Dia del Mes' valor del camp"
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat a empleat {1} per al període {2} a {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Seleccioneu Producte
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lots (lot) d'un element.
 DocType: C-Form Invoice Detail,Invoice Date,Data de la factura
 DocType: GL Entry,Debit Amount,Suma Dèbit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grups d&#39;estudiants
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,Sol · licitud de pressupost
 DocType: Salary Slip Timesheet,Working Hours,Hores de Treball
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Crear un nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Crear un nou client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si hi ha diverses regles de preus vàlides, es demanarà als usuaris que estableixin la prioritat manualment per resoldre el conflicte."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Crear ordres de compra
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Crear ordres de compra
 ,Purchase Register,Compra de Registre
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Càrrecs aplicables
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre de vacances.
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Del paquet número
 DocType: Item Attribute,To Range,Per Abast
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No es pot canviar el mètode de valoració, ja que hi ha transaccions en contra d&#39;alguns articles que no tenen el seu propi mètode de valoració"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Job Opening,Description of a Job Opening,Descripció d'una oferta de treball
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activitats pendents per avui
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,comprar
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Si us plau, defineixi el grau de Llindar 0%"
 DocType: Sales Order,To Deliver,Per Lliurar
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Subcontractació Gestió
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 DocType: Production Plan Item,Pending Qty,Pendent Quantitat
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} no està actiu
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} no està actiu
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS enviat als telèfons: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensions de verificació de configuració per a la impressió
 DocType: Salary Slip,Salary Slip Timesheet,Part d&#39;hores de salari de lliscament
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Total Comissió
 DocType: Pricing Rule,Sales Partner,Soci de vendes
 DocType: Buying Settings,Purchase Receipt Required,Es requereix rebut de compra
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No es troben en la taula de registres de factures
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Els valors acumulats
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Fes la teva comanda de vendes
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Fes la teva comanda de vendes
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Adjunt currículum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
 DocType: Leave Control Panel,Allocate,Assignar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Devolucions de vendes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Els fulls totals assignats {0} no ha de ser inferior a les fulles ja aprovats {1} per al període
 DocType: Announcement,Posted By,Publicat per
 DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Si us plau ajust la Companyia
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venda de parts d&#39;hores
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar el compte de pagament per fer l&#39;entrada del Banc
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Crear registres dels empleats per gestionar les fulles, les reclamacions de despeses i nòmina"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Crear registres dels empleats per gestionar les fulles, les reclamacions de despeses i nòmina"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Afegir a la Base de Coneixement
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Redacció de propostes
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pagament Deducció d&#39;entrada
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relació amb Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gerent
 DocType: Payment Entry,Payment From / To,El pagament de / a
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Rang de dates
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
 DocType: SMS Settings,Receiver Parameter,Paràmetre de Receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basat En' i 'Agrupar Per' no pot ser el mateix
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Resolució Data
 DocType: Student Batch Name,Batch Name,Nom del lot
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Part d&#39;hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,inscriure
 DocType: Selling Settings,Customer Naming By,Customer Naming By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mostrarà a l&#39;estudiant com Estudiant Present en informes mensuals d&#39;assistència
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Assistència de l&#39;estudiant
 DocType: Sales Invoice Timesheet,Time Sheet,Horari
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush matèries primeres Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Entra els detalls de l'article
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Entra els detalls de l'article
 DocType: Interest,Interest,interès
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,abans de la compra
 DocType: Purchase Receipt,Other Details,Altres detalls
@@ -727,7 +730,7 @@
 ,Absent Student Report,Informe de l&#39;alumne absent
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Offer Letter Term,Offer Letter Term,Present Carta Termini
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,L&#39;article té variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} no trobat
 DocType: Bin,Stock Value,Estoc Valor
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Companyia {0} no existeix
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,Data final de garantia
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i Magatzem
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si us plau ajust de denominació de la sèrie de {0} a través d&#39;Configuració&gt; Configuració&gt; Sèrie Naming
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleccioneu Programa
 DocType: Project,Estimated Cost,cost estimat
 DocType: Purchase Order,Link to material requests,Enllaç a les sol·licituds de materials
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} no és un article d'estoc
 DocType: Mode of Payment Account,Default Account,Compte predeterminat
 DocType: Payment Entry,Received Amount (Company Currency),Quantitat rebuda (Companyia de divises)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Si us plau seleccioni el dia lliure setmanal
 DocType: Production Order Operation,Planned End Time,Planificació de Temps Final
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Variance Item Group-Wise
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Request for Quotation Supplier,Send Email,Enviar per correu electrònic
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,No permission
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No s'ha trobat cap empeat
 DocType: Supplier Quotation,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
 DocType: SMS Center,All Customer Contact,Contacte tot client
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Puja saldo d'existències a través csv.
 DocType: Warehouse,Tree Details,Detalls de l&#39;arbre
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volum mínim Factura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Centre de cost {2} no pertany a l&#39;empresa {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Compte {2} no pot ser un grup
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Element Fila {} idx: {} {DOCTYPE docname} no existeix en l&#39;anterior &#39;{} tipus de document&#39; taula
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Element Fila {} idx: {} {DOCTYPE docname} no existeix en l&#39;anterior &#39;{} tipus de document&#39; taula
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hi ha tasques
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El dia del mes en què es generarà factura acte per exemple 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,L&#39;obertura de la depreciació acumulada
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Seleccionar elements
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} contra Factura {1} {2} de data
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Horari del curs
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horari del curs
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: HR Settings,Enter retirement age in years,Introdueixi l&#39;edat de jubilació en anys
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Magatzem destí
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 DocType: Stock Entry,STE-,Stephen
 DocType: Upload Attendance,Import Attendance,Importa Assistència
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tots els grups d'articles
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tots els grups d'articles
 DocType: Process Payroll,Activity Log,Registre d'activitat
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Guany/Pèrdua neta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ordre de compra de Pagament
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Obertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Obert a fer
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Quantitat
 DocType: Leave Block List Date,Leave Block List Date,Deixa Llista de bloqueig Data
 DocType: Pricing Rule,Price or Discount,Preu o Descompte
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total d&#39;comissions aplicables en la compra Taula de rebuts Els articles han de ser iguals que les taxes totals i càrrecs
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total d&#39;comissions aplicables en la compra Taula de rebuts Els articles han de ser iguals que les taxes totals i càrrecs
 DocType: Sales Team,Incentives,Incentius
 DocType: SMS Log,Requested Numbers,Números sol·licitats
 DocType: Production Planning Tool,Only Obtain Raw Materials,Només obtenció de matèries primeres
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Defecte del compte bancari / efectiu s&#39;actualitzarà automàticament en el Salari entrada de diari quan es selecciona aquesta manera.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Els intervals de Codi Grau {0} es superposa amb els intervals de grau per als altres graus. Gràcies per confirmar intervals {0} i {1} i torneu a provar
 DocType: BOM,Raw Material Cost(Company Currency),Prima Cost de Materials (Companyia de divises)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Fila # {0}: taxa no pot ser més gran que la taxa utilitzada en {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM lloc web d&#39;articles
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
 DocType: Timesheet Detail,Bill,projecte de llei
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,La depreciació propera data s&#39;introdueix com a data passada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La depreciació propera data s&#39;introdueix com a data passada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Blanc
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Quantitat no està disponible per {4} al magatzem {1} a publicar moment de l&#39;entrada ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
 DocType: Lead,Next Contact Date,Data del següent contacte
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantitat d'obertura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
 DocType: Student Batch Name,Student Batch Name,Lot Nom de l&#39;estudiant
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del Préstec Monto
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Si us plau especificar un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} no pot ser negatiu
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Descompte
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Descompte
 DocType: Asset,Total Number of Depreciations,Nombre total d&#39;amortitzacions
 DocType: Sales Invoice Item,Rate With Margin,Amb la taxa de marge
 DocType: Workstation,Wages,Salari
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,Nom de l'organització
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 ,Projected Quantity as Source,Quantitat projectada com Font
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Incloure elements no estan en estoc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Despeses de venda
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Codi ZIP
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Codi ZIP
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
 DocType: Opportunity,Contact Info,Informació de Contacte
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Fer comentaris Imatges
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 DocType: Global Defaults,Global Defaults,Valors per defecte globals
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Si us plau, introdueixi el codi d&#39;article per obtenir el nombre de lot"
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
 DocType: Employee Loan,Partially Disbursed,parcialment Desemborsament
-DocType: Grading Structure,Grading System Name,Nom del sistema de classificació
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de dades de proveïdors.
 DocType: Account,Balance Sheet,Balanç
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,La seva persona de vendes es posarà un avís en aquesta data per posar-se en contacte amb el client
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mateix article no es pot introduir diverses vegades.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Si us plau, especifiqui almenys un atribut a la taula d&#39;atributs"
 DocType: Announcement,All Students,tots els alumnes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Veure Ledger
 DocType: Grading Scale,Intervals,intervals
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Nº d&#39;Estudiants mòbil
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Les ordres de compra li ajudarà a planificar i donar seguiment a les seves compres
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Les ordres de compra li ajudarà a planificar i donar seguiment a les seves compres
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantitat total d&#39;emissió / Transferència {0} en la Sol·licitud de material {1} \ no pot ser major que la quantitat sol·licitada {2} per a l&#39;article {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Petit
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronització de dades mestres
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Nombre Rotllo Grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,Entrada de diari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} articles en procés
 DocType: Workstation,Workstation Name,Nom de l'Estació de treball
-DocType: Grade Interval,Grade Code,codi grau
+DocType: Grading Scale Interval,Grade Code,codi grau
 DocType: POS Item Group,POS Item Group,POS Grup d&#39;articles
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Resum:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Maquinari
 DocType: Sales Order,Recurring Upto,Fins que es repeteix
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Seleccioneu una Empresa
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Seleccioneu una Empresa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Menjar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rang 3 Envelliment
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Marc Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Marc Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Programa de manteniment {0} existeix en contra de {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,estudiant que s&#39;inscriu
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa del compte de clausura ha de ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de punts per a totes les metes ha de ser 100. És {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Pla General de Comptabilitat
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Detail,Depends on Leave Without Pay,Depèn de la llicència sense sou
 DocType: Pricing Rule,"Higher the number, higher the priority","Més gran sigui el nombre, més gran és la prioritat"
 ,Purchase Invoice Trends,Tendències de les Factures de Compra
 DocType: Employee,Better Prospects,Millors perspectives
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lot {1} té solament {2} Quant. Si us plau seleccioni un altre lot que té {3} Cant disponible o dividir la fila en diverses files, per lliurar / tema des de diversos lots"
 DocType: Vehicle,License Plate,Matrícula
 DocType: Appraisal,Goals,Objectius
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estat de l'AMC
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, només es permeten entrades alguns usuaris."
 DocType: Email Digest,Bank Balance,Balanç de Banc
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil del lloc, formació necessària, etc."
 DocType: Journal Entry Account,Account Balance,Saldo del compte
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regla fiscal per a les transaccions.
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostra P &amp; L saldos sense tancar l&#39;exercici fiscal
 DocType: Shipping Rule,Shipping Account,Compte d'Enviaments
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Compte {2} està inactiu
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Fan comandes de client per ajudar-lo a planificar el seu treball i lliurament del temps de funcionament
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Fan comandes de client per ajudar-lo a planificar el seu treball i lliurament del temps de funcionament
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total de despeses addicionals
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Asset Movement,Stock Manager,Gerent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Llista de presència
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Llista de presència
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,Font
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra tancada
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No hi ha registres a la taula de Pagaments
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Aquest {0} conflictes amb {1} de {2} {3}
 DocType: Student Attendance Tool,Students HTML,Els estudiants HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,Data de baixa
 DocType: Pricing Rule,For Price List,Per Preu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,crear Vendes
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,crear Vendes
 DocType: Maintenance Schedule,Schedules,Horaris
 DocType: Purchase Invoice Item,Net Amount,Import Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Les inscripcions del programa
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Caixa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,possible Proveïdor
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,L'Organització
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM per defecte per {0} no trobat per a Projecte {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Les reclamacions per compte de l'empresa.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Els estudiants estan en el cor del sistema, se sumen tots els seus estudiants"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Els estudiants estan en el cor del sistema, se sumen tots els seus estudiants"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: data de liquidació {1} no pot ser anterior Xec Data {2}
 DocType: Company,Default Holiday List,Per defecte Llista de vacances
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del temps i Temps de {1} es solapen amb {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Torneu a enviar el pagament per correu electrònic
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,nova tasca
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Fer Cita
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Fer Cita
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,altres informes
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Si us plau, estableix nòmina compte per pagar per defecte en l&#39;empresa {0}"
 DocType: SMS Center,Receiver List,Llista de receptors
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,cerca article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,cerca article
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Canvi Net en Efectiu
 DocType: Assessment Plan,Grading Scale,Escala de Qualificació
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ja acabat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,recollir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No es pot eliminar l&#39;any fiscal {0}. Any fiscal {0} s&#39;estableix per defecte en la configuració global
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
 ,Customer Credit Balance,Saldo de crèdit al Client
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,Estudiar en el mateix Institut
 DocType: Territory,Territory Manager,Gerent de Territory
 DocType: Packed Item,To Warehouse (Optional),Per magatzems (Opcional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup Element&gt; Marca
 DocType: Payment Entry,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,veure Cistella
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Sol·licitud de material utilitzat per fer aquesta entrada Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,La depreciació propera data és obligatori per als nous actius
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciació propera data és obligatori per als nous actius
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grup basat curs separat per a cada lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unitat individual d'un article
 DocType: Fee Category,Fee Category,Fee Categoria
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PD-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: es requereix de centres de cost de &#39;pèrdues i guanys&#39; compte {2}. Si us plau, establir un centre de cost per defecte per a la Companyia."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nou contacte
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliació JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 DocType: Purchase Invoice Item,Batch No,Lot número
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},No es pot trobar el tipus de canvi per a {0} a {1} per a la data clau {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d&#39;un client Ordre de Compra
 DocType: Student Group Instructor,Student Group Instructor,Instructor grup d&#39;alumnes
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Sense Guardian2 mòbil
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Inici
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Inici
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Email Digest,Annual Expenses,Les despeses anuals
 DocType: Item,Variants,Variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Feu l'Ordre de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto assignat
@@ -1764,7 +1761,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,taxacions
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condició per a una regla d'enviament
-DocType: Grading Structure,Grading Intervals,intervals de qualificació
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Si us plau, entra"
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","No es pot cobrar massa a Punt de {0} a la fila {1} més {2}. Per permetre que l&#39;excés de facturació, si us plau, defineixi en la compra d&#39;Ajustaments"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pagament
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestionar les seves comandes
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestionar les seves comandes
 DocType: Production Order Operation,Actual Time and Cost,Temps real i Cost
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Per l'article {1} es poden fer un màxim de {0} sol·licituds de materials destinats a l'ordre de venda {2}
 DocType: Employee,Salutation,Salutació
 DocType: Course,Course Abbreviation,Abreviatura de golf
 DocType: Student Leave Application,Student Leave Application,Aplicació Deixar estudiant
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleat {0} del mig dia del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Total d&#39;hores de treball no han de ser més grans que les hores de treball max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,En
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Articles agrupats en el moment de la venda.
 DocType: Quotation Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associat
 DocType: Asset Movement,Asset Movement,moviment actiu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nou carro
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,nou carro
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 DocType: Vehicle,Wheels,rodes
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desactiva la creació de registres de temps en contra de les ordres de fabricació. Les operacions no seran objecte de seguiment contra l&#39;Ordre de Producció
 DocType: Student,Student Mobile Number,Nombre mòbil Estudiant
 DocType: Item,Has Variants,Té variants
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Identificació del lot és obligatori
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identificació del lot és obligatori
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrent
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestió de Projectes
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,Any Fiscal
 DocType: Vehicle Log,Fuel Price,Preu del combustible
 DocType: Budget,Budget,Pressupost
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Pressupost no es pot assignar en contra {0}, ja que no és un compte d&#39;ingressos o despeses"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 DocType: Student Admission,Application Form Route,Ruta Formulari de Sol·licitud
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
 DocType: Employee,Salary Information,Informació sobre sous
 DocType: Sales Person,Name and Employee ID,Nom i ID d'empleat
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
 DocType: Website Item Group,Website Item Group,Lloc web Grup d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Taxes i impostos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Si us plau, introduïu la data de referència"
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetiu els ingressos dels clients
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Parell
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
 DocType: Asset,Depreciation Schedule,Programació de la depreciació
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Mig dia de la data ha d&#39;estar entre De la data i Fins a la data
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
 DocType: Purchase Order,Delivered,Alliberat
 ,Vehicle Expenses,Les despeses de vehicles
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
+DocType: Serial No,Invoice Details,Detalls de la factura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data en què s'atura la factura recurrent
 DocType: Employee Loan,Loan Amount,Total del préstec
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grup de No-Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
 DocType: Loan Type,Loan Name,Nom del préstec
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,Captació i Fidelització
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magatzem en què es desen les existències dels articles rebutjats
 DocType: Production Order,Skip Material Transfer,Saltar de transferència de material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"No s&#39;ha pogut trobar el tipus de canvi per a {0} a {1} per a la data clau {2}. Si us plau, crear un registre de canvi manual"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,El seu exercici acaba el
 DocType: POS Profile,Price List,Llista de preus
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} és ara l'Any Fiscal.oer defecte Si us plau, actualitzi el seu navegador perquè el canvi tingui efecte."
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Article {0} ja s'ha tornat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Any Fiscal ** representa un exercici financer. Els assentaments comptables i altres transaccions importants es segueixen contra ** Any Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Direcció Plom
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 DocType: Student Admission,Eligibility,Elegibilitat
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Cables ajuden a obtenir negoci, posar tots els seus contactes i més com els seus clients potencials"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Cables ajuden a obtenir negoci, posar tots els seus contactes i més com els seus clients potencials"
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Seleccioneu l'empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixar en blanc si es considera per a tots els departaments
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Process Payroll,Fortnightly,quinzenal
 DocType: Currency Exchange,From Currency,De la divisa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Nen Article no ha de ser un paquet de productes. Si us plau remoure l&#39;article `` {0} i guardar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Afegir parts d&#39;hores
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Afegir parts d&#39;hores
 DocType: Vehicle Service,Service Item,servei d&#39;articles
 DocType: Bank Guarantee,Bank Guarantee,garantia bancària
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Els preus no es mostren si la llista de preus no s&#39;ha establert
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Si us plau, especifiqui un país d&#39;aquesta Regla de la tramesa o del check Enviament mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total entrant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Es requereix dèbit per
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d&#39;activitats realitzades pel seu equip"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Es requereix dèbit per
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d&#39;activitats realitzades pel seu equip"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
 DocType: Offer Letter Term,Offer Term,Oferta Termini
 DocType: Quality Inspection,Quality Manager,Gerent de Qualitat
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,Raó Perdut
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adreça
 DocType: Quality Inspection,Sample Size,Mida de la mostra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Si us plau, introdueixi recepció de documents"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Si us plau, introdueixi recepció de documents"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,S'han facturat tots els articles
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Si us plau, especifica un 'Des del Cas Número' vàlid"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuaris i permisos
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordres de fabricació creades: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Ordres de fabricació creades: {0}
 DocType: Branch,Branch,Branca
 DocType: Guardian,Mobile Number,Número de mòbil
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing and Branding
@@ -2176,7 +2175,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no trobat
 DocType: Scheduling Tool,Student Batch,lot estudiant
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Els teus Clients
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,fer Estudiant
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,fer Estudiant
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
 DocType: Leave Block List Date,Block Date,Bloquejar Data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplicar ara
@@ -2199,8 +2198,9 @@
 DocType: SMS Log,Sent To,Enviat A
 DocType: Payment Request,Make Sales Invoice,Fer Factura Vendes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programaris
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
 DocType: Company,For Reference Only.,Només de referència.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Seleccioneu Lot n
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No vàlida {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Quantitat Anticipada
@@ -2214,7 +2214,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No. No pot ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Botigues
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Botigues
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
 DocType: Item,End of Life,Final de la Vida
@@ -2230,8 +2230,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transferir material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Aquest document està per sobre del límit de {0} {1} per a l&#39;element {4}. Estàs fent una altra {3} contra el mateix {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Seleccioneu el canvi import del compte
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
@@ -2242,7 +2242,7 @@
 DocType: Budget Account,Budget Account,compte pressupostària
 DocType: Quality Inspection,Verified By,Verified Per
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No es pot canviar moneda per defecte de l'empresa, perquè hi ha operacions existents. Les transaccions han de ser cancel·lades a canviar la moneda per defecte."
-DocType: Grade Interval,Grade Description,grau Descripció
+DocType: Grading Scale Interval,Grade Description,grau Descripció
 DocType: Stock Entry,Purchase Receipt No,Número de rebut de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Diners Earnest
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
@@ -2280,7 +2280,7 @@
 DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Compte de Pagament
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Canvi net en els comptes per cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Compensatori
 DocType: Offer Letter,Accepted,Acceptat
@@ -2293,7 +2293,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fòrum d&#39;Usuaris
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
@@ -2307,7 +2307,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,El nom de l&#39;institut per al qual està configurant aquest sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Assentament comptable congelat fins ara, ningú pot fer / modificar entrada excepte paper s'especifica a continuació."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estat del Projecte
 DocType: UOM,Check this to disallow fractions. (for Nos),Habiliteu aquesta opció per no permetre fraccions. (Per números)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
@@ -2330,6 +2330,7 @@
 DocType: Email Digest,How frequently?,Amb quina freqüència?
 DocType: Purchase Receipt,Get Current Stock,Obtenir Stock actual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre de la llista de materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup Element&gt; Marca
 DocType: Student,Joining Date,Data d&#39;incorporació
 ,Employees working on a holiday,Els empleats que treballen en un dia festiu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marc Present
@@ -2430,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,No s'esmenta l'espai de dates
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producció
 DocType: Guardian,Occupation,ocupació
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
 DocType: Sales Invoice,This Document,aquest document
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
@@ -2453,7 +2454,7 @@
 DocType: Notification Control,Sales Order Message,Sol·licitar Sales Missatge
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establir valors predeterminats com a Empresa, vigència actual any fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipus de Pagament
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
 DocType: Process Payroll,Select Employees,Seleccioneu Empleats
 DocType: Opportunity,Potential Sales Deal,Tracte de vendes potencials
 DocType: Payment Entry,Cheque/Reference Date,Xec / Data de referència
@@ -2470,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},POS Perfil Global {0} ja creat per la companyia de {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Reemplaça element / BOM en totes les llistes de materials
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,document de recepció ha de ser presentat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,document de recepció ha de ser presentat
 DocType: Purchase Invoice Item,Received Qty,Quantitat rebuda
 DocType: Stock Entry Detail,Serial No / Batch,Número de sèrie / lot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,"No satisfets, i no lliurats"
@@ -2483,7 +2484,7 @@
 ,To Produce,Per a Produir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,nòmina de sous
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,fer usuari
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,fer usuari
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificació del paquet per al lliurament (per imprimir)
 DocType: Bin,Reserved Quantity,Quantitat reservades
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Si us plau, introdueixi l&#39;adreça de correu electrònic vàlida"
@@ -2495,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,plantilla persones amb discapacitat no ha de ser plantilla per defecte
 DocType: Account,Income Account,Compte d'ingressos
 DocType: Payment Request,Amount in customer's currency,Suma de la moneda del client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Vegeu ""Taxa de materials basats en"" a la Secció Costea"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,anterior
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Els lots dels estudiants ajuden a realitzar un seguiment d&#39;assistència, avaluacions i quotes per als estudiants"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Els lots dels estudiants ajuden a realitzar un seguiment d&#39;assistència, avaluacions i quotes per als estudiants"
 DocType: Payment Entry,Total Allocated Amount,total assignat
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Entrada de diari Accural per a salaris de {0} a {1}
@@ -2522,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
@@ -2532,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Enviarà un correu electrònic sobre l&#39;esdeveniment als empleats amb l&#39;estat &#39;obert&#39;
 DocType: Task,Depends on Tasks,Depèn de Tasques
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrar grup Client arbre.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Els arxius adjunts poden mostrar-se sense habilitar el carret de la compra
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nou nom de centres de cost
 DocType: Leave Control Panel,Leave Control Panel,Deixa Panell de control
@@ -2544,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,Per Dèbit
 DocType: Delivery Note,Required only for sample item.,Només és necessari per l'article de mostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sense nòmina trobat entre {0} i {1}
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissió d&#39;Estudiants
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} està desactivat
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} està desactivat
 DocType: Supplier,Billing Currency,Facturació moneda
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra gran
@@ -2565,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Pàgina d&#39;inici Producte destacat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tots els grups d&#39;avaluació
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Magatzem nou nom
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
@@ -2583,7 +2585,7 @@
 DocType: Price List,Price List Master,Llista de preus Mestre
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Només Deixa aplicacions amb estat &quot;Aprovat&quot; i &quot;Rebutjat&quot; pot ser presentat
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Estudiant Nom del grup és obligatori a la fila {0}
@@ -2675,7 +2677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Vehicle Service,Engine Oil,d&#39;oli del motor
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 DocType: Employee Loan,Loan Details,Detalls de préstec
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Complet Quantitat ha de ser més gran que zero.
@@ -2739,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Complexos de transacció existents no poden ser convertits en grup.
 DocType: Assessment Result Tool,Result HTML,El resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Caduca el
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Afegir estudiants
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Afegir estudiants
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2803,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,límit creuades
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un terme acadèmic amb això &#39;Any Acadèmic&#39; {0} i &#39;Nom terme&#39; {1} ja existeix. Si us plau, modificar aquestes entrades i torneu a intentar."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Com que hi ha transaccions existents contra l&#39;element {0}, no es pot canviar el valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Com que hi ha transaccions existents contra l&#39;element {0}, no es pot canviar el valor de {1}"
 DocType: UOM,Must be Whole Number,Ha de ser nombre enter
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Noves Fulles Assignats (en dies)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,El número de sèrie {0} no existeix
@@ -2846,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,Últim dia del mes
 DocType: Support Settings,Auto close Issue after 7 days,Tancament automàtic d&#39;emissió després de 7 dies
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixi no poden ser distribuïdes abans {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,estudiant sol·licitant
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte de depreciació acumulada
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
@@ -2874,7 +2876,7 @@
 DocType: Asset,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
 DocType: Journal Entry,User Remark,Observació de l'usuari
 DocType: Lead,Market Segment,Sector de mercat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
@@ -2892,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,Crear sol·licituds de materials
 DocType: Employee Education,School/University,Escola / Universitat
 DocType: Payment Request,Reference Details,Detalls Referència
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l&#39;import brut de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l&#39;import brut de compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Disponible Quantitat en magatzem
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Quantitat facturada
 DocType: Asset,Double Declining Balance,Doble saldo decreixent
@@ -2913,19 +2915,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma desemborsat no pot ser més gran que Suma del préstec {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordre de producció no s&#39;ha creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Ordre de producció no s&#39;ha creat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
 DocType: Asset,Fully Depreciated,Estant totalment amortitzats
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Assistència marcat HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Les cites són propostes, les ofertes que ha enviat als seus clients"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Les cites són propostes, les ofertes que ha enviat als seus clients"
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de sèrie i de lot
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma de les puntuacions de criteris d&#39;avaluació ha de ser {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valor o Quantitat
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
@@ -3053,7 +3055,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grup d&#39;Estudiants
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Seleccioneu al client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Seleccioneu al client
 DocType: C-Form,I,jo
 DocType: Company,Asset Depreciation Cost Center,Centre de l&#39;amortització del cost dels actius
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
@@ -3072,19 +3074,18 @@
 DocType: Vehicle,Insurance Details,Detalls d&#39;Assegurances
 DocType: Account,Payable,Pagador
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Si us plau, introdueixi terminis d&#39;amortització"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Deutors ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Deutors ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clients Nous
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Benefici Brut%
 DocType: Appraisal Goal,Weightage (%),Ponderació (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidació
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Compra import brut és obligatori
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Compra import brut és obligatori
 DocType: Lead,Address Desc,Descripció de direcció
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Part és obligatòria
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nom del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Has de marcar compra o venda
-DocType: Grading Structure,Grade Intervals,intervals de grau
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccioneu la naturalesa del seu negoci.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,On es realitzen les operacions de fabricació.
 DocType: Asset Movement,Source Warehouse,Magatzem d'origen
@@ -3113,6 +3114,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Si us plau ajust per defecte {0} a l&#39;empresa {1}
 DocType: Cheque Print Template,Starting position from top edge,posició des de la vora superior de partida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Mateix proveïdor s&#39;ha introduït diverses vegades
@@ -3164,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Quantitat per a generar comanda
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Ofertes d&#39;ocupació actuals
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
-DocType: Journal Entry,Write Off,Cancel
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Cancel
 DocType: Timesheet Detail,Operation ID,Operació ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. If set, it will become default for all HR forms."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Des {1}
@@ -3175,8 +3177,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Form/Item/{0}) està esgotat
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Següent data ha de ser major que la data de publicació
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar impostos ruptura
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Les dades d&#39;importació i exportació
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Hi entrades en existències de magatzem en contra {0}, per tant, no es pot tornar a assignar o modificar"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No s&#39;han trobat estudiants
@@ -3188,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
 DocType: Program Enrollment,School House,Casa de l&#39;escola
 DocType: Serial No,Out of AMC,Fora d'AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Seleccioneu Cites
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Feu Manteniment Visita
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Seleccioneu Cites
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Feu Manteniment Visita
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
 DocType: Company,Default Cash Account,Compte de Tresoreria predeterminat
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Això es basa en la presència d&#39;aquest Estudiant
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,No Estudiants en
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Afegir més elements o forma totalment oberta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
@@ -3240,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos i Càrrecs Afegits (Divisa de la Companyia)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
 DocType: Sales Order,Partly Billed,Parcialment Facturat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Element {0} ha de ser un element d&#39;actiu fix
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} ha de ser un element d&#39;actiu fix
 DocType: Item,Default BOM,BOM predeterminat
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Viu total Amt
@@ -3265,7 +3268,7 @@
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,nom direcció
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,nom direcció
 DocType: Stock Entry,From BOM,A partir de la llista de materials
 DocType: Assessment Code,Assessment Code,codi avaluació
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Bàsic
@@ -3290,7 +3293,7 @@
 DocType: Purchase Invoice,Print Language,Llenguatge d&#39;impressió
 DocType: Salary Slip,Total Working Hours,Temps de treball total
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Introduir el valor ha de ser positiu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Introduir el valor ha de ser positiu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Tots els territoris
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Estudiant ja està inscrit.
@@ -3309,16 +3312,14 @@
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
 DocType: Assessment Plan,Supervisor Name,Nom del supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,I matrícula Programa
-DocType: Grading Structure,Grading Structure,Estructura de classificació
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
 DocType: Tax Rule,Shipping City,Enviaments City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Aquest article és una variant de {0} (plantilla). Els atributs es copiaran de la plantilla llevat que 'No Copy' es fixa
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flux de caixa operatiu
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
@@ -3341,6 +3342,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Seleccioneu Data de comptabilització primer
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data d&#39;obertura ha de ser abans de la data de Tancament
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si us plau configuració sèries de numeració per a l&#39;assistència a través d&#39;Configuració&gt; sèries de numeració
 DocType: Leave Control Panel,Carry Forward,Portar endavant
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centre de costos de les transaccions existents no es pot convertir en llibre major
 DocType: Department,Days for which Holidays are blocked for this department.,Dies de festa que estan bloquejats per aquest departament.
@@ -3368,7 +3370,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Crear registres d&#39;empleats
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Crear registres d&#39;empleats
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Present total
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Les declaracions de comptabilitat
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
@@ -3383,7 +3385,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,La nova llista de materials després del reemplaçament
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punt de Venda
 DocType: Payment Entry,Received Amount,quantitat rebuda
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració Empleat Sistema de noms de Recursos Humans&gt; Configuració de recursos humans
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Crear per la quantitat completa, fent cas omís de la quantitat que ja estan en ordre"
 DocType: Account,Tax,Impost
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,no Marcat
@@ -3394,7 +3395,7 @@
 DocType: C-Form,Invoices,Factures
 DocType: Batch,Source Document Name,Font Nom del document
 DocType: Job Opening,Job Title,Títol Professional
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,crear usuaris
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,crear usuaris
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita informe de presa de manteniment.
@@ -3405,8 +3406,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
 DocType: BOM,Website Description,Descripció del lloc web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Canvi en el Patrimoni Net
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,rebut
 ,Sales Register,Registre de vendes
@@ -3417,16 +3418,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hi ha res a editar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Els clients no hi ha encara!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estat de fluxos d&#39;efectiu
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,llicència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
 DocType: GL Entry,Against Voucher Type,Contra el val tipus
 DocType: Item,Attributes,Atributs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Darrera Data de comanda
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
 DocType: Student,Guardian Details,guardià detalls
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marc d&#39;Assistència per a diversos empleats
@@ -3451,14 +3454,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # El compte ha de ser de tipus &quot;Actiu Fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Quantitat de sortida
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regles per calcular l'import d'enviament per a una venda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Sèries és obligatori
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Sèries és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 DocType: Student Sibling,Student ID,Identificació de l&#39;estudiant
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipus d&#39;activitats per als registres de temps
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
 DocType: Training Event,Exam,examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Estat de facturació
@@ -3491,7 +3494,7 @@
 DocType: Payment Entry,Account Paid From,De compte de pagament
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Matèria Prima Codi de l'article
 DocType: Journal Entry,Write Off Based On,Anotació basada en
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,fer plom
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,fer plom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impressió i papereria
 DocType: Stock Settings,Show Barcode Field,Mostra Camp de codi de barres
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
@@ -3506,6 +3509,7 @@
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Per sobre de
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut no vàlid {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Esmentar si compta per pagar no estàndard
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
@@ -3539,7 +3543,7 @@
 DocType: Program Enrollment Tool,Get Students From,Rep estudiants de
 DocType: Hub Settings,Seller Country,Venedor País
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar articles per pàgina web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Agrupar seus estudiants en lots
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Agrupar seus estudiants en lots
 DocType: Authorization Rule,Authorization Rule,Regla d'Autorització
 DocType: Sales Invoice,Terms and Conditions Details,Termes i Condicions Detalls
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Especificacions
@@ -3598,7 +3602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probation
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,components de sous
 DocType: Program Enrollment Tool,New Academic Year,Nou Any Acadèmic
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retorn / Nota de Crèdit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Retorn / Nota de Crèdit
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Suma total de pagament
 DocType: Production Order Item,Transferred Qty,Quantitat Transferida
@@ -3639,6 +3643,7 @@
 ,Sales Funnel,Sales Funnel
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abreviatura és obligatori
 DocType: Project,Task Progress,Grup de Progrés
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carro
 ,Qty to Transfer,Quantitat a Transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
@@ -3671,7 +3676,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantitat ({0}) no pot ser una fracció a la fila {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,cobrar tarifes
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 DocType: Lead,Add to calendar on this date,Afegir al calendari en aquesta data
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 DocType: Item,Opening Stock,l&#39;obertura de la
@@ -3690,7 +3695,7 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Program Enrollment Tool,Enroll Students,inscriure els estudiants
 DocType: Hub Settings,Name Token,Nom Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3701,7 +3706,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nom del projecte
-DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
+DocType: Customer,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
 DocType: Journal Entry Account,If Income or Expense,Si ingressos o despeses
 DocType: Production Order,Required Items,elements necessaris
 DocType: Stock Ledger Entry,Stock Value Difference,Diferència del valor d'estoc
@@ -3731,6 +3736,7 @@
 DocType: Item,Taxes,Impostos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,A càrrec i no lliurats
 DocType: Project,Default Cost Center,Centre de cost predeterminat
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si us plau ajust de denominació de la sèrie de {0} a través d&#39;Configuració&gt; Configuració&gt; Sèrie Naming
 DocType: Bank Guarantee,End Date,Data de finalització
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Les transaccions de valors
 DocType: Budget,Budget Accounts,comptes Pressupost
@@ -3795,7 +3801,7 @@
 DocType: Customer,Sales Partner and Commission,Soci de vendes i de la Comissió
 DocType: Employee Loan,Rate of Interest (%) / Year,Taxa d&#39;interès (%) / Any
 ,Project Quantity,projecte Quantitat
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar a &quot;Distribuir els càrrecs basats en &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar a &quot;Distribuir els càrrecs basats en &#39;"
 DocType: Opportunity,To Discuss,Per Discutir
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unitats de {1} necessària en {2} per completar aquesta transacció.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa d&#39;interès (%) anual
@@ -3818,7 +3824,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marc Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la llista de materials # {1} ha de ser igual a la moneda seleccionada {2}
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Quota de components
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestió de Flotes
@@ -3835,7 +3841,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,El magatzem {0} no existeix
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrar ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Els percentatges de distribució mensuals
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","taxa de valorització no trobat per a l&#39;element {0}, que es requereix per fer assentaments comptables per {1} {2}. Si l&#39;article està tramitant com un element de la mostra en el {1}, si us plau esmentar que a la taula {1} article. Altrament, si us plau crea una transacció d&#39;accions d&#39;entrada per a la taxa de valorització article o menció en el registre d&#39;articles i, a continuació, tractar d&#39;enviar / cancel·lació d&#39;aquesta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materials lliurats d'aquesta Nota de Lliurament
 DocType: Project,Customer Details,Dades del client
@@ -3852,7 +3858,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,comandes presentats no es poden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestió de la Qualitat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Element {0} ha estat desactivat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} ha estat desactivat
 DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una quantitat fixa per Període
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
@@ -3878,7 +3884,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Estudiant ID de correu electrònic
 DocType: Employee,Notice (days),Avís (dies)
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Seleccioneu articles per estalviar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Seleccioneu articles per estalviar la factura
 DocType: Employee,Encashment Date,Data Cobrament
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajust d'estoc
@@ -3911,6 +3917,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota de dèbit Publicat
 DocType: Production Order,Warehouses,Magatzems
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actiu no es pot transferir
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Aquest article és una variant de {0} (plantilla).
 DocType: Workstation,per hour,per hores
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,adquisitiu
 DocType: Announcement,Announcement,anunci
@@ -3926,7 +3933,7 @@
 DocType: Account,Receivable,Compte per cobrar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Seleccionar articles a Fabricació
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Seleccionar articles a Fabricació
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Venedor Descripció
@@ -3939,7 +3946,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Criteris d&#39;avaluació del Grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},L&#39;obertura de la depreciació acumulada ha de ser inferior a igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},L&#39;obertura de la depreciació acumulada ha de ser inferior a igual a {0}
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Si us plau entra el rol d'aprovació o l'usuari aprovador
@@ -3973,7 +3980,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,unir-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Employee Loan,Repay from Salary,Pagar del seu sou
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Sol·licitant el pagament contra {0} {1} per la quantitat {2}
@@ -3991,7 +3998,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Avaluació de Resultats Detall
 DocType: Employee Education,Employee Education,Formació Empleat
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,grup d&#39;articles duplicat trobat en la taula de grup d&#39;articles
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
@@ -4000,7 +4007,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magatzem {0} no està vinculada a cap compte, si us plau crear / enllaçar el compte corresponent (Actiu) per al magatzem."
 DocType: Purchase Invoice,Recurring Id,Recurrent Aneu
 DocType: Customer,Sales Team Details,Detalls de l'Equip de Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminar de forma permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Eliminar de forma permanent?
 DocType: Expense Claim,Total Claimed Amount,Suma total del Reclamat
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Els possibles oportunitats de venda.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},No vàlida {0}
@@ -4011,13 +4018,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Configuració del seu School a ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantitat de canvi (moneda de l&#39;empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Deseu el document primer.
 DocType: Account,Chargeable,Facturable
 DocType: Company,Change Abbreviation,Canvi Abreviatura
 DocType: Expense Claim Detail,Expense Date,Data de la Despesa
 DocType: Item,Max Discount (%),Descompte màxim (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Darrera Quantitat de l'ordre
+DocType: Task,Is Milestone,és Milestone
 DocType: Daily Work Summary,Email Sent To,Correu electrònic enviat a
 DocType: Budget,Warn,Advertir
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
@@ -4050,11 +4058,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
 DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributària
 ,Project wise Stock Tracking,Projecte savi Stock Seguiment
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Hi Manteniment Programa de {0} contra {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Actual Quantitat (en origen / destinació)
 DocType: Item Customer Detail,Ref Code,Codi de Referència
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registres d'empleats.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
 DocType: HR Settings,Payroll Settings,Ajustaments de Nòmines
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Poseu l&#39;ordre
@@ -4077,7 +4084,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Els xecs i dipòsits esborren de forma incorrecta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
 DocType: Purchase Invoice Item,Price List Rate,Preu de llista Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Crear cites de clients
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Crear cites de clients
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostra ""En estock"" o ""No en estoc"", basat en l'estoc disponible en aquest magatzem."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Llista de materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Temps mitjà pel proveïdor per lliurar
@@ -4099,7 +4106,7 @@
 DocType: Asset,Disposal Date,disposició Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Els correus electrònics seran enviats a tots els empleats actius de l&#39;empresa a l&#39;hora determinada, si no tenen vacances. Resum de les respostes serà enviat a la mitjanit."
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Formació de vots
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
@@ -4107,7 +4114,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Per descomptat és obligatori a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Afegeix / Edita Preus
 DocType: Batch,Parent Batch,lots dels pares
 DocType: Cheque Print Template,Cheque Print Template,Plantilla d&#39;impressió de xecs
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gràfic de centres de cost
@@ -4151,7 +4158,7 @@
 DocType: Item,Variant Based On,En variant basada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Els seus Proveïdors
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
 DocType: Request for Quotation Item,Supplier Part No,Proveïdor de part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Rebut des
@@ -4161,7 +4168,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Des {0} de {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Hores ha de ser més gran que zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
 DocType: Issue,Content Type,Tipus de Contingut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
@@ -4170,20 +4177,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
 DocType: Payment Reconciliation,From Invoice Date,Des Data de la factura
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturació ha de ser igual a la moneda o divisa de compte del partit, ja sigui per defecte de comapany"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturació ha de ser igual a la moneda o divisa de compte del partit, ja sigui per defecte de comapany"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,deixa Cobrament
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Què fa?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Magatzem destí
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tots Admissió d&#39;Estudiants
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: School House,House Name,Nom de la casa
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Actualització dels costos addicionals per al càlcul del preu al desembarcament d'articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elèctric
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Afegir la resta de la seva organització com als seus usuaris. També podeu afegir convidar els clients al seu portal amb l&#39;addició d&#39;ells des Contactes
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Afegir la resta de la seva organització com als seus usuaris. També podeu afegir convidar els clients al seu portal amb l&#39;addició d&#39;ells des Contactes
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID d'usuari no entrat per l'Empleat {0}
@@ -4192,7 +4199,7 @@
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Recordatori d'aniversari per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dies des de l'última comanda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d&#39;inici d&#39;assegurança ha de ser inferior a la data d&#39;Assegurances Fi
@@ -4207,7 +4214,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},La relliscada de sou de l&#39;empleat {0} ja creat per al full de temps {1}
 DocType: Vehicle Log,Odometer,comptaquilòmetres
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM no conté cap article comuna
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
@@ -4220,7 +4227,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
 DocType: Sales Invoice Timesheet,Billing Hours,Hores de facturació
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM per defecte per {0} no trobat
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toc els articles a afegir aquí
 DocType: Fees,Program Enrollment,programa d&#39;Inscripció
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Si us plau, estableix {0}"
@@ -4318,7 +4326,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
 DocType: Issue,First Responded On,Primer respost el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Creu Fitxa d'article en diversos grups
-DocType: Grade Interval,Grade Interval,grau d&#39;interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Any fiscal Data d'Inici i Final de l'exercici fiscal data ja es troben en l'Any Fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidació Data s&#39;actualitza
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split batch
@@ -4326,6 +4333,7 @@
 DocType: Request for Quotation Supplier,Download PDF,descarregar PDF
 DocType: Production Order,Planned End Date,Planejat Data de finalització
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Lloc d'emmagatzematge dels articles.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Request for Quotation,Supplier Detail,Detall del proveïdor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Error en la fórmula o condició: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Quantitat facturada
@@ -4370,7 +4378,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configuració d&#39;un lloc web senzill per a la meva organització
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte de cobrament / pagament
 DocType: Delivery Note Item,Against Sales Order Item,Contra l'Ordre de Venda d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Si us plau, introduïu el centre de cost dels pares"
@@ -4427,7 +4435,7 @@
 ,Items To Be Requested,Articles que s'han de demanar
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Company,Company Info,Qui Som
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Seleccionar o afegir nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Seleccionar o afegir nou client
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Això es basa en la presència d&#39;aquest empleat
@@ -4440,13 +4448,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permetis que els usuaris realitzin Aplicacions d'absències els següents dies.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Import de la compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Cita Proveïdor {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Beneficis als empleats
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Production Order,Manufactured Qty,Quantitat fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existeix
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures enviades als clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
@@ -4455,15 +4463,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Cub
 DocType: GL Entry,Voucher Type,Tipus de Vals
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Employee Loan Application,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
 DocType: Guardian,Guardian,tutor
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} creat per Empleat {1} en l'interval de dates determinat
 DocType: Employee,Education,Educació
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Naming de Campanya Per
 DocType: Employee,Current Address Is,L'adreça actual és
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificat
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Estableix moneda per defecte de l&#39;empresa, si no s&#39;especifica."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
@@ -4500,7 +4510,7 @@
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
 DocType: Asset,Is Existing Asset,És existent d&#39;actius
 DocType: Salary Detail,Statistical Component,component estadística
 ,Monthly Salary Register,Registre de Salari mensual
@@ -4554,7 +4564,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Adjuntar Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Els nivells d&#39;existències
 DocType: Customer,Commission Rate,Percentatge de comissió
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipus de pagament ha de ser un Rebre, Pagar i Transferència interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analítica
@@ -4567,6 +4577,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Permetre Producció en Vacances
 DocType: Sales Order,Customer's Purchase Order Date,Data de l'ordre de compra del client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
+DocType: Shopping Cart Settings,Show Public Attachments,Mostra adjunts Públiques
 DocType: Packing Slip,Package Weight Details,Pes del paquet Detalls
 DocType: Payment Gateway Account,Payment Gateway Account,Compte Passarel·la de Pagament
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Després de la realització del pagament redirigir l&#39;usuari a la pàgina seleccionada.
@@ -4591,7 +4602,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Fer lots Estudiant
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Fer lots Estudiant
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
@@ -4610,7 +4621,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si us plau configuració sèries de numeració per a l&#39;assistència a través d&#39;Configuració&gt; sèries de numeració
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,El compte {0} no existeix
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 93e7d5e..3a3392b 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch položky vypršení platnosti Stav
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Zobrazit Varianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Zobrazit Varianty
 DocType: Academic Term,Academic Term,Akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Množství
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zpoždění s platbou (dny)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskální rok {0} je vyžadována
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Stejný Společnost je zapsána více než jednou
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Není dovoleno {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Není dovoleno {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Položka získaná z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Žádné položky nejsou uvedeny
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 DocType: Process Payroll,Make Bank Entry,Proveďte Bank Vstup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Vedle Odpisy datum nemůže být před zakoupením Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedle Odpisy datum nemůže být před zakoupením Datum
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Měsíční Distribuce ** umožňuje distribuovat Rozpočet / Target celé měsíce, pokud máte sezónnosti ve vaší firmě."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nebyl nalezen položek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nebyl nalezen položek
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plat Struktura Chybějící
 DocType: Lead,Person Name,Osoba Jméno
 DocType: Sales Invoice Item,Sales Invoice Item,Položka prodejní faktury
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",například &quot;Základní škola&quot; nebo &quot;univerzita&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Reports
 DocType: Warehouse,Warehouse Detail,Sklad Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum ukončení nemůže být později než v roce Datum ukončení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemůže být bez povšimnutí, protože existuje Asset záznam proti položce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemůže být bez povšimnutí, protože existuje Asset záznam proti položce"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Daňové Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodinová sazba / 60) * Skutečný čas operace
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Vybrat BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Vybrat BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Dovolená na {0} není mezi Datum od a do dnešního dne
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Školní známka
 DocType: Sales Invoice Item,Delivered By Supplier,Dodává se podle dodavatele
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Výrobní zakázka již vytvořili u všech položek s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Výrobní zakázka již vytvořili u všech položek s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Roční Plat
 DocType: Daily Work Summary,Daily Work Summary,Denní práce Souhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zmrazený
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vyberte existující společnosti pro vytváření účtový rozvrh
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Náklady
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vyberte objekt Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Úvěrové společnosti v měně
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Chcete aktualizovat docházku? <br> Present: {0} \ <br> Chybí: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pro nákup
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,pro POS fakturu je nutná alespoň jeden způsob platby.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,pro POS fakturu je nutná alespoň jeden způsob platby.
 DocType: Products Settings,Show Products as a List,Zobrazit produkty jako seznam
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Udělat Odpisy Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Udělat zaměstnance
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Udělat zaměstnance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plán pro návštěvy údržby.
 DocType: SMS Settings,Enter url parameter for message,Zadejte url parametr zprávy
 DocType: POS Profile,Customer Groups,Skupiny zákazníků
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finanční výkazy
 DocType: Guardian,Students,studenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Company,Default Payroll Payable Account,"Výchozí mzdy, splatnou Account"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aktualizace Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aktualizace Email Group
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmínka v případě nestandardní pohledávky účet použitelná
 DocType: Course Schedule,Instructor Name,instruktor Name
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Čistý peněžní tok z financování
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Přidat nevyužité listy z předchozích přídělů
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulace Částka (přes Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankovní Příspěvky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,Student Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Položka {0} je zrušen
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Více měn
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Náklady prodaných aktiv
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
 DocType: Student Applicant,Admitted,"připustil,"
 DocType: Workstation,Rent Cost,Rent Cost
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Hodnota objednávky
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Banka / Hotovostní operace proti osobě nebo pro interní převod
 DocType: Shipping Rule,Valid for Countries,"Platí pro země,"
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} již přidělené pro zaměstnance {1} na dobu {2} až {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Převést na non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Šarže položky.
 DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
 DocType: GL Entry,Debit Amount,Debetní Částka
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvoření skupiny studentů
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,Žádost o cenovou nabídku
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Vytvořit nový zákazník
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Vytvořit nový zákazník
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Vytvoření objednávek
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Vytvoření objednávek
 ,Purchase Register,Nákup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Od č balíčku
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda oceňování nelze změnit, neboť existují transakce proti některým položkám, které nemají vlastní metodu oceňování"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkem listy přidělené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevyřízené aktivity pro dnešek
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Koupit
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Zadejte prosím stupeň pro Threshold 0%
 DocType: Sales Order,To Deliver,Dodat
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sériové žádná položka nemůže být zlomkem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Sériové žádná položka nemůže být zlomkem
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Správa Subdodávky
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čekající Množství
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} není aktivní
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} není aktivní
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslal do následujících čísel: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Zkontrolujte nastavení rozměry pro tisk
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Ocenění Rate je povinné, pokud zadaná počátečním stavem zásob"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Ocenění Rate je povinné, pokud zadaná počátečním stavem zásob"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Neuhrazená Hodnoty
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Ujistěte se prodejní objednávky
 DocType: Project Task,Project Task,Úkol Project
 ,Lead Id,Id leadu
 DocType: C-Form Invoice Detail,Grand Total,Celkem
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by neměla být menší než které již byly schváleny listy {1} pro období
 DocType: Announcement,Posted By,Přidal
 DocType: Item,Delivered by Supplier (Drop Ship),Dodává Dodavatelem (Drop Ship)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavte společnost
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodejní faktury časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Vybrat Platební účet, aby Bank Entry"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Vytvořit Zaměstnanecké záznamy pro správu listy, prohlášení o výdajích a mezd"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Vytvořit Zaměstnanecké záznamy pro správu listy, prohlášení o výdajích a mezd"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Přidat do Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukce
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Souvislost s Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manažer
 DocType: Payment Entry,Payment From / To,Platba z / do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Časové období
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úvěrový limit je nižší než aktuální dlužné částky za zákazníka. Úvěrový limit musí být aspoň {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úvěrový limit je nižší než aktuální dlužné částky za zákazníka. Úvěrový limit musí být aspoň {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno na"" a ""Seskupeno podle"", nemůže být stejné"
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Rozlišení Datum
 DocType: Student Batch Name,Batch Name,Batch Name
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Časového rozvrhu vytvoření:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Zapsat
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ukáže studenta přítomnému v Student měsíční návštěvnost Zpráva
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Student Účast
 DocType: Sales Invoice Timesheet,Time Sheet,Rozvrh hodin
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Se zpětným suroviny na základě
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Prosím, zadejte podrobnosti položky"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Interest,Interest,Zajímat
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Předprodej
 DocType: Purchase Receipt,Other Details,Další podrobnosti
@@ -727,7 +730,7 @@
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Nabídka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Společnost {0} neexistuje
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,Záruka Datum vypršení platnosti
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Série jmen
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vyberte prosím Program
 DocType: Project,Estimated Cost,Odhadované náklady
 DocType: Purchase Order,Link to material requests,Odkaz na materiálních požadavků
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} není skladová položka
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 DocType: Payment Entry,Received Amount (Company Currency),Přijaté Částka (Company měna)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odeslat email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nemáte oprávnění
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Žádný zaměstnanec nalezeno
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentská skupina je již aktualizována.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentská skupina je již aktualizována.
 DocType: SMS Center,All Customer Contact,Vše Kontakt Zákazník
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
 DocType: Warehouse,Tree Details,Tree Podrobnosti
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimální částka faktury
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: náklady Center {2} nepatří do společnosti {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Účet {2} nemůže být skupina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v předchozím &#39;{typ_dokumentu}&#39; tabulka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v předchozím &#39;{typ_dokumentu}&#39; tabulka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žádné úkoly
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 DocType: Asset,Opening Accumulated Depreciation,Otevření Oprávky
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,rozvrh
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,rozvrh
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadejte věk odchodu do důchodu v letech
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Čistý zisk / ztráta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Objednávka na platební
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Otevření&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otevřená dělat
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkový počet použitelných poplatcích v dokladu o koupi zboží, které tabulky musí být stejná jako celkem daní a poplatků"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkový počet použitelných poplatcích v dokladu o koupi zboží, které tabulky musí být stejná jako celkem daní a poplatků"
 DocType: Sales Team,Incentives,Pobídky
 DocType: SMS Log,Requested Numbers,Požadované Čísla
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vypsat pouze slkadový materiál
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,Komponenty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Výchozí banka / Peněžní účet budou automaticky aktualizovány v plat položka deníku je-li zvolen tento režim.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervaly pro platové třídy zákoníku {0} překrývá s stupeň intervaly pro ostatních tříd. Prosím zkontrolujte intervaly {0} a {1} a zkuste to znovu
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Company měna)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Řádek # {0}: Míra nemůže být větší než rychlost použitá v {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
 DocType: Timesheet Detail,Bill,Účet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Vedle Odpisy Datum se zadává jako uplynulém dni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Vedle Odpisy Datum se zadává jako uplynulém dni
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bílá
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Řádek {0}: Množství není k dispozici pro {4} ve skladu {1} při účtování čas vložení údajů ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
 DocType: Student Batch Name,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Název seznamu dovolené
 DocType: Repayment Schedule,Balance Loan Amount,Balance Výše úvěru
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Zadejte {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Sales Invoice Item,Rate With Margin,Míra s marží
 DocType: Workstation,Wages,Mzdy
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,Název organizace
 DocType: Tax Rule,Shipping State,Přepravní State
 ,Projected Quantity as Source,Množství projekcí as Zdroj
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidána pomocí tlačítka""položka získaná z dodacího listu"""
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidána pomocí tlačítka""položka získaná z dodacího listu"""
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Včetně neskladových položek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodejní náklady
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,PSČ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Prodejní objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Tvorba přírůstků zásob
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Prosím, zadejte kód položky se dostat číslo šarže"
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
 DocType: Employee Loan,Partially Disbursed,částečně Vyplacené
-DocType: Grading Structure,Grading System Name,Jméno systém třídění
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba není nakonfigurován. Prosím zkontrolujte, zda je účet byl nastaven na režim plateb nebo na POS Profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba není nakonfigurován. Prosím zkontrolujte, zda je účet byl nastaven na režim plateb nebo na POS Profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Stejnou položku nelze zadat vícekrát.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Uveďte prosím alespoň jeden atribut v tabulce atributy
 DocType: Announcement,All Students,Všichni studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} musí být non-skladová položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} musí být non-skladová položka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervaly
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Objednávky pomohou při plánování a navázat na vašich nákupech
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Objednávky pomohou při plánování a navázat na vašich nákupech
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emise / přenosu množství {0} v hmotné Request {1} \ nemůže být vyšší než požadované množství {2} pro položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Malý
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Číslo role skupiny
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Součet všech vah úkol by měl být 1. Upravte váhy všech úkolů projektu v souladu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} položky v probíhající
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
-DocType: Grade Interval,Grade Code,Grade Code
+DocType: Grading Scale Interval,Grade Code,Grade Code
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakující Až
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vyberte společnost
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vyberte společnost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Musíte povolit Nákupní košík
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Plán údržby {0} existuje proti {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,učící studenta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Měna závěrečného účtu, musí být {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Součet bodů za všech cílů by mělo být 100. Je {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
 DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
 ,Purchase Invoice Trends,Trendy přijatách faktur
 DocType: Employee,Better Prospects,Lepší vyhlídky
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Řádek # {0}: Dávka {1} má pouze {2} qty. Vyberte prosím jinou dávku, která má k dispozici {3} qty nebo rozdělit řádek do více řádků, doručit / vydávat z více dávek"
 DocType: Vehicle,License Plate,poznávací značka
 DocType: Appraisal,Goals,Cíle
 DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázat P &amp; L zůstatky neuzavřený fiskální rok je
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktivní
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Udělat Prodejní objednávky, které vám pomohou plánovat svou práci a doručit na čas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Udělat Prodejní objednávky, které vám pomohou plánovat svou práci a doručit na čas"
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkem Dodatečné náklady
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Asset Movement,Stock Manager,Reklamní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Balící list
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Balící list
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavení SMS brány
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,Zdroj
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show uzavřen
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset kategorie je povinný pro položku dlouhodobých aktiv
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset kategorie je povinný pro položku dlouhodobých aktiv
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Tato {0} je v rozporu s {1} o {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenti HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,Datem odchodu
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,vytvoření vede
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,vytvoření vede
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá částka
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Přihlášky
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Výchozí sklad je vyžadováno pro vybraná položka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Výchozí sklad je vyžadováno pro vybraná položka
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Krabice
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,možné Dodavatel
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizace
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Výchozí BOM pro {0} nenalezen Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti jsou jádrem systému, přidejte všechny své studenty"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti jsou jádrem systému, přidejte všechny své studenty"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Řádek # {0}: datum Světlá {1} nemůže být před Cheque Datum {2}
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Řádek {0}: čas od času i na čas z {1} se překrývá s {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslat e-mail Payment
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nová úloha
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Vytvořit nabídku
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Vytvořit nabídku
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostatní zprávy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Prosím nastavit výchozí mzdy, splatnou účet ve firmě {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Hledání položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Hledání položky
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Čistá změna v hotovosti
 DocType: Assessment Plan,Grading Scale,Klasifikační stupnice
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,již byly dokončeny
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Platba Poptávka již existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sbírat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nelze odstranit fiskální rok {0}. Fiskální rok {0} je nastaven jako výchozí v globálním nastavení
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studium se ve stejném ústavu
 DocType: Territory,Territory Manager,Oblastní manažer
 DocType: Packed Item,To Warehouse (Optional),Warehouse (volitelné)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Payment Entry,Paid Amount (Company Currency),Uhrazená částka (firemní měna)
 DocType: Purchase Invoice,Additional Discount,Další slevy
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobrazit Košík
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zadaný požadavek materiálu k výrobě této skladové karty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Vedle Odpisy Datum je povinné pro nové aktivum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Vedle Odpisy Datum je povinné pro nové aktivum
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina založená na kurzu pro každou dávku
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single jednotka položky.
 DocType: Fee Category,Fee Category,poplatek Kategorie
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Je zapotřebí nákladového střediska pro &#39;zisku a ztráty &quot;účtu {2}. Prosím nastavit výchozí nákladového střediska pro společnost.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nepodařilo se najít kurz pro {0} až {1} pro klíčové datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povolit více Prodejní objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Instruktor skupiny studentů
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Žádné
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hlavní
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varianta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hlavní
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,zaměstnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
 DocType: Employee,Leave Encashed?,Dovolená proplacena?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,roční náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
@@ -1764,7 +1761,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ocenění
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
-DocType: Grading Structure,Grading Intervals,třídění Intervaly
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prosím Vstupte
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Aby bylo možné přes-fakturace, je třeba nastavit při nákupu Nastavení"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Prosím nastavit filtr na základě výtisku nebo ve skladu
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Řádek # {0}: Zamítnutí Warehouse je povinná proti zamítnuté bodu {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Platba
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Správa objednávek
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Správa objednávek
 DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
 DocType: Employee,Salutation,Oslovení
 DocType: Course,Course Abbreviation,Zkratka hřiště
 DocType: Student Leave Application,Student Leave Application,Student nechat aplikaci
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaměstnanec {0} na půl dne na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Celkem pracovní doba by neměla být větší než maximální pracovní doby {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Reference
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,New košík
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,New košík
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Vehicle,Wheels,kola
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Zakáže vytváření časových protokolů proti výrobní zakázky. Operace nesmějí být sledovány proti výrobní zakázky
 DocType: Student,Student Mobile Number,Student Číslo mobilního telefonu
 DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Číslo šarže je povinné
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektů
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,Fiskální rok
 DocType: Vehicle Log,Fuel Price,palivo Cena
 DocType: Budget,Budget,Rozpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nelze přiřadit proti {0}, protože to není výnos nebo náklad účet"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 DocType: Student Admission,Application Form Route,Přihláška Trasa
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Množství {0} {1} odečíst proti {2}
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Odvody a daně
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
 DocType: Asset,Depreciation Schedule,Plán odpisy
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date by měla být v rozmezí Datum od a do dnešního dne
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Částka - doprava
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 ,Vehicle Expenses,Náklady pro auta
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
+DocType: Serial No,Invoice Details,Podrobnosti faktury
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
 DocType: Employee Loan,Loan Amount,Částka půjčky
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Dodatečná sleva Částka
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 DocType: Loan Type,Loan Name,půjčka Name
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
 DocType: Production Order,Skip Material Transfer,Přeskočit přenos materiálu
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nelze najít kurz {0} až {1} pro klíčový den {2}. Ručně vytvořte záznam o směnném kurzu
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Váš finanční rok končí
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Lead Address
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 DocType: Student Admission,Eligibility,Způsobilost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Vede vám pomohou podnikání, přidejte všechny své kontakty a více jak svých potenciálních zákazníků"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Vede vám pomohou podnikání, přidejte všechny své kontakty a více jak svých potenciálních zákazníků"
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Vyberte společnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Process Payroll,Fortnightly,Čtrnáctidenní
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dítě Položka by neměla být produkt Bundle. Odeberte položku `{0}` a uložit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Přidat Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Přidat Timesheets
 DocType: Vehicle Service,Service Item,servis Položka
 DocType: Bank Guarantee,Bank Guarantee,Bankovní záruka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nebude zobrazeno, pokud Ceník není nastaven"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím zemi, k tomuto Shipping pravidla nebo zkontrolovat Celosvětová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debetní K je vyžadováno
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debetní K je vyžadováno
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Nabídka Term
 DocType: Quality Inspection,Quality Manager,Manažer kvality
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,Důvod ztráty
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Prosím, zadejte převzetí dokumentu"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Prosím, zadejte převzetí dokumentu"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
 DocType: Project,External,Externí
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Výrobní zakázky Vytvořeno: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Výrobní zakázky Vytvořeno: {0}
 DocType: Branch,Branch,Větev
 DocType: Guardian,Mobile Number,Telefonní číslo
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
@@ -2176,7 +2175,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Udělat Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Udělat Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Byli jste pozváni ke spolupráci na projektu: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Použít teď
@@ -2199,8 +2198,9 @@
 DocType: SMS Log,Sent To,Odeslána
 DocType: Payment Request,Make Sales Invoice,Proveďte prodejní faktuře
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programy
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Následující Kontakt datum nemůže být v minulosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Následující Kontakt datum nemůže být v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Vyberte číslo šarže
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PInv-RET-
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
@@ -2214,7 +2214,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 0
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,kusovníky
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Zásoba
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Zásoba
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
@@ -2230,8 +2230,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Přenos materiálu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicí {0} {1} pro položku {4}. Děláte si jiný {3} proti stejné {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Prosím nastavte opakující se po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vybrat změna výše účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Prosím nastavte opakující se po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vybrat změna výše účet
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2242,7 +2242,7 @@
 DocType: Budget Account,Budget Account,rozpočet účtu
 DocType: Quality Inspection,Verified By,Verified By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
-DocType: Grade Interval,Grade Description,Grade Popis
+DocType: Grading Scale Interval,Grade Description,Grade Popis
 DocType: Stock Entry,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
@@ -2280,7 +2280,7 @@
 DocType: Upload Attendance,Attendance To Date,Účast na data
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Čistá změna objemu pohledávek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Vyrovnávací Off
 DocType: Offer Letter,Accepted,Přijato
@@ -2293,7 +2293,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
@@ -2307,7 +2307,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Název institutu pro který nastavujete tento systém.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Následující Výrobní zakázky byly vytvořeny:
@@ -2330,6 +2330,7 @@
 DocType: Email Digest,How frequently?,Jak často?
 DocType: Purchase Receipt,Get Current Stock,Získejte aktuální stav
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Strom Bill materiálů
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Student,Joining Date,Datum připojení
 ,Employees working on a holiday,Zaměstnanci pracující na dovolenou
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Současnost
@@ -2430,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Výprodej Datum není uvedeno
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Výroba
 DocType: Guardian,Occupation,Povolání
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Sales Invoice,This Document,Tento dokument
 DocType: Installation Note Item,Installed Qty,Instalované množství
@@ -2453,7 +2454,7 @@
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 DocType: Payment Entry,Payment Type,Typ platby
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pro položku {0}. Nelze najít jednu dávku, která splňuje tento požadavek"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pro položku {0}. Nelze najít jednu dávku, která splňuje tento požadavek"
 DocType: Process Payroll,Select Employees,Vybrat Zaměstnanci
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenční datum
@@ -2470,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} již vytvořili pro firmu {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Nahradit položky / kusovníky ve všech kusovníků
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Příjem dokument musí být předložen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Příjem dokument musí být předložen
 DocType: Purchase Invoice Item,Received Qty,Přijaté Množství
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nezaplatil a není doručení
@@ -2483,7 +2484,7 @@
 ,To Produce,K výrobě
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mzdy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Udělat uživatele
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Udělat uživatele
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Zadejte platnou e-mailovou adresu
@@ -2495,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Bezbariérový šablona nesmí být výchozí šablonu
 DocType: Account,Income Account,Účet příjmů
 DocType: Payment Request,Amount in customer's currency,Částka v měně zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Předch
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Šarže pomůže sledovat docházku, posudky a poplatků pro studenty"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Šarže pomůže sledovat docházku, posudky a poplatků pro studenty"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná částka
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Zápis do deníku na platy od {0} do {1}
@@ -2522,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
@@ -2532,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"Pošle e-mail o této události, aby zaměstnanci se statusem &quot;otevřený&quot;"
 DocType: Task,Depends on Tasks,Závisí na Úkoly
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Přílohy lze zobrazit bez povolení nákupního vozíku
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Jméno Nového Nákladového Střediska
 DocType: Leave Control Panel,Leave Control Panel,Ovládací panel dovolených
@@ -2544,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Žádné výplatní pásce nalezena mezi {0} a {1}
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Přijímací
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je zakázán
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je zakázán
 DocType: Supplier,Billing Currency,Fakturace Měna
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Velké
@@ -2565,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodní Doporučené zboží
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Všechny skupiny Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Celkem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Celkem {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
@@ -2583,7 +2585,7 @@
 DocType: Price List,Price List Master,Ceník Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
 DocType: Price List,Applicable for Countries,Pro země
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nechte pouze aplikace, které mají status &quot;schváleno&quot; i &quot;Zamítnuto&quot; může být předložena"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Název skupiny je povinné v řadě {0}
@@ -2675,7 +2677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Vehicle Service,Engine Oil,Motorový olej
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Employee Loan,Loan Details,půjčka Podrobnosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Řádek {0}: Dokončené množství musí být větší než nula.
@@ -2739,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Sklady se stávajícími transakce nelze převést na skupinu.
 DocType: Assessment Result Tool,Result HTML,výsledek HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,vyprší dne
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Přidejte studenty
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Přidejte studenty
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2803,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit zkříženými
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademický termín s tímto &quot;akademický rok &#39;{0} a&quot; Jméno Termín&#39; {1} již existuje. Upravte tyto položky a zkuste to znovu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Stejně jako existují nějaké transakce proti položce {0} nelze změnit hodnotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Stejně jako existují nějaké transakce proti položce {0} nelze změnit hodnotu {1}
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
@@ -2846,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,Poslední den následujícího měsíce
 DocType: Support Settings,Auto close Issue after 7 days,Auto v blízkosti Issue po 7 dnech
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolená nemůže být přiděleny před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Žadatel
 DocType: Asset Category Account,Accumulated Depreciation Account,Účet oprávek
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
@@ -2874,7 +2876,7 @@
 DocType: Asset,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplacená částka nemůže být vyšší než celkový negativní dlužné částky {0}
@@ -2892,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,Vytvořit požadavek na materiál
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekávaná hodnota Po celou dobu životnosti musí být menší než Gross částky nákupu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekávaná hodnota Po celou dobu životnosti musí být menší než Gross částky nákupu
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturovaná částka
 DocType: Asset,Double Declining Balance,Double degresivní
@@ -2913,19 +2915,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplacené částky nemůže být větší než Výše úvěru {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Výrobní příkaz nebyl vytvořen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Výrobní příkaz nebyl vytvořen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nemůže změnit statut studenta {0} je propojen s aplikací studentské {1}
 DocType: Asset,Fully Depreciated,plně odepsán
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účast HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citace jsou návrhy, nabídky jste svým zákazníkům odeslané"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citace jsou návrhy, nabídky jste svým zákazníkům odeslané"
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Pořadové číslo a Batch
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Součet skóre hodnotících kritérií musí být {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervováno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervováno
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Hodnota nebo Množství
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
@@ -3053,7 +3055,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vyberte zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Vyberte zákazníka
 DocType: C-Form,I,já
 DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového střediska
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
@@ -3072,19 +3074,18 @@
 DocType: Vehicle,Insurance Details,pojištění Podrobnosti
 DocType: Account,Payable,Splatný
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Prosím, zadejte dobu splácení"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dlužníci ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dlužníci ({0})
 DocType: Pricing Rule,Margin,Marže
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Hrubý Zisk %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Částka nákupu je povinná
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Částka nákupu je povinná
 DocType: Lead,Address Desc,Popis adresy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je povinná
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Název tématu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
-DocType: Grading Structure,Grade Intervals,grade Intervaly
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vyberte podstatu svého podnikání.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
@@ -3113,6 +3114,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Prosím nastavit výchozí {0} ve firmě {1}
 DocType: Cheque Print Template,Starting position from top edge,Výchozí poloha od horního okraje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Stejný dodavatel byl zadán vícekrát
@@ -3164,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Změna pořadí Množství
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuální pracovní příležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
-DocType: Journal Entry,Write Off,Odepsat
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odepsat
 DocType: Timesheet Detail,Operation ID,Provoz ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
@@ -3175,8 +3177,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dodavatel doručí zákazníkovi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) není na skladě
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Další Datum musí být větší než Datum zveřejnění
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dat a export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravovat"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Žádní studenti Nalezené
@@ -3188,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vyberte prosím citace
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vyberte prosím citace
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založeno na účasti tohoto studenta
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Žádné studenty v
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Přidat další položky nebo otevřené plné formě
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
@@ -3240,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} musí být dlouhodobá aktiva položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} musí být dlouhodobá aktiva položka
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
@@ -3264,7 +3267,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
 DocType: Purchase Invoice Item,Rate,Cena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Internovat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresa Jméno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,adresa Jméno
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Základní
@@ -3289,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,Tisk Language
 DocType: Salary Slip,Total Working Hours,Celkové pracovní doby
 DocType: Stock Entry,Including items for sub assemblies,Včetně položek pro podsestav
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Zadejte hodnota musí být kladná
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Zadejte hodnota musí být kladná
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je již zapsáno.
@@ -3308,16 +3311,14 @@
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
 DocType: Assessment Plan,Supervisor Name,Jméno Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program pro zápis do programu
-DocType: Grading Structure,Grading Structure,třídění Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Dodací město
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash flow z provozních činností
 DocType: Sales Invoice,Shipping Rule,Pravidlo dopravy
@@ -3340,6 +3341,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Datum zahájení by měla být před uzávěrky
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte sérii číslování pro Účast přes Nastavení&gt; Série číslování"
 DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
 DocType: Department,Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
@@ -3367,7 +3369,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Vytvořit Zaměstnanecké záznamů
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Vytvořit Zaměstnanecké záznamů
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Celkem Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,účetní závěrka
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hodina
@@ -3382,7 +3384,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po změně
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Místo Prodeje
 DocType: Payment Entry,Received Amount,přijaté Částka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Vytvořit na celé množství, ignoruje již objednané množství"
 DocType: Account,Tax,Daň
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neoznačený
@@ -3393,7 +3394,7 @@
 DocType: C-Form,Invoices,Faktury
 DocType: Batch,Source Document Name,Název zdrojového dokumentu
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Vytvořit uživatele
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Vytvořit uživatele
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
@@ -3404,8 +3405,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá změna ve vlastním kapitálu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Příjem
 ,Sales Register,Sales Register
@@ -3416,16 +3417,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Zatím žádné zákazníky!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Přehled o peněžních tocích
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výše úvěru nesmí být vyšší než Maximální výše úvěru částku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atributy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Datum poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark docházky pro více zaměstnanců
@@ -3450,14 +3453,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Řádek {0} # účet musí být typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typy činností pro Time Záznamy
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
 DocType: Training Event,Exam,Zkouška
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturace State
@@ -3490,7 +3493,7 @@
 DocType: Payment Entry,Account Paid From,Účet jsou placeni z prostředků
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Udělat Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Udělat Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tisk a papírnictví
 DocType: Stock Settings,Show Barcode Field,Show čárového kódu Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Poslat Dodavatel e-maily
@@ -3505,6 +3508,7 @@
 DocType: Offer Letter,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Výše
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neplatný atribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Uvedete-li neštandardní splatný účet
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
@@ -3538,7 +3542,7 @@
 DocType: Program Enrollment Tool,Get Students From,Získat studenty z
 DocType: Hub Settings,Seller Country,Prodejce Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikovat položky na webových stránkách
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Skupina vaši studenti v dávkách
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Skupina vaši studenti v dávkách
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikace
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Zkouška
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / dobropis
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Celkem uhrazené částky
 DocType: Production Order Item,Transferred Qty,Přenesená Množství
@@ -3638,6 +3642,7 @@
 ,Sales Funnel,Prodej Nálevka
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Zkratka je povinná
 DocType: Project,Task Progress,Pokrok úkol
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Vozík
 ,Qty to Transfer,Množství pro přenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
@@ -3670,7 +3675,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množství ({0}) nemůže být zlomek v řádku {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,vybírat poplatky
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 DocType: Item,Opening Stock,otevření Sklad
@@ -3689,7 +3694,7 @@
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapsat studenti
 DocType: Hub Settings,Name Token,Jméno Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
@@ -3700,7 +3705,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Název projektu
-DocType: Supplier,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
+DocType: Customer,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Production Order,Required Items,Povinné předměty
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
@@ -3730,6 +3735,7 @@
 DocType: Item,Taxes,Daně
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Uhrazené a nedoručené
 DocType: Project,Default Cost Center,Výchozí Center Náklady
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Série jmen
 DocType: Bank Guarantee,End Date,Datum ukončení
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Sklad Transakce
 DocType: Budget,Budget Accounts,rozpočtové účty
@@ -3794,7 +3800,7 @@
 DocType: Customer,Sales Partner and Commission,Prodej Partner a Komise
 DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sazba (%) / rok
 ,Project Quantity,projekt Množství
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, může být byste měli změnit &quot;Rozdělte poplatků založený na&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, může být byste měli změnit &quot;Rozdělte poplatků založený na&quot;"
 DocType: Opportunity,To Discuss,K projednání
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotek {1} zapotřebí {2} pro dokončení této transakce.
 DocType: Loan Type,Rate of Interest (%) Yearly,Úroková sazba (%) Roční
@@ -3817,7 +3823,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Řádek {0}: Měna BOM # {1} by se měla rovnat vybrané měně {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatek Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet management
@@ -3834,7 +3840,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Sklad {0} neexistuje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ocenění sazba nebyl nalezen na výtisku {0}, který je k tomu účetních zápisů pro požadovanou {1} {2}. Pokud je položka transakci jako položka vzorek v {1}, prosím zmínit, že v {1} položky tabulky. V opačném případě vytvořte příchozí transakce akcie za položku nebo zmínka sazby ocenění v záznamu položku a potom zkuste odevzdání / zrušení této položky"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
 DocType: Project,Customer Details,Podrobnosti zákazníků
@@ -3851,7 +3857,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Předložené objednávky nelze smazat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Řízení kvality
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} byl zakázán
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} byl zakázán
 DocType: Employee Loan,Repay Fixed Amount per Period,Splatit pevná částka na období
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
@@ -3877,7 +3883,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student ID e-mailu
 DocType: Employee,Notice (days),Oznámení (dny)
 DocType: Tax Rule,Sales Tax Template,Daň z prodeje Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Reklamní Nastavení
@@ -3910,6 +3916,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Vydání dluhopisu
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} pohledávka nemůže být převedena
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Tato položka je variantou {0} (šablony).
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nákup
 DocType: Announcement,Announcement,Oznámení
@@ -3925,7 +3932,7 @@
 DocType: Account,Receivable,Pohledávky
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vyberte položky do Výroba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Vyberte položky do Výroba
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Prodejce Popis
@@ -3938,7 +3945,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotící kritéria Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otevření Oprávky musí být menší než rovná {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otevření Oprávky musí být menší než rovná {0}
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
@@ -3972,7 +3979,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Připojit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Employee Loan,Repay from Salary,Splatit z platu
 DocType: Leave Application,LAP/,ÚSEK/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Požadovala vyplacení proti {0} {1} na částku {2}
@@ -3990,7 +3997,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Posuzování Detail Výsledek
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicitní skupinu položek uvedeny v tabulce na položku ve skupině
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -3999,7 +4006,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Sklad {0} není vázáno na žádný účet, vytvořte / odkazují na příslušném účtu (aktiv) na skladu."
 DocType: Purchase Invoice,Recurring Id,Opakující se Id
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Smazat trvale?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Smazat trvale?
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neplatný {0}
@@ -4010,13 +4017,14 @@
 DocType: Warehouse,PIN,KOLÍK
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Nastavte si škola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základna Změna Částka (Company měna)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Uložte dokument jako první.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Změna zkratky
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Částka poslední objednávky
+DocType: Task,Is Milestone,Je milník
 DocType: Daily Work Summary,Email Sent To,E-mailem odeslaným
 DocType: Budget,Warn,Varovat
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
@@ -4049,11 +4057,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit zásoby starší než` by mělo být nižší než %d dnů.
 DocType: Tax Rule,Purchase Tax Template,Spotřební daň šablony
 ,Project wise Stock Tracking,Sledování zboží dle projektu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaměstnanecké záznamy.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Objednat
@@ -4076,7 +4083,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávně vymazány
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
 DocType: Purchase Invoice Item,Price List Rate,Ceník Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Vytvořit citace zákazníků
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Vytvořit citace zákazníků
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Zobrazit ""Skladem"" nebo ""Není skladem"" na základě skladem k dispozici v tomto skladu."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Průměrná doba pořízena dodavatelem dodat
@@ -4098,7 +4105,7 @@
 DocType: Asset,Disposal Date,Likvidace Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budou zaslány všem aktivním zaměstnancům společnosti v danou hodinu, pokud nemají dovolenou. Shrnutí odpovědí budou zaslány do půlnoci."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Trénink Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
@@ -4106,7 +4113,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Samozřejmě je povinné v řadě {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Přidat / Upravit ceny
 DocType: Batch,Parent Batch,Nadřazená dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablony tisku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram nákladových středisek
@@ -4150,7 +4157,7 @@
 DocType: Item,Variant Based On,Varianta založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši Dodavatelé
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 DocType: Request for Quotation Item,Supplier Part No,Žádný dodavatel Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemůže odečíst, pokud kategorie je pro &quot;ocenění&quot; nebo &quot;Vaulation a Total&quot;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Přijaté Od
@@ -4160,7 +4167,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Řádek {0}: doba hodnota musí být větší než nula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
@@ -4169,20 +4176,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Payment Reconciliation,From Invoice Date,Z faktury Datum
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturační měna se musí rovnat měny nebo účtu strana peněz buď výchozího comapany je
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturační měna se musí rovnat měny nebo účtu strana peněz buď výchozího comapany je
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Nechat inkasa
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Co to dělá?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do skladu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Všechny Student Přijímací
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: School House,House Name,Jméno dům
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrický
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Přidejte zbytek vaší organizace jako uživatele. Můžete také přidat pozvat zákazníky na portálu tím, že přidáním z Kontaktů"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Přidejte zbytek vaší organizace jako uživatele. Můžete také přidat pozvat zákazníky na portálu tím, že přidáním z Kontaktů"
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
@@ -4191,7 +4198,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum pojištění startu by měla být menší než pojištění koncovým datem
@@ -4206,7 +4213,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Výplatní pásce zaměstnance {0} již vytvořili pro časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo ujetých kilometrů
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},"Období od a období, k datům povinné pro opakované {0}"
@@ -4219,7 +4226,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hodiny
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Výchozí BOM pro {0} nebyl nalezen
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Klepnutím na položky je můžete přidat zde
 DocType: Fees,Program Enrollment,Registrace do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
@@ -4317,7 +4325,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
-DocType: Grade Interval,Grade Interval,třída Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Světlá Datum aktualizováno
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4325,6 +4332,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Stáhnout PDF
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,"Tam, kde jsou uloženy předměty."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: Request for Quotation,Supplier Detail,dodavatel Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Chyba ve vzorci nebo stavu: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Fakturovaná částka
@@ -4369,7 +4377,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Nastavení jednoduché webové stránky pro mou organizaci
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
@@ -4426,7 +4434,7 @@
 ,Items To Be Requested,Položky se budou vyžadovat
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Společnost info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Vyberte nebo přidání nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Vyberte nebo přidání nového zákazníka
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Nákladové středisko je nutné rezervovat výdajů nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založeno na účasti základu tohoto zaměstnance
@@ -4439,13 +4447,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Částka nákupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Konec roku nemůže být před uvedením do provozu roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Konec roku nemůže být před uvedením do provozu roku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Zaměstnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastavit výchozí Holiday List pro zaměstnance {0} nebo {1} Company
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Směnky vznesené zákazníkům.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
@@ -4454,15 +4462,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Employee Loan Application,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Guardian,Guardian,poručník
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdělání
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Upravené
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Volitelné. Nastaví výchozí měně společnosti, není-li uvedeno."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozici Množství na Od Warehouse
@@ -4499,7 +4509,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marže %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
 DocType: Asset,Is Existing Asset,Je existujícímu aktivu
 DocType: Salary Detail,Statistical Component,Statistická složka
 ,Monthly Salary Register,Měsíční plat Register
@@ -4553,7 +4563,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Připojit Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Sklad Úrovně
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Udělat Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí být jedním z příjem Pay a interní převod
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytika
@@ -4566,6 +4576,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Order,Customer's Purchase Order Date,Zákazníka Objednávka Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Základní kapitál
+DocType: Shopping Cart Settings,Show Public Attachments,Zobrazit veřejné přílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Platební brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby přesměrovat uživatele na vybrané stránky.
@@ -4590,7 +4601,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Udělat Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Udělat Student Batch
 DocType: Leave Type,Is Carry Forward,Je převádět
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Položka získaná z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
@@ -4609,7 +4620,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte sérii číslování pro Účast přes Nastavení&gt; Série číslování"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
new file mode 100644
index 0000000..8f12975
--- /dev/null
+++ b/erpnext/translations/da-DK.csv
@@ -0,0 +1,30 @@
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Åbning'
+DocType: Lead,Lead,Bly
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+DocType: Timesheet,% Amount Billed,% Beløb Billed
+DocType: Purchase Order,% Billed,% Billed
+,Lead Id,Bly Id
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total','Total'
+DocType: Selling Settings,Selling Settings,Salg af indstillinger
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+DocType: Item,Default Selling Cost Center,Standard Selling Cost center
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
+DocType: Pricing Rule,Selling,Selling
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,Ultima Actualización : Fecha inválida
+DocType: Sales Order,%  Delivered,% Leveres
+DocType: Lead,Lead Owner,Bly Owner
+apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+apps/erpnext/erpnext/controllers/accounts_controller.py +290, or ,o
+DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
+DocType: SMS Center,All Lead (Open),Alle Bly (Open)
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hent opdateringer
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
+apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
+,Lead Details,Bly Detaljer
+DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
+,Lead Name,Bly navn
+apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+DocType: Vehicle Service,Half Yearly,Halvdelen Årlig
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 6eb1c34..86e6672 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -25,13 +25,13 @@
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundeservicekontakt
 DocType: Job Applicant,Job Applicant,Ansøger
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er baseret på transaktioner imod denne leverandør. Se tidslinje nedenfor for detaljer
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er baseret på transaktioner for denne leverandør. Se tidslinje nedenfor for detaljer
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i vare sats i række {0}"
 DocType: Bank Guarantee,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kræves By
-DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
+DocType: Delivery Note,Return Against Delivery Note,Retur mod følgeseddel
 DocType: Purchase Order,% Billed,% Faktureret
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Vekselkurs skal være det samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundennavn
@@ -42,10 +42,10 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
 DocType: Leave Type,Leave Type Name,Fraværstypenavn
 apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Vis åben
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Series opdateret
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Nummerserien opdateret
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,bestilling
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Kassekladde Indsendt
-DocType: Pricing Rule,Apply On,Påfør On
+DocType: Pricing Rule,Apply On,Gælder for
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
 ,Purchase Order Items To Be Received,"Købsordre, der modtages"
 DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
@@ -54,10 +54,10 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Forventet slutdato kan ikke være mindre end forventet startdato
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Ny fraværs Application
-,Batch Item Expiry Status,Batch Item Udløb status
+,Batch Item Expiry Status,Partivare-udløbsstatus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
-DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Vis varianter
+DocType: Mode of Payment Account,Mode of Payment Account,Betalingsmådekonto
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Vis varianter
 DocType: Academic Term,Academic Term,Akademisk Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Mængde
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dage)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskabsår {0} er påkrævet
@@ -80,8 +81,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
 DocType: Salary Component,Abbr,Forkortelse
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} passer ikke med {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Række # {0}:
 DocType: Timesheet,Total Costing Amount,Total Costing Beløb
 DocType: Delivery Note,Vehicle No,Køretøjsnr.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Vælg venligst prisliste
@@ -92,11 +93,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Revisor
 DocType: Cost Center,Stock User,Lagerbruger
 DocType: Company,Phone No,Telefonnr.
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursus Tidsplaner oprettet:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursusskema oprettet:
 apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Salgs Partneres Kommission
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
-DocType: Payment Request,Payment Request,Betaling Request
+DocType: Payment Request,Payment Request,Betalingsanmodning
 DocType: Asset,Value After Depreciation,Værdi efter afskrivninger
 DocType: Employee,O+,O +
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relaterede
@@ -116,37 +117,39 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklame
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er indtastet mere end én gang
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tilladt for {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ikke tilladt for {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Hent varer fra
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Lager kan ikke opdateres mod følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen emner opført
 DocType: Payment Reconciliation,Reconcile,Forene
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
 DocType: Quality Inspection Reading,Reading 1,Læsning 1
 DocType: Process Payroll,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Næste Afskrivninger Dato kan ikke være før Købsdato
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasser
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næste afskrivningsdato kan ikke være før købsdatoen
 DocType: SMS Center,All Sales Person,Alle salgsmedarbejdere
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Månedlig Distribution ** hjælper dig distribuere Budget / Target tværs måneder, hvis du har sæsonudsving i din virksomhed."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ikke varer fundet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Løn Struktur Missing
-DocType: Lead,Person Name,Person Name
-DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Ikke varer fundet
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Lønstruktur mangler
+DocType: Lead,Person Name,Navn
+DocType: Sales Invoice Item,Sales Invoice Item,Salgsfakturavare
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Afskriv omkostningssted
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",fx &quot;Primary School&quot; eller &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Rapporter
 DocType: Warehouse,Warehouse Detail,Lagerinformation
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Slutdato kan ikke være senere end året Slutdato af akademiske år, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Er anlægsaktiv"" kan ikke være umarkeret, da der eksisterer et anlægsaktiv på varen"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Slutdato kan ikke være senere end året Slutdato af skoleåret, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Er anlægsaktiv"" kan ikke være umarkeret, da der eksisterer et anlægsaktiv på varen"
 DocType: Vehicle Service,Brake Oil,Bremse Oil
 DocType: Tax Rule,Tax Type,Skat Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har ikke tilladelse til at tilføje eller opdatere poster før {0}
-DocType: BOM,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
+DocType: BOM,Item Image (if not slideshow),Varebillede (hvis ikke lysbilledshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunde eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Vælg stykliste
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Vælg stykliste
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ferien på {0} er ikke mellem Fra dato og Til dato
@@ -178,23 +181,23 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
 DocType: Purchase Invoice Item,Is Fixed Asset,Er anlægsaktiv
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,"Available qty is {0}, you need {1}","Tilgængelige qty er {0}, du har brug for {1}"
-DocType: Expense Claim Detail,Claim Amount,Krav Beløb
-DocType: Employee,Mr,Hr
+DocType: Expense Claim Detail,Claim Amount,Beløb
+DocType: Employee,Mr,Hr.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Doppelt kundegruppe forefindes i Kundegruppetabellen
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandørtype / leverandør
 DocType: Naming Series,Prefix,Præfiks
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Forbrugsmaterialer
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import-log
-DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Træk Materiale Anmodning af typen Fremstilling på grundlag af de ovennævnte kriterier
+DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Hent materialeanmodning af typen Fremstilling på grundlag af de ovennævnte kriterier
 DocType: Training Result Employee,Grade,Grad
 DocType: Sales Invoice Item,Delivered By Supplier,Leveret af Leverandøren
 DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produktionsordre allerede skabt for alle poster med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Produktionsordre allerede skabt for alle poster med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Årsløn
 DocType: Daily Work Summary,Daily Work Summary,Daglige arbejde Summary
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} er frosset
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende firma for at danne kontoplanen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Udgifter
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vælg Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra indtastning
 DocType: Journal Entry Account,Credit in Company Currency,Kredit (firmavaluta)
 DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ønsker du at opdatere fremmøde? <br> Present: {0} \ <br> Fraværende: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
 DocType: Request for Quotation,RFQ-,AT-
 DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Mindst én form for betaling er nødvendig for POS faktura.
 DocType: Products Settings,Show Products as a List,Vis produkterne på en liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
@@ -220,8 +223,8 @@
 DocType: BOM Replace Tool,New BOM,Ny stykliste
 DocType: Depreciation Schedule,Make Depreciation Entry,Foretag Afskrivninger indtastning
 DocType: Appraisal Template Goal,KRA,KRA
-DocType: Lead,Request Type,Anmodning Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Opret medarbejder
+DocType: Lead,Request Type,Anmodningstype
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Opret medarbejder
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Udførelse
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
@@ -233,10 +236,11 @@
 DocType: Customer,Individual,Individuel
 DocType: Interest,Academics User,akademikere Bruger
 DocType: Cheque Print Template,Amount In Figure,Beløb I figur
-DocType: Employee Loan Application,Loan Info,lån Info
+DocType: Employee Loan Application,Loan Info,Låneinformation
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
 DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
 DocType: POS Profile,Customer Groups,Kundegrupper
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Regnskaber
 DocType: Guardian,Students,Studerende
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
@@ -256,43 +260,43 @@
 DocType: Bank Guarantee,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
 DocType: Employee,Create User,Opret bruger
-DocType: Selling Settings,Default Territory,Standard Territory
+DocType: Selling Settings,Default Territory,Standardområde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fjernsyn
 DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
 DocType: Company,Default Payroll Payable Account,Standard Payroll Betales konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Opdatér E-mailgruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Opdatér E-mailgruppe
 DocType: Sales Invoice,Is Opening Entry,Åbningspost
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
 DocType: Course Schedule,Instructor Name,Instruktør Navn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Til lager skal angives før godkendelse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Modtaget On
 DocType: Sales Partner,Reseller,Forhandler
-DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis markeret, vil omfatte ikke-lagervarer i Material anmodninger."
+DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis markeret, vil ikke-lagervarer i materialeanmodningerne blive medtaget."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Indtast firma
-DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice varer
-,Production Orders in Progress,Produktionsordrer i Progress
+DocType: Delivery Note Item,Against Sales Invoice Item,Mod salgsfakturavarer
+,Production Orders in Progress,Igangværende produktionsordrer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Netto kontant fra Finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage er fuld, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage er fuld, ikke spare"
 DocType: Lead,Address & Contact,Adresse og kontaktperson
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugte blade fra tidligere tildelinger
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Næste gentagende {0} vil blive oprettet den {1}
 DocType: Sales Partner,Partner website,Partner hjemmeside
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tilføj vare
 ,Contact Name,Kontaktnavn
-DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier Kursus Assessment
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier for kursusvurdering
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
-DocType: POS Customer Group,POS Customer Group,POS Customer Group
+DocType: POS Customer Group,POS Customer Group,Kassesystem-kundegruppe
 DocType: Cheque Print Template,Line spacing for amount in words,Linjeafstand for beløb i ord
 DocType: Vehicle,Additional Details,Yderligere detaljer
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivelse
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Indkøbsanmodning.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dette er baseret på de timesedler oprettes imod denne sag
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,Nettoløn kan ikke være mindre end 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Kun den valgte fraværsgodkender kan godkende denne fraværsansøgning
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Blade pr år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Fravær pr. år
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
 apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Lager {0} ikke hører til firmaet {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totale omkostninger (via tidsregistrering)
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Fravær blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
@@ -312,20 +316,20 @@
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Antal
-DocType: Pricing Rule,Supplier Type,Leverandør Type
-DocType: Course Scheduling Tool,Course Start Date,Kursusstart
-,Student Batch-Wise Attendance,Student Batch-Wise Fremmøde
-DocType: POS Profile,Allow user to edit Rate,Tillad brugeren at redigere Rate
+DocType: Pricing Rule,Supplier Type,Leverandørtype
+DocType: Course Scheduling Tool,Course Start Date,Kursusstartdato
+,Student Batch-Wise Attendance,Fremmøde efter elevgrupper
+DocType: POS Profile,Allow user to edit Rate,Tillad brugeren at redigere satsen
 DocType: Item,Publish in Hub,Offentliggør i Hub
 DocType: Student Admission,Student Admission,Studerende optagelse
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materialeanmodning
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Indkøbsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
 DocType: Employee,Relation,Relation
-DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
+DocType: Shipping Rule,Worldwide Shipping,Levering til hele verden
 DocType: Student Guardian,Mother,Mor
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
@@ -341,83 +345,82 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,Vælg Charge Type først
 DocType: Student Group Student,Student Group Student,Elev i elevgruppe
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
-DocType: Vehicle Service,Inspection,Inspektion
+DocType: Vehicle Service,Inspection,Kontrol
 DocType: Email Digest,New Quotations,Nye tilbud
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails lønseddel til medarbejderen baseret på foretrukne e-mail er valgt i Medarbejder
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første fraværsgodkender i listen, vil blive markeret som standard-fraværsgodkender"
 DocType: Tax Rule,Shipping County,Forsendelse County
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Hjælp
-DocType: Asset,Next Depreciation Date,Næste Afskrivninger Dato
+DocType: Asset,Next Depreciation Date,Næste afskrivningsdato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Omkostninger per Medarbejder
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for regnskab
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},Leverandør faktura nr eksisterer i købsfaktura {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrer Sales Person Tree.
-DocType: Job Applicant,Cover Letter,Cover Letter
+DocType: Job Applicant,Cover Letter,Følgebrev
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Udestående Checks og Indlån at rydde
 DocType: Item,Synced With Hub,Synkroniseret med Hub
 DocType: Vehicle,Fleet Manager,Fleet manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Rækken # {0}: {1} kan ikke være negativ for vare {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Forkert Adgangskode
+apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Forkert adgangskode
 DocType: Item,Variant Of,Variant af
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
 DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Cirkulær reference Fejl
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,Guardian1 Navn
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I ord (udlæsning) vil være synlig, når du gemmer følgesedlen."
 DocType: Cheque Print Template,Distance from left edge,Afstand fra venstre kant
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enheder af [{1}] (# Form / vare / {1}) findes i [{2}] (# Form / Warehouse / {2})
-DocType: Lead,Industry,Industri
+DocType: Lead,Industry,Branche
 DocType: Employee,Job Profile,Stillingsprofil
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på e-mail om oprettelse af automatiske materialeanmodninger
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Fakturatype
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Følgeseddel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Følgeseddel
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Udgifter Solgt Asset
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
-DocType: Grade Interval,Min Score,Min score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} indtastet to gange i varemoms
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
 DocType: Student Applicant,Admitted,Advokat
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Beløb efter afskrivninger
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Kommende Kalender Events
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Kommende kalenderbegivenheder
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Vælg måned og år
 DocType: Employee,Company Email,Firma e-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debetbeløb i Kontoens valuta
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ordreværdi
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash transaktioner mod fest eller til intern overførsel
 DocType: Shipping Rule,Valid for Countries,Gælder for lande
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Samlet Order Anses
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Medarbejderbetegnelse (fx CEO, direktør osv.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Indtast en værdi i feltet 'Gentagelsedag i måneden »felt værdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
-DocType: Course Scheduling Tool,Course Scheduling Tool,Kursus Planlægning Tool
+DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusplanlægningsværktøj
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
 DocType: Item Tax,Tax Rate,Skat
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede afsat til Medarbejder {1} for perioden {2} til {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Vælg Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede sendt
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede godkendt
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Række # {0}: Partinr. skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (parti) af en vare.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debetbeløb
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr. firma i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr. firma i {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Se venligst vedhæftede fil
 DocType: Purchase Order,% Received,% Modtaget
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opret Elevgrupper
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Opsætning Allerede Complete !!
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
-DocType: Quality Inspection,Inspected By,Inspiceres af
-DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
+DocType: Quality Inspection,Inspected By,Kontrolleret af
+DocType: Maintenance Visit,Maintenance Type,Vedligeholdelsestype
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} hører ikke til følgeseddel {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tilføj varer
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kvalitetskontrolparameter
 DocType: Leave Application,Leave Approver Name,Fraværsgodkendernavn
 DocType: Depreciation Schedule,Schedule Date,Tidsplan Dato
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Tillæg, fradrag og andre lønarter"
@@ -427,16 +430,16 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Obligatorisk felt - Få studerende fra
 DocType: Program Enrollment,Enrolled courses,Indskrevne kurser
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
-DocType: Asset,Item Name,Item Name
+DocType: Asset,Item Name,Varenavn
 DocType: Authorization Rule,Approving User  (above authorized value),Godkendelse Bruger (over autoriserede værdi)
 DocType: Email Digest,Credit Balance,Kreditsaldo
 DocType: Employee,Widowed,Enke
 DocType: Request for Quotation,Request for Quotation,Anmodning om tilbud
 DocType: Salary Slip Timesheet,Working Hours,Arbejdstider
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Opret ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Opret ny kunde
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Opret indkøbsordrer
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Opret indkøbsordrer
 ,Purchase Register,Indkøb Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
@@ -444,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
 DocType: Purchase Receipt,Vehicle Date,Køretøj dato
 DocType: Student Log,Medical,Medicinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Årsag til at miste
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Tabsårsag
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Emneejer kan ikke være den samme som emnet
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Allokeret beløb kan ikke større end ikke-justerede beløb
 DocType: Announcement,Receiver,Modtager
@@ -456,30 +459,30 @@
 DocType: Purchase Invoice,Yearly,Årlig
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Indtast omkostningssted
 DocType: Journal Entry Account,Sales Order,Salgsordre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Gns. Salgskurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Gns. Salgssats
 DocType: Assessment Plan,Examiner Name,Censornavn
 DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
 DocType: Delivery Note,% Installed,% Installeret
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasseværelser / Laboratorier osv hvor foredrag kan planlægges.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Indtast venligst firmanavn først
-DocType: Purchase Invoice,Supplier Name,Leverandør Navn
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Læs ERPNext Manual
+DocType: Purchase Invoice,Supplier Name,Leverandørnavn
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Læs ERPNext-håndbogen
 DocType: Account,Is Group,Is Group
-DocType: Email Digest,Pending Purchase Orders,Afventer indkøbsordrer
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Serial nr baseret på FIFO
+DocType: Email Digest,Pending Purchase Orders,Afventende indkøbsordrer
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Angiv serienumrene automatisk baseret på FIFO-princippet
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Tjek entydigheden af  leverandørfakturanummeret
 DocType: Vehicle Service,Oil Change,Olieskift
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
-DocType: Production Order,Not Started,Ikke igang
+DocType: Production Order,Not Started,Ikke igangsat
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligatorisk felt - akademisk år
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligatorisk felt - skoleår
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,ikke gældende
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Ferie mester.
@@ -489,7 +492,7 @@
 DocType: BOM,Costing,Koster
 DocType: Tax Rule,Billing County,Fakturering County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede inkluderet i Print Sats / Print Beløb"
-DocType: Request for Quotation,Message for Supplier,Besked til Leverandøren
+DocType: Request for Quotation,Message for Supplier,Besked til leverandøren
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal i alt
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2 Email ID
 DocType: Item,Show in Website (Variant),Vis i Website (Variant)
@@ -500,9 +503,10 @@
 DocType: Packing Slip,From Package No.,Fra pakkenr.
 DocType: Item Attribute,To Range,At Rækkevidde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke ændre værdiansættelsesmetode, da der er transaktioner mod nogle poster, der ikke har egen værdiansættelsesmetode"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tildelt fravær allokeret i alt er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse af en ledig stilling
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Afventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Fremmøde rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønart til tidsregistering
 DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
@@ -511,35 +515,35 @@
 DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
 DocType: Journal Entry,Accounts Payable,Kreditor
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,De valgte styklister er ikke for den samme vare
-DocType: Pricing Rule,Valid Upto,Gyldig Op
+DocType: Pricing Rule,Valid Upto,Gyldig til
 DocType: Training Event,Workshop,Værksted
-apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,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 enkeltpersoner.
 ,Enough Parts to Build,Nok Dele til Build
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direkte indkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Kontorfuldmægtig
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vælg venligst Kursus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vælg kursus
 DocType: Timesheet Detail,Hrs,timer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Vælg firma
 DocType: Stock Entry Detail,Difference Account,Forskel konto
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Opgave kan ikke lukkes, da den afhængig opgave {0} ikke er lukket."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
+apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Opgaven kan ikke lukkes, da dens afhængige opgave {0} ikke er lukket."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Indtast venligst lager for hvilket materialeanmodning vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Shipping Rule,Net Weight,Nettovægt
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Køb
 ,Serial No Warranty Expiry,Serienummer garantiudløb
-DocType: Sales Invoice,Offline POS Name,Offline POS Navn
+DocType: Sales Invoice,Offline POS Name,Offline-kassesystemnavn
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Angiv venligst lønklasse for Tærskel 0%
 DocType: Sales Order,To Deliver,Til at levere
 DocType: Purchase Invoice Item,Item,Vare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Seriel ingen post kan ikke være en brøkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serienummervare kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
 DocType: Account,Profit and Loss,Resultatopgørelse
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Håndtering af underleverancer
-DocType: Project,Project will be accessible on the website to these users,Projekt vil være tilgængelig på hjemmesiden for at disse brugere
+DocType: Project,Project will be accessible on the website to these users,Sagen vil være tilgængelig på hjemmesiden for disse brugere
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/setup/doctype/company/company.py +59,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation already used for another company,Forkortelse allerede brugt til et andet selskab
@@ -554,35 +558,35 @@
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør fakturanr.
 DocType: Territory,For reference,For reference
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Løbenummer {0}, som det bruges på lager transaktioner"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette serienummer {0}, eftersom det bruges på lagertransaktioner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Lukning (Cr)
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flyt Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flyt vare
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
-DocType: Production Plan Item,Pending Qty,Afventer Antal
+DocType: Production Plan Item,Pending Qty,Afventende antal
 DocType: Budget,Ignore,Ignorér
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} er ikke aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} er ikke aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Opsætning kontrol dimensioner til udskrivning
 DocType: Salary Slip,Salary Slip Timesheet,Lønseddel Timeseddel
-apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise købskvittering
 DocType: Pricing Rule,Valid From,Gyldig fra
 DocType: Sales Invoice,Total Commission,Samlet Kommissionen
 DocType: Pricing Rule,Sales Partner,Salgs Partner
 DocType: Buying Settings,Purchase Receipt Required,Købskvittering påkrævet
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Værdiansættelse Rate er obligatorisk, hvis Åbning Stock indtastet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Værdiansættelsesværdi er obligatorisk, hvis Åbning Stock indtastet"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ingen poster i faktureringstabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vælg Company og Party Type først
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Akkumulerede værdier
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Opret salgsordre
-DocType: Project Task,Project Task,Project Task
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, serienumre kan ikke blive slået sammen"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Opret salgsordre
+DocType: Project Task,Project Task,Sagsopgave
 ,Lead Id,Emne-Id
 DocType: C-Form Invoice Detail,Grand Total,Beløb i alt
 DocType: Training Event,Course,Kursus
 DocType: Timesheet,Payslip,Lønseddel
-apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Vare kurv
+apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Varekurv
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
 DocType: Issue,Resolution,Løsning
 DocType: C-Form,IV,IV
@@ -590,10 +594,10 @@
 DocType: Expense Claim,Payable Account,Betales konto
 DocType: Payment Entry,Type of Payment,Type af betaling
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering status
-DocType: Job Applicant,Resume Attachment,Genoptag Attachment
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag kunder
+DocType: Job Applicant,Resume Attachment,Vedhæft CV
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gamle kunder
 DocType: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Salg Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Salg Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Bemærk: I alt tildelt blade {0} bør ikke være mindre end allerede godkendte blade {1} for perioden
 DocType: Announcement,Posted By,Bogført af
 DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Tilbud til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Angiv venligst selskabet
 DocType: Purchase Order Item,Billed Amt,Billed Amt
@@ -611,15 +615,15 @@
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk lager hvor lagerændringer foretages.
 DocType: Repayment Schedule,Principal Amount,hovedstol
 DocType: Employee Loan Application,Total Payable Interest,Samlet Betales Renter
-DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timesheet
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salgsfaktura tidsregistrering
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
-DocType: Process Payroll,Select Payment Account to make Bank Entry,Vælg Betalingskonto at gøre Bank indtastning
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Opret Medarbejder optegnelser til at styre blade, udgiftsopgørelser og løn"
-apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tilføj til Knowledge Base
+DocType: Process Payroll,Select Payment Account to make Bank Entry,Vælg Betalingskonto til bankbetalingerne
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Opret Medarbejder optegnelser til at styre blade, udgiftsopgørelser og løn"
+apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tilføj til vidensbasen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Forslag Skrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling indtastning Fradrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden salgsmedarbejder {0} eksisterer med samme Medarbejder-id
-DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Hvis markeret, råmaterialer til varer, der er i underentreprise vil indgå i materialet Anmodning"
+DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Hvis markeret, vil råmaterialer til varer, der er i underentreprise indgå i materialeanmodningerne"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimal Score Assessment
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Opdatering Bank transaktionstidspunkterne
@@ -628,11 +632,11 @@
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Training Event,Conference,Konference
 DocType: Timesheet,Billed,Billed
-DocType: Batch,Batch Description,Batch Beskrivelse
+DocType: Batch,Batch Description,Partibeskrivelse
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Oprettelse af elevgrupper
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke oprettet, skal du oprette en manuelt."
 DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
-DocType: Employee,Organization Profile,Organisation profil
+DocType: Employee,Organization Profile,Organisationsprofil
 DocType: Student,Sibling Details,søskende Detaljer
 DocType: Vehicle Service,Vehicle Service,Køretøj service
 apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,udløser automatisk feedback anmodning baseret på betingelser.
@@ -644,19 +648,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ikke i regnskabsåret {2}
 DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} hører ikke til selskab {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Indtast venligst kvittering først
-DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Indtast venligst købskvittering først
+DocType: Buying Settings,Supplier Naming By,Leverandørnavngivning af
 DocType: Activity Type,Default Costing Rate,Standard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så vil prisreglerne blive filtreret på kunde, kundegruppe, område, leverandør, leverandørtype, kampagne, salgspartner etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Netto Ændring i Inventory
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Medarbejder Lån Management
 DocType: Employee,Passport Number,Pasnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Forholdet til Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Leder
 DocType: Payment Entry,Payment From / To,Betaling fra/til
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datointerval
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kreditmaksimum er mindre end nuværende udestående beløb for kunden. Credit grænse skal være mindst {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kreditmaksimum er mindre end nuværende udestående beløb for kunden. Credit grænse skal være mindst {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Samme element er indtastet flere gange.
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Sortér efter ' ikke kan være samme
@@ -664,9 +667,9 @@
 DocType: Installation Note,IN-,I-
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Løsningsdato
-DocType: Student Batch Name,Batch Name,Batch Name
+DocType: Student Batch Name,Batch Name,Partinavn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timeseddel oprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Indskrive
 DocType: Selling Settings,Customer Naming By,Kundenavngivning af
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Vil vise den studerende som Present i Student Månedlig Deltagelse Rapport
@@ -680,7 +683,7 @@
 DocType: Quotation Item,Item Balance,Item Balance
 DocType: Sales Invoice,Packing List,Pakkeliste
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Udgivning
 DocType: Activity Cost,Projects User,Sagsbruger
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
@@ -701,14 +704,14 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst/tabskonto vedr. salg af anlægsaktiv
 DocType: Vehicle Log,Service Details,Service Detaljer
 DocType: Purchase Invoice,Quarterly,Kvartalsvis
-DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
+DocType: Selling Settings,Delivery Note Required,Følgeseddel er påkrævet
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
 DocType: Assessment Criteria,Assessment Criteria,vurderingskriterier
 DocType: BOM Item,Basic Rate (Company Currency),Basissats (firmavaluta)
 DocType: Student Attendance,Student Attendance,Student Fremmøde
 DocType: Sales Invoice Timesheet,Time Sheet,Tidsregistrering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush råstoffer baseret på
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Indtast venligst varedetaljer
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst varedetaljer
 DocType: Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre-Sale
 DocType: Purchase Receipt,Other Details,Andre detaljer
@@ -717,7 +720,7 @@
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (sidste aflæsning)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Betalingspost er allerede dannet
-DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
+DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel lagerbeholdning
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke er knyttet til Vare {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Eksempel lønseddel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} er indtastet flere gange
@@ -726,7 +729,7 @@
 ,Absent Student Report,Fraværende studerende rapport
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Ansættelsesvilkår
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Vare har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} findes ikke
@@ -735,10 +738,9 @@
 DocType: Serial No,Warranty Expiry Date,Garanti udløbsdato
 DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserie for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vælg venligst Program
 DocType: Project,Estimated Cost,Anslåede omkostninger
-DocType: Purchase Order,Link to material requests,Link til materiale anmodninger
+DocType: Purchase Order,Link to material requests,Link til materialeanmodninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
 apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Firma og regnskab
@@ -748,14 +750,14 @@
 DocType: Selling Settings,Close Opportunity After Days,Luk salgsmulighed efter dage
 ,Reserved,Reserveret
 DocType: Purchase Order,Supply Raw Materials,Supply råmaterialer
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datoen, hvor den næste faktura vil blive dannet. Den dannes ved godkendelsen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ikke en lagervare
 DocType: Mode of Payment Account,Default Account,Standard-konto
 DocType: Payment Entry,Received Amount (Company Currency),Modtaget beløb (firmavaluta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"""Er emne"" skal markeres, hvis salgsmulighed er lavet fra emne"
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vælg ugentlige off dag
-DocType: Production Order Operation,Planned End Time,Planned Sluttid
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"""Er emne"" skal markeres, hvis salgsmulighed er lavet fra emne"
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vælg ugentlig fridag
+DocType: Production Order Operation,Planned End Time,Planlagt sluttid
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
 apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
 DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
@@ -771,7 +773,7 @@
 DocType: BOM,Website Specifications,Website Specifikationer
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
 DocType: Warranty Claim,CI-,Cl-
-apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Række {0}: konverteringsfaktor er obligatorisk
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +325,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris Regler eksisterer med samme kriterier, skal du løse konflikter ved at tildele prioritet. Pris Regler: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +434,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere en stykliste, som det er forbundet med andre styklister"
@@ -812,12 +814,12 @@
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Opsætning Email-konto
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Indtast vare først
 DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bevilliget beløb kan ikke være større end udlægsbeløbet i række {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prisliste ikke valgt
-DocType: Employee,Family Background,Familie Baggrund
+DocType: Employee,Family Background,Familiebaggrund
 DocType: Request for Quotation Supplier,Send Email,Send e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advarsel: ugyldig vedhæftet fil {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ingen Tilladelse
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
@@ -826,23 +828,23 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} skal indsendes
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,Række # {0}: Aktiv {1} skal godkendes
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen medarbejder fundet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen er allerede opdateret.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen er allerede opdateret.
 DocType: SMS Center,All Customer Contact,Alle kundekontakter
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload lager balance via csv.
 DocType: Warehouse,Tree Details,Tree Detaljer
 DocType: Training Event,Event Status,begivenhed status
-,Support Analytics,Support Analytics
+,Support Analytics,Supportanalyser
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +344,"If you have any questions, please get back to us.","Hvis du har spørgsmål, er du velkommen til at kontakte os."
 DocType: Item,Website Warehouse,Webside-Lager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindste fakturabeløb
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: omkostningssted {2} tilhører ikke firma {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} kan ikke være en gruppe
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DOCNAME} findes ikke i ovenstående &#39;{doctype}&#39; tabel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Tidsregistreringskladde {0} er allerede afsluttet eller annulleret
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DOCNAME} findes ikke i ovenstående &#39;{doctype}&#39; tabel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Tidsregistreringskladde {0} er allerede afsluttet eller annulleret
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Ingen opgaver
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
 DocType: Asset,Opening Accumulated Depreciation,Åbning Akkumulerede afskrivninger
@@ -850,15 +852,15 @@
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tilmelding Tool
 apps/erpnext/erpnext/config/accounts.py +299,C-Form records,C-Form optegnelser
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde og leverandør
-DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
+DocType: Email Digest,Email Digest Settings,Indstillinger for e-mail nyhedsbreve
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +346,Thank you for your business!,Tak for din forretning!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support forespørgsler fra kunder.
 ,Production Order Stock Report,Produktionsordre Stock Report
-DocType: HR Settings,Retirement Age,pensionsalder
+DocType: HR Settings,Retirement Age,Pensionsalder
 DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg varer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursus Schedule
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursusskema
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: HR Settings,Enter retirement age in years,Indtast pensionsalderen i år
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Importér fremmøde
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto Resultat / Loss
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
@@ -877,10 +879,10 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Indkøbsordre til betaling
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Forventet antal
 DocType: Sales Invoice,Payment Due Date,Sidste betalingsdato
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Åbner'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åbn Opgaver
-DocType: Notification Control,Delivery Note Message,Levering Note Message
+DocType: Notification Control,Delivery Note Message,Følgeseddelmeddelelse
 DocType: Expense Claim,Expenses,Udgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Item Variant Attribut
 ,Purchase Receipt Trends,Købskvittering Tendenser
@@ -891,9 +893,9 @@
 DocType: Company,Registration Details,Registrering Detaljer
 DocType: Timesheet,Total Billed Amount,Samlet Faktureret beløb
 DocType: Item Reorder,Re-Order Qty,Re-prisen evt
-DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
+DocType: Leave Block List Date,Leave Block List Date,Fraværsblokeringsdato
 DocType: Pricing Rule,Price or Discount,Pris eller rabat
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total gældende takster i kvittering Elementer tabel skal være det samme som de samlede skatter og afgifter
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total gældende takster i købskvitteringsvaretabel skal være det samme som de samlede skatter og afgifter
 DocType: Sales Team,Incentives,Incitamenter
 DocType: SMS Log,Requested Numbers,Anmodet Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Kun Opnå råstoffer
@@ -901,8 +903,8 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering »anvendelse til indkøbskurv"", som indkøbskurv er aktiveret, og der skal være mindst én momsregel til Indkøbskurven"
 apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling indtastning {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
-apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Sagsværdi
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Kassesystem
 DocType: Vehicle Log,Odometer Reading,kilometerstand
 apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov til at ændre 'Balancetype' til 'debet'"
 DocType: Account,Balance must be,Balance skal være
@@ -912,7 +914,7 @@
 DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
 DocType: Purchase Invoice Item,Rejected Qty,afvist Antal
 DocType: Salary Slip,Working Days,Arbejdsdage
-DocType: Serial No,Incoming Rate,Indgående Rate
+DocType: Serial No,Incoming Rate,Indgående sats
 DocType: Packing Slip,Gross Weight,Bruttovægt
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,"Navnet på dit firma, som du oprette i dette system."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i det totale antal arbejdsdage
@@ -924,19 +926,19 @@
 DocType: Examination Result,Examination Result,eksamensresultat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Købskvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Indsendte lønsedler
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Godkendte lønsedler
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Henvisning Doctype skal være en af {0}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
-apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Områder
+apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgspartnere og områder
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Kan ikke automatisk oprette konto, da der allerede bestand balance i kontoen. Du skal oprette en matchende konto, før du kan foretage en post på dette lager"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,Stykliste {0} skal være aktiv
 DocType: Journal Entry,Depreciation Entry,Afskrivninger indtastning
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serienummer {0} hører ikke til vare {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +223,Warehouses with existing transaction can not be converted to ledger.,Lager med eksisterende transaktioner kan ikke konverteres til Finans.
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Fee Structure,Components,Lønarter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
@@ -963,13 +964,13 @@
 DocType: Lead,LEAD-,EMNE-
 DocType: Employee,Permanent Address Is,Fast adresse
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Varemærket
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
 DocType: Asset,Purchase Invoice,Købsfaktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
 apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nye salgsfaktura
-DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
+DocType: Stock Entry,Total Outgoing Value,Samlet værdi udgående
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åbning Dato og Closing Datoen skal ligge inden samme regnskabsår
 DocType: Lead,Request for Information,Anmodning om information
 apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Synkroniser Offline fakturaer
@@ -981,8 +982,8 @@
 DocType: Cheque Print Template,Has Print Format,Har Print Format
 DocType: Employee Loan,Sanctioned,sanktioneret
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Måske Valutaveksling rekord er ikke skabt til
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For &#39;Product Bundle&#39; elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra &quot;Packing List &#39;bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver &quot;Product Bundle &#39;post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til&quot; Packing List&#39; bord."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Række # {0}: Angiv serienummer for vare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For produktpakke-varer, lagre, serienumre og partier vil blive betragtet fra pakkelistetabellen. Hvis lager og parti er ens for alle pakkede varer for enhver produktpakkevare, kan disse værdier indtastes for den vigtigste vare, og værdierne vil blive kopieret til pakkelistetabellen."
 DocType: Job Opening,Publish on website,Udgiv på hjemmesiden
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Forsendelser til kunder.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Leverandørfakturadato kan ikke være større end bogføringsdatoen
@@ -995,34 +996,32 @@
 DocType: SMS Center,Total Message(s),Besked (er) i alt
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Vælg Item for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatprocent
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle hjælpevideoerne
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
-DocType: Pricing Rule,Max Qty,Max Antal
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere prislistesatsen i transaktioner
+DocType: Pricing Rule,Max Qty,Maksimalt antal
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Række {0}: Faktura {1} er ugyldig, kan det blive annulleret / findes ikke. \ Indtast en gyldig faktura"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Standard Bank / Kontant konto vil automatisk blive opdateret i Løn Kassekladde når denne tilstand er valgt.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallerne for Grade kode {0} overlapper med intervaller kvalitet for andre kvaliteter. Tjek venligst intervaller {0} og {1} og prøv igen
 DocType: BOM,Raw Material Cost(Company Currency),Råmaterialeomkostninger (firmavaluta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle varer er allerede blevet overført til denne produktionsordre.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Prisen kan ikke være større end den sats, der anvendes i {1} {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektricitetsomkostninger
 DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke medarbejderfødselsdags- påmindelser
-DocType: Item,Inspection Criteria,Inspektion Kriterier
+DocType: Item,Inspection Criteria,Kontrolkriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overført
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload dit brevhoved og logo. (Du kan redigere dem senere).
 DocType: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Næste Afskrivninger Dato indtastes som tidligere dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Næste afskrivningsdato er indtastet som tidligere dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle emner (åbne)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Række {0}: Antal ikke tilgængelig for {4} i lageret {1} på udstationering tid af posten ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
-DocType: Item,Automatically Create New Batch,Opret automatisk nyt batch automatisk
+DocType: Item,Automatically Create New Batch,Opret automatisk et nyt parti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Opret
 DocType: Student Admission,Admission Start Date,Optagelse Startdato
 DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
@@ -1031,37 +1030,37 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Bestil type skal være en af {0}
 DocType: Lead,Next Contact Date,Næste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Indtast konto for ændring beløb
-DocType: Student Batch Name,Student Batch Name,Student Kladdenavn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Indtast konto for returbeløb
+DocType: Student Batch Name,Student Batch Name,Elevgruppenavn
 DocType: Holiday List,Holiday List Name,Helligdagskalendernavn
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lånebeløb
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Skema Kursus
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Kursusskema
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Aktieoptioner
 DocType: Journal Entry Account,Expense Claim,Udlæg
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vil du virkelig gendanne dette kasserede anlægsaktiv?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},Antal for {0}
 DocType: Leave Application,Leave Application,Ansøg om fravær
-apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lad Tildeling Tool
-DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Fraværstildelingsværktøj
+DocType: Leave Block List,Leave Block List Dates,Fraværsblokeringsdatoer
 DocType: Workstation,Net Hour Rate,Netto timeløn
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost købskvittering
 DocType: Company,Default Terms,Standard Vilkår
 DocType: Packing Slip Item,Packing Slip Item,Pakkeseddelvare
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Angiv en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
 DocType: Delivery Note,Delivery To,Levering Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabat
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabat
 DocType: Asset,Total Number of Depreciations,Samlet antal afskrivninger
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margen
 DocType: Workstation,Wages,Løn
 DocType: Project,Internal,Intern
-DocType: Task,Urgent,Urgent
+DocType: Task,Urgent,Hurtigst muligt
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynde at bruge ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynd at bruge ERPNext
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Købskvittering vare
 DocType: Purchase Receipt,PREC-RET-,PREC-Retsinformation
@@ -1069,7 +1068,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Salgsbeløb
 DocType: Repayment Schedule,Interest Amount,Renter Beløb
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du er udlægsgodkender til denne oplysning. Opdater ""Status"" og gem"
 DocType: Serial No,Creation Document No,Creation dokument nr
 DocType: Issue,Issue,Issue
 DocType: Asset,Scrapped,Skrottet
@@ -1077,12 +1076,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varer Varianter. f.eks størrelse, farve etc."
 DocType: Purchase Invoice,Returns,Retur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Varer-i-arbejde-lager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serienummer {0} er under vedligeholdelseskontrakt ind til d. {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekruttering
 DocType: Lead,Organization Name,Organisationens navn
 DocType: Tax Rule,Shipping State,Forsendelse stat
-,Projected Quantity as Source,Forventet Mængde som kilde
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
+,Projected Quantity as Source,Forventet mængde som kilde
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Varer skal tilføjes ved hjælp af knappen: ""Hent varer fra købskvitteringer"""
 DocType: Employee,A-,EN-
 DocType: Production Planning Tool,Include non-stock items,Medtag ikke-lagervarer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Salgsomkostninger
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard salgsomkostningssted
 DocType: Sales Partner,Implementation Partner,Implementering Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postnummer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock Angivelser
@@ -1100,16 +1099,16 @@
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
 DocType: Employee Loan,Repayment Schedule,tilbagebetaling Schedule
 DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelsesregelbetingelse
-DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
+DocType: Holiday List,Get Weekly Off Dates,Hent ugentlige fridage til kalenderen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
 DocType: Sales Person,Select company name first.,Vælg firmanavn først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr.
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilbud modtaget fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
-DocType: School Settings,Attendance Freeze Date,Deltagelsesfrysedato
+DocType: School Settings,Attendance Freeze Date,Tilmelding senest d.
 DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Nævn et par af dine leverandører. Disse kunne være firmaer eller enkeltpersoner.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Se alle produkter
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Mindste levealder (dage)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Alle styklister
@@ -1121,7 +1120,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ugyldig Attribut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} skal indsendes
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} skal godkendes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Antal skal være mindre end eller lig med {0}
 DocType: SMS Center,Total Characters,Total tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
@@ -1132,10 +1131,10 @@
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv forsendelsesregler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
-DocType: Global Defaults,Global Defaults,Globale standarder
+DocType: Global Defaults,Global Defaults,Globale indstillinger
 apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,Invitation til sagssamarbejde
 DocType: Salary Slip,Deductions,Fradrag
 DocType: Leave Allocation,LAL/,LAL /
@@ -1148,7 +1147,7 @@
 DocType: Salary Slip,Earnings,Indtjening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +390,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Åbning Regnskab Balance
-DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
+DocType: Sales Invoice Advance,Sales Invoice Advance,Salgsfaktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Intet at anmode om
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En anden Budget rekord &#39;{0}&#39; findes allerede mod {1} &#39;{2}&#39; for regnskabsåret {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
@@ -1159,35 +1158,34 @@
 DocType: Purchase Invoice,Is Return,Er Return
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retur / debetnota
 DocType: Price List Country,Price List Country,Prisliste Land
-DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gyldige løbenr for vare {1}
+DocType: Item,UOMs,Enheder
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gyldige serienumre for vare {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Varenr. kan ikke ændres for Serienummer
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
 DocType: Sales Invoice Item,UOM Conversion Factor,UOM Conversion Factor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Indtast venligst varenr. for at få batchnr.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Indtast venligst varenr. for at få partinr.
 DocType: Stock Settings,Default Item Group,Standard varegruppe
 DocType: Employee Loan,Partially Disbursed,Delvist udbetalt
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Omkostningssted for vare med varenr. '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling tilstand er ikke konfigureret. Kontroller, om konto er blevet indstillet på Mode betalinger eller på POS profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Omkostningssted for vare med varenr. '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalingsmåde er ikke konfigureret. Kontroller, om konto er blevet indstillet på betalingsmåden eller på Kassesystemprofilen."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samme vare kan ikke indtastes flere gange.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
 DocType: Lead,Lead,Emne
 DocType: Email Digest,Payables,Gæld
-DocType: Course,Course Intro,Kursus Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock indtastning {0} skabt
+DocType: Course,Course Intro,Kursusintroduktion
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Lagerindtastning {0} oprettet
 apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 ,Purchase Order Items To Be Billed,Indkøbsordre varer til fakturering
-DocType: Purchase Invoice Item,Net Rate,Net Rate
+DocType: Purchase Invoice Item,Net Rate,Nettosats
 DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Lagerposter og finansposter er posteret om  for de valgte købskvitteringer
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Vare 1
 DocType: Holiday,Holiday,Holiday
 DocType: Support Settings,Close Issue After Days,Luk Issue efter dage
-DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
+DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det skal gælde for alle filialer
 DocType: Bank Guarantee,Validity in Days,Gyldighed i dage
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-formen er ikke for faktura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
@@ -1197,7 +1195,7 @@
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
 DocType: Employee Loan Application,Repayment Info,tilbagebetaling Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
-apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplikér række {0} med samme {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +416,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
 apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Opsætning af Medarbejdere
@@ -1205,31 +1203,31 @@
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +157,Please select prefix first,Vælg venligst præfiks først
 DocType: Employee,O-,O-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Forskning
-DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
+DocType: Maintenance Visit Purpose,Work Done,Arbejdet udført
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Angiv mindst én attribut i Attributter tabellen
 DocType: Announcement,All Students,Alle studerende
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Vare {0} skal være en ikke-lagervare
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vis Ledger
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Vare {0} skal være en ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Se kladde
 DocType: Grading Scale,Intervals,Intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Der eksisterer en varegruppe med samme navn, og du bedes derfor ændre varenavnet eller omdøbe varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Der eksisterer en varegruppe med samme navn, og du bedes derfor ændre varenavnet eller omdøbe varegruppen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Studerende mobiltelefonnr.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resten af verden
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Vare {0} kan ikke have parti
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitet Typen er obligatorisk.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitetstypen er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Betalt udbytte
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskab Ledger
 DocType: Stock Reconciliation,Difference Amount,Differencebeløb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Overført overskud
 DocType: Vehicle Log,Service Detail,service Detail
-DocType: BOM,Item Description,Punkt Beskrivelse
+DocType: BOM,Item Description,Varebeskrivelse
 DocType: Student Sibling,Student Sibling,Student Søskende
 DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
 DocType: Purchase Invoice,Supplied Items,Medfølgende varer
 DocType: Student,STUD.,STUD.
-DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
+DocType: Production Order,Qty To Manufacture,Antal at producere
 DocType: Email Digest,New Income,Ny Indkomst
 DocType: School Settings,School Settings,Skoleindstillinger
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
@@ -1252,22 +1250,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere låst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Indkøbsordrer hjælpe dig med at planlægge og følge op på dine køb
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Indkøbsordrer hjælpe dig med at planlægge og følge op på dine køb
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
-							cannot be greater than requested quantity {2} for Item {3}",Den samlede Udstedelse / Transfer mængde {0} i Material Request {1} \ ikke kan være større end ønskede mængde {2} for Item {3}
+							cannot be greater than requested quantity {2} for Item {3}",Den samlede overførselsmængde {0} i materialeanmodning {1} \ kan ikke være større end den anmodede mængde {2} for vare {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Lille
 DocType: Employee,Employee Number,Medarbejdernr.
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
-DocType: Project,% Completed,% Afsluttet
+DocType: Project,% Completed,% afsluttet
 ,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Vare 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Konto head {0} oprettet
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Træning begivenhed
 DocType: Item,Auto re-order,Auto re-ordre
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Opnået
-DocType: Employee,Place of Issue,Sted for Issue
+DocType: Employee,Place of Issue,Udstedelsessted
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Tilføj tilbud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
@@ -1276,8 +1274,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Dine produkter eller tjenester
-DocType: Mode of Payment,Mode of Payment,Mode Betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
+DocType: Mode of Payment,Mode of Payment,Betalingsmåde
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Stykliste
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dette er en rod-varegruppe og kan ikke redigeres.
@@ -1289,15 +1287,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +394,"{0}: Employee email not found, hence email not sent","{0}: Medarbejderens e-mail er ikke fundet, og derfor er e-mailen ikke sendt"
 DocType: Item,Foreign Trade Details,Udenrigshandel Detaljer
 DocType: Email Digest,Annual Income,Årlige indkomst
-DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
-DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
+DocType: Serial No,Serial No Details,Serienummeroplysninger
+DocType: Purchase Invoice Item,Item Tax Rate,Varemoms-%
 DocType: Student Group Student,Group Roll Number,Gruppe Roll nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,I alt for alle task vægte skal være 1. Juster vægten af alle Projekt opgaver i overensstemmelse hermed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totalen for vægtningen af alle opgaver skal være 1. Juster vægten af alle sagsopgaver i overensstemmelse hermed
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Følgeseddel {0} er ikke godkendt
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelsesregel først valgt baseret på ""Apply On 'felt, som kan være vare, varegruppe eller Brand."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelsesregel skal først baseres på feltet 'Gælder for', som kan indeholde vare, varegruppe eller varemærke."
 DocType: Hub Settings,Seller Website,Sælger Website
 DocType: Item,ITEM-,VARE-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
@@ -1319,11 +1317,11 @@
 DocType: Purchase Invoice,Total (Company Currency),I alt (firmavaluta)
 apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
 DocType: Depreciation Schedule,Journal Entry,Kassekladde
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elementer igangværende
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} igangværende varer
 DocType: Workstation,Workstation Name,Workstation Navn
-DocType: Grade Interval,Grade Code,Grade kode
-DocType: POS Item Group,POS Item Group,POS-varegruppe
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
+DocType: Grading Scale Interval,Grade Code,Grade kode
+DocType: POS Item Group,POS Item Group,Kassesystem-varegruppe
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail nyhedsbrev:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Stykliste {0} hører ikke til vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bankkonto No.
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,tilbagevendende Op
 DocType: Attendance,HR Manager,HR-chef
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vælg firma
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vælg firma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Forlad
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Du skal aktivere Indkøbskurven
@@ -1353,16 +1351,17 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Mad
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Antal besøg
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Vedligeholdelsesplanen {0} eksisterer imod {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,tilmelding elev
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta for Lukning Der skal være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
 DocType: Project,Start and End Dates,Start- og slutdato
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Åben stykliste {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan ikke ændres for Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan ikke ændres for serienummeret
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,Enhed
 DocType: Rename Tool,Utilities,Forsyningsvirksomheder
 DocType: Purchase Invoice Item,Accounting,Regnskab
 DocType: Employee,EMP/,EMP /
@@ -1381,10 +1380,10 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
-DocType: Course Scheduling Tool,Course End Date,Kursus Slutdato
+DocType: Course Scheduling Tool,Course End Date,Kursus slutdato
 DocType: Holiday List,Holidays,Helligdage
-DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
-DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
+DocType: Sales Order Item,Planned Quantity,Planlagt mængde
+DocType: Purchase Invoice Item,Item Tax Amount,Varemomsbeløb
 DocType: Item,Maintain Stock,Vedligehold lageret
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 DocType: Employee,Prefered Email,foretrukket Email
@@ -1398,17 +1397,18 @@
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikation log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +151,"Request for Quotation is disabled to access from portal, for more check portal settings.",Adgang til portal er deaktiveret for anmodning om tilbud. Check portal instillinger
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Buying Amount,Køb Beløb
-DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
+DocType: Sales Invoice,Shipping Address Name,Leveringsadressenavn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Detail,Depends on Leave Without Pay,Afhænger af fravær uden løn
-DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
+DocType: Pricing Rule,"Higher the number, higher the priority","Desto højere tallet er, jo højere prioritet"
 ,Purchase Invoice Trends,Købsfaktura Trends
 DocType: Employee,Better Prospects,Bedre udsigter
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Række # {0}: Parti {1} har kun {2} mængde. Vælg venligst et andet parti, der har {3} antal tilgængelige eller opdel rækken i flere rækker for at kunne levere fra flere partier"
 DocType: Vehicle,License Plate,Nummerplade
 DocType: Appraisal,Goals,Mål
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
@@ -1416,7 +1416,7 @@
 DocType: Payment Entry Reference,Payment Entry Reference,Betalingspost reference
 DocType: GL Entry,GL Entry,GL indtastning
 DocType: HR Settings,Employee Settings,Medarbejderindstillinger
-,Batch-Wise Balance History,Batch-Wise Balance History
+,Batch-Wise Balance History,Historik sorteret pr. parti
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Udskriftsindstillinger opdateret i respektive print format
 DocType: Package Code,Package Code,Pakkekode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Lærling
@@ -1426,29 +1426,29 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Medarbejder kan ikke referere til sig selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Stillingsprofil, kvalifikationskrav mv."
 DocType: Journal Entry Account,Account Balance,Kontosaldo
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Momsregel til transaktioner.
 DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
 apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Vi køber denne vare
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden er påkrævet mod Tilgodehavende konto {2}
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Moms i alt (firmavaluta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis uafsluttede finanspolitiske års P &amp; L balancer
 DocType: Shipping Rule,Shipping Account,Forsendelse konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} er inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Opret salgsordrer til at hjælpe dig med at planlægge dit arbejde og levere til tiden
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Opret salgsordrer til at hjælpe dig med at planlægge dit arbejde og levere til tiden
 DocType: Quality Inspection,Readings,Aflæsninger
-DocType: Stock Entry,Total Additional Costs,Total Yderligere omkostninger
+DocType: Stock Entry,Total Additional Costs,Yderligere omkostninger i alt
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Skrot materialeomkostninger (firmavaluta)
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub forsamlinger
-DocType: Asset,Asset Name,Asset Name
-DocType: Project,Task Weight,Opgave Vægt
+DocType: Asset,Asset Name,Aktivnavn
+DocType: Project,Task Weight,Opgavevægtning
 DocType: Shipping Rule Condition,To Value,Til Value
 DocType: Asset Movement,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakkeseddel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Pakkeseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
@@ -1458,7 +1458,7 @@
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Salg Detaljer
 DocType: Quality Inspection,QI-,QI-
-DocType: Opportunity,With Items,Med Varer
+DocType: Opportunity,With Items,Med varer
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
 DocType: Notification Control,Expense Claim Rejected,Udlæg afvist
 DocType: Item,Item Attribute,Item Attribut
@@ -1469,12 +1469,12 @@
 apps/erpnext/erpnext/config/stock.py +300,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
 DocType: HR Settings,Email Salary Slip to Employee,E-mail lønseddel til medarbejder
-DocType: Cost Center,Parent Cost Center,Parent omkostningssted
+DocType: Cost Center,Parent Cost Center,Overordnet omkostningssted
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Vælg Mulig leverandør
 DocType: Sales Invoice,Source,Kilde
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis lukket
 DocType: Leave Type,Is Leave Without Pay,Er fravær uden løn
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Aktivkategori er obligatorisk for en anlægsaktivvare
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Aktivkategori er obligatorisk for en anlægsaktivvare
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ingen resultater i Payment tabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Dette {0} konflikter med {1} for {2} {3}
 DocType: Student Attendance Tool,Students HTML,Studerende HTML
@@ -1484,7 +1484,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Åbne sager
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,Pakkeseddel (ler) annulleret
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Pengestrømme fra investeringsaktiviteter
-DocType: Program Course,Program Course,Program Kursus
+DocType: Program Course,Program Course,Kursusprogram
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline for website hjemmeside
 DocType: Item Group,Item Group Name,Varegruppenavn
@@ -1492,14 +1492,14 @@
 DocType: Student,Date of Leaving,Dato for Leaving
 DocType: Pricing Rule,For Price List,For prisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Opret emner
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Opret emner
 DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Landed Cost Voucher,Additional Charges,Ekstragebyrer
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatbeløb (firmavaluta)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
-DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
+DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelsesbesøg
 DocType: Student,Leaving Certificate Number,Leaving Certificate Number
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængeligt batch-antal på lageret
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Opdater Print Format
@@ -1509,18 +1509,18 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,Debitor Resumé
 DocType: Employee Loan,Monthly Repayment Amount,Månedlige ydelse Beløb
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
-DocType: UOM,UOM Name,UOM Navn
+DocType: UOM,UOM Name,Enhedsnavn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Bidrag Beløb
-DocType: Purchase Invoice,Shipping Address,Forsendelse Adresse
+DocType: Purchase Invoice,Shipping Address,Leveringsadresse
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
-DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand mester.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"""I ord"" vil være synlig, når du gemmer følgesedlen."
+DocType: Expense Claim,EXP,UDL
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Varemærke-master.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} forekommer flere gange i træk {2} &amp; {3}
 DocType: Program Enrollment Tool,Program Enrollments,program Tilmeldingsaftaler
-DocType: Sales Invoice Item,Brand Name,Brandnavn
+DocType: Sales Invoice Item,Brand Name,Varemærkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standardlageret er påkrævet for den valgte vare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Standardlageret er påkrævet for den valgte vare
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kasse
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mulig leverandør
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisationen
@@ -1528,59 +1528,59 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
 DocType: Sales Partner,Sales Partner Target,Salgs Partner Mål
-DocType: Loan Type,Maximum Loan Amount,Maksimale lånebeløb
+DocType: Loan Type,Maximum Loan Amount,Maksimalt lånebeløb
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelsesregel
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dupliceringsrulle nummer for studerende {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action hvis årlige budgetplan overskredet
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
-DocType: Shopping Cart Settings,Payment Success URL,Betaling Succes URL
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materialeanmodning til indkøbsordre
+DocType: Shopping Cart Settings,Payment Success URL,Betaling gennemført URL
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
 ,Bank Reconciliation Statement,Bank Saldoopgørelsen
 ,Lead Name,Emnenavn
-,POS,POS
+,POS,Kassesystem
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Åbning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} må kun optræde én gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke tilladt at overføre mere {0} end {1} mod indkøbsordre {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Fravær blev succesfuldt tildelt til {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
 DocType: Shipping Rule Condition,From Value,Fra Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Produktionmængde er obligatorisk
 DocType: Employee Loan,Repayment Method,tilbagebetaling Metode
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Hvis markeret, vil hjemmesiden være standard varegruppe til hjemmesiden"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standard BOM for {0} ikke fundet for Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standard stykliste for {0} ikke fundet for sag {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Krav om selskabets regning.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studerende er i hjertet af systemet, tilføje alle dine elever"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studerende er i hjertet af systemet, tilføje alle dine elever"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"Row # {0}: Clearance dato {1} kan ikke være, før Cheque Dato {2}"
 DocType: Company,Default Holiday List,Standard helligdagskalender
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Række {0}: Fra tid og til tid af {1} overlapper med {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Passiver
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt mobiltelefonnr.
-,Material Requests for which Supplier Quotations are not created,Materialebehov uden hvilket et leverandørtilbud ikke oprettes
+,Material Requests for which Supplier Quotations are not created,Materialeanmodninger under hvilke leverandørtilbud ikke er oprettet
 DocType: Student Group,Set 0 for no limit,Sæt 0 for ingen grænse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gensend Betaling E-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Ny opgave
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Make Citat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Opret tilbud
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Andre rapporter
 DocType: Dependent Task,Dependent Task,Afhængig opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Fravær af typen {0} må ikke vare længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Venligst sæt Standard Payroll Betales konto i Company {0}
-DocType: SMS Center,Receiver List,Modtager liste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Søg Vare
+DocType: SMS Center,Receiver List,Modtageroversigt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Søg Vare
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoændring i kontanter
 DocType: Assessment Plan,Grading Scale,karakterbekendtgørelsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Allerede afsluttet
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betaling Anmodning findes allerede {0}
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betalingsanmodning findes allerede {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Antal må ikke være mere end {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Foregående regnskabsår er ikke lukket
@@ -1588,19 +1588,19 @@
 DocType: Quotation Item,Quotation Item,Tilbudt vare
 DocType: Account,Account Name,Kontonavn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
-apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandør Type mester.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} mængde {1} kan ikke være en brøkdel
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandørtype-master.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
 DocType: Sales Invoice,Reference Document,referencedokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{0} {1} is cancelled or stopped,{0} {1} er aflyst eller stoppet
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,Købskvittering {0} er ikke sendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,Købskvittering {0} er ikke godkendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom forsendelsesregler, prisliste mv."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Faktureret
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserveret Antal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserveret mængde
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Medarbejdere
 DocType: Lead,Upper Income,Upper Indkomst
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Indsamle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standardprisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Movement rekord {0} skabt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Movement rekord {0} skabt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette Fiscal År {0}. Regnskabsår {0} er indstillet som standard i Globale indstillinger
 DocType: Journal Entry,Entry Type,Posttype
 ,Customer Credit Balance,Customer Credit Balance
@@ -1635,28 +1635,27 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obligatorisk felt - Program
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantikrav
 ,Lead Details,Emnedetaljer
-DocType: Salary Slip,Loan repayment,lån tilbagebetaling
+DocType: Salary Slip,Loan repayment,Tilbagebetaling af lån
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
 DocType: Pricing Rule,Applicable For,Gældende For
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fjern link Betaling ved Annullering af faktura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuel kilometerstand indtastet bør være større end Køretøjets indledende kilometerstand {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Forsendelsesregelland
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Fravær og fremmøde
-DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
+DocType: Maintenance Visit,Partially Completed,Delvist afsluttet
 DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage indenfor fraværsperioden som fravær
 DocType: Sales Invoice,Packed Items,Pakkede varer
-apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garanti krav mod Serial No.
+apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantikrav mod serienummer
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere &quot;BOM Explosion Item&quot; tabel som pr ny BOM"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total','I alt'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
 DocType: Employee,Permanent Address,Permanent adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Forskud mod {0} {1} kan ikke være større \ end Grand alt {2}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg Varenr.
 DocType: Student Sibling,Studying in Same Institute,At studere i samme institut
-DocType: Territory,Territory Manager,Territory manager
+DocType: Territory,Territory Manager,Områdechef
 DocType: Packed Item,To Warehouse (Optional),Til lager (valgfrit)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Payment Entry,Paid Amount (Company Currency),Betalt beløb (firmavaluta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabat
 DocType: Selling Settings,Selling Settings,Salgsindstillinger
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Se i indkøbskurven
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Markedsføringsomkostninger
 ,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Næste Afskrivning Dato er obligatorisk for nye aktiver
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialeanmodning brugt til denne lagerpost
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Næste afskrivningsdato er obligatorisk for nye aktiver
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursusbaseret gruppe for hver batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enkelt enhed af et element.
 DocType: Fee Category,Fee Category,Gebyr Kategori
@@ -1676,18 +1675,17 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Tildelt fravær i alt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},Lager kræves på rækkenr. {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Indtast venligst gyldigt Regnskabsår start- og slutdatoer
+apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Indtast venligst det gyldige regnskabsårs start- og slutdatoer
 DocType: Employee,Date Of Retirement,Dato for pensionering
-DocType: Upload Attendance,Get Template,Få skabelon
+DocType: Upload Attendance,Get Template,Hent skabelon
 DocType: Vehicle,Doors,Døre
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext opsætning er afsluttet !
 DocType: Course Assessment Criteria,Weightage,Vægtning
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: omkostningssted er påkrævet for resultatopgørelsekonto {2}. Opret venligst et standard omkostningssted for firmaet.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Ny kontakt
-DocType: Territory,Parent Territory,Parent Territory
+DocType: Territory,Parent Territory,Overordnet område
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materiale Kvittering
 DocType: Homepage,Products,Produkter
@@ -1701,38 +1699,37 @@
 DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
 ,Item-wise Sales Register,Vare-wise Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttokøbesum
-DocType: Asset,Depreciation Method,afskrivningsmetode
+DocType: Asset,Depreciation Method,Afskrivningsmetode
 apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Samlet Target
 DocType: Program Course,Required,Nødvendig
 DocType: Job Applicant,Applicant for a Job,Ansøger
-DocType: Production Plan Material Request,Production Plan Material Request,Produktion Plan Materiale Request
+DocType: Production Plan Material Request,Production Plan Material Request,Produktionsplan-Materialeanmodning
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ingen produktionsordrer oprettet
 DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
-apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
-DocType: Purchase Invoice Item,Batch No,Batch Nej
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Kan ikke finde valutakurs for {0} til {1} for centrale dato {2}
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Udlæs rapporten og udskriv den ved hjælp af et regnearksprogram.
+DocType: Purchase Invoice Item,Batch No,Partinr.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod kundens indkøbsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Formynder 2 mobiltelefonnr.
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hoved
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hoved
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Medarbejdere HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Standard stykliste ({0}) skal være aktiv for denne vare eller dens skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Standard stykliste ({0}) skal være aktiv for denne vare eller dens skabelon
 DocType: Employee,Leave Encashed?,Skal fravær udbetales?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Salgsmulighed Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige Omkostninger
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Opret indkøbsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Opret indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Der er ikke nok dage til rådighed til fraværstype {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens varenr.
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
-DocType: Territory,Territory Name,Territory Navn
+DocType: Territory,Territory Name,Områdenavn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Ansøger.
 DocType: Purchase Order Item,Warehouse and Reference,Lager og reference
@@ -1741,9 +1738,8 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppens styrke
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Medarbejdervurderinger
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Doppelte serienumre er indtastet for vare {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
-DocType: Grading Structure,Grading Intervals,grading Intervaller
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom ind
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kan ikke overbill til konto {0} i rækken {1} mere end {2}. For at tillade over-fakturering, skal du indstille i Køb Indstillinger"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Indstil filter baseret på Item eller Warehouse
@@ -1752,20 +1748,21 @@
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
 DocType: Student Group,Instructors,Instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit Beløb i Konto Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Stykliste {0} skal indsendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Stykliste {0} skal godkendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række # {0}: Afvist Warehouse er obligatorisk mod afvist element {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betaling
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Administrer dine ordrer
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Administrér dine ordrer
 DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialeanmodning af maksimum {0} kan oprettes for vare {1} mod salgsordre {2}
 DocType: Employee,Salutation,Titel
-DocType: Course,Course Abbreviation,Kursus Forkortelse
+DocType: Course,Course Abbreviation,Kursusforkortelse
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Medarbejder {0} på halv tid den {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Samlet arbejdstid bør ikke være større end maksimal arbejdstid {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Quotation Item,Actual Qty,Faktiske Antal
 DocType: Sales Invoice Item,References,Referencer
@@ -1775,19 +1772,19 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Ny kurv
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Ny kurv
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Vare {0} er ikke en serienummervare
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
 DocType: Vehicle,Wheels,Hjul
 DocType: Packing Slip,To Package No.,Til pakkenr.
-DocType: Production Planning Tool,Material Requests,Materiale Anmodning
+DocType: Production Planning Tool,Material Requests,Materialeanmodninger
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitetsomkostninger
 DocType: Sales Invoice Timesheet,Timesheet Detail,Timeseddel Detaljer
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 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/doctype/payment_request/payment_request.js +36,Make Payment Entry,Foretag indbetaling indtastning
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Indtast indbetaling
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Mængde for vare {0} skal være mindre end {1}
 ,Sales Invoice Trends,Salgsfaktura Trends
 DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend fravær
@@ -1798,18 +1795,18 @@
 apps/erpnext/erpnext/config/accounts.py +210,Tree of financial Cost Centers.,Tree of finansielle omkostningssteder.
 DocType: Serial No,Delivery Document No,Levering dokument nr
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +184,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Sæt venligst ""Gevinst/tabskonto vedr. salg af anlægsaktiv"" i firma {0}"
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Hent varer fra købskvitteringer
 DocType: Serial No,Creation Date,Oprettelsesdato
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
-DocType: Production Plan Material Request,Material Request Date,Materiale Request Dato
+DocType: Production Plan Material Request,Material Request Date,Materialeanmodningsdato
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør tibudt Varer
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiverer skabelse af tid logfiler mod produktionsordrer. Operationer må ikke spores mod produktionsordre
 DocType: Student,Student Mobile Number,Studerende mobiltelefonnr.
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-id er obligatorisk
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Parti-id er obligatorisk
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Håndtering af sager
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,Regnskabsår
 DocType: Vehicle Log,Fuel Price,Brændstofpris
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Anlægsaktiv-varen skal være en ikke-lagervare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Anlægsaktiv-varen skal være en ikke-lagervare.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan ikke tildeles mod {0}, da det ikke er en indtægt eller omkostning konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
 DocType: Student Admission,Application Form Route,Ansøgningsskema Route
@@ -1825,20 +1822,20 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,fx 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Fraværstype {0} kan ikke fordeles, da den er af typen uden løn"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""I ord"" vil være synlig, når du gemmer salgsfakturaen."
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Varegruppetræ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
-DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke sat op til serienumre. Tjek vare-masteren
+DocType: Maintenance Visit,Maintenance Time,Vedligeholdelsestid
 ,Amount to Deliver,"Beløb, Deliver"
 apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Startdato kan ikke være tidligere end året Start Dato for akademiske år, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Startdato kan ikke være tidligere end året Start Dato for skoleåret, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
 DocType: Guardian,Guardian Interests,Guardian Interesser
 DocType: Naming Series,Current Value,Aktuel værdi
 apps/erpnext/erpnext/controllers/accounts_controller.py +252,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
-,Serial No Status,Løbenummer status
+,Serial No Status,Serienummerstatus
 DocType: Payment Entry Reference,Outstanding,Udestående
 ,Daily Timesheet Summary,Daglig Tidsregisteringsoversigt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
@@ -1848,19 +1845,19 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Mængden {0} {1} trækkes mod {2}
 DocType: Employee,Salary Information,Løn Information
 DocType: Sales Person,Name and Employee ID,Navne og Medarbejder ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
 DocType: Website Item Group,Website Item Group,Webside-varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Skatter og afgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Indtast referencedato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingsposter ikke kan filtreres med {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
-DocType: Purchase Order Item,Material Request Item,Materiale Request Vare
+DocType: Purchase Order Item,Material Request Item,Materialeanmodningsvare
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Varegruppetræer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
 DocType: Asset,Sold,solgt
 ,Item-wise Purchase History,Vare-wise Købshistorik
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klik på ""Generer plan"" for at hente serienummeret tilføjet til vare {0}"
 DocType: Account,Frozen,Frosne
 ,Open Production Orders,Åbne produktionsordrer
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Beløb (Company Currency)
@@ -1873,7 +1870,7 @@
 DocType: Issue,Resolution Details,Løsningsdetaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,tildelinger
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptkriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Indtast Materiale Anmodning i ovenstående tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Indtast materialeanmodninger i ovenstående tabel
 DocType: Item Attribute,Attribute Name,Attribut Navn
 DocType: BOM,Show In Website,Vis I Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Vis Mængde i Website
@@ -1883,15 +1880,15 @@
 ,Qty to Order,Antal til ordre
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kontoen hoved under ansvar eller Equity, hvor gevinst / tab vil være reserveret"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
-DocType: Opportunity,Mins to First Response,Minutter til First Response
+DocType: Opportunity,Mins to First Response,Minutter til første reaktion
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} timer
 DocType: Course,Default Grading Scale,Standard karakterbekendtgørelsen
 DocType: Appraisal,For Employee Name,Til medarbejdernavn
-DocType: Holiday List,Clear Table,Klar Table
+DocType: Holiday List,Clear Table,Ryd tabellen
 DocType: C-Form Invoice Detail,Invoice No,Fakturanr.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +342,Make Payment,Foretag indbetaling
-DocType: Room,Room Name,Room Navn
+DocType: Room,Room Name,Værelsesnavn
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lad ikke kan anvendes / annulleres, før {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kundeadresser og kontakter
@@ -1899,18 +1896,18 @@
 DocType: Discussion,Discussion,Diskussion
 DocType: Payment Entry,Transaction ID,Transaktions-ID
 DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prisfastsættelsesregler er yderligere filtreret på mængden.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Angiv datoen for tilslutning til medarbejder {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Faktureret beløb i alt (via Tidsregistrering)
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kundeomsætning
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Omsætning gamle kunder
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Udlægsgodkender'"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vælg stykliste og produceret antal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Vælg stykliste og produceret antal
 DocType: Asset,Depreciation Schedule,Afskrivninger Schedule
 DocType: Bank Reconciliation Detail,Against Account,Mod konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halv Dag Dato skal være mellem Fra dato og Til dato
 DocType: Maintenance Schedule Detail,Actual Date,Faktisk dato
-DocType: Item,Has Batch No,Har Batch Nej
+DocType: Item,Has Batch No,Har partinr.
 apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Årlig fakturering: {0}
 DocType: Delivery Note,Excise Page Number,Excise Sidetal
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, Fra dato og Til dato er obligatorisk"
@@ -1922,26 +1919,27 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
 ,Quotation Trends,Tilbud trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke er nævnt i vare-masteren for vare {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
-DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Afventer Beløb
-DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
+DocType: Shipping Rule Condition,Shipping Amount,Forsendelsesmængde
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Afventende beløb
+DocType: Purchase Invoice Item,Conversion Factor,Konverteringsfaktor
 DocType: Purchase Order,Delivered,Leveret
 ,Vehicle Expenses,Køretøjsudgifter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
+DocType: Serial No,Invoice Details,Faktura detaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
 DocType: Employee Loan,Loan Amount,Lånebeløb
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Række {0}: Bill of Materials ikke fundet for Item {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Række {0}: stykliste ikke fundet for vare {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samlede fordelte blade {0} kan ikke være mindre end allerede godkendte blade {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Tilgodehavender
-,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
+,Supplier-Wise Sales Analytics,Salgsanalyser pr. leverandør
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Indtast betalt beløb
-DocType: Salary Structure,Select employees for current Salary Structure,Vælg medarbejdere til nuværende Løn Structure
+DocType: Salary Structure,Select employees for current Salary Structure,Vælg medarbejdere til denne lønstruktur
 DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
-DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Moderskurs (Forlad blank, hvis dette ikke er en del af Moders kursus)"
-DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Overordnet kursus (markér ikke, hvis dette ikke er en del af et overordnet kursus)"
+DocType: Leave Control Panel,Leave blank if considered for all employee types,"Lad feltet stå tomt, hvis det skal gælde for alle medarbejdertyper"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Tidsregistreringskladder
 DocType: HR Settings,HR Settings,HR-indstillinger
@@ -1950,18 +1948,19 @@
 DocType: Email Digest,New Expenses,Nye udgifter
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatbeløb
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
-DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+DocType: Leave Block List Allow,Leave Block List Allow,Tillad blokerede fraværsansøgninger
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppe til ikke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
-DocType: Loan Type,Loan Name,lån Navn
+DocType: Loan Type,Loan Name,Lånenavn
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Samlede faktiske
 DocType: Student Siblings,Student Siblings,Student Søskende
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Enhed
 apps/erpnext/erpnext/stock/get_item_details.py +131,Please specify Company,Angiv venligst firma
-,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
+,Customer Acquisition and Loyalty,Kundetilgang og -loyalitet
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste varer"
 DocType: Production Order,Skip Material Transfer,Spring over overførsel af materiale
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan ikke finde valutakurs for {0} til {1} for nøgle dato {2}. Opret venligst en valutaudvekslingsoptegnelse manuelt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Din regnskabsår slutter den
 DocType: POS Profile,Price List,Prisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
@@ -1972,13 +1971,13 @@
 DocType: Vehicle,Fuel Type,Brændstofstype
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Angiv venligst valuta i firmaet
 DocType: Workstation,Wages per hour,Timeløn
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagersaldo i parti {0} vil blive negativ {1} for vare {2} på lager {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materialeanmodninger er blevet dannet automatisk baseret på varens genbestillelsesniveau
-DocType: Email Digest,Pending Sales Orders,Afventer salgsordrer
+DocType: Email Digest,Pending Sales Orders,Afventende salgsordrer
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af salgsordre, salgsfaktura eller Kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Række # {0}: referencedokumenttype skal være en af følgende: salgsordre, salgsfaktura eller kassekladde"
 DocType: Salary Component,Deduction,Fradrag
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Række {0}: Fra tid og til tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,beløb Forskel
@@ -1993,27 +1992,27 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Tilbud
 DocType: Quotation,QTN-,T-
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
-,Production Analytics,Produktion Analytics
+,Production Analytics,Produktionsanalyser
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Omkostninger opdateret
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Emne Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldigt SSL-certifikat på vedhæftet fil {0}
 DocType: Student Admission,Eligibility,Berettigelse
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads hjælpe dig virksomhed, tilføje alle dine kontakter, og flere som din fører"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads hjælpe dig virksomhed, tilføje alle dine kontakter, og flere som din fører"
 DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
 DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
 DocType: Purchase Taxes and Charges,Deduct,Fratræk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Anvendt
-DocType: Sales Invoice Item,Qty as per Stock UOM,Antal pr Stock UOM
+DocType: Sales Invoice Item,Qty as per Stock UOM,Mængde pr. lagerenhed
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian2 Name,Guardian2 Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +131,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på emner, tilbud, salgsordrer osv fra kampagne til Return on Investment."
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
-DocType: Guardian,Work Address,Arbejde Adresse
+DocType: Guardian,Work Address,Arbejdsadresse
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Request for Quotation,Manufacturing Manager,Produktionschef
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serienummer {0} er under garanti op til {1}
@@ -2023,7 +2022,7 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Samlet tildelte beløb (Company Currency)
 DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
 DocType: BOM,Scrap Material Cost,Skrot materialeomkostninger
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Løbenummer {0} tilhører ikke nogen Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} tilhører ikke noget lager
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Asset,Supplier,Leverandør
 DocType: C-Form,Quarter,Kvarter
@@ -2038,15 +2037,15 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til deaktiverede brugere
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antal interaktioner
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Vælg firma ...
-DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
+DocType: Leave Control Panel,Leave blank if considered for all departments,"Lad stå tomt, hvis det skal gælde for alle afdelinger"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
-DocType: Process Payroll,Fortnightly,Fortnightly
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
+DocType: Process Payroll,Fortnightly,Hver 14. dag
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Udgifter til nye køb
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Salgsordre påkrævet for vare {0}
-DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
+DocType: Purchase Invoice Item,Rate (Company Currency),Sats (firmavaluta)
 DocType: Student Guardian,Others,Andre
 DocType: Payment Entry,Unallocated Amount,Ufordelt Beløb
 apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.
@@ -2054,9 +2053,9 @@
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ikke flere opdateringer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item bør ikke være et produkt Bundle. Fjern element `{0}` og gemme
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Underordnet vare bør ikke være en produktpakke. Fjern vare `{0}` og gem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Tilføj Tidsregistreringskladder
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Tilføj Tidsregistreringskladder
 DocType: Vehicle Service,Service Item,tjenesten Item
 DocType: Bank Guarantee,Bank Guarantee,Bank garanti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
@@ -2070,7 +2069,7 @@
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tree af finansielle konti.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Anlægsaktiv
-apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Føljeton Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serienummer-lager
 DocType: Employee Loan,Account Info,Kontooplysninger
 DocType: Activity Type,Default Billing Rate,Standard Billing Rate
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0} Studentgrupper oprettet.
@@ -2084,28 +2083,28 @@
 DocType: Expense Claim Detail,Expense Claim Detail,Udlægsdetalje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Vælg korrekt konto
 DocType: Item,Weight UOM,Vægtenhed
-DocType: Salary Structure Employee,Salary Structure Employee,Løn Struktur Medarbejder
+DocType: Salary Structure Employee,Salary Structure Employee,Lønstruktur medarbejder
 DocType: Employee,Blood Group,Blood Group
 DocType: Production Order Operation,Pending,Afventer
-DocType: Course,Course Name,Kursus navn
+DocType: Course,Course Name,Kursusnavn
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontorudstyr
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Firmaer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
+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/install_fixtures.py +60,Full-time,Fuld tid
 DocType: Salary Structure,Employees,Medarbejdere
 DocType: Employee,Contact Details,Kontaktoplysninger
-DocType: C-Form,Received Date,Modtaget Dato
+DocType: C-Form,Received Date,Modtaget d.
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Grundbeløb (Company Currency)
 DocType: Student,Guardians,Guardians
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Priserne vil ikke blive vist, hvis prisliste ikke er indstillet"
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Angiv et land for denne forsendelsesregel eller check Worldwide Shipping
-DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debet-til skal angives
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesedler hjælpe med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Angiv et land for denne forsendelsesregel eller check ""Levering til hele verden"""
+DocType: Stock Entry,Total Incoming Value,Samlet værdi indgående
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debet-til skal angives
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesedler hjælpe med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøbsprisliste
 DocType: Offer Letter Term,Offer Term,Offer Term
 DocType: Quality Inspection,Quality Manager,Kvalitetschef
@@ -2116,8 +2115,8 @@
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Sum ubetalt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ansættelsesbrev
-apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Dan materialeanmodninger og produktionsordrer.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Opret materialeanmodninger og produktionsordrer
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlet faktureret beløb
 DocType: BOM,Conversion Rate,Omregningskurs
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Søg efter vare
 DocType: Timesheet Detail,To Time,Til Time
@@ -2129,47 +2128,47 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktiveret
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Række {0}: Afsluttet Antal kan ikke være mere end {1} til drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} kan ikke opdateres ved hjælp af Stock Forsoning, brug venligst Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serienummervare {0} kan ikke opdateres ved hjælp af lagerafstemning, brug venligst lagerposter"
 DocType: Training Event Employee,Training Event Employee,Træning Begivenhed Medarbejder
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for vare {1}. Du har givet {2}."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for vare {1}. Du har angivet {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
 DocType: Item,Customer Item Codes,Kunde varenumre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Gevinst / Tab
 DocType: Opportunity,Lost Reason,Tabt Årsag
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Indtast Kvittering Dokument
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle varer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Indtast Kvittering Dokument
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Alle varer er allerede blevet faktureret
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
 DocType: Project,External,Ekstern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produktionsordrer Oprettet: {0}
-DocType: Branch,Branch,Branch
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Produktionsordrer Oprettet: {0}
+DocType: Branch,Branch,Filial
 DocType: Guardian,Mobile Number,Mobiltelefonnr.
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Udskriving
 DocType: Bin,Actual Quantity,Faktiske Mængde
 DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
-DocType: Scheduling Tool,Student Batch,Student Batch
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serienummer {0} ikke fundet
+DocType: Scheduling Tool,Student Batch,Elevgruppe
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dine kunder
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Opret studerende
-apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om projektet: {0}
-DocType: Leave Block List Date,Block Date,Block Dato
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Opret studerende
+apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om sag: {0}
+DocType: Leave Block List Date,Block Date,Blokeringsdato
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Ansøg nu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktisk antal {0} / ventende antal {1}
 DocType: Sales Order,Not Delivered,Ikke leveret
 ,Bank Clearance Summary,Bank Clearance Summary
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Opret og administrér de daglige, ugentlige og månedlige e-mail-nyhedsbreve."
 DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
 DocType: Stock Reconciliation Item,Current Amount,Det nuværende beløb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Bygninger
 DocType: Fee Structure,Fee Structure,Gebyr struktur
 DocType: Timesheet Detail,Costing Amount,Koster Beløb
 DocType: Student Admission,Application Fee,Tilmeldingsgebyr
-DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
-apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
+DocType: Process Payroll,Submit Salary Slip,Godkend lønseddel
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maksimal rabat for vare {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
 DocType: Sales Partner,Address & Contacts,Adresse & kontaktpersoner
 DocType: SMS Log,Sender Name,Afsendernavn
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,Sendt Til
 DocType: Payment Request,Make Sales Invoice,Opret salgsfaktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Næste Kontakt Dato kan ikke være i fortiden
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Næste Kontakt Dato kan ikke være i fortiden
 DocType: Company,For Reference Only.,Kun til reference.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Vælg partinr.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-Retsinformation
 DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
@@ -2188,28 +2188,28 @@
 DocType: Employee,Employment Details,Beskæftigelse Detaljer
 DocType: Employee,New Workplace,Ny Arbejdsplads
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
-apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},Ingen Vare med stregkode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},Ingen vare med stregkode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
 DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,styklister
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Butikker
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Butikker
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
 DocType: Item,End of Life,End of Life
 apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,Rejser
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard Løn Struktur fundet for medarbejderen {0} for de givne datoer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard-lønstruktur fundet for medarbejder {0} for de givne datoer
 DocType: Leave Block List,Allow Users,Tillad brugere
 DocType: Purchase Order,Customer Mobile No,Kunde mobiltelefonnr.
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Opdatering Omkostninger
-DocType: Item Reorder,Item Reorder,Item Genbestil
+DocType: Item Reorder,Item Reorder,Genbestil vare
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Vis lønseddel
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Materiale
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokument er over grænsen ved {0} {1} for vare {4}. Er du gør en anden {3} mod samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vælg ændringsstørrelse konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vælg ændringsstørrelse konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
@@ -2218,9 +2218,9 @@
 DocType: Topic,Topic,Emne
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Pengestrømme fra finansaktiviteter
 DocType: Budget Account,Budget Account,Budget-konto
-DocType: Quality Inspection,Verified By,Verified by
+DocType: Quality Inspection,Verified By,Bekræftet af
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi den anvendes i eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
-DocType: Grade Interval,Grade Description,Grade Beskrivelse
+DocType: Grading Scale Interval,Grade Description,Grade Beskrivelse
 DocType: Stock Entry,Purchase Receipt No,Købskvitteringsnr.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Opret lønseddel
@@ -2230,7 +2230,7 @@
 DocType: Appraisal,Employee,Medarbejder
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 DocType: Training Event,End Time,End Time
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,Aktiv Løn Struktur {0} fundet for medarbejderen {1} for de givne datoer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,Aktiv lønstruktur {0} fundet for medarbejder {1} for de givne datoer
 DocType: Payment Entry,Payment Deductions or Loss,Betalings Fradrag eller Tab
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Sortér efter Bilagstype
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,Fremmøde tildato
 DocType: Warranty Claim,Raised By,Rejst af
 DocType: Payment Gateway Account,Payment Account,Betalingskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Angiv venligst firma for at fortsætte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Angiv venligst firma for at fortsætte
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettoændring i Debitor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenserende Off
 DocType: Offer Letter,Accepted,Accepteret
@@ -2271,13 +2271,13 @@
 DocType: Shipping Rule,Shipping Rule Label,Forsendelseregeltekst
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Brugerforum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Råmaterialer kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Kassekladde
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
 DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
 DocType: Stock Entry,For Quantity,For Mængde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ikke godkendt
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Anmodning om.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} skal være negativ til gengæld dokument
@@ -2285,11 +2285,11 @@
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Navnet på det institut, som du konfigurerer dette system."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Sagsstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Følgende produktionsordrer blev dannet:
-DocType: Student Admission,Naming Series (for Student Applicant),Navngivnings Serienummer (for Student Ansøger)
+DocType: Student Admission,Naming Series (for Student Applicant),Navngivningsnummerserie (for elevansøger)
 DocType: Delivery Note,Transporter Name,Transporter Navn
 DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
 DocType: BOM,Show Operations,Vis Operations
@@ -2298,7 +2298,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Vare eller lager for række {0} matcher ikke materiale Request
 apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,Sidste dag i året
-DocType: Task Depends On,Task Depends On,Task Afhænger On
+DocType: Task Depends On,Task Depends On,Opgave afhænger af
 DocType: Supplier Quotation,Opportunity,Salgsmulighed
 ,Completed Production Orders,Afsluttede produktionsordrer
 DocType: Operation,Default Workstation,Standard Workstation
@@ -2306,13 +2306,14 @@
 DocType: Payment Entry,Deductions or Loss,Fradrag eller Tab
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} er lukket
 DocType: Email Digest,How frequently?,Hvor ofte?
-DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
+DocType: Purchase Receipt,Get Current Stock,Hent aktuel lagerbeholdning
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Styklistetræ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Student,Joining Date,Vær med Dato
 ,Employees working on a holiday,"Medarbejdere, der arbejder på en helligdag"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marker tilstede
 DocType: Project,% Complete Method,% Complete Method
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelsesstartdato kan ikke være før leveringsdato for serienummer {0}
 DocType: Production Order,Actual End Date,Faktisk slutdato
 DocType: BOM,Operating Cost (Company Currency),Driftsomkostninger (Company Valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2321,10 +2322,10 @@
 DocType: Company,Fixed Asset Depreciation Settings,Anlægsaktiv nedskrivning Indstillinger
 DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
 DocType: Purchase Invoice,Advances,Forskud
-DocType: Production Order,Manufacture against Material Request,Fremstilling mod Materiale Request
+DocType: Production Order,Manufacture against Material Request,Produktion mod materialeanmodning
 DocType: Item Reorder,Request for,Anmodning om
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundlæggende Rate (som pr Stock UOM)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundlæggende sats (som pr. lagerenhed)
 DocType: SMS Log,No of Requested SMS,Antal  af forespurgte SMS'er
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Fravær uden løn stemmer ikke med de godkendte fraværsansøgninger
 DocType: Campaign,Campaign-.####,Kampagne -. ####
@@ -2332,10 +2333,10 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
 DocType: Selling Settings,Auto close Opportunity after 15 days,Luk automatisk salgsmulighed efter 15 dage
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End År
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Tilbud/emne %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
 DocType: Delivery Note,DN-,DN-
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En distributør, forhandler, sælger eller butik, der sælger firmaets varer og tjenesteydelser mod en provision."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via Time Sheet)
@@ -2361,13 +2362,13 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standard momsskabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som ""Shipping"", ""forsikring"", ""Håndtering"" osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på ""Forrige Row alt"" kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
 DocType: Homepage,Homepage,Hjemmeside
 DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Oprettet - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Lagerindtastning {0} er ikke godkendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Næste Kontakt By kan ikke være det samme som Lead e-mail adresse
 DocType: Tax Rule,Billing City,Fakturering By
@@ -2380,7 +2381,7 @@
 DocType: Warranty Claim,Service Address,Tjeneste Adresse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Havemøbler og Kampprogram
 DocType: Item,Manufacture,Fremstilling
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vælg følgeseddel først
 DocType: Student Applicant,Application Date,Ansøgningsdato
 DocType: Salary Detail,Amount based on formula,Beløb baseret på formlen
 DocType: Purchase Invoice,Currency and Price List,Valuta- og prisliste
@@ -2388,17 +2389,17 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Clearance Dato ikke nævnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produktion
 DocType: Guardian,Occupation,Besættelse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (antal)
 DocType: Sales Invoice,This Document,Dette dokument
 DocType: Installation Note Item,Installed Qty,Antal installeret
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Træning Resultat
-DocType: Purchase Invoice,Is Paid,er Betalt
+DocType: Purchase Invoice,Is Paid,er betalt
 DocType: Salary Structure,Total Earning,Samlet Earning
 DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation gren mester.
+apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation filial-master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +290, or ,eller
 DocType: Sales Order,Billing Status,Fakturering status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapporter et problem
@@ -2410,12 +2411,12 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Ingen medarbejder for de ovenfor udvalgte kriterier eller lønseddel allerede skabt
 DocType: Notification Control,Sales Order Message,Salgsordrebesked
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Firma, Valuta, indeværende regnskabsår, m.v."
-DocType: Payment Entry,Payment Type,Betaling Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vælg venligst en batch for vare {0}. Kunne ikke finde en enkelt batch, der opfylder dette krav"
+DocType: Payment Entry,Payment Type,Betalingstype
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vælg venligst et parti for vare {0}. Kunne ikke finde et eneste parti, der opfylder dette krav"
 DocType: Process Payroll,Select Employees,Vælg Medarbejdere
 DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Check / reference Dato
-DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
+DocType: Purchase Invoice,Total Taxes and Charges,Moms i alt
 DocType: Employee,Emergency Contact,Emergency Kontakt
 DocType: Bank Reconciliation Detail,Payment Entry,Betaling indtastning
 DocType: Item,Quality Parameters,Kvalitetsparametre
@@ -2428,11 +2429,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvittering dokument skal indsendes
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvittering skal godkendes
 DocType: Purchase Invoice Item,Received Qty,Modtaget Antal
-DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
+DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Parti
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ikke betalte og ikke leveret
-DocType: Product Bundle,Parent Item,Parent Item
+DocType: Product Bundle,Parent Item,Overordnet vare
 DocType: Account,Account Type,Kontotype
 DocType: Delivery Note,DN-RET-,DN-Retsinformation
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Ingen tidsregistreringer
@@ -2441,28 +2442,29 @@
 ,To Produce,At producere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Løn
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Opret Bruger
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Opret Bruger
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
-DocType: Bin,Reserved Quantity,Reserveret Mængde
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Indtast venligst gyldig email adresse
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},Der er ingen obligatorisk kursus for programmet {0}
+DocType: Bin,Reserved Quantity,Reserveret mængde
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Indtast venligst en gyldig e-mailadresse
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},Der er intet obligatorisk kursus for programmet {0}
 DocType: Landed Cost Voucher,Purchase Receipt Items,Købskvittering varer
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,bagud
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Afskrivningsbeløb i perioden
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Deaktiveret skabelon må ikke være standardskabelon
-DocType: Account,Income Account,Indkomst konto
+DocType: Account,Income Account,Indtægtskonto
 DocType: Payment Request,Amount in customer's currency,Beløb i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,forrige
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Partier hjælper dig med at spore fremmøde, vurderinger og gebyrer for studerende"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Elevgrupper hjælper dig med at administrere fremmøde, vurderinger og gebyrer for eleverne"
 DocType: Payment Entry,Total Allocated Amount,Samlet bevilgede beløb
-DocType: Item Reorder,Material Request Type,Materiale Request Type
+DocType: Item Reorder,Material Request Type,Materialeanmodningstype
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Kassekladde til løn fra {0} til {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage er fuld, ikke spare"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Række {0}: UOM Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Række {0}: Enhedskode-konverteringsfaktor er obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Omkostningssted
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bilagsnr.
@@ -2471,16 +2473,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Skjul kundens CVR-nummer fra salgstransaktioner
 DocType: Upload Attendance,Upload HTML,Upload HTML
 DocType: Employee,Relieving Date,Lindre Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kan kun ændres via lager indtastning / følgeseddel / kvittering
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Prisfastsættelseregler laves for at overskrive prislisten og for at fastlægge rabatprocenter baseret på forskellige kriterier.
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,"Lager kan kun ændres via lagerindtastning, følgeseddel eller købskvittering"
 DocType: Employee Education,Class / Percentage,Klasse / Procent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Salg- og marketingschef
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Indkomstskat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
-apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spor fører af Industry Type.
-DocType: Item Supplier,Item Supplier,Vare Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Indtast venligst varenr. for at få batchnr.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Analysér emner efter branchekode.
+DocType: Item Supplier,Item Supplier,Vareleverandør
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Stock Indstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
@@ -2488,12 +2490,13 @@
 DocType: Task,% Progress,% fremskridt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gevinst/tab vedr. salg af anlægsaktiv
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Vil sende en e-mail om arrangementet til medarbejdere med status &#39;Åbn&#39;
-DocType: Task,Depends on Tasks,Afhænger Opgaver
+DocType: Task,Depends on Tasks,Afhænger af opgaver
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrér Kundegruppetræ.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Vedhæftede filer kan vises uden at gøre det muligt for indkøbskurven
 DocType: Supplier Quotation,SQTN-,LT-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Ny Cost center navn
 DocType: Leave Control Panel,Leave Control Panel,Forlad Kontrolpanel
-DocType: Project,Task Completion,Task Afslutning
+DocType: Project,Task Completion,Opgaveafslutning
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ikke på lager
 DocType: Appraisal,HR User,HR-bruger
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,Debit Til
 DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lønseddel fundet mellem {0} og {1}
-,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
+,Pending SO Items For Purchase Request,Afventende salgsordre-varer til indkøbsanmodning
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Studerende optagelser
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} er deaktiveret
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} er deaktiveret
 DocType: Supplier,Billing Currency,Fakturering Valuta
 DocType: Sales Invoice,SINV-RET-,SF-RET
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2515,20 +2517,20 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Check Number
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Samlet kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lagerpost {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Assessment Grupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nyt lagernavn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),I alt {0} ({1})
-DocType: C-Form Invoice Detail,Territory,Territory
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),I alt {0} ({1})
+DocType: C-Form Invoice Detail,Territory,Område
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
 DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
 DocType: Vehicle Log,Fuel Qty,Antal Fuel
-DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
+DocType: Production Order Operation,Planned Start Time,Planlagt starttime
 DocType: Course,Assessment,Vurdering
 DocType: Payment Entry Reference,Allocated,Allokeret
 apps/erpnext/erpnext/config/accounts.py +236,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,Master-Prisliste
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
 ,S.O. No.,SÅ No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Opret kunde fra emne {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Opret kunde fra emne {0}
 DocType: Price List,Applicable for Countries,Gældende for lande
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; og &quot;Afvist&quot; kan indsendes
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Elevgruppenavn er obligatorisk i rækken {0}
@@ -2587,7 +2589,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} tilhører ikke firmaet {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Omkostninger som på
 DocType: Account,Round Off,Afrundninger
-,Requested Qty,Anmodet Antal
+,Requested Qty,Anmodet mængde
 DocType: Tax Rule,Use for Shopping Cart,Bruges til Indkøbskurv
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Værdi {0} for Attribut {1} findes ikke på listen over gyldige Item Attribut Værdier for Item {2}
 DocType: BOM Item,Scrap %,Skrot-%
@@ -2596,20 +2598,20 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
 ,Requested,Anmodet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,Ingen Bemærkninger
-DocType: Purchase Invoice,Overdue,Forfaldne
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,Ingen bemærkninger
+DocType: Purchase Invoice,Overdue,Forfalden
 DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
 apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root Der skal være en gruppe
 DocType: Fees,FEE.,BETALING.
 DocType: Employee Loan,Repaid/Closed,Tilbagebetales / Lukket
 DocType: Item,Total Projected Qty,Den forventede samlede Antal
 DocType: Monthly Distribution,Distribution Name,Distribution Name
-DocType: Course,Course Code,Kursus Code
-apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+DocType: Course,Course Code,Kursuskode
+apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},Kvalitetskontrol kræves for vare {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettosats (firmavaluta)
 DocType: Salary Detail,Condition and Formula Help,Tilstand og formel Hjælp
-apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Territory Tree.
+apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Område-træ.
 DocType: Journal Entry Account,Sales Invoice,Salgsfaktura
 DocType: Journal Entry Account,Party Balance,Party Balance
 apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Vælg Anvend Rabat på
@@ -2621,9 +2623,9 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Vehicle Service,Engine Oil,Motorolie
 DocType: Sales Invoice,Sales Team1,Salgs TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kundeadresse
-DocType: Employee Loan,Loan Details,lån Detaljer
+DocType: Employee Loan,Loan Details,Lånedetaljer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Række {0}: suppleret Antal skal være større end nul.
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
 DocType: Account,Root Type,Root Type
@@ -2631,17 +2633,17 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plot
 DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
-DocType: BOM,Item UOM,Item UOM
+DocType: BOM,Item UOM,Vareenhed
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Cheque Print Template,Primary Settings,Primære indstillinger
 DocType: Purchase Invoice,Select Supplier Address,Vælg leverandør Adresse
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Tilføj medarbejdere
-DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
+DocType: Purchase Invoice Item,Quality Inspection,Kvalitetskontrol
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Anmodet materialemængde er mindre end minimum ordremængden
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2663,7 +2665,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vurdering Plan Kriterier
 DocType: Training Event,Scheduled,Planlagt
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Anmodning om tilbud.
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg venligst en vare, hvor ""Er lagervare"" er ""nej"" og ""Er salgsvare"" er ""Ja"", og der er ingen anden produktpakke"
 DocType: Student Log,Academic,Akademisk
 apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
@@ -2673,19 +2675,19 @@
 apps/erpnext/erpnext/stock/get_item_details.py +318,Price List Currency not selected,Prisliste Valuta ikke valgt
 ,Student Monthly Attendance Sheet,Student Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Sag startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +11,Until,Indtil
-DocType: Rename Tool,Rename Log,Omdøbe Log
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgruppe eller kursusplan er obligatorisk
+DocType: Rename Tool,Rename Log,Omdøb log
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Elevgruppe eller kursusplan er obligatorisk
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Vedligehold fakturering Timer og arbejdstid samme på Timesheet
 DocType: Maintenance Visit Purpose,Against Document No,Mod dokument nr
 DocType: BOM,Scrap,Skrot
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrer Sales Partners.
-DocType: Quality Inspection,Inspection Type,Inspektion Type
+DocType: Quality Inspection,Inspection Type,Kontroltype
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Lager med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Udløber på
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Tilføj studerende
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Tilføj studerende
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vælg {0}
 DocType: C-Form,C-Form No,C-Form Ingen
 DocType: BOM,Exploded_items,Exploded_items
@@ -2693,35 +2695,35 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Forsker
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Tilmelding Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Navn eller E-mail er obligatorisk
-apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspektion indkommende kvalitet.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Kommende kvalitetskontrol.
 DocType: Purchase Order Item,Returned Qty,Returneret Antal
 DocType: Employee,Exit,Udgang
 apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Typen er obligatorisk
 DocType: BOM,Total Cost(Company Currency),Totale omkostninger (firmavaluta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serienummer {0} oprettet
 DocType: Homepage,Company Description for website homepage,Firmabeskrivelse til hjemmesiden
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Af hensyn til kunderne, kan disse koder bruges i udskriftsformater ligesom fakturaer og følgesedler"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Navn
 DocType: Sales Invoice,Time Sheet List,Timeregistreringsoversigt
 DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
 DocType: Asset Category Account,Depreciation Expense Account,Afskrivninger udgiftskonto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
-DocType: Expense Claim,Expense Approver,Expense Godkender
+DocType: Expense Claim,Expense Approver,Udlægsgodkender
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Ikke-gruppe til gruppe
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},Batch er obligatorisk i række {0}
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},Parti er obligatorisk i række {0}
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Købskvittering leveret vare
 DocType: Payment Entry,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursus Tidsplaner udgår:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursusskema udgår:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Foretag betaling via kassekladden
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Printed On,Trykt On
-DocType: Item,Inspection Required before Delivery,Inspektion Kræves før Levering
-DocType: Item,Inspection Required before Purchase,Inspektion Kræves før køb
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ventende Aktiviteter
+DocType: Item,Inspection Required before Delivery,Kontrol påkrævet før levering
+DocType: Item,Inspection Required before Purchase,Kontrol påkrævet før køb
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Afventende aktiviteter
 DocType: Fee Component,Fees Category,Gebyrer Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -2731,7 +2733,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Company,Chart Of Accounts Template,Kontoplan Skabelon
 DocType: Attendance,Attendance Date,Fremmødedato
-apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},Vare Pris opdateret for {0} i prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},Vareprisen opdateret for {0} i prisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønnen opdelt på tillæg og fradrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
 DocType: Purchase Invoice Item,Accepted Warehouse,Accepteret lager
@@ -2745,14 +2747,14 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Fejl]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
 ,Employee Birthday,Medarbejder Fødselsdag
-DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Deltagelse Tool
-apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,grænse Krydset
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Elevgruppe fremmødeværktøj
+apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Grænse overskredet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"En akademisk sigt denne &quot;Academic Year &#39;{0} og&quot; Term Name&#39; {1} findes allerede. Venligst ændre disse poster, og prøv igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Da der er eksisterende transaktioner mod element {0}, kan du ikke ændre værdien af {1}"
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"En akademisk sigt denne ""skoleår '{0} og"" Term Name' {1} findes allerede. Venligst ændre disse poster, og prøv igen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Da der er eksisterende transaktioner mod element {0}, kan du ikke ændre værdien af {1}"
 DocType: UOM,Must be Whole Number,Skal være hele tal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nyt fravær tildelt (i dage)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serienummer {0} eksisterer ikke
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Kundelager (valgfrit)
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
@@ -2760,7 +2762,7 @@
 DocType: Employee Leave Approver,Leave Approver,Fraværsgodkender
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale Overført til Fremstilling
-DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udlæg' rolle
+DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Udlægsgodkender'-rolle
 DocType: Landed Cost Item,Receipt Document Type,Kvittering Dokumenttype
 DocType: Daily Work Summary Settings,Select Companies,Vælg Virksomheder
 ,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
@@ -2780,27 +2782,27 @@
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Betalings Entries {0} er un-linked
 DocType: GL Entry,Voucher No,Bilagsnr.
 ,Lead Owner Efficiency,Lederegenskaber Effektivitet
-DocType: Leave Allocation,Leave Allocation,Lad Tildeling
+DocType: Leave Allocation,Leave Allocation,Fraværstildeling
 DocType: Payment Request,Recipient Message And Payment Details,Modtager Besked Og Betalingsoplysninger
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materiale Anmodning {0} skabt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materialeanmodning {0} oprettet
 DocType: Production Planning Tool,Include sub-contracted raw materials,Medtag underleverandører råmaterialer
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og kontaktperson
 DocType: Cheque Print Template,Is Account Payable,Er konto Betales
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},Stock kan ikke opdateres mod køb Kvittering {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},Lager kan ikke opdateres mod købskvittering {0}
 DocType: Supplier,Last Day of the Next Month,Sidste dag i den næste måned
 DocType: Support Settings,Auto close Issue after 7 days,Auto tæt Issue efter 7 dage
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Efterlad ikke kan fordeles inden {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: forfalden / reference Dato overstiger tilladte kredit dage efter {0} dag (e)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: forfalden / reference Dato overstiger tilladte kredit dage efter {0} dag (e)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Ansøger
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumuleret Afskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
-DocType: Asset,Expected Value After Useful Life,Forventet værdi efter Nyttige Life
+DocType: Asset,Expected Value After Useful Life,Forventet værdi efter forventet brugstid
 DocType: Item,Reorder level based on Warehouse,Genbestil niveau baseret på Warehouse
-DocType: Activity Cost,Billing Rate,Fakturering Rate
-,Qty to Deliver,Antal til Deliver
-,Stock Analytics,Stock Analytics
+DocType: Activity Cost,Billing Rate,Faktureringssats
+,Qty to Deliver,Antal at levere
+,Stock Analytics,Lageranalyser
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operationer kan ikke være tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Imod Dokument Detail Nej
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Party Typen er obligatorisk
@@ -2808,11 +2810,11 @@
 DocType: Material Request,Requested For,Anmodet om
 DocType: Quotation Item,Against Doctype,Mod DOCTYPE
 apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1} er aflyst eller lukket
-DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
+DocType: Delivery Note,Track this Delivery Note against any Project,Spor denne følgeseddel mod en hvilken som helst sag
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Netto kontant fra Investering
 ,Is Primary Address,Er primære adresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,Asset {0} skal indsendes
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,Aktiv {0} skal godkendes
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +58,Attendance Record {0} exists against Student {1},Tilstedeværelse {0} eksisterer for studerende {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Afskrivninger Slået grund afhændelse af aktiver
@@ -2820,25 +2822,25 @@
 DocType: Asset,Item Code,Varenr.
 DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
 DocType: Journal Entry,User Remark,Brugerbemærkning
-DocType: Lead,Market Segment,Market Segment
+DocType: Lead,Market Segment,Markedssegment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end den samlede negative udestående beløb {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Lukning (dr)
 DocType: Cheque Print Template,Cheque Size,Check Størrelse
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serienummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Beskatningsskabelon for salgstransaktioner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
-DocType: School Settings,Current Academic Year,Nuværende akademiske år
-DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
+DocType: School Settings,Current Academic Year,Nuværende skoleår
+DocType: Stock Settings,Default Stock UOM,Standard lagerenhed
 DocType: Asset,Number of Depreciations Booked,Antal Afskrivninger Reserveret
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Imod medarbejderlån: {0}
 DocType: Landed Cost Item,Receipt Document,Kvittering dokument
 DocType: Production Planning Tool,Create Material Requests,Opret materialeanmodning
 DocType: Employee Education,School/University,Skole / Universitet
 DocType: Payment Request,Reference Details,Henvisning Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet værdi efter Nyttig Livet skal være mindre end Gross Købesum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet værdi efter brugstid skal være mindre end bruttokøbesummen
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængeligt antal på lageret
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Faktureret beløb
 DocType: Asset,Double Declining Balance,Dobbelt Faldende Balance
@@ -2847,9 +2849,9 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +572,'Update Stock' cannot be checked for fixed asset sale,'Opdater lager' kan ikke kontrolleres pga. salg af anlægsaktiver
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 DocType: Attendance,On Leave,Fraværende
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Send nyhedsbrev
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Modtag nyhedsbrev
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} tilhører ikke firma {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,Materialeanmodning {0} er annulleret eller stoppet
 apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Tilføj et par prøve optegnelser
 apps/erpnext/erpnext/config/hr.py +301,Leave Management,Fraværsadministration
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Sortér efter konto
@@ -2859,32 +2861,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differencebeløbet skal være en kontotype Aktiv / Fordring, da dette Stock Forsoning er en åbning indtastning"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Udbetalte beløb kan ikke være større end Lånebeløb {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Indkøbsordrenr. påkrævet for vare {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produktionsordre ikke oprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Produktionsordre ikke oprettet
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke ændre status som studerende {0} er forbundet med student ansøgning {1}
 DocType: Asset,Fully Depreciated,fuldt afskrevet
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markant Deltagelse HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citater er forslag, bud, du har sendt til dine kunder"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citater er forslag, bud, du har sendt til dine kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens Indkøbsordre
-apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Løbenummer og Batch
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serienummer og parti
 DocType: Warranty Claim,From Company,Fra firma
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summen af Snesevis af Assessment Criteria skal være {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Venligst sæt Antal Afskrivninger Reserveret
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Værdi eller Antal
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Venligst sæt Antal Afskrivninger Reserveret
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Værdi eller mængde
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
 ,Qty to Receive,Antal til Modtag
-DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
+DocType: Leave Block List,Leave Block List Allowed,Tillad blokerede fraværsansøgninger
 DocType: Grading Scale Interval,Grading Scale Interval,Karakterskala Interval
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Udlæg for kørebog {0}
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Rabat (%) på prisliste med margen
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Alle lagre
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Alle Leverandør Typer
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Alle leverandørtyper
 DocType: Global Defaults,Disable In Words,Deaktiver i ord
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Varenr. er obligatorisk, fordi varen ikke nummereres automatisk"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Tilbud {0} ikke af typen {1}
@@ -2897,7 +2899,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Sikrede lån
 DocType: Purchase Invoice,Edit Posting Date and Time,Redigér bogføringsdato og -tid
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +98,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Venligst sæt Afskrivninger relaterede konti i Asset kategori {0} eller Company {1}
-DocType: Academic Term,Academic Year,Akademi år
+DocType: Academic Term,Academic Year,Skoleår
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Åbning Balance Egenkapital
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Vurdering
@@ -2912,21 +2914,21 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +278,Select Quantity,Vælg antal
 DocType: Customs Tariff Number,Customs Tariff Number,Toldtarif nummer
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Afmelde denne e-mail-Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Afmeld dette e-mail-nyhedsbrev
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Besked sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konto med barn noder kan ikke indstilles som hovedbog
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Firma Valuta)
-DocType: Salary Slip,Hour Rate,Hour Rate
+DocType: Salary Slip,Hour Rate,Timesats
 DocType: Stock Settings,Item Naming By,Item Navngivning By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} findes ikke
-DocType: Project,Project Type,Projekt type
+DocType: Project,Project Type,Sagstype
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Omkostninger ved forskellige aktiviteter
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Indstilling Begivenheder til {0}, da Medarbejderen er knyttet til nedenstående sælgere ikke har et bruger-id {1}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Sætter begivenheder til {0}, da den til medarbejderen tilknyttede salgsmedarbejder {1} ikke har et brugernavn"
 DocType: Timesheet,Billing Details,faktureringsoplysninger
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kilde og mål lager skal være forskellige
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke tilladt at opdatere lagertransaktioner ældre end {0}
@@ -2965,13 +2967,13 @@
 DocType: Lead,From Customer,Fra kunde
 apps/erpnext/erpnext/demo/setup/setup_data.py +321,Calls,Opkald
 DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
-DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke sendt
+DocType: Purchase Order Item Supplied,Stock UOM,Lagerenhed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke godkendt
 DocType: Customs Tariff Number,Tariff Number,Tarif nummer
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Forventet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} hører ikke til lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +163,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
-DocType: Notification Control,Quotation Message,Tilbuds besked
+DocType: Notification Control,Quotation Message,Tilbudsbesked
 DocType: Employee Loan,Employee Loan Application,Medarbejder låneansøgning
 DocType: Issue,Opening Date,Åbning Dato
 apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Deltagelse er mærket korrekt.
@@ -2992,58 +2994,57 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Relation with Guardian1,Forholdet til Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kontant fra drift
 apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,fx moms
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Vare 4
 DocType: Student Admission,Admission End Date,Optagelse Slutdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +29,Sub-contracting,Underleverandører
 DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Elevgruppe
 DocType: Shopping Cart Settings,Quotation Series,Tilbudsnummer
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","En vare eksisterer med samme navn ({0}), og du bedes derfor ændre navnet på varegruppen eller omdøbe varen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vælg venligst kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Vælg venligst kunde
 DocType: C-Form,I,jeg
 DocType: Company,Asset Depreciation Cost Center,Asset Afskrivninger Omkostninger center
 DocType: Sales Order Item,Sales Order Date,Salgsordredato
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
-DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis markeret, vil alle børn i hver produktion element indgå i Materiale anmodninger."
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis markeret, vil alle underelementer i hvert produktionselement indgå i materialeanmodningerne."
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Lager {0}: firma er obligatorisk
-DocType: Stock Settings,Limit Percent,Begræns Procent
+DocType: Stock Settings,Limit Percent,Begrænsningsprocent
 ,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
 DocType: Assessment Plan,Examiner,Censor
 DocType: Student,Siblings,Søskende
-DocType: Journal Entry,Stock Entry,Stock indtastning
-DocType: Payment Entry,Payment References,Betalings Referencer
+DocType: Journal Entry,Stock Entry,Lagerindtastning
+DocType: Payment Entry,Payment References,Betalingsreferencer
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Forsikring Detaljer
 DocType: Account,Payable,Betales
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Indtast venligst Tilbagebetalingstid
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitorer ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitorer ({0})
 DocType: Pricing Rule,Margin,Margen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Gross Profit%
 DocType: Appraisal Goal,Weightage (%),Vægtning (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttokøbesummen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttokøbesummen er obligatorisk
 DocType: Lead,Address Desc,Adresse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party er obligatorisk
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Emnenavn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
-DocType: Grading Structure,Grade Intervals,Grade Intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vælg arten af din virksomhed.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installation Dato
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not belong to company {2},Række # {0}: Aktiv {1} hører ikke til firma {2}
-DocType: Employee,Confirmation Date,Bekræftelse Dato
+DocType: Employee,Confirmation Date,Bekræftet den
 DocType: C-Form,Total Invoiced Amount,Totalt faktureret beløb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
 DocType: Account,Accumulated Depreciation,Akkumulerede afskrivninger
 DocType: Stock Entry,Customer or Supplier Details,Kunde- eller leverandørdetaljer
 DocType: Employee Loan Application,Required by Date,Kræves af Dato
 DocType: Lead,Lead Owner,Emneejer
-DocType: Bin,Requested Quantity,Anmodet Mængde
+DocType: Bin,Requested Quantity,Anmodet mængde
 DocType: Employee,Marital Status,Civilstand
 DocType: Stock Settings,Auto Material Request,Automatisk materialeanmodning
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgængeligt batch-antal fra lageret
@@ -3052,13 +3053,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende stykliste og ny stykliste må ikke være ens
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Lønseddel id
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Der var fejl under planlægning kursus om:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Der var fejl under planlægning af kursus:
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Leveret
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
-DocType: Territory,Territory Targets,Territory Mål
+DocType: Territory,Territory Targets,Områdemål
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Indstil standard {0} i Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Startposition fra overkanten
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Samme leverandør er indtastet flere gange
@@ -3073,7 +3075,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Kassekladde til skrot
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Træk varene fra følgeseddel
 apps/erpnext/erpnext/accounts/utils.py +470,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
 apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.","Registrering af al kommunikation af type e-mail, telefon, chat, besøg osv"
 DocType: Manufacturer,Manufacturers used in Items,"Producenter, der anvendes i artikler"
@@ -3083,14 +3085,14 @@
 DocType: Buying Settings,Purchase Order Required,Indkøbsordre påkrævet
 ,Item-wise Sales History,Vare-wise Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
-,Purchase Analytics,Indkøbsanalyse
-DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
+,Purchase Analytics,Indkøbsanalyser
+DocType: Sales Invoice Item,Delivery Note Item,Følgeseddelvare
 DocType: Expense Claim,Task,Opgave
 DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for varer {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partinummer er obligatorisk for vare {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ","Hvis valgt, vil den værdi, der er angivet eller beregnet i denne komponent, ikke bidrage til indtjeningen eller fradrag. Men det er værdien kan henvises af andre komponenter, som kan tilføjes eller fratrækkes."
-,Stock Ledger,Stock Ledger
+,Stock Ledger,Lagerkladde
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Pris: {0}
 DocType: Company,Exchange Gain / Loss Account,Exchange Gevinst / Tab konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbejder og fremmøde
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Genbestil Antal
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuelle ledige stillinger
 DocType: Company,Stock Adjustment Account,Stock Justering konto
-DocType: Journal Entry,Write Off,Skriv Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskriv
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
@@ -3121,31 +3123,32 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandøren leverer til Kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Vare / {0}) er udsolgt
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Næste dato skal være større end bogføringsdatoen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Vis skat break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Vis momsdetaljer
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dataind- og udlæsning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock indgange findes mod Warehouse {0}, og derfor kan du ikke re-tildele eller ændre det"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ingen studerende Fundet
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Bogføringsdato
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Sælge
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Salg
 DocType: Sales Invoice,Rounded Total,Afrundet i alt
 DocType: Product Bundle,List items that form the package.,"Vis varer, der er indeholdt i pakken."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel fordeling bør være lig med 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ud af AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vælg venligst Citater
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Make Vedligeholdelse Besøg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vælg venligst Citater
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Vedligeholdelse Besøg
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
 DocType: Company,Default Cash Account,Standard Kontant konto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er baseret på deltagelse af denne Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Ingen studerende i
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Tilføj flere varer eller åben fulde form
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den salgsordre annulleres"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +77,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end beløb i alt
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke et gyldigt partinummer for vare {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok dage til rådighed til fraværstype {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tilmelding Gebyr
@@ -3156,7 +3159,7 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt en forkert konto.
 DocType: Employee,Prefered Contact Email,Foretrukket kontakt e-mail
 DocType: Cheque Print Template,Cheque Width,Check Bredde
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validér salgspris for vare mod købspris eller værdiansættelsespris
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Godkend salgspris for vare mod købspris eller værdiansættelsespris
 DocType: Program,Fee Schedule,Fee Schedule
 DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
 DocType: Company,Create Chart Of Accounts Based On,Opret kontoplan baseret på
@@ -3169,12 +3172,12 @@
 DocType: Cheque Print Template,Scanned Cheque,scannede Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
 DocType: Timesheet,Total Billable Amount,Samlet faktureres Beløb
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Vare 3
 DocType: Purchase Order,Customer Contact Email,Kundeservicekontakt e-mail
 DocType: Warranty Claim,Item and Warranty Details,Item og garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Vælg Programmet for at hente obligatoriske kurser.
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Vælg programmet for at hente obligatoriske kurser.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Ansvar
 DocType: Expense Claim Account,Expense Claim Account,Udlægskonto
 DocType: Sales Person,Sales Person Name,Salgsmedarbejdernavn
@@ -3182,18 +3185,19 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Tilføj brugere
 DocType: POS Item Group,Item Group,Varegruppe
 DocType: Item,Safety Stock,Sikkerhed Stock
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fremskridt% for en opgave kan ikke være mere end 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fremskridt-% for en opgave kan ikke være mere end 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Varemoms række {0} skal have en konto med 
+typen moms, indtægt, omkostning eller kan debiteres"
 DocType: Sales Order,Partly Billed,Delvist faktureret
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Vare {0} skal være en anlægsaktiv-vare
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Vare {0} skal være en anlægsaktiv-vare
 DocType: Item,Default BOM,Standard stykliste
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
-DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
-DocType: Sales Invoice,Include Payment (POS),Medtag Betaling (POS)
+DocType: Journal Entry,Printing Settings,Udskrivningsindstillinger
+DocType: Sales Invoice,Include Payment (POS),Medtag betaling (Kassesystem)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Forsikringsselskab
@@ -3208,19 +3212,19 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto skal indtastes for post
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Studentadresse
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste valutakurs
-DocType: Purchase Invoice Item,Rate,Rate
+DocType: Purchase Invoice Item,Rate,Sats
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adresse Navn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adresse Navn
 DocType: Stock Entry,From BOM,Fra stykliste
 DocType: Assessment Code,Assessment Code,Assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grundlæggende
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktioner før {0} er frosset
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
 DocType: Bank Reconciliation Detail,Payment Document,Betaling dokument
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
-DocType: Salary Slip,Salary Structure,Løn Struktur
+DocType: Salary Slip,Salary Structure,Lønstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Issue Materiale
@@ -3229,23 +3233,23 @@
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilbud
 apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du vil ikke være i stand til at genindlæse, indtil du har netværk igen."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Ingen elevgrupper oprettet.
-DocType: Purchase Invoice Item,Serial No,Løbenummer
+DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig tilbagebetaling beløb kan ikke være større end Lånebeløb
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
 DocType: Purchase Invoice,Print Language,print Sprog
 DocType: Salary Slip,Total Working Hours,Samlede arbejdstid
 DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Indtast værdien skal være positiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Indtast værdien skal være positiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle områder
 DocType: Purchase Invoice,Items,Varer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student er allerede tilmeldt.
 DocType: Fiscal Year,Year Name,År navn
-DocType: Process Payroll,Process Payroll,Proces Payroll
+DocType: Process Payroll,Process Payroll,Lønafregning
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +234,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
-DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
+DocType: Product Bundle Item,Product Bundle Item,Produktpakkevare
 DocType: Sales Partner,Sales Partner Name,Salgs Partner Navn
 apps/erpnext/erpnext/hooks.py +111,Request for Quotations,Anmodning om tilbud
-DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Faktura Beløb
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalt fakturabeløb
 DocType: Student Language,Student Language,Student Sprog
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kunder
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Ordre / Quot%
@@ -3254,21 +3258,19 @@
 DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra lager
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ingen Elementer med Bill of Materials at Fremstilling
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
 DocType: Assessment Plan,Supervisor Name,supervisor Navn
-DocType: Program Enrollment Course,Program Enrollment Course,Program tilmeldingskursus
-DocType: Grading Structure,Grading Structure,indplaceringsstruktur
+DocType: Program Enrollment Course,Program Enrollment Course,Tilmeldingskursusprogramm
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
 DocType: Tax Rule,Shipping City,Forsendelse By
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
 DocType: Notification Control,Customize the Notification,Tilpas Underretning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Pengestrøm fra driften
 DocType: Sales Invoice,Shipping Rule,Forsendelseregel
 DocType: Manufacturer,Limited to 12 characters,Begrænset til 12 tegn
-DocType: Journal Entry,Print Heading,Print Overskrift
+DocType: Journal Entry,Print Heading,Overskrift
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Samlede kan ikke være nul
 DocType: Training Event Employee,Attended,deltog
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
@@ -3286,6 +3288,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ingen standard-stykliste eksisterer for vare {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vælg bogføringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Åbning Dato bør være, før Closing Dato"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
 DocType: Department,Days for which Holidays are blocked for this department.,"Dage, for hvilke helligdage er blokeret for denne afdeling."
@@ -3295,83 +3298,84 @@
 DocType: Issue,Raised By (Email),Rejst af (E-mail)
 DocType: Training Event,Trainer Name,Trainer Navn
 DocType: Mode of Payment,General,Generelt
-apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Vedhæft Brevpapir
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Sidste Kommunikation
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Vedhæft brevhoved
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Sidste kommunikation
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serienummer påkrævet for serienummervare {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match betalinger med fakturaer
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
 ,Profitability Analysis,Lønsomhedsanalyse
-apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Tilføj til indkøbsvogn
+apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Føj til indkøbsvogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Sortér efter
 DocType: Guardian,Interests,Interesser
 apps/erpnext/erpnext/config/accounts.py +267,Enable / disable currencies.,Aktivér / deaktivér valuta.
 DocType: Production Planning Tool,Get Material Request,Hent materialeanmodning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,Postale Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,Portoudgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
-DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Opret Medarbejder Records
+DocType: Quality Inspection,Item Serial No,Serienummer til varer
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Opret Medarbejder Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Samlet tilstede
-apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,regnskaber
+apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Regnskabsoversigter
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Time
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Lager id. Lager id skal indstilles af Lager indtastning eller kvittering
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nyt serienummer kan ikke have lager angivet. Lageret skal sættes ved lagerindtastning eller købskvittering
 DocType: Lead,Lead Type,Emnetype
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende blade på Block Datoer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende fravær på blokerede dage
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +380,All these items have already been invoiced,Alle disse varer er allerede blevet faktureret
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
 DocType: Item,Default Material Request Type,Standard materialeanmodningstype
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Ukendt
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelsesregelbetingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Kassesystem
 DocType: Payment Entry,Received Amount,modtaget Beløb
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Opret fuld mængde, ignorerer mængde allerede er i ordre"
 DocType: Account,Tax,Skat
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Ikke Markeret
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægningsværktøj
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan ikke opdateres ved hjælp af Stock Afstemning, men brug Lagerindgang"
-DocType: Quality Inspection,Report Date,Report Date
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Parti-vare {0} kan ikke opdateres ved hjælp af lagerafstemning, men brug lagerindtastning i stedet"
+DocType: Quality Inspection,Report Date,Rapporteringsdato
 DocType: Student,Middle Name,Mellemnavn
 DocType: C-Form,Invoices,Fakturaer
 DocType: Batch,Source Document Name,Kildedokumentnavn
 DocType: Job Opening,Job Title,Titel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Opret Brugere
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Opret Brugere
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
 DocType: Stock Entry,Update Rate and Availability,Opdatering Vurder og tilgængelighed
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
 DocType: POS Customer Group,Customer Group,Kundegruppe
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Ny batch-id (valgfri)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nyt partinr. (valgfri)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: BOM,Website Description,Hjemmesidebeskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoændring i Equity
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail adresse skal være unikt, findes allerede for {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresse skal være unikt, findes allerede for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Kvittering
 ,Sales Register,Salgs Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send e-mails på
-DocType: Quotation,Quotation Lost Reason,Tilbud afvist - Årsag
+DocType: Quotation,Quotation Lost Reason,Tilbud afvist - årsag
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Vælg dit domæne
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transaktion henvisning ingen {0} dateret {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ingen kunder endnu!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pengestrømsopgørelse
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige maksimale lånebeløb af {0}
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Bilagstype
 DocType: Item,Attributes,Attributter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Indtast venligst Skriv Off konto
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste Ordredato
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste ordredato
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Deltagelse for flere medarbejdere
@@ -3381,29 +3385,29 @@
 DocType: Serial No,Creation Document Type,Creation Dokumenttype
 DocType: Leave Type,Is Encash,Er indløse
 DocType: Leave Allocation,New Leaves Allocated,Nye fravær Allokeret
-apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Sagsdata er ikke tilgængelige for tilbuddet
 DocType: Project,Expected End Date,Forventet slutdato
 DocType: Budget Account,Budget Amount,Budget Beløb
 DocType: Appraisal Template,Appraisal Template Title,Vurderingsskabelonnavn
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},"Fra Dato {0} for Employee {1} kan ikke være, før medarbejderens sammenføjning Dato {2}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Kommerciel
 DocType: Payment Entry,Account Paid To,Konto Betalt Til
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} må ikke være en lagervare
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Overordnet bare {0} må ikke være en lagervare
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle produkter eller tjenesteydelser.
 DocType: Expense Claim,More Details,Flere detaljer
 DocType: Supplier Quotation,Supplier Address,Leverandør Adresse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget for konto {1} mod {2} {3} er {4}. Det vil overstige med {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Række {0} # konto skal være af typen 'Anlægsaktiv'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
-apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelsesmængden for et salg
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Nummerserien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Studiekort
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typer af aktiviteter for Time Logs
 DocType: Tax Rule,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
 DocType: Training Event,Exam,Eksamen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturering stat
@@ -3414,19 +3418,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
-DocType: Naming Series,Setup Series,Opsætning Series
+DocType: Naming Series,Setup Series,Opsætning af nummerserier
 DocType: Payment Reconciliation,To Invoice Date,Til fakturadato
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Inaktive kunder
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Købskvitteringer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan anvendes en prisfastsættelsesregel?
-DocType: Stock Entry,Delivery Note No,Levering Note Nej
-DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Hvis markeret, kun købe materielle anmodninger om endelige råmaterialer vil indgå i de Materielle anmodninger. Ellers vil Materiale Anmodninger om forældre elementer skabes"
+DocType: Stock Entry,Delivery Note No,Følgeseddelnr.
+DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Hvis markeret, vil kun indkøbs-materialeanmodninger om endelige råmaterialer indgå i materialeanmodningerne. Ellers vil materialeanmodninger for overordnede varer blive dannet"
 DocType: Cheque Print Template,Message to show,Besked for at vise
 DocType: Company,Retail,Retail
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Produktpakke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
@@ -3436,12 +3440,12 @@
 DocType: Payment Entry,Account Paid From,Konto Betalt Fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råmateriale varenr.
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Opret emne
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Opret emne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print og papirvarer
 DocType: Stock Settings,Show Barcode Field,Vis stregkodefelter
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Send Leverandør Emails
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Løn allerede behandlet for perioden {0} til {1}, ferie ansøgningsperiode kan ikke være i dette datointerval."
-apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installation rekord for en Serial No.
+apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installationspost for et serienummer
 DocType: Guardian Interest,Guardian Interest,Guardian Renter
 apps/erpnext/erpnext/config/hr.py +177,Training,Uddannelse
 DocType: Timesheet,Employee Detail,Medarbejder Detail
@@ -3451,17 +3455,18 @@
 DocType: Offer Letter,Awaiting Response,Afventer svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Frem
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Angiv hvis ikke-standard betalingskonto
 DocType: Salary Slip,Earning & Deduction,Tillæg & fradrag
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Værdiansættelses Rate er ikke tilladt
 DocType: Holiday List,Weekly Off,Ugedag fri
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
-DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
+DocType: Sales Invoice,Return Against Sales Invoice,Retur mod salgsfaktura
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Vare 5
 DocType: Serial No,Creation Time,Creation Time
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
-DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Omsætning i alt
+DocType: Sales Invoice,Product Bundle Help,Produktpakkehjælp
 ,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
 DocType: Production Order Item,Production Order Item,Produktionsordre Item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
@@ -3469,8 +3474,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Delvist bestilt
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Omkostningssted er obligatorisk for vare {2}
 DocType: Vehicle,Policy No,Politik Ingen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Få elementer fra Product Bundle
-DocType: Asset,Straight Line,Lige linje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Hent varer fra produktpakke
+DocType: Asset,Straight Line,Lineær afskrivning
 DocType: Project User,Project User,Sagsbruger
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dele
 DocType: GL Entry,Is Advance,Er Advance
@@ -3484,23 +3489,23 @@
 DocType: Program Enrollment Tool,Get Students From,Få studerende fra
 DocType: Hub Settings,Seller Country,Sælger Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicer Punkter på hjemmesiden
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppe dine elever i batches
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Opdel dine elever i grupper
 DocType: Authorization Rule,Authorization Rule,Autorisation Rule
 DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikationer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),I alt (kredit)
 DocType: Repayment Schedule,Payment Date,Betalingsdato
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nyt partiantal
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ny partimængde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antal Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelsesmængden
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,åbning Value
 DocType: Salary Detail,Formula,Formel
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serienummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Salgsprovisioner
 DocType: Offer Letter Term,Value / Description,/ Beskrivelse
 apps/erpnext/erpnext/controllers/accounts_controller.py +575,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
@@ -3508,9 +3513,9 @@
 DocType: Purchase Order Item,Expected Delivery Date,Forventet leveringsdato
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og kredit ikke ens for {0} # {1}. Forskellen er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Repræsentationsudgifter
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Make Materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Opret materialeanmodning
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Åbent Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salgsfaktura {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salgsfaktura {0} skal annulleres, før denne salgsordre annulleres"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Alder
 DocType: Sales Invoice Timesheet,Billing Amount,Fakturering Beløb
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
@@ -3518,18 +3523,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 DocType: Vehicle,Last Carbon Check,Sidste synsdato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Advokatudgifter
-DocType: Purchase Invoice,Posting Time,Bogføringstid
+DocType: Purchase Invoice,Posting Time,Bogføringsdato og -tid
 DocType: Timesheet,% Amount Billed,% Faktureret beløb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonudgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
-apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
+apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Serial No {0},Ingen vare med serienummer {0}
 DocType: Email Digest,Open Notifications,Åbne Meddelelser
 DocType: Payment Entry,Difference Amount (Company Currency),Forskel Beløb (Company Currency)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direkte udgifter
 apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} er en ugyldig e-mailadresse i &#39;Notification \ e-mail adresse&#39;
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Omsætning nye kunder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Rejseudgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
 apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
@@ -3542,8 +3547,8 @@
 DocType: Program Enrollment,Enrollment Date,Tilmelding Dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Kriminalforsorgen
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Lønarter
-DocType: Program Enrollment Tool,New Academic Year,Nye akademiske år
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retur / kreditnota
+DocType: Program Enrollment Tool,New Academic Year,Nyt skoleår
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Retur / kreditnota
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Samlet indbetalt beløb
 DocType: Production Order Item,Transferred Qty,Overført antal
@@ -3551,23 +3556,23 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planlægning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Udstedt
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
-apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vi sælger denne Vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vi sælger denne vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Leverandør id
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Mængde bør være større end 0
 DocType: Journal Entry,Cash Entry,indtastning af kontanter
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child noder kan kun oprettes under &#39;koncernens typen noder
 DocType: Leave Application,Half Day Date,Halv dag dato
-DocType: Academic Year,Academic Year Name,Studer i Name
+DocType: Academic Year,Academic Year Name,Skoleårsnavn
 DocType: Sales Partner,Contact Desc,Kontaktbeskrivelse
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
 DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
 DocType: Payment Entry,PE-,PE-
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Angiv standardkonto i udlægstype {0}
 DocType: Assessment Result,Student Name,Elevnavn
-DocType: Brand,Item Manager,Item manager
+DocType: Brand,Item Manager,Varechef
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Udbetalt løn
-DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
+DocType: Buying Settings,Default Supplier Type,Standard-leverandørtype
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +168,Note: Item {0} entered multiple times,Bemærk: Varer {0} indtastet flere gange
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakter.
@@ -3583,11 +3588,12 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
 ,Sales Funnel,Salgstragt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Forkortelsen er obligatorisk
-DocType: Project,Task Progress,Task Progress
+DocType: Project,Task Progress,Opgave-fremskridt
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kurv
 ,Qty to Transfer,Antal til Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Tilbud til emner eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
-,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
+,Territory Target Variance Item Group-Wise,Områdemål Variance Item Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Akkumuleret månedlig
 apps/erpnext/erpnext/controllers/accounts_controller.py +648,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
@@ -3602,12 +3608,12 @@
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Hvis deaktivere, &#39;I Words&#39; område vil ikke være synlig i enhver transaktion"
 DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
 DocType: Pricing Rule,Buying,Køb
-DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
+DocType: HR Settings,Employee Records to be created by,Medarbejdere skal oprettes af
 DocType: POS Profile,Apply Discount On,Påfør Rabat på
 ,Reqd By Date,Reqd Efter dato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Kreditorer
 DocType: Assessment Plan,Assessment Name,Vurdering Navn
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Række # {0}: Løbenummer er obligatorisk
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Række # {0}: serienummer er obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Forkortelse
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
@@ -3616,7 +3622,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Mængde ({0}) kan ikke være en brøkdel i række {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Saml Gebyrer
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i vare {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i vare {1}
 DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
 DocType: Item,Opening Stock,Åbning Stock
@@ -3634,7 +3640,7 @@
 DocType: Customer,From Lead,Fra Emne
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordrer frigives til produktion.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Program Enrollment Tool,Enroll Students,Tilmeld Studerende
 DocType: Hub Settings,Name Token,Navn Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard salg
@@ -3645,7 +3651,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
 DocType: Sales Invoice,SINV-,SF-
 DocType: Request for Quotation Item,Project Name,Sagsnavn
-DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
+DocType: Customer,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
 DocType: Production Order,Required Items,Nødvendige varer
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
@@ -3659,9 +3665,9 @@
 DocType: BOM Replace Tool,The BOM which will be replaced,Den stykliste som vil blive erstattet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Elektronisk udstyr
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Fravær skal angives i multipla af 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
-apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Indlæs fremmøde fra en .csv-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
@@ -3669,14 +3675,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Til Valuta
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillad følgende brugere til at godkende fraværsansøgninger på blokerede dage.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Udlægstyper.
 apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salgsprisen for vare {0} er lavere end dens {1}. Salgsprisen skal være mindst {2}
 DocType: Item,Taxes,Moms
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Betalt og ikke leveret
 DocType: Project,Default Cost Center,Standard omkostningssted
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserie for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Bank Guarantee,End Date,Slutdato
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transaktioner
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Lagertransaktioner
 DocType: Budget,Budget Accounts,Budget Regnskab
 DocType: Employee,Internal Work History,Intern Arbejde Historie
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akkumuleret Afskrivninger Beløb
@@ -3705,41 +3712,41 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Opret Leverandørtilbud
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
-apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",Tilføj andre brugere til din organisation end dig selv
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Bogføringsdato kan ikke være en fremtidig dato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: Løbenummer {1} matcher ikke med {2} {3}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: serienummer {1} matcher ikke med {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
-DocType: Batch,Batch ID,Batch-id
+DocType: Batch,Batch ID,Parti-id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Denne uges oversigt
 ,In Stock Qty,På lager Antal
-apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
-DocType: Program Enrollment,Get Courses,Få Kurser
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Lagertransaktioner
+DocType: Program Enrollment,Get Courses,Hent kurser
 DocType: GL Entry,Party,Selskab
 DocType: Sales Order,Delivery Date,Leveringsdato
 DocType: Opportunity,Opportunity Date,Salgsmulighedsato
-DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
+DocType: Purchase Receipt,Return Against Purchase Receipt,Retur mod købskvittering
 DocType: Request for Quotation Item,Request for Quotation Item,Anmodning om tilbud Varer
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
 DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Indtast e-mail-adresse adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Akkordarbejde
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Gns. Køb Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Gns. købssats
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timer)
 DocType: Employee,History In Company,Historie I Company
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhedsbreve
-DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
+DocType: Stock Ledger Entry,Stock Ledger Entry,Lagerpost
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Samme vare er blevet indtastet flere gange
-DocType: Department,Leave Block List,Lad Block List
+DocType: Department,Leave Block List,Blokér fraværsansøgninger
 DocType: Sales Invoice,Tax ID,CVR-nr.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke opsat til serienumre. Kolonnen skal være tom
 DocType: Accounts Settings,Accounts Settings,Kontoindstillinger
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Godkende
 DocType: Customer,Sales Partner and Commission,Salgs Partner og Kommission
 DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / år
-,Project Quantity,Projekt Mængde
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","I alt {0} for alle punkter er nul, kan være du skal ændre &quot;Fordel afgifter baseret på &#39;"
+,Project Quantity,Sagsmængde
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","I alt {0} for alle punkter er nul, kan være du skal ændre &quot;Fordel afgifter baseret på &#39;"
 DocType: Opportunity,To Discuss,Til Diskuter
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enheder af {1} behov i {2} at fuldføre denne transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rente (%) Årlig
@@ -3754,15 +3761,15 @@
 DocType: Purchase Invoice,Return,Retur
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Mode betaling er forpligtet til at foretage en betaling
-DocType: Project Task,Pending Review,Afventer anmeldelse
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Betalingsmåde er forpligtet til at foretage en betaling
+DocType: Project Task,Pending Review,Afventende anmeldelse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Anlægsaktiv {0} kan ikke kasseres, da det allerede er {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Udlæg ialt (via Udlæg)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Kunde-id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Række {0}: Valuta af BOM # {1} skal være lig med den valgte valuta {2}
 DocType: Journal Entry Account,Exchange Rate,Vekselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Salgsordre {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Salgsordre {0} er ikke godkendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Gebyr Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flådestyring
@@ -3770,7 +3777,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
 DocType: Cheque Print Template,Regular,Fast
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Samlet vægtning af alle vurderingskriterier skal være 100%
-DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
+DocType: BOM,Last Purchase Rate,Sidste købsværdi
 DocType: Account,Asset,Anlægsaktiv
 DocType: Project Task,Task ID,Opgave-id
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
@@ -3779,38 +3786,38 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Lager {0} eksisterer ikke
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Den valgte vare kan ikke have parti
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Værdiansættelse fald ikke fundet for Item {0}, som er forpligtet til at gøre regnskabsmæssige poster for {1} {2}. Hvis varen er transaktionsomkostninger som en prøve post i nævne {1}, bedes der i {1} Item bord. Ellers skal du oprette en indgående bestand transaktion for elementet eller omtale værdiansættelse sats i Item rekord, og derefter prøve submiting / annullering denne post"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% af materialer leveret mod denne følgeseddel
 DocType: Project,Customer Details,Kunde Detaljer
 DocType: Employee,Reports to,Rapporter til
-,Unpaid Expense Claim,Ubetalt omkostning
+,Unpaid Expense Claim,Ubetalt udlæg
 DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
 DocType: Payment Entry,Paid Amount,Betalt beløb
 DocType: Assessment Plan,Supervisor,Tilsynsførende
 apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
-DocType: Item Variant,Item Variant,Item Variant
+DocType: Item Variant,Item Variant,Varevariant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 DocType: BOM Scrap Item,BOM Scrap Item,Stykliste skrotvare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Indsendte ordrer kan ikke slettes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Godkendte ordrer kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Quality Management
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Vare {0} er blevet deaktiveret
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kvalitetssikring
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Vare {0} er blevet deaktiveret
 DocType: Employee Loan,Repay Fixed Amount per Period,Tilbagebetale fast beløb pr Periode
-apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
+apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Indtast mængde for vare {0}
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 DocType: Tax Rule,Purchase,Indkøb
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Antal
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Mål kan ikke være tom
-DocType: Item Group,Parent Item Group,Moder-varegruppe
+DocType: Item Group,Parent Item Group,Overordnet varegruppe
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +23,Cost Centers,Omkostningssteder
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillad nulværdi
 DocType: Training Event Employee,Invited,inviteret
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Løn Strukturer fundet for medarbejderen {0} for de givne datoer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive lønstrukturer fundet for medarbejder {0} for de givne datoer
 DocType: Opportunity,Next Contact,Næste Kontakt
 apps/erpnext/erpnext/config/accounts.py +277,Setup Gateway accounts.,Opsætning Gateway konti.
 DocType: Employee,Employment Type,Beskæftigelsestype
@@ -3822,12 +3829,12 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: Tax Rule,Sales Tax Template,Salg Afgift Skabelon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Vælg elementer for at gemme fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Vælg elementer for at gemme fakturaen
 DocType: Employee,Encashment Date,Indløsning Dato
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitets Omkostninger findes for Aktivitets Type - {0}
-DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
+DocType: Production Order,Planned Operating Cost,Planlagte driftsomkostninger
 DocType: Academic Term,Term Start Date,Term startdato
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},Vedlagt {0} # {1}
@@ -3840,8 +3847,8 @@
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
-Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** varer **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** varer **. Pakken ** Item ** vil have ""Er lagervarer"" som ""Nej"" og ""Er Sales Item"" som ""Ja"". For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
+Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** varer **. Dette er nyttigt, hvis du sammenfører en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** varer **. Pakken ** Item ** vil have ""Er lagervarer"" som ""Nej"" og ""Er Sales Item"" som ""Ja"". For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item."
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serienummer er obligatorisk for vare {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Angiv fra / til spænder
 DocType: Serial No,Under AMC,Under AMC
@@ -3850,27 +3857,28 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Grænseværdi
 DocType: BOM Replace Tool,Current BOM,Aktuel stykliste
-apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tilføj Løbenummer
+apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tilføj serienummer
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Udstedt
 DocType: Production Order,Warehouses,Lagre
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktiv kan ikke overføres
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Denne vare er en variant af {0} (skabelon).
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Indkøb
 DocType: Announcement,Announcement,Bekendtgørelse
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kan ikke slettes, da der eksisterer lager posteringer for dette lager."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kan ikke slettes, da der eksisterer lagerposter for dette lager."
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Beløb betalt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projektleder
 ,Quoted Item Comparison,Sammenligning Citeret Vare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Maksimal rabat tilladt for vare: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Indre værdi som på
 DocType: Account,Receivable,Tilgodehavende
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vælg varer til Produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Vælg varer til Produktion
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
 DocType: Item,Material Issue,Materiale Issue
 DocType: Hub Settings,Seller Description,Sælger Beskrivelse
@@ -3883,7 +3891,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Salary Detail,Component,Lønart
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Åbning Akkumuleret Afskrivning skal være mindre end lig med {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Åbning Akkumuleret Afskrivning skal være mindre end lig med {0}
 DocType: Warehouse,Warehouse Name,Lagernavn
 DocType: Naming Series,Select Transaction,Vælg Transaktion
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
@@ -3895,17 +3903,17 @@
 DocType: POS Profile,Terms and Conditions,Betingelser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
-DocType: Leave Block List,Applies to Company,Gælder for Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
+DocType: Leave Block List,Applies to Company,Gælder for hele firmaet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,"Kan ikke annullere, for en godkendt lagerindtastning {0} eksisterer"
 DocType: Employee Loan,Disbursement Date,Udbetaling Dato
 DocType: Vehicle,Vehicle,Køretøj
 DocType: Purchase Invoice,In Words,I Words
 DocType: POS Profile,Item Groups,Varegrupper
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
-DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
+DocType: Production Planning Tool,Material Request For Warehouse,Materialeanmodning for lager
 DocType: Sales Order Item,For Production,For Produktion
 DocType: Payment Request,payment_url,payment_url
-DocType: Project Task,View Task,View Opgave
+DocType: Project Task,View Task,Vis opgave
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Din regnskabsår begynder på
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
@@ -3917,7 +3925,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Tilslutte
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Employee Loan,Repay from Salary,Tilbagebetale fra Løn
 DocType: Leave Application,LAP/,SKØD/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Anmodning betaling mod {0} {1} for beløb {2}
@@ -3935,40 +3943,41 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Vurdering Resultat Detail
 DocType: Employee Education,Employee Education,Medarbejder Uddannelse
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Samme varegruppe findes to gange i varegruppetabellen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
 DocType: Salary Slip,Net Pay,Nettoløn
 DocType: Account,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} er allerede blevet modtaget
 ,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
 DocType: Expense Claim,Vehicle Log,Kørebog
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} er ikke knyttet til nogen konto, skal du oprette / linke den tilsvarende (Asset) konto for lageret."
 DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
 DocType: Customer,Sales Team Details,Salgs Team Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Slet permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Slet permanent?
 DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentielle muligheder for at sælge.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ugyldig {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Sygefravær
-DocType: Email Digest,Email Digest,Email Digest
+DocType: Email Digest,Email Digest,E-mail nyhedsbrev
 DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Opsætning din skole i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base ændring beløb (Company Currency)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Gem dokumentet først.
 DocType: Account,Chargeable,Gebyr
 DocType: Company,Change Abbreviation,Skift Forkortelse
-DocType: Expense Claim Detail,Expense Date,Expense Dato
-DocType: Item,Max Discount (%),Max Rabat (%)
+DocType: Expense Claim Detail,Expense Date,Udlægsdato
+DocType: Item,Max Discount (%),Maksimal rabat (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Sidste ordrebeløb
+DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail til
 DocType: Budget,Warn,Advar
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
 DocType: BOM,Manufacturing User,Produktionsbruger
 DocType: Purchase Invoice,Raw Materials Supplied,Raw Materials Leveres
 DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
-DocType: C-Form,Series,Series
+DocType: C-Form,Series,Nummerserie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
 DocType: Appraisal,Appraisal Template,Vurdering skabelon
 DocType: Item Group,Item Classification,Item Klassifikation
@@ -3990,38 +3999,37 @@
 DocType: Salary Detail,Default Amount,Standard Mængde
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Lager ikke fundet i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Denne måneds Summary
-DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
+DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontrol-aflæsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
 DocType: Tax Rule,Purchase Tax Template,Køb Skat Skabelon
-,Project wise Stock Tracking,Projekt klogt Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
+,Project wise Stock Tracking,Opfølgning på lager sorteret efter sager
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbejder Records.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Venligst sæt Næste Afskrivninger Dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Indtast Næste afskrivningsdato
 DocType: HR Settings,Payroll Settings,Lønindstillinger
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Angiv bestilling
 DocType: Email Digest,New Purchase Orders,Nye indkøbsordrer
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Vælg mærke ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Vælg varemærke ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akkumulerede afskrivninger som på
 DocType: Sales Invoice,C-Form Applicable,C-anvendelig
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Lager er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og kontaktpersoner
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Hold det webvenligt med en bredde på 900 pixels og en højde på 100 pixels
 DocType: Program,Program Abbreviation,Program Forkortelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
-DocType: Warranty Claim,Resolved By,Løst Af
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i købskvitteringen for hver enkelt vare
+DocType: Warranty Claim,Resolved By,Løst af
 DocType: Bank Guarantee,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Afsætte blade i en periode.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checks og Indskud forkert ryddet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
 DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Opret tilbud til kunder
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Opret tilbud til kunder
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;På lager&quot; eller &quot;Ikke på lager&quot; baseret på lager til rådighed i dette lager.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Styklister
 DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
@@ -4038,21 +4046,21 @@
 DocType: Employee,Educational Qualification,Uddannelseskvalifikation
 DocType: Workstation,Operating Costs,Driftsomkostninger
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action hvis Akkumulerede Månedligt budget overskredet
-DocType: Purchase Invoice,Submit on creation,Indsend om skabelse
+DocType: Purchase Invoice,Submit on creation,Godkend ved oprettelse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta for {0} skal være {1}
 DocType: Asset,Disposal Date,Salgsdato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mails vil blive sendt til alle aktive medarbejdere i selskabet ved den givne time, hvis de ikke har ferie. Sammenfatning af svarene vil blive sendt ved midnat."
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklæres tabt, fordi tilbud er afgivet."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Træning Feedback
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produktionsordre {0} skal godkendes
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursus er obligatorisk i række {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Tilføj / rediger priser
-DocType: Batch,Parent Batch,Moderselskab
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Tilføj / rediger priser
+DocType: Batch,Parent Batch,Overordnet parti
 DocType: Cheque Print Template,Cheque Print Template,Check Print skabelon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram af omkostningssteder
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
@@ -4062,11 +4070,11 @@
 DocType: Employee Loan,Totals,Totaler
 DocType: BOM,Manufacturing,Produktion
 ,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
-DocType: Account,Income,Indkomst
-DocType: Industry Type,Industry Type,Industri Type
+DocType: Account,Income,Indtægter
+DocType: Industry Type,Industry Type,Branchekode
 apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Salgsfaktura {0} er allerede blevet indsendt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Advarsel: Fraværsansøgningen indeholder følgende blokerede dage
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Salgsfaktura {0} er allerede blevet godkendt
 DocType: Assessment Result Detail,Score,score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Regnskabsår {0} findes ikke
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
@@ -4074,11 +4082,11 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheder af {1} behov i {2} på {3} {4} til {5} for at gennemføre denne transaktion.
 DocType: Fee Structure,Student Category,Studerendekategori
 DocType: Announcement,Student,Studerende
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisation enhed (departement) herre.
+apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisationsenheds-master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Indtast venligst gyldige mobiltelefonnumre
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
-DocType: Email Digest,Pending Quotations,Afventer Citater
-apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,Point-of-Sale profil
+DocType: Email Digest,Pending Quotations,Afventende tilbud
+apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,Kassesystemprofil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +75,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Usikrede lån
 DocType: Cost Center,Cost Center Name,Omkostningsstednavn
@@ -4088,24 +4096,24 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
 DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
-,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
+,Serial No Service Contract Expiry,Serienummer Servicekontrakt-udløb
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
 DocType: Naming Series,Help HTML,Hjælp HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Værktøj til dannelse af elevgrupper
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke fratrække når kategori er for &quot;Værdiansættelse&quot; eller &quot;Vaulation og Total &#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Modtaget fra
 DocType: Lead,Converted,Konverteret
-DocType: Item,Has Serial No,Har Løbenummer
+DocType: Item,Has Serial No,Har serienummer
 DocType: Employee,Date of Issue,Udstedt den
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Række {0}: Timer værdi skal være større end nul.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
 DocType: Issue,Content Type,Indholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
@@ -4114,30 +4122,30 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
 DocType: Payment Reconciliation,From Invoice Date,Fra fakturadato
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta skal være lig med enten standard comapany valuta eller fest konto valuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta skal være lig med enten standard comapany valuta eller fest konto valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Udbetal fravær
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Hvad gør det?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Til lager
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Student Indlæggelser
 ,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagerførte vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagerførte vare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
-DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
+DocType: Pricing Rule,Pricing Rule Help,Hjælp til prisfastsættelsesregel
 DocType: School House,House Name,Husnavn
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrisk
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsæt resten af din organisation som dine brugere. Du kan også tilføje invitere kunder til din portal ved at tilføje dem fra Kontakter
-DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsæt resten af din organisation som dine brugere. Du kan også tilføje invitere kunder til din portal ved at tilføje dem fra Kontakter
+DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi (difference udgående - indgående)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
 DocType: Vehicle,Vehicle Value,Køretøjsværdi
-DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
+DocType: Stock Entry,Default Source Warehouse,Standardkildelager
 DocType: Item,Customer Code,Kundekode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Birthday Reminder for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
-DocType: Buying Settings,Naming Series,Navngivnings Serienummer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
+DocType: Buying Settings,Naming Series,Navngivningsnummerserie
 DocType: Leave Block List,Leave Block List Name,Blokering af fraværsansøgninger
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdato skal være mindre end Forsikring Slutdato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
@@ -4145,13 +4153,13 @@
 DocType: Target Detail,Target Qty,Target Antal
 DocType: Shopping Cart Settings,Checkout Settings,Kassen Indstillinger
 DocType: Attendance,Present,Tilstede
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Følgeseddel {0} må ikke godkendes
 DocType: Notification Control,Sales Invoice Message,Salgfakturabesked
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukning konto {0} skal være af typen Ansvar / Equity
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Medarbejder {0} lønseddel er allerede overført til tidsregistreringskladde {1}
 DocType: Vehicle Log,Odometer,kilometertæller
 DocType: Sales Order Item,Ordered Qty,Bestilt antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Vare {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Stykliste indeholder ikke nogen lagervarer
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periode fra og periode datoer obligatorisk for tilbagevendende {0}
@@ -4160,11 +4168,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generer lønsedler
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Indkøb skal kontrolleres, om nødvendigt er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Sidste købskurs ikke fundet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Sidste købsværdi ikke fundet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Fakturering Timer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standard stykliste for {0} blev ikke fundet
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tryk på elementer for at tilføje dem her
 DocType: Fees,Program Enrollment,Program Tilmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Indstil {0}
@@ -4176,7 +4185,7 @@
 DocType: Payment Entry,Allocate Payment Amount,Tildel Betaling Beløb
 DocType: Employee External Work History,Salary,Løn
 DocType: Serial No,Delivery Document Type,Levering Dokumenttype
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Valider alle lønsedler for de ovenfor valgte kriterier
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Godkend alle lønsedler for de ovenfor valgte kriterier
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} varer
 DocType: Sales Order,Partly Delivered,Delvist leveret
 DocType: Email Digest,Receivables,Tilgodehavender
@@ -4184,24 +4193,24 @@
 DocType: Customer,Additional information regarding the customer.,Yderligere oplysninger om kunden.
 DocType: Quality Inspection Reading,Reading 5,Reading 5
 DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
-DocType: Purchase Invoice Item,Rejected Serial No,Afvist Løbenummer
+DocType: Purchase Invoice Item,Rejected Serial No,Afvist serienummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
 DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
-DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis nummerserien er indstillet, og serienummeret ikke fremkommer i transaktionerne, så vil serienummeret automatisk blive oprettet på grundlag af denne nummerserie. Hvis du altid ønsker, eksplicit at angive serienumre for denne vare, skal du lade dette felt være blankt."
+DocType: Upload Attendance,Upload Attendance,Indlæs fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +306,BOM and Manufacturing Quantity are required,Stykliste and produceret mængde skal angives
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stykliste erstattet
-,Sales Analytics,Salg Analytics
+,Sales Analytics,Salgsanalyser
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Tilgængelige {0}
 ,Prospects Engaged But Not Converted,Udsigter Engageret men ikke konverteret
 DocType: Manufacturing Settings,Manufacturing Settings,Produktion Indstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,Formynder 1 mobiltelefonnr.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,Indtast standardvaluta i Firma-masteren
-DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
+DocType: Stock Entry Detail,Stock Entry Detail,Lagerindtastningsdetaljer
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglige påmindelser
 DocType: Products Settings,Home Page is Products,Home Page er Produkter
 ,Asset Depreciation Ledger,Asset Afskrivninger Ledger
@@ -4254,28 +4263,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende helligdagskalender
 DocType: Employee,Cheque,Check
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +61,Series Updated,Series Opdateret
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +61,Series Updated,Nummerserien opdateret
 apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Kontotype er obligatorisk
-DocType: Item,Serial Number Series,Serial Number Series
+DocType: Item,Serial Number Series,Serienummer-nummerserie
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Lager er obligatorisk for lagervare {0} i række {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
 DocType: Issue,First Responded On,Først svarede den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Dato opdateret
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Opdel parti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Succesfuld Afstemt
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
-DocType: Production Order,Planned End Date,Planlagt Slutdato
-apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvor varer er gemt.
+DocType: Production Order,Planned End Date,Planlagt slutdato
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvor varer er på lager.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Request for Quotation,Supplier Detail,Leverandør Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Fejl i formel eller betingelse: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Faktureret beløb
 DocType: Attendance,Attendance,Fremmøde
 apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Lagervarer
 DocType: BOM,Materials,Materialer
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, skal hver afdeling vælges, hvor det skal anvendes."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være samme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Bogføringsdato og -tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
@@ -4299,39 +4308,39 @@
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Opsigelsesperiode
 DocType: Asset Category,Asset Category Name,Asset Kategori Navn
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ny salgsmedarbejder navn
-DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er et overordnet område og kan ikke redigeres.
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Navn på ny salgsmedarbejder
+DocType: Packing Slip,Gross Weight UOM,Bruttovægtenhed
 DocType: Delivery Note Item,Against Sales Invoice,Mod salgsfaktura
 DocType: Bin,Reserved Qty for Production,Reserveret Antal for Produktion
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Forlad ukontrolleret, hvis du ikke vil overveje batch mens du laver kursusbaserede grupper."
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Markér ikke, hvis du ikke vil overveje batch mens du laver kursusbaserede grupper."
 DocType: Asset,Frequency of Depreciation (Months),Hyppigheden af afskrivninger (måneder)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kreditkonto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Vis nul værdier
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Vis nulværdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
-apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Opsætning en simpel hjemmeside for min organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Opsæt en simpel hjemmeside for mit firma
 DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
 DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard-lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Indtast forælder omkostningssted
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Indtast overordnet omkostningssted
 DocType: Delivery Note,Print Without Amount,Print uden Beløb
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Afskrivningsdato
 apps/erpnext/erpnext/controllers/buying_controller.py +79,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Skat Kategori kan ikke være ""Værdiansættelse"" eller ""Værdiansættelse og Total"" eftersom alle varene er ikke-lagervarer"
-DocType: Issue,Support Team,Support Team
+DocType: Issue,Support Team,Supportteam
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Udløb (i dage)
 DocType: Appraisal,Total Score (Out of 5),Samlet score (ud af 5)
 DocType: Fee Structure,FS.,FS.
-DocType: Program Enrollment,Batch,Batch
+DocType: Program Enrollment,Batch,Parti
 apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balance
 DocType: Room,Seating Capacity,Seating Capacity
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Udlæg ialt (via Udlæg)
 DocType: Assessment Result,Total Score,Samlet score
 DocType: Journal Entry,Debit Note,Debitnota
-DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
+DocType: Stock Entry,As per Stock UOM,pr. lagerenhed
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke udløbet
 DocType: Student Log,Achievement,Præstation
 DocType: Batch,Source Document Type,Kilde dokumenttype
@@ -4345,21 +4354,21 @@
 DocType: Guardian,Alternate Number,Alternativ Number
 DocType: Assessment Plan Criteria,Maximum Score,Maksimal score
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
-DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Lad være tom hvis du laver elever grupper om året
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lad feltet stå tomt, hvis du laver elevergrupper hvert år"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af Løn Per Day"
 DocType: Purchase Invoice,Total Advance,Samlet Advance
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Den Term Slutdato kan ikke være tidligere end den Term startdato. Ret de datoer og prøv igen.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Citeringsantal
 ,BOM Stock Report,BOM Stock Rapport
 DocType: Stock Reconciliation Item,Quantity Difference,Mængdeforskel
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Behandling Payroll
+apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Lønadministration
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Kreditbeløb
 DocType: Cheque Print Template,Signatory Position,undertegnende holdning
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Sæt som Lost
 DocType: Timesheet,Total Billable Hours,Total fakturerbare timer
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betalingskvittering
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er baseret på transaktioner mod denne kunde. Se tidslinje nedenfor for detaljer
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er baseret på transaktioner for denne kunde. Se tidslinje nedenfor for detaljer
 DocType: Supplier,Credit Days Based On,Kreditdage baseret på
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Række {0}: Allokeret beløb {1} skal være mindre end eller lig med Payment indtastning beløb {2}
 DocType: Tax Rule,Tax Rule,Momsregel
@@ -4367,10 +4376,10 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
 apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kunder i kø
 DocType: Student,Nationality,Nationalitet
-,Items To Be Requested,Varer skal ansøges
+,Items To Be Requested,Varer til bestilling
 DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Company,Company Info,Firmainformation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Vælg eller tilføj ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Vælg eller tilføj ny kunde
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Omkostningssted er forpligtet til at bestille et udlæg
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er baseret på deltagelse af denne Medarbejder
@@ -4383,13 +4392,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at oprette fraværsansøgninger for de følgende dage.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Indkøbsbeløb
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverandørtilbud {0} oprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End År kan ikke være før Start År
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,End År kan ikke være før Start År
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Personalegoder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for vare {0} i række {1}
-DocType: Production Order,Manufactured Qty,Fremstillet Antal
-DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
+DocType: Production Order,Manufactured Qty,Fremstillet antal
+DocType: Purchase Receipt Item,Accepted Quantity,Mængde
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Angiv en standard helligdagskalender for medarbejder {0} eller firma {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger sendt til kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Sags-id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rækkenr. {0}: Beløb kan ikke være større end Udestående Beløb overfor Udlæg {1}. Udestående Beløb er {2}
@@ -4398,20 +4407,22 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bilagstype
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prisliste ikke fundet eller deaktiveret
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Prisliste ikke fundet eller deaktiveret
 DocType: Employee Loan Application,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} dannet for medarbejder {1} i det givne datointerval
 DocType: Employee,Education,Uddannelse
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Slet
 DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
 DocType: Employee,Current Address Is,Nuværende adresse er
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificeret
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valgfri. Sætter virksomhedens standard valuta, hvis ikke angivet."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængeligt antal fra vores lager
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Vælg Medarbejder Record først.
-DocType: POS Profile,Account for Change Amount,Konto for ændring beløb
+DocType: POS Profile,Account for Change Amount,Konto for returbeløb
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
@@ -4420,15 +4431,15 @@
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
 DocType: Serial No,Purchase / Manufacture Details,Indkøbs- og produktionsdetaljer
 DocType: Assessment Group,Assessment Group,Gruppe Assessment
-apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Partilager
 DocType: Employee,Contract End Date,Kontrakt Slutdato
-DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
+DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver sag
 DocType: Sales Invoice Item,Discount and Margin,Rabat og Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
 DocType: Pricing Rule,Min Qty,Min Antal
 DocType: Asset Movement,Transaction Date,Transaktionsdato
-DocType: Production Plan Item,Planned Qty,Planned Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,I alt Skat
+DocType: Production Plan Item,Planned Qty,Planlagt mængde
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Moms i alt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Netto i alt (firmavaluta)
@@ -4443,17 +4454,17 @@
 DocType: Hub Settings,Hub Settings,Hub Indstillinger
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Er eksisterende aktiv
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 ,Monthly Salary Register,Månedlig Løn Tilmeld
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kundeadresse
 DocType: BOM Operation,BOM Operation,BOM Operation
-DocType: School Settings,Validate the Student Group from Program Enrollment,Valider Studentgruppen fra Programindskrivning
+DocType: School Settings,Validate the Student Group from Program Enrollment,Godkend elevgruppen fra programindskrivning
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
 DocType: Student,Home Address,Hjemmeadresse
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
-DocType: POS Profile,POS Profile,POS profil
+DocType: POS Profile,POS Profile,Kassesystemprofil
 DocType: Training Event,Event Name,begivenhed Navn
 apps/erpnext/erpnext/config/schools.py +39,Admission,Adgang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Indlæggelser for {0}
@@ -4465,7 +4476,7 @@
 DocType: SMS Settings,Static Parameters,Statiske parametre
 DocType: Assessment Plan,Room,Værelse
 DocType: Purchase Order,Advance Paid,Advance Betalt
-DocType: Item,Item Tax,Item Skat
+DocType: Item,Item Tax,Varemoms
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiale til leverandøren
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Skattestyrelsen Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Grænsen {0}% forekommer mere end én gang
@@ -4476,11 +4487,11 @@
 DocType: Program,Program Name,Programnavn
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-DocType: Employee Loan,Loan Type,låntype
+DocType: Employee Loan,Loan Type,Lånetype
 DocType: Scheduling Tool,Scheduling Tool,Planlægning Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
-apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardindstillinger for lagertransaktioner.
 DocType: Purchase Invoice,Next Date,Næste dato
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -4497,10 +4508,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Vedhæft Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lagrene
 DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Opret Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Opret Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokér fraværsansøgninger pr. afdeling.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type skal være en af Modtag, Pay og Intern Transfer"
-apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
+apps/erpnext/erpnext/config/selling.py +179,Analytics,Analyser
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Indkøbskurv er tom
 DocType: Vehicle,Model,Model
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
@@ -4510,6 +4521,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad produktion på helligdage
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedhæftede filer
 DocType: Packing Slip,Package Weight Details,Pakkevægtdetaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betaling afslutning omdirigere brugeren til valgte side.
@@ -4517,7 +4529,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vælg en CSV-fil
 DocType: Student Leave Application,Mark as Present,Markér som tilstede
 DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
-apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Fremhævede Produkter
+apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Fremhævede varer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
@@ -4529,31 +4541,30 @@
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
 ,accounts-browser,konti-browser
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vælg kategori først
-apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt mester.
+apps/erpnext/erpnext/config/projects.py +13,Project master.,Sags-master.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","For at tillade over-fakturering eller over-bestilling, opdatere &quot;Allowance&quot; i Stock-indstillinger eller Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Vis ikke valutasymbol (fx. $) ved siden af valutaen.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Kreditdage
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Masseopret studerende
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Masseopret elever
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Hent varer fra stykliste
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Række # {0}: Bogføringsdato skal være den samme som købsdatoen {1} af aktivet {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,Ikke Indsendt lønsedler
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,Ikke-godkendte lønsedler
 ,Stock Summary,Stock Summary
 apps/erpnext/erpnext/config/accounts.py +241,Transfer an asset from one warehouse to another,Overfør et aktiv fra et lager til et andet
 DocType: Vehicle,Petrol,Benzin
-apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Styklister
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Driftsomkostninger (Company Valuta)
-DocType: Employee Loan Application,Rate of Interest,Rente
+DocType: Employee Loan Application,Rate of Interest,Rentesats
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
 DocType: GL Entry,Is Opening,Er Åbning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} findes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index d8b965e..bb5d300 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Stapelobjekt Ablauf-Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankwechsel
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Varianten anzeigen
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Varianten anzeigen
 DocType: Academic Term,Academic Term,Semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Stoff
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Menge
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gesundheitswesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zahlungsverzug (Tage)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Dienstzeitaufwand
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Häufigkeit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} ist erforderlich
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Werbung
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Gleiche Firma wurde mehr als einmal eingegeben
 DocType: Employee,Married,Verheiratet
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nicht zulässig für {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nicht zulässig für {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Holen Sie Elemente aus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie Mitarbeiter-Naming-System in Human Resource&gt; HR-Einstellungen ein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Keine Artikel aufgeführt
 DocType: Payment Reconciliation,Reconcile,Abgleichen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Lebensmittelgeschäft
 DocType: Quality Inspection Reading,Reading 1,Ablesewert 1
 DocType: Process Payroll,Make Bank Entry,Bankbuchung erstellen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonds
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Weiter Abschreibungen Datum kann nicht vor dem Kauf Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Weiter Abschreibungen Datum kann nicht vor dem Kauf Datum
 DocType: SMS Center,All Sales Person,Alle Vertriebsmitarbeiter
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Monatliche Ausschüttung ** hilft Ihnen, das Budget / Ziel über Monate zu verteilen, wenn Sie Saisonalität in Ihrem Unternehmen haben."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nicht Artikel gefunden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nicht Artikel gefunden
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Gehaltsstruktur Fehlende
 DocType: Lead,Person Name,Name der Person
 DocType: Sales Invoice Item,Sales Invoice Item,Ausgangsrechnungs-Artikel
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","z.B. ""Grundschule"" oder ""Universität"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Auf Berichte
 DocType: Warehouse,Warehouse Detail,Lagerdetail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Enddatum kann nicht später sein als das Jahr Enddatum des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
 DocType: Vehicle Service,Brake Oil,Bremsöl
 DocType: Tax Rule,Tax Type,Steuerart
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
 DocType: BOM,Item Image (if not slideshow),Artikelbild (wenn keine Diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Es existiert bereits ein Kunde mit dem gleichen Namen
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundensatz / 60) * tatsächliche Betriebszeit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Wählen Sie BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Wählen Sie BOM
 DocType: SMS Log,SMS Log,SMS-Protokoll
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Aufwendungen für gelieferte Artikel
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Der Urlaub am {0} ist nicht zwischen dem Von-Datum und dem Bis-Datum
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Klasse
 DocType: Sales Invoice Item,Delivered By Supplier,Geliefert von Lieferant
 DocType: SMS Center,All Contact,Alle Kontakte
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Fertigungsauftrag bereits für alle Positionen mit BOM erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Fertigungsauftrag bereits für alle Positionen mit BOM erstellt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Jahresgehalt
 DocType: Daily Work Summary,Daily Work Summary,tägliche Arbeitszusammenfassung
 DocType: Period Closing Voucher,Closing Fiscal Year,Abschluss des Geschäftsjahres
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ist gesperrt
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ist gesperrt
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Lagerkosten
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Wählen Sie Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Gegenbuchung
 DocType: Journal Entry Account,Credit in Company Currency,(Gut)Haben in Unternehmenswährung
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Wollen Sie die Teilnahme zu aktualisieren? <br> Present: {0} \ <br> Abwesend: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Rohmaterial für Einkauf bereitstellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Mindestens eine Art der Bezahlung ist für POS-Rechnung erforderlich.
 DocType: Products Settings,Show Products as a List,Produkte anzeigen als Liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen. Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Machen Abschreibungen Eintrag
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Anfragetyp
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Mitarbeiter anlegen
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Mitarbeiter anlegen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rundfunk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Ausführung
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan für Wartungsbesuche
 DocType: SMS Settings,Enter url parameter for message,URL-Parameter für Nachricht eingeben
 DocType: POS Profile,Customer Groups,Kundengruppen
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Jahresabschluss
 DocType: Guardian,Students,Studenten
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regeln für die Anwendung von Preisen und Rabatten
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Preisliste muss für Einkauf oder Vertrieb gültig sein
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Anzahlung kann nicht größer sein als {0} {1}
 DocType: Naming Series,Series List for this Transaction,Nummernkreise zu diesem Vorgang
 DocType: Company,Default Payroll Payable Account,Standardabrechnungskreditorenkonto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update-E-Mail-Gruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update-E-Mail-Gruppe
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto verwendbar ist"
 DocType: Course Schedule,Instructor Name,Ausbilder-Name
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
 ,Production Orders in Progress,Fertigungsaufträge in Arbeit
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettocashflow aus Finanzierung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ist voll, nicht gespeichert"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage ist voll, nicht gespeichert"
 DocType: Lead,Address & Contact,Adresse & Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Gesamtkostenbetrag (über Arbeitszeitblatt)
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank-Einträge
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 DocType: Student Admission,Student Admission,Studenten Eintritt
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Artikel {0} wird storniert
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
 DocType: Item,Purchase Details,Einkaufsdetails
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanfrage per E-Mail benachrichtigen
 DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Payment Reconciliation Invoice,Invoice Type,Rechnungstyp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Lieferschein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Lieferschein
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Steuern einrichten
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Herstellungskosten der verkauften Vermögens
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
-DocType: Grade Interval,Min Score,Min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
 DocType: Student Applicant,Admitted,Zugelassen
 DocType: Workstation,Rent Cost,Mietkosten
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Bestellwert
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Geldgeschäfte gegen Partei oder für die interne Übertragung
 DocType: Shipping Rule,Valid for Countries,Gültig für folgende Länder
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Geschätzte Summe der Bestellungen
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,Steuersatz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} bereits an Mitarbeiter {1} zugeteilt für den Zeitraum {2} bis {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Artikel auswählen
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,In nicht-Gruppe umwandeln
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Charge (Los) eines Artikels
 DocType: C-Form Invoice Detail,Invoice Date,Rechnungsdatum
 DocType: GL Entry,Debit Amount,Soll-Betrag
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Erstellen Studentengruppen
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Angebotsanfrage
 DocType: Salary Slip Timesheet,Working Hours,Arbeitszeit
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Anfangs- / Ist-Wert eines Nummernkreises ändern.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Erstellen Sie einen neuen Kunden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Erstellen Sie einen neuen Kunden
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Erstellen von Bestellungen
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Erstellen von Bestellungen
 ,Purchase Register,Übersicht über Einkäufe
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Anfallende Gebühren
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Stammdaten zum Urlaub
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,Von Paket Nr.
 DocType: Item Attribute,To Range,Bis-Bereich
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kann die Bewertungsmethode nicht ändern, da es Transaktionen gegen einige Posten gibt, für die es keine eigene Bewertungsmethode gibt"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Die Gesamtmenge des zugeteilten Urlaubs ist zwingend erforderlich
 DocType: Job Opening,Description of a Job Opening,Stellenbeschreibung
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ausstehende Aktivitäten für heute
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
 DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
 DocType: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kaufen
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Bitte definieren Sie Grade for Threshold 0%
 DocType: Sales Order,To Deliver,Auszuliefern
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
 DocType: Account,Profit and Loss,Gewinn und Verlust
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Unteraufträge vergeben
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
 DocType: Production Plan Item,Pending Qty,Ausstehende Menge
 DocType: Budget,Ignore,Ignorieren
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ist nicht aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ist nicht aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS an folgende Nummern verschickt: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup-Kontrollmaße für den Druck
 DocType: Salary Slip,Salary Slip Timesheet,Gehaltszettel Timesheet
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,Gesamtprovision
 DocType: Pricing Rule,Sales Partner,Vertriebspartner
 DocType: Buying Settings,Purchase Receipt Required,Kaufbeleg notwendig
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Kumulierte Werte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Kundenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Kundenauftrag erstellen
 DocType: Project Task,Project Task,Projekt-Teilaufgabe
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,Resume-Anlage
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Bestandskunden
 DocType: Leave Control Panel,Allocate,Zuweisen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Rücklieferung
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Rücklieferung
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Hinweis: Die aufteilbaren Gesamt Blätter {0} sollte nicht kleiner sein als bereits genehmigt Blätter {1} für den Zeitraum
 DocType: Announcement,Posted By,Geschrieben von
 DocType: Item,Delivered by Supplier (Drop Ship),durch Lieferanten geliefert (Streckengeschäft)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Bitte setzen Sie das Unternehmen
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Ausgangsrechnung-Zeiterfassung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Wählen Sie Zahlungskonto zu machen Bank Eintrag
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Zur Knowledge Base hinzufügen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Verfassen von Angeboten
 DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlung Eintrag Abzug
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Beziehung mit Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Leiter
 DocType: Payment Entry,Payment From / To,Die Zahlung von / bis
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datumsbereich
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
 DocType: SMS Settings,Receiver Parameter,Empfängerparameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""basierend auf"" und ""guppiert nach"" können nicht gleich sein"
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,Datum der Entscheidung
 DocType: Student Batch Name,Batch Name,Stapelname
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet erstellt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Einschreiben
 DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,"Zeigen die Schüler, wie sie in Studenten monatlichen Anwesenheitsbericht"
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,Schülerzahl
 DocType: Sales Invoice Timesheet,Time Sheet,Zeitblatt
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Rückmeldung Rohmaterialien auf Basis von
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Bitte Artikel-Details angeben
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Bitte Artikel-Details angeben
 DocType: Interest,Interest,Interessieren
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vorverkauf
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
@@ -726,7 +729,7 @@
 ,Absent Student Report,Abwesend Student Report
 DocType: Email Digest,Next email will be sent on:,Nächste E-Mail wird gesendet am:
 DocType: Offer Letter Term,Offer Letter Term,Gültigkeit des Angebotsschreibens
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Artikel hat Varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} nicht gefunden
 DocType: Bin,Stock Value,Lagerwert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Gesellschaft {0} existiert nicht
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,Ablaufsdatum der Garantie
 DocType: Material Request Item,Quantity and Warehouse,Menge und Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionssatz (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte nennen Sie die Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Bitte wählen Sie Programm
 DocType: Project,Estimated Cost,Geschätzte Kosten
 DocType: Purchase Order,Link to material requests,Link zu Materialanforderungen
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ist kein Lagerartikel
 DocType: Mode of Payment Account,Default Account,Standardkonto
 DocType: Payment Entry,Received Amount (Company Currency),Erhaltene Menge (Gesellschaft Währung)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Bitte die wöchentlichen Auszeittage auswählen
 DocType: Production Order Operation,Planned End Time,Geplante Endzeit
 ,Sales Person Target Variance Item Group-Wise,Artikelgruppenbezogene Zielabweichung des Vertriebsmitarbeiters
@@ -836,7 +838,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Preisliste nicht ausgewählt
 DocType: Employee,Family Background,Familiärer Hintergrund
 DocType: Request for Quotation Supplier,Send Email,E-Mail absenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Keine Berechtigung
 DocType: Company,Default Bank Account,Standardbankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
@@ -849,7 +851,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Kein Mitarbeiter gefunden
 DocType: Supplier Quotation,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentengruppe ist bereits aktualisiert.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentengruppe ist bereits aktualisiert.
 DocType: SMS Center,All Customer Contact,Alle Kundenkontakte
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Lagerbestand über CSV hochladen
 DocType: Warehouse,Tree Details,Baum-Details
@@ -860,8 +862,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindestabrechnung
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostenstelle {2} gehört nicht zur Firma {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} darf keine Gruppe sein
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Artikel Row {idx}: {} {Doctype docname} existiert nicht in der oben &#39;{Doctype}&#39; Tisch
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Artikel Row {idx}: {} {Doctype docname} existiert nicht in der oben &#39;{Doctype}&#39; Tisch
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Keine Aufgaben
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an welchem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw."
 DocType: Asset,Opening Accumulated Depreciation,Öffnungs Kumulierte Abschreibungen
@@ -877,7 +879,7 @@
 DocType: Bin,Moving Average Rate,Wert für den Gleitenden Durchschnitt
 DocType: Production Planning Tool,Select Items,Artikel auswählen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kurstermine
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kurstermine
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: HR Settings,Enter retirement age in years,Geben Sie das Rentenalter in Jahren
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Eingangslager
@@ -885,7 +887,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle Artikelgruppen
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle Artikelgruppen
 DocType: Process Payroll,Activity Log,Aktivitätsprotokoll
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Nettogewinn/-verlust
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
@@ -896,7 +898,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Vom Lieferantenauftrag zur Zahlung
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Geplante Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Eröffnung"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Öffnen Sie tun
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
@@ -912,7 +914,7 @@
 DocType: Item Reorder,Re-Order Qty,Nachbestellmenge
 DocType: Leave Block List Date,Leave Block List Date,Urlaubssperrenliste Datum
 DocType: Pricing Rule,Price or Discount,Preis oder Rabatt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Gesamt Die Gebühren in Kauf Eingangspositionen Tabelle muss als Gesamt Steuern und Abgaben gleich sein
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Gesamt Die Gebühren in Kauf Eingangspositionen Tabelle muss als Gesamt Steuern und Abgaben gleich sein
 DocType: Sales Team,Incentives,Anreize
 DocType: SMS Log,Requested Numbers,Angeforderte Nummern
 DocType: Production Planning Tool,Only Obtain Raw Materials,Erhalten Sie nur Rohstoffe
@@ -970,8 +972,7 @@
 DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Fee Structure,Components,Komponenten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vorkasse zur Eingangsrechnung
@@ -1023,8 +1024,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Kunden-/Lieferantenauftrag"" sollte immer als ""Vorkasse"" eingestellt werden"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemische Industrie
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Standard Bank / Geldkonto wird automatisch in Gehalts Journal Entry aktualisiert werden, wenn dieser Modus ausgewählt ist."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Die Intervalle für Grade-Code {0} überlappt mit der Note Intervalle für andere Typen. Bitte überprüfen Sie Intervalle {0} und {1} und versuchen Sie es erneut
 DocType: BOM,Raw Material Cost(Company Currency),Rohstoffkosten (Gesellschaft Währung)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Die Rate kann nicht größer sein als die Rate, die in {1} {2}"
@@ -1036,7 +1035,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Webseite Artikel
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
 DocType: Timesheet Detail,Bill,Rechnung
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Weiß
 DocType: SMS Center,All Lead (Open),Alle Leads (offen)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Menge nicht für {4} in Lager {1} zum Zeitpunkt des Eintrags Entsendung ({2} {3})
@@ -1050,7 +1049,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Bestelltyp muss aus {0} sein
 DocType: Lead,Next Contact Date,Nächstes Kontaktdatum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Anfangsmenge
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
 DocType: Student Batch Name,Student Batch Name,Studentenstapelname
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
 DocType: Repayment Schedule,Balance Loan Amount,Bilanz Darlehensbetrag
@@ -1070,10 +1069,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Bitte geben Sie eine {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
 DocType: Delivery Note,Delivery To,Lieferung an
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Planning Tool,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kann nicht negativ sein
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Gesamtzahl der abschreibungen
 DocType: Sales Invoice Item,Rate With Margin,Bewerten Sie mit Margin
 DocType: Workstation,Wages,Lohn
@@ -1101,7 +1100,7 @@
 DocType: Lead,Organization Name,Firmenname
 DocType: Tax Rule,Shipping State,Versandstatus
 ,Projected Quantity as Source,Projizierte Menge als Quelle
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Kaufbeleg übernehmen"" hinzugefügt werden"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Kaufbeleg übernehmen"" hinzugefügt werden"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Fügen Sie nicht auf Lager gehalten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Vertriebskosten
@@ -1109,7 +1108,7 @@
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postleitzahl
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Postleitzahl
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
 DocType: Opportunity,Contact Info,Kontakt-Information
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Lagerbuchungen erstellen
@@ -1151,7 +1150,7 @@
 DocType: Sales Partner,Distributor,Lieferant
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Warenkorb-Versandregel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
@@ -1186,11 +1185,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Bitte geben Sie Item Code zu Chargennummer erhalten
 DocType: Stock Settings,Default Item Group,Standard-Artikelgruppe
 DocType: Employee Loan,Partially Disbursed,teil~~POS=TRUNC Zahlter
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Lieferantendatenbank
 DocType: Account,Balance Sheet,Bilanz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Zahlungsmittel ist nicht konfiguriert. Bitte überprüfen Sie, ob ein Konto in den Zahlungsmodi oder in einem Verkaufsstellen-Profil eingestellt wurde."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Zahlungsmittel ist nicht konfiguriert. Bitte überprüfen Sie, ob ein Konto in den Zahlungsmodi oder in einem Verkaufsstellen-Profil eingestellt wurde."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ihr Vertriebsmitarbeiter erhält an diesem Datum eine Erinnerung, den Kunden zu kontaktieren"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Das gleiche Einzelteil kann nicht mehrfach eingegeben werden.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
@@ -1227,11 +1225,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: Announcement,All Students,Alle Schüler
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Artikel {0} muss eine Nichtlagerposition sein
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Artikel {0} muss eine Nichtlagerposition sein
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Hauptbuch anzeigen
 DocType: Grading Scale,Intervals,Intervalle
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobil-Nr
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Rest der Welt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
@@ -1271,8 +1269,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
 DocType: Journal Entry,Get Outstanding Invoices,Ausstehende Rechnungen aufrufen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Bestellungen helfen Ihnen bei der Planung und Follow-up auf Ihre Einkäufe
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Bestellungen helfen Ihnen bei der Planung und Follow-up auf Ihre Einkäufe
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Die gesamte Ausgabe / Transfer Menge {0} in Material anfordern {1} \ kann nicht größer sein als die angeforderte Menge {2} für Artikel {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Klein
@@ -1296,7 +1294,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Stückliste
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
@@ -1313,7 +1311,7 @@
 DocType: Student Group Student,Group Roll Number,Gruppenrolle Nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summe aller Aufgabe Gewichte sollten 1. Bitte stellen Sie Gewichte aller Projektaufgaben werden entsprechend
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Betriebsvermögen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
@@ -1340,7 +1338,7 @@
 DocType: Depreciation Schedule,Journal Entry,Buchungssatz
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} Elemente in Bearbeitung
 DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
-DocType: Grade Interval,Grade Code,Grade-Code
+DocType: Grading Scale Interval,Grade Code,Grade-Code
 DocType: POS Item Group,POS Item Group,POS Artikelgruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Täglicher E-Mail-Bericht:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
@@ -1356,7 +1354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Wiederholt sich bis
 DocType: Attendance,HR Manager,Leiter der Personalabteilung
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Bitte ein Unternehmen auswählen
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Bitte ein Unternehmen auswählen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
@@ -1372,7 +1370,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Lebensmittel
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alter Bereich 3
 DocType: Maintenance Schedule Item,No of Visits,Anzahl der Besuche
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Wartungsplan {0} existiert gegen {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,einschreibende Student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Die Währung des Abschlusskontos muss {0} sein
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summe der Punkte für alle Ziele sollte 100 sein. Aktueller Stand {0}
@@ -1421,13 +1420,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontenplan
 DocType: Material Request,Terms and Conditions Content,Allgemeine Geschäftsbedingungen Inhalt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
 DocType: Employee,Owned,Im Besitz von
 DocType: Salary Detail,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
 DocType: Pricing Rule,"Higher the number, higher the priority","Je höher die Zahl, desto höher die Priorität"
 ,Purchase Invoice Trends,Trendanalyse Eingangsrechnungen
 DocType: Employee,Better Prospects,Bessere Vorhersage
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Zeile # {0}: Der Batch {1} hat nur {2} Menge. Bitte wähle eine andere Charge aus, die {3} Menge zur Verfügung hat oder die Zeile in mehrere Zeilen aufteilt, um aus mehreren Chargen zu liefern / auszutauschen"
 DocType: Vehicle,License Plate,Nummernschild
 DocType: Appraisal,Goals,Ziele
 DocType: Warranty Claim,Warranty / AMC Status,Status der Garantie / des jährlichen Wartungsvertrags
@@ -1445,7 +1445,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 DocType: Email Digest,Bank Balance,Kontostand
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
 DocType: Job Opening,"Job profile, qualifications required etc.","Stellenbeschreibung, erforderliche Qualifikationen usw."
 DocType: Journal Entry Account,Account Balance,Kontostand
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Steuerregel für Transaktionen
@@ -1456,7 +1456,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Zeigen Sie nicht geschlossene Geschäftsjahr des P &amp; L-Waagen
 DocType: Shipping Rule,Shipping Account,Versandkonto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ist inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Machen Sie Kundenaufträge Sie Ihre Arbeit planen und liefern on-time
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Machen Sie Kundenaufträge Sie Ihre Arbeit planen und liefern on-time
 DocType: Quality Inspection,Readings,Ablesungen
 DocType: Stock Entry,Total Additional Costs,Gesamte Zusatzkosten
 DocType: Course Schedule,SH,Sch
@@ -1467,7 +1467,7 @@
 DocType: Shipping Rule Condition,To Value,Bis-Wert
 DocType: Asset Movement,Stock Manager,Lagerleiter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Ausgangslager ist für Zeile {0} zwingend erforderlich
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Packzettel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Packzettel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Büromiete
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import fehlgeschlagen!
@@ -1493,7 +1493,7 @@
 DocType: Sales Invoice,Source,Quelle
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zeige geschlossen
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Anlagekategorie ist obligatorisch für Posten des Anlagevermögens
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Anlagekategorie ist obligatorisch für Posten des Anlagevermögens
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Diese {0} Konflikte mit {1} von {2} {3}
 DocType: Student Attendance Tool,Students HTML,Studenten HTML
@@ -1511,7 +1511,7 @@
 DocType: Student,Date of Leaving,Datum Weggehen
 DocType: Pricing Rule,For Price List,Für Preisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Direktsuche
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,erstellen Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,erstellen Leads
 DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr.
@@ -1539,7 +1539,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Programm Einschreibungen
 DocType: Sales Invoice Item,Brand Name,Bezeichnung der Marke
 DocType: Purchase Receipt,Transporter Details,Informationen zum Transporteur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standard Lager wird für das ausgewählte Element erforderlich
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Standard Lager wird für das ausgewählte Element erforderlich
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kiste
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Mögliche Lieferant
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Die Firma
@@ -1572,7 +1572,7 @@
 DocType: Quality Inspection Reading,Reading 4,Ablesewert 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standardstückliste für {0} nicht für das Projekt gefunden {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Die Schüler im Herzen des Systems sind, fügen Sie alle Ihre Schüler"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Die Schüler im Herzen des Systems sind, fügen Sie alle Ihre Schüler"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Räumungsdatum {1} kann nicht vor dem Scheck Datum sein {2}
 DocType: Company,Default Holiday List,Standard-Urlaubsliste
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},"Row {0}: Von Zeit und Zeit, um von {1} überlappt mit {2}"
@@ -1584,20 +1584,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Erneut senden Zahlung per E-Mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Neue Aufgabe
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Angebot erstellen
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Angebot erstellen
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Weitere Berichte
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Bitte setzen Sie Standard-Abrechnungskreditorenkonto in Gesellschaft {0}
 DocType: SMS Center,Receiver List,Empfängerliste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Suche Artikel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Suche Artikel
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoveränderung der Barmittel
 DocType: Assessment Plan,Grading Scale,Bewertungsskala
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Schon erledigt
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Zahlungsanordnung bereits vorhanden ist {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
@@ -1635,7 +1635,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sammeln
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sie können das Geschäftsjahr {0} nicht löschen. Das Geschäftsjahr {0} ist als Standard in den globalen Einstellungen festgelegt
 DocType: Journal Entry,Entry Type,Buchungstyp
 ,Customer Credit Balance,Kunden-Kreditlinien
@@ -1675,7 +1675,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studieren in Same-Institut
 DocType: Territory,Territory Manager,Gebietsleiter
 DocType: Packed Item,To Warehouse (Optional),Eingangslager (Optional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Marke
 DocType: Payment Entry,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung)
 DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
@@ -1685,9 +1684,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ansicht Warenkorb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Weiter Abschreibungen Datum ist obligatorisch für neue Anlage
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Weiter Abschreibungen Datum ist obligatorisch für neue Anlage
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separate Kursbasierte Gruppe für jede Charge
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Einzelnes Element eines Artikels
 DocType: Fee Category,Fee Category,Preis Kategorie
@@ -1703,8 +1702,7 @@
 DocType: Course Assessment Criteria,Weightage,Gewichtung
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kostenstelle ist erforderlich für die &quot;Gewinn- und Verlust &#39;Konto {2}. Bitte stellen Sie eine Standard-Kostenstelle für das Unternehmen.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Neuer Kontakt
 DocType: Territory,Parent Territory,Übergeordnete Region
 DocType: Quality Inspection Reading,Reading 2,Ablesewert 2
@@ -1731,20 +1729,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Abgleich JSON (JavaScript Object Notation)
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie ihn mit einem Tabellenkalkulationsprogramm aus.
 DocType: Purchase Invoice Item,Batch No,Chargennummer
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Es kann nicht nach Wechselkurs zu finden {0} {1} für Stichtag {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zusammenfassen mehrerer Kundenaufträge zu einer Kundenbestellung erlauben
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instructor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobil Nein
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Haupt
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Haupt
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
 DocType: Employee Attendance Tool,Employees HTML,Mitarbeiter HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
 DocType: Employee,Leave Encashed?,Urlaub eingelöst?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Chance von"" ist zwingend erforderlich"
 DocType: Email Digest,Annual Expenses,Jährliche Kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Lieferantenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Lieferantenauftrag erstellen
 DocType: SMS Center,Send To,Senden an
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Zugewiesene Menge
@@ -1762,7 +1759,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Beurteilungen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0} eingegeben
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Bedingung für eine Versandregel
-DocType: Grading Structure,Grading Intervals,Grading Intervalle
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Bitte eingeben
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kann nicht für Artikel overbill {0} in Zeile {1} mehr als {2}. Damit über Abrechnung, setzen Sie sich bitte Einstellungen in Kauf"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Bitte setzen Sie Filter basierend auf Artikel oder Lager
@@ -1775,16 +1771,17 @@
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Bezahlung
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Verwalten Sie Ihre Aufträge
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Verwalten Sie Ihre Aufträge
 DocType: Production Order Operation,Actual Time and Cost,Tatsächliche Laufzeit und Kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanfrage von maximal {0} kann für Artikel {1} zum Kundenauftrag {2} gemacht werden
 DocType: Employee,Salutation,Anrede
 DocType: Course,Course Abbreviation,Kurs Abkürzung
 DocType: Student Leave Application,Student Leave Application,Student Urlaubsantrag
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Vermögens kann nicht rückgängig gemacht werden, da es ohnehin schon ist {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Vermögens kann nicht rückgängig gemacht werden, da es ohnehin schon ist {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mitarbeiter {0} auf halber Tag auf {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Am
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs bündeln
 DocType: Quotation Item,Actual Qty,Tatsächliche Anzahl
 DocType: Sales Invoice Item,References,Referenzen
@@ -1794,7 +1791,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Mitarbeiter/-in
 DocType: Asset Movement,Asset Movement,Asset-Bewegung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,neue Produkte Warenkorb
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,neue Produkte Warenkorb
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
 DocType: Vehicle,Wheels,Räder
@@ -1826,9 +1823,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiviert die Erstellung von Zeitprotokollen zu Fertigungsaufträgen. Arbeitsgänge werden nicht zu Fertigungsaufträgen nachverfolgt
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Hat Varianten
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID ist obligatorisch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID ist obligatorisch
 DocType: Sales Person,Parent Sales Person,Übergeordneter Vertriebsmitarbeiter
 DocType: Purchase Invoice,Recurring Invoice,Wiederkehrende Rechnung
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projekte verwalten
@@ -1836,7 +1833,7 @@
 DocType: Budget,Fiscal Year,Geschäftsjahr
 DocType: Vehicle Log,Fuel Price,Kraftstoff-Preis
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kann {0} nicht zugewiesen werden, da es kein Ertrags- oder Aufwandskonto ist"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Erreicht
 DocType: Student Admission,Application Form Route,Antragsformular Strecke
@@ -1867,7 +1864,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Menge {0} {1} abgezogen gegen {2}
 DocType: Employee,Salary Information,Gehaltsinformationen
 DocType: Sales Person,Name and Employee ID,Name und Mitarbeiter-ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
 DocType: Website Item Group,Website Item Group,Webseiten-Artikelgruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Zölle und Steuern
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Bitte den Stichtag eingeben
@@ -1924,7 +1921,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Umsatz Bestandskunden
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für Produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für Produktion
 DocType: Asset,Depreciation Schedule,Abschreibungsplan
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halbtages Datum sollte zwischen Von-Datum und eine aktuelle
@@ -1941,13 +1938,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
 ,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
 DocType: Purchase Order,Delivered,Geliefert
 ,Vehicle Expenses,Fahrzeugkosten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
+DocType: Serial No,Invoice Details,Rechnungs-Details
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Das Datum, an dem wiederkehrende Rechnungen angehalten werden"
 DocType: Employee Loan,Loan Amount,Darlehensbetrag
@@ -1970,7 +1968,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Menge muss 1 sein, als Element eine Anlage ist. Bitte verwenden Sie separate Zeile für mehrere Menge."
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppe an konzernfremde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,Loan-Name
@@ -1981,6 +1979,7 @@
 ,Customer Acquisition and Loyalty,Kundengewinnung und -bindung
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Lager, in dem zurückerhaltene Artikel aufbewahrt werden (Sperrlager)"
 DocType: Production Order,Skip Material Transfer,Materialübertragung überspringen
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Der Wechselkurs für {0} bis {1} für das Stichtag {2} kann nicht gefunden werden. Bitte erstellen Sie einen Exchange Exchange-Eintrag manuell
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Ihr Geschäftsjahr endet am
 DocType: POS Profile,Price List,Preisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt das Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser, damit die Änderungen wirksam werden."
@@ -2018,9 +2017,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"""Geschäftsjahr"" steht für ein Finazgeschäftsjahr. Alle Buchungen und anderen größeren Transaktionen werden mit dem ""Geschäftsjahr"" verglichen."
 DocType: Opportunity,Customer / Lead Address,Kunden- / Lead-Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
 DocType: Student Admission,Eligibility,Wählbarkeit
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads helfen Ihnen ins Geschäft zu erhalten, fügen Sie alle Ihre Kontakte und mehr als Ihre Leads"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads helfen Ihnen ins Geschäft zu erhalten, fügen Sie alle Ihre Kontakte und mehr als Ihre Leads"
 DocType: Production Order Operation,Actual Operation Time,Tatsächliche Betriebszeit
 DocType: Authorization Rule,Applicable To (User),Anwenden auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
@@ -2059,7 +2058,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Firma auswählen...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Freilassen, wenn für alle Abteilungen gültig"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Process Payroll,Fortnightly,vierzehntägig
 DocType: Currency Exchange,From Currency,Von Währung
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
@@ -2075,7 +2074,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Unterartikel sollte nicht ein Produkt-Bundle sein. Bitte Artikel `{0}` entfernen und speichern.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankwesen
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Zeiterfassung hinzufügen
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Zeiterfassung hinzufügen
 DocType: Vehicle Service,Service Item,Serviceposition
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
@@ -2123,8 +2122,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Die Preise werden nicht angezeigt, wenn Preisliste nicht gesetzt"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Bitte ein Land für diese Versandregel angeben oder ""Weltweiter Versand"" aktivieren"
 DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit Um erforderlich
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit Um erforderlich
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
 DocType: Offer Letter Term,Offer Term,Angebotsfrist
 DocType: Quality Inspection,Quality Manager,Qualitätsmanager
@@ -2157,14 +2156,14 @@
 DocType: Opportunity,Lost Reason,Verlustgrund
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Neue Adresse
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Bitte geben Sie Eingangsbeleg
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Bitte geben Sie Eingangsbeleg
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Benutzer und Berechtigungen
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Fertigungsaufträge Erstellt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Fertigungsaufträge Erstellt: {0}
 DocType: Branch,Branch,Filiale
 DocType: Guardian,Mobile Number,Handynummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Druck und Branding
@@ -2173,7 +2172,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ihre Kunden
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Machen Schüler
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Machen Schüler
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sie wurden zur Zusammenarbeit für das Projekt {0} eingeladen.
 DocType: Leave Block List Date,Block Date,Datum sperren
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Jetzt bewerben
@@ -2196,8 +2195,9 @@
 DocType: SMS Log,Sent To,Gesendet An
 DocType: Payment Request,Make Sales Invoice,Verkaufsrechnung erstellen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Nächste Kontakt Datum kann nicht in der Vergangenheit liegen
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nächste Kontakt Datum kann nicht in der Vergangenheit liegen
 DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Wählen Sie Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-Ret
 DocType: Sales Invoice Advance,Advance Amount,Anzahlungsbetrag
@@ -2211,7 +2211,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Fall-Nr. kann nicht 0 sein
 DocType: Item,Show a slideshow at the top of the page,Diaschau oben auf der Seite anzeigen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Lagerräume
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Lagerräume
 DocType: Serial No,Delivery Time,Zeitpunkt der Lieferung
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Alter basierend auf
 DocType: Item,End of Life,Ende der Lebensdauer
@@ -2227,8 +2227,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material übergeben
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dieses Dokument ist über dem Limit von {0} {1} für item {4}. Machen Sie eine andere {3} gegen die gleiche {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Wählen Sie Änderungsbetrag Konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Wählen Sie Änderungsbetrag Konto
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
 DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
@@ -2239,7 +2239,7 @@
 DocType: Budget Account,Budget Account,Budget Konto
 DocType: Quality Inspection,Verified By,Geprüft durch
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Die Standardwährung der Firma kann nicht geändern werden, weil es bestehende Transaktionen gibt. Transaktionen müssen abgebrochen werden, um die Standardwährung zu ändern."
-DocType: Grade Interval,Grade Description,Grade Beschreibung
+DocType: Grading Scale Interval,Grade Description,Grade Beschreibung
 DocType: Stock Entry,Purchase Receipt No,Kaufbeleg Nr.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Anzahlung
 DocType: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
@@ -2277,7 +2277,7 @@
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Gateway Account,Payment Account,Zahlungskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettoveränderung der Forderungen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Ausgleich für
 DocType: Offer Letter,Accepted,Genehmigt
@@ -2290,7 +2290,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Bezeichnung der Versandregel
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Schnellbuchung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
@@ -2304,7 +2304,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Der Name des Instituts, für die Sie setzen dieses System."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Buchung wurde bis zu folgendem Zeitpunkt gesperrt. Bearbeiten oder ändern kann nur die Person in unten stehender Rolle.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen (für Nr.)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Die folgenden Fertigungsaufträge wurden erstellt:
@@ -2327,6 +2327,7 @@
 DocType: Email Digest,How frequently?,Wie häufig?
 DocType: Purchase Receipt,Get Current Stock,Aktuellen Lagerbestand aufrufen
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Stücklistenstruktur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Marke
 DocType: Student,Joining Date,Beitrittsdatum
 ,Employees working on a holiday,Die Mitarbeiter an einem Feiertag arbeiten
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Anwesend setzen
@@ -2427,7 +2428,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produktion
 DocType: Guardian,Occupation,Beruf
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Zeile {0}: Startdatum muss vor dem Enddatum liegen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Zeile {0}: Startdatum muss vor dem Enddatum liegen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
 DocType: Sales Invoice,This Document,Dieses Dokument
 DocType: Installation Note Item,Installed Qty,Installierte Anzahl
@@ -2450,7 +2451,7 @@
 DocType: Notification Control,Sales Order Message,Benachrichtigung über Kundenauftrag
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Standardwerte wie Firma, Währung, aktuelles Geschäftsjahr usw. festlegen"
 DocType: Payment Entry,Payment Type,Zahlungsart
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Batch für Item {0}. Es ist nicht möglich, eine einzelne Charge zu finden, die diese Anforderung erfüllt"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Batch für Item {0}. Es ist nicht möglich, eine einzelne Charge zu finden, die diese Anforderung erfüllt"
 DocType: Process Payroll,Select Employees,Mitarbeiter auswählen
 DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
 DocType: Payment Entry,Cheque/Reference Date,Scheck-/ Referenztag
@@ -2467,7 +2468,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Allgemeines POS-Profil {0} bereits für Firma {1} angelegt
 DocType: Purchase Order,Ref SQ,Ref-SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Artikel/Stückliste in allen Stücklisten ersetzen
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Eingangsbeleg muss vorgelegt werden
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Eingangsbeleg muss vorgelegt werden
 DocType: Purchase Invoice Item,Received Qty,Erhaltene Menge
 DocType: Stock Entry Detail,Serial No / Batch,Seriennummer / Charge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nicht bezahlt und nicht geliefert
@@ -2480,7 +2481,7 @@
 ,To Produce,Zu produzieren
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lohn-und Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Machen Sie Benutzer
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Machen Sie Benutzer
 DocType: Packing Slip,Identification of the package for the delivery (for print),Kennzeichnung des Paketes für die Lieferung (für den Druck)
 DocType: Bin,Reserved Quantity,Reservierte Menge
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Bitte geben Sie eine gültige Email Adresse an
@@ -2492,11 +2493,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Deaktiviert Vorlage muss nicht Standard-Vorlage sein
 DocType: Account,Income Account,Ertragskonto
 DocType: Payment Request,Amount in customer's currency,Betrag in Kundenwährung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Auslieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Auslieferung
 DocType: Stock Reconciliation Item,Current Qty,Aktuelle Anzahl
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Siehe „Anteil der zu Grunde liegenden Materialien“ im Abschnitt Kalkulation
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorherige
 DocType: Appraisal Goal,Key Responsibility Area,Entscheidender Verantwortungsbereich
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
 DocType: Payment Entry,Total Allocated Amount,Insgesamt Geschätzter Betrag
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journaleintrag für die Gehälter von {0} {1}
@@ -2519,7 +2521,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen
 DocType: Item Supplier,Item Supplier,Artikellieferant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle Adressen
 DocType: Company,Stock Settings,Lager-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
@@ -2529,6 +2531,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Wird eine E-Mail über das Ereignis senden an Mitarbeiter mit dem Status 'Offen'
 DocType: Task,Depends on Tasks,Hängt von Aufgaben
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Anhänge können ohne Erlaubnis des Einkaufswagens angezeigt werden
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
@@ -2541,11 +2544,10 @@
 DocType: Sales Invoice,Debit To,Belasten auf
 DocType: Delivery Note,Required only for sample item.,Nur erforderlich für Probeartikel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tatsächliche Anzahl nach Transaktionen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferanten Typ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Kein Gehaltszettel gefunden zwischen {0} und {1}
 ,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Admissions
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ist deaktiviert
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ist deaktiviert
 DocType: Supplier,Billing Currency,Abrechnungswährung
 DocType: Sales Invoice,SINV-RET-,SINV-Ret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Besonders groß
@@ -2562,7 +2564,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,auf Webseite vorgestelltes Produkt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Bewertungsgruppen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Neuer Lagername
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Insgesamt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Insgesamt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Region
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
@@ -2580,7 +2582,7 @@
 DocType: Price List,Price List Master,Preislisten-Vorlagen
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere verschiedene ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
 ,S.O. No.,Nummer der Lieferantenbestellung
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
 DocType: Price List,Applicable for Countries,Anwenden für Länder
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Lassen Sie nur Anwendungen mit dem Status &quot;Approved&quot; und &quot;Abgelehnt&quot; eingereicht werden können
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Studentengruppenname ist obligatorisch in Zeile {0}
@@ -2672,7 +2674,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Lagerbuchung
 DocType: Vehicle Service,Engine Oil,Motoröl
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
 DocType: Employee Loan,Loan Details,Loan-Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Abgeschlossen Menge muss größer als Null sein.
@@ -2736,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Lagerhäuser mit bestehenden Transaktion nicht zu einer Gruppe umgewandelt werden.
 DocType: Assessment Result Tool,Result HTML,Ergebnis HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Läuft aus am
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,In Students
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,In Students
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Aufgelöste Artikel
@@ -2800,7 +2802,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Grenze überschritten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Risikokapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Ein akademischer Begriff mit diesem &quot;Academic Year &#39;{0} und&quot; Bezeichnen Namen&#39; {1} ist bereits vorhanden. Bitte ändern Sie diese Einträge und versuchen Sie es erneut.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Da bestehende Transaktionen gegen Artikel sind {0}, können Sie nicht den Wert ändern {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Da bestehende Transaktionen gegen Artikel sind {0}, können Sie nicht den Wert ändern {1}"
 DocType: UOM,Must be Whole Number,Muss eine ganze Zahl sein
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Neue Urlaubszuordnung (in Tagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Seriennummer {0} existiert nicht
@@ -2843,7 +2845,7 @@
 DocType: Supplier,Last Day of the Next Month,Letzter Tag des nächsten Monats
 DocType: Support Settings,Auto close Issue after 7 days,Auto schließen Ausgabe nach 7 Tagen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} zugeteilt werden."
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studienbewerber
 DocType: Asset Category Account,Accumulated Depreciation Account,Abschreibungskonto
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
@@ -2871,7 +2873,7 @@
 DocType: Asset,Item Code,Artikelabkürzung
 DocType: Production Planning Tool,Create Production Orders,Fertigungsaufträge erstellen
 DocType: Serial No,Warranty / AMC Details,Details der Garantie / des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
 DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0}
@@ -2889,7 +2891,7 @@
 DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
 DocType: Employee Education,School/University,Schule/Universität
 DocType: Payment Request,Reference Details,Referenzdetails
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Erwartungswert nach der Ausmusterung muss kleiner sein als Bruttokaufbetrag
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Erwartungswert nach der Ausmusterung muss kleiner sein als Bruttokaufbetrag
 DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Rechnungsbetrag
 DocType: Asset,Double Declining Balance,Doppelte degressive
@@ -2910,19 +2912,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zahlter Betrag kann nicht größer sein als Darlehensbetrag {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Fertigungsauftrag nicht erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Fertigungsauftrag nicht erstellt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
 DocType: Asset,Fully Depreciated,vollständig abgeschriebene
 ,Stock Projected Qty,Projizierter Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Teilnahme HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",Angebote sind Offerten an einen Kunden zur Lieferung von Materialien bzw. zur Erbringung von Leistungen.
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",Angebote sind Offerten an einen Kunden zur Lieferung von Materialien bzw. zur Erbringung von Leistungen.
 DocType: Sales Order,Customer's Purchase Order,Kundenauftrag
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seriennummer und Chargen
 DocType: Warranty Claim,From Company,Von Firma
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Die Summe der Ergebnisse von Bewertungskriterien muss {0} sein.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Bitte setzen Sie Anzahl der Abschreibungen gebucht
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Bitte setzen Sie Anzahl der Abschreibungen gebucht
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Wert oder Menge
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Bestellungen können nicht angehoben werden:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
@@ -3050,7 +3052,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Nummernkreis für Angebote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0}). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Bitte wählen Sie Kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Bitte wählen Sie Kunde
 DocType: C-Form,I,ich
 DocType: Company,Asset Depreciation Cost Center,Asset-Abschreibungen Kostenstellen
 DocType: Sales Order Item,Sales Order Date,Kundenauftrags-Datum
@@ -3069,19 +3071,18 @@
 DocType: Vehicle,Insurance Details,Versicherungsdaten
 DocType: Account,Payable,Zahlbar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Bitte geben Sie Laufzeiten
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Schuldnern ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Schuldnern ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Neue Kunden
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Rohgewinn %
 DocType: Appraisal Goal,Weightage (%),Gewichtung (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Abwicklungsdatum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist erforderlich
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist erforderlich
 DocType: Lead,Address Desc,Adresszusatz
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partei ist obligatorisch
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Thema Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Mindestens ein Eintrag aus Vertrieb oder Einkauf muss ausgewählt werden
-DocType: Grading Structure,Grade Intervals,Grade Intervalle
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Wählen Sie die Art Ihres Unternehmens.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Ort, an dem Arbeitsgänge der Fertigung ablaufen."
 DocType: Asset Movement,Source Warehouse,Ausgangslager
@@ -3110,6 +3111,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Bitte setzen Sie default {0} in Gesellschaft {1}
 DocType: Cheque Print Template,Starting position from top edge,Ausgangsposition von der Oberkante
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Same Anbieter wurde mehrmals eingegeben
@@ -3161,7 +3163,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Nachbestellmenge
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuelle Stellenangebote
 DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto
-DocType: Journal Entry,Write Off,Abschreiben
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Abschreiben
 DocType: Timesheet Detail,Operation ID,Arbeitsgang-ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systembenutzer-ID (Anmeldung). Wenn gesetzt, wird sie standardmäßig für alle HR-Formulare verwendet."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Von {1}
@@ -3172,8 +3174,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert an Kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ist ausverkauft
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Nächster Termin muss größer sein als Datum der Veröffentlichung
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Steuerverteilung anzeigen
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Steuerverteilung anzeigen
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Daten-Import und -Export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Auf Einträge vorhanden sind gegen Lager {0}, daher kann man nicht neu zuweisen oder ändern"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Keine Studenten gefunden
@@ -3185,13 +3187,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Bitte wählen Sie Zitate
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Wartungsbesuch erstellen
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Bitte wählen Sie Zitate
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Wartungsbesuch erstellen
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
 DocType: Company,Default Cash Account,Standardbarkonto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dies basiert auf der Anwesenheit dieses Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Keine Studenten in
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Weitere Elemente hinzufügen oder vollständiges Formular öffnen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
@@ -3237,9 +3240,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
 DocType: Sales Order,Partly Billed,Teilweise abgerechnet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Artikel {0} muss ein Posten des Anlagevermögens sein
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Artikel {0} muss ein Posten des Anlagevermögens sein
 DocType: Item,Default BOM,Standardstückliste
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Offener Gesamtbetrag
@@ -3261,7 +3264,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Preislisten-Wechselkurs
 DocType: Purchase Invoice Item,Rate,Preis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Praktikant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adresse Name
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adresse Name
 DocType: Stock Entry,From BOM,Von Stückliste
 DocType: Assessment Code,Assessment Code,Bewertungs-Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grundeinkommen
@@ -3286,7 +3289,7 @@
 DocType: Purchase Invoice,Print Language,drucken Sprache
 DocType: Salary Slip,Total Working Hours,Gesamtarbeitszeit
 DocType: Stock Entry,Including items for sub assemblies,Einschließlich der Artikel für Unterbaugruppen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Geben Sie Wert muss positiv sein
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Geben Sie Wert muss positiv sein
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle Regionen
 DocType: Purchase Invoice,Items,Artikel
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student ist bereits eingetragen sind.
@@ -3305,16 +3308,14 @@
 DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Von- und Bis-Daten erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
 DocType: Assessment Plan,Supervisor Name,Name des Vorgesetzten
 DocType: Program Enrollment Course,Program Enrollment Course,Programm Einschreibung Kurs
-DocType: Grading Structure,Grading Structure,Grading Struktur
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
 DocType: Tax Rule,Shipping City,Zielstadt der Lieferung
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dieser Artikel ist eine Variante von {0} (Vorlage). Attribute werden von der Vorlage übernommen, ausser es wurde ""Nicht kopieren"" ausgewählt."
 DocType: Notification Control,Customize the Notification,Mitteilungstext anpassen
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cashflow aus Geschäftstätigkeit
 DocType: Sales Invoice,Shipping Rule,Versandregel
@@ -3337,6 +3338,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum liegen
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über die Einrichtung&gt; Nummerierung ein
 DocType: Leave Control Panel,Carry Forward,Übertragen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
 DocType: Department,Days for which Holidays are blocked for this department.,"Tage, an denen eine Urlaubssperre für diese Abteilung gilt."
@@ -3364,7 +3366,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gesamtsumme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 DocType: Quality Inspection,Item Serial No,Artikel-Seriennummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Erstellen Sie Mitarbeiterdaten
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Erstellen Sie Mitarbeiterdaten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Summe Anwesend
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Buchhaltungsauszüge
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Stunde
@@ -3379,7 +3381,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Verkaufsstelle
 DocType: Payment Entry,Received Amount,erhaltenen Betrag
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie Mitarbeiter-Naming-System in Human Resource&gt; HR-Einstellungen ein
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Erstellen Sie für die volle Menge, ignorierend Menge bereits auf Bestellung"
 DocType: Account,Tax,Steuer
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nicht markiert
@@ -3390,7 +3391,7 @@
 DocType: C-Form,Invoices,Rechnungen
 DocType: Batch,Source Document Name,Quelldokumentname
 DocType: Job Opening,Job Title,Stellenbezeichnung
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Benutzer erstellen
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Benutzer erstellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramm
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besuchsbericht für Wartungsauftrag
@@ -3401,8 +3402,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: BOM,Website Description,Webseiten-Beschreibung
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoveränderung des Eigenkapitals
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, bereits vorhanden ist für {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, bereits vorhanden ist für {0}"
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Eingang
 ,Sales Register,Übersicht über den Umsatz
@@ -3413,16 +3414,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Es gibt nichts zu bearbeiten.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
 DocType: Customer Group,Customer Group Name,Kundengruppenname
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Noch keine Kunden!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Geldflussrechnung
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht länger als maximale Kreditsumme {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lizenz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertragen"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
 DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
 DocType: Item,Attributes,Attribute
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Letztes Bestelldatum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
 DocType: Student,Guardian Details,Wächter-Details
 DocType: C-Form,C-Form,Kontakt-Formular
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Teilnahme für mehrere Mitarbeiter
@@ -3447,14 +3450,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',"Konto in Zeile {0} muss vom Typ ""Anlagevermögen"" sein"
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ausgabe-Menge
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regeln zum Berechnen des Versandbetrags für einen Verkauf
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serie ist zwingend erforderlich
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serie ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanzdienstleistungen
 DocType: Student Sibling,Student ID,Studenten ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Arten von Aktivitäten für Time Logs
 DocType: Tax Rule,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
 DocType: Training Event,Exam,Prüfung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
 DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Haben
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
@@ -3487,7 +3490,7 @@
 DocType: Payment Entry,Account Paid From,Konto einzuzahlen Aus
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Rohmaterial-Artikelnummer
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,neue Verkaufsanfrage
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,neue Verkaufsanfrage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Drucken und Papierwaren
 DocType: Stock Settings,Show Barcode Field,Anzeigen Barcode-Feld
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Senden Lieferant von E-Mails
@@ -3502,6 +3505,7 @@
 DocType: Offer Letter,Awaiting Response,Warte auf Antwort
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Über
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ungültige Attribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Erwähnen Sie, wenn nicht standardmäßig zahlbares Konto"
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
@@ -3535,7 +3539,7 @@
 DocType: Program Enrollment Tool,Get Students From,Holen Studenten aus
 DocType: Hub Settings,Seller Country,Land des Verkäufers
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Veröffentlichen Sie Artikel auf der Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppieren Sie Ihre Schüler in den Reihen
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Gruppieren Sie Ihre Schüler in den Reihen
 DocType: Authorization Rule,Authorization Rule,Autorisierungsregel
 DocType: Sales Invoice,Terms and Conditions Details,Allgemeine Geschäftsbedingungen Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Technische Daten
@@ -3594,7 +3598,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probezeit
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Gehaltskomponenten
 DocType: Program Enrollment Tool,New Academic Year,Neues Studienjahr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Gutschrift
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / Gutschrift
 DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Summe gezahlte Beträge
 DocType: Production Order Item,Transferred Qty,Übergebene Menge
@@ -3635,6 +3639,7 @@
 ,Sales Funnel,Verkaufstrichter
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
 DocType: Project,Task Progress,Aufgabenfortschritt
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Einkaufswagen
 ,Qty to Transfer,Zu versendende Menge
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Angebote an Leads oder Kunden
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten Bestand bearbeiten
@@ -3667,7 +3672,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Menge ({0}) kann kein Bruch in Zeile {1} sein
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Sammeln Gebühren
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
 DocType: Lead,Add to calendar on this date,Zu diesem Datum in Kalender einfügen
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten
 DocType: Item,Opening Stock,Anfangsbestand
@@ -3685,7 +3690,7 @@
 DocType: Customer,From Lead,Von Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Für die Produktion freigegebene Bestellungen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Program Enrollment Tool,Enroll Students,einschreiben Studenten
 DocType: Hub Settings,Name Token,Kürzel benennen
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard-Vertrieb
@@ -3696,7 +3701,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektname
-DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
+DocType: Customer,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
 DocType: Journal Entry Account,If Income or Expense,Wenn Ertrag oder Aufwand
 DocType: Production Order,Required Items,Erforderliche Elemente
 DocType: Stock Ledger Entry,Stock Value Difference,Lagerwert-Differenz
@@ -3726,6 +3731,7 @@
 DocType: Item,Taxes,Steuern
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Bezahlt und nicht geliefert
 DocType: Project,Default Cost Center,Standardkostenstelle
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte nennen Sie die Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 DocType: Bank Guarantee,End Date,Enddatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Lagervorgänge
 DocType: Budget,Budget Accounts,Budget Accounts
@@ -3790,7 +3796,7 @@
 DocType: Customer,Sales Partner and Commission,Vertriebspartner und Verprovisionierung
 DocType: Employee Loan,Rate of Interest (%) / Year,Zinssatz (%) / Jahr
 ,Project Quantity,Projekt Menge
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Insgesamt {0} für alle Elemente gleich Null ist, sein kann, sollten Sie &quot;Verteilen Gebühren auf der Grundlage&quot; ändern"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Insgesamt {0} für alle Elemente gleich Null ist, sein kann, sollten Sie &quot;Verteilen Gebühren auf der Grundlage&quot; ändern"
 DocType: Opportunity,To Discuss,Infos zur Diskussion
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} Einheiten von {1} benötigt in {2} zum Abschluss dieser Transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Zinssatz (%) Jahres
@@ -3813,7 +3819,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Abwesend setzen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Währung der BOM # {1} sollte auf die gewählte Währung gleich {2}
 DocType: Journal Entry Account,Exchange Rate,Wechselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 DocType: Homepage,Tag Line,Tag-Linie
 DocType: Fee Component,Fee Component,Fee-Komponente
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flottenmanagement
@@ -3830,7 +3836,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Lager {0} existiert nicht
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Für ERPNext Hub anmelden
 DocType: Monthly Distribution,Monthly Distribution Percentages,Prozentuale Aufteilungen der monatsweisen Verteilung
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Bewertungsrate nicht für den Artikel {0} gefunden, die die Buchungen zu tun erforderlich ist {1} {2}. Wenn das Element als ein Beispielartikel in der Abwicklung von {1}, bitte erwähnen, dass in der {1} Artikel Tisch. Andernfalls erstellen Sie bitte einen eingehenden Aktien-Transaktion für das Element oder Erwähnung Bewertungsrate in der Elementdatensatz, und dann versuchen, submiting / Cancelling diesen Eintrag"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dieser Lieferscheinmenge geliefert
 DocType: Project,Customer Details,Kundendaten
@@ -3847,7 +3853,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Übermittelt Aufträge können nicht gelöscht werden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Qualitätsmanagement
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Artikel {0} wurde deaktiviert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Artikel {0} wurde deaktiviert
 DocType: Employee Loan,Repay Fixed Amount per Period,Repay fixen Betrag pro Periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
 DocType: Employee External Work History,Employee External Work History,Externe Berufserfahrung des Mitarbeiters
@@ -3873,7 +3879,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Studenten E-Mail-ID
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
 DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
 DocType: Employee,Encashment Date,Inkassodatum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Bestandskorrektur
@@ -3906,6 +3912,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Lastschrift ausgestellt am
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} Anlagevermögen kann nicht übertragen werden
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Dieser Artikel ist eine Variante von {0} (Vorlage).
 DocType: Workstation,per hour,pro stunde
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Einkauf
 DocType: Announcement,Announcement,Ankündigung
@@ -3921,7 +3928,7 @@
 DocType: Account,Receivable,Forderung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits ein Lieferantenauftrag vorhanden ist"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, welche Transaktionen, die das gesetzte Kreditlimit überschreiten, übertragen darf."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
 DocType: Item,Material Issue,Materialentnahme
 DocType: Hub Settings,Seller Description,Beschreibung des Verkäufers
@@ -3934,7 +3941,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
 DocType: Salary Detail,Component,Komponente
 DocType: Assessment Criteria,Assessment Criteria Group,Beurteilungskriterien Gruppe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Kumulierte Abschreibungen Öffnungs muss kleiner sein als gleich {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Kumulierte Abschreibungen Öffnungs muss kleiner sein als gleich {0}
 DocType: Warehouse,Warehouse Name,Lagername
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Bitte genehmigende Rolle oder genehmigenden Nutzer eingeben
@@ -3968,7 +3975,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, auf ""Als Standard festlegen"" anklicken"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Beitreten
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Employee Loan,Repay from Salary,Repay von Gehalts
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Anfordern Zahlung gegen {0} {1} für Menge {2}
@@ -3986,7 +3993,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Bewertungsergebnis Details
 DocType: Employee Education,Employee Education,Mitarbeiterschulung
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Doppelte Artikelgruppe in der Artikelgruppentabelle gefunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
 DocType: Salary Slip,Net Pay,Nettolohn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Seriennummer {0} bereits erhalten
@@ -3995,7 +4002,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Lager {0} ist nicht auf ein Konto verknüpft, bitte erstellen / verknüpfen die entsprechenden (Aktiva) Konto für das Lager."
 DocType: Purchase Invoice,Recurring Id,Wiederkehrende ID
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Dauerhaft löschen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Dauerhaft löschen?
 DocType: Expense Claim,Total Claimed Amount,Gesamtforderung
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mögliche Opportunität für den Vertrieb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ungültige(r) {0}
@@ -4006,13 +4013,14 @@
 DocType: Warehouse,PIN,STIFT
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Richten Sie Ihre Schule in ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base-Änderungsbetrag (Gesellschaft Währung)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Speichern Sie das Dokument zuerst.
 DocType: Account,Chargeable,Gebührenpflichtig
 DocType: Company,Change Abbreviation,Abkürzung ändern
 DocType: Expense Claim Detail,Expense Date,Datum der Aufwendung
 DocType: Item,Max Discount (%),Maximaler Rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Letzter Bestellbetrag
+DocType: Task,Is Milestone,Ist Milestone
 DocType: Daily Work Summary,Email Sent To,Email an gesendet
 DocType: Budget,Warn,Warnen
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
@@ -4045,11 +4053,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage."
 DocType: Tax Rule,Purchase Tax Template,Umsatzsteuer-Vorlage
 ,Project wise Stock Tracking,Projektbezogene Lagerbestandsverfolgung
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Wartungsplan {0} gegen {0} zu
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tatsächliche Anzahl (am Ursprung/Ziel)
 DocType: Item Customer Detail,Ref Code,Ref-Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Mitarbeiterdatensätze
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
 DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Bestellung aufgeben
@@ -4072,7 +4079,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Schecks und Kautionen fälschlicherweise gelöscht
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
 DocType: Purchase Invoice Item,Price List Rate,Preisliste
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Erstellen Sie Angebote
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Erstellen Sie Angebote
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""Auf Lager"" oder ""Nicht auf Lager"" basierend auf dem in diesem Lager enthaltenen Bestand anzeigen"
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Stückliste
 DocType: Item,Average time taken by the supplier to deliver,Durchschnittliche Lieferzeit des Lieferanten
@@ -4094,7 +4101,7 @@
 DocType: Asset,Disposal Date,Verkauf Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-Mails werden an alle aktiven Mitarbeiter des Unternehmens an der angegebenen Stunde gesendet werden, wenn sie nicht Urlaub. Zusammenfassung der Antworten wird um Mitternacht gesendet werden."
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
@@ -4102,7 +4109,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurs ist obligatorisch in Zeile {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bis-Datum kann nicht vor Von-Datum liegen
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Preise hinzufügen / bearbeiten
 DocType: Batch,Parent Batch,Übergeordnete Charge
 DocType: Cheque Print Template,Cheque Print Template,Scheck Druckvorlage
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kostenstellenplan
@@ -4146,7 +4153,7 @@
 DocType: Item,Variant Based On,Variante basierend auf
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ihre Lieferanten
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
 DocType: Request for Quotation Item,Supplier Part No,Lieferant Teile-Nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abziehen, wenn der Kategorie für &quot;Bewertung&quot; oder &quot;Vaulation und Total &#39;ist"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Erhalten von
@@ -4156,7 +4163,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Von {0} für {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Stunden-Wert muss größer als Null sein.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
 DocType: Issue,Content Type,Inhaltstyp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
@@ -4165,20 +4172,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
 DocType: Payment Reconciliation,From Invoice Date,Ab Rechnungsdatum
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Abrechnungswährung muss entweder auf Standard comapany Währung oder Partei Kontowährung gleich
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Abrechnungswährung muss entweder auf Standard comapany Währung oder Partei Kontowährung gleich
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lassen Sie Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Unternehmenszweck
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,An Lager
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Studenten Admissions
 ,Average Commission Rate,Durchschnittlicher Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
 DocType: School House,House Name,Hausname
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Zusatzkosten aktualisieren um die Einstandskosten des Artikels zu kalkulieren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektro
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Fügen Sie den Rest Ihrer Organisation als Nutzer hinzu. Sie können auch Kunden zu Ihrem Portal einladen indem Sie sie aus den Kontakten hinzufügen
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Fügen Sie den Rest Ihrer Organisation als Nutzer hinzu. Sie können auch Kunden zu Ihrem Portal einladen indem Sie sie aus den Kontakten hinzufügen
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Zeile {0}: Wechselkurs ist erforderlich
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Benutzer-ID ist für Mitarbeiter {0} nicht eingegeben
@@ -4187,7 +4194,7 @@
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Geburtstagserinnerung für {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versicherung Startdatum sollte weniger als Versicherung Enddatum
@@ -4202,7 +4209,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}
 DocType: Vehicle Log,Odometer,Kilometerzähler
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Stückliste enthält keine Lagerware
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Ab-Zeitraum und Bis-Zeitraum sind zwingend erforderlich für wiederkehrende {0}
@@ -4215,7 +4222,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Stunden
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standardstückliste für {0} nicht gefunden
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Tippen Sie auf Elemente, um sie hier hinzuzufügen"
 DocType: Fees,Program Enrollment,Programm Einschreibung
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Bitte {0} setzen
@@ -4313,7 +4321,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
 DocType: Issue,First Responded On,Zuerst geantwortet auf
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen
-DocType: Grade Interval,Grade Interval,Gehalt Intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Start- und Enddatum des Geschäftsjahres sind für das Geschäftsjahr {0} bereits gesetzt
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Räumungs Datum aktualisiert
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4321,6 +4328,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF Herunterladen
 DocType: Production Order,Planned End Date,Geplantes Enddatum
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,"Ort, an dem Artikel gelagert werden."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferanten Typ
 DocType: Request for Quotation,Supplier Detail,Lieferant Details
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Fehler in der Formel oder Bedingung: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Rechnungsbetrag
@@ -4365,7 +4373,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Richten Sie eine einfache Website für meine Organisation
 DocType: Payment Reconciliation,Receivable / Payable Account,Forderungen-/Verbindlichkeiten-Konto
 DocType: Delivery Note Item,Against Sales Order Item,Zu Kundenauftrags-Position
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Bitte übergeordnete Kostenstelle eingeben
@@ -4422,7 +4430,7 @@
 ,Items To Be Requested,Anzufragende Artikel
 DocType: Purchase Order,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
 DocType: Company,Company Info,Informationen über das Unternehmen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Wählen oder neue Kunden hinzufügen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Wählen oder neue Kunden hinzufügen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,"Kostenstelle ist erforderlich, einen Aufwand Anspruch buchen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dies basiert auf der Anwesenheit dieser Arbeitnehmer
@@ -4435,13 +4443,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage einzureichen."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Gesamtbetrag des Einkaufs
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,"Ende Jahr sein kann, nicht vor dem Startjahr"
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,"Ende Jahr sein kann, nicht vor dem Startjahr"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Vergünstigungen an Mitarbeiter
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Production Order,Manufactured Qty,Produzierte Menge
 DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Bitte stellen Sie eine Standard-Feiertagsliste für Mitarbeiter {0} oder Gesellschaft {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existiert nicht
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} existiert nicht
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rechnungen an Kunden
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
@@ -4450,15 +4458,17 @@
 DocType: Quality Inspection Reading,Reading 3,Ablesewert 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Belegtyp
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Employee Loan Application,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
 DocType: Guardian,Guardian,Wächter
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt
 DocType: Employee,Education,Bildung
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Benennung der Kampagnen nach
 DocType: Employee,Current Address Is,Aktuelle Adresse ist
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,geändert
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Optional. Stellt die Standardwährung des Unternehmens ein, falls nichts angegeben ist."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Buchungssätze
 DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
@@ -4495,7 +4505,7 @@
 DocType: Hub Settings,Hub Settings,Hub-Einstellungen
 DocType: Project,Gross Margin %,Handelsspanne %
 DocType: BOM,With Operations,Mit Arbeitsgängen
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
 DocType: Asset,Is Existing Asset,Ist bereits bestehenden Asset
 DocType: Salary Detail,Statistical Component,Statistische Komponente
 ,Monthly Salary Register,Übersicht monatliche Gehälter
@@ -4549,7 +4559,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo anhängen
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Lagerbestände
 DocType: Customer,Commission Rate,Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Variante erstellen
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Variante erstellen
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Zahlungsart muss eine der Receive sein, Pay und interne Übertragung"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analysetools
@@ -4562,6 +4572,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Fertigung im Urlaub zulassen
 DocType: Sales Order,Customer's Purchase Order Date,Kundenauftragsdatum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Grundkapital
+DocType: Shopping Cart Settings,Show Public Attachments,Öffentliche Anhänge anzeigen
 DocType: Packing Slip,Package Weight Details,Details zum Verpackungsgewicht
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Nach Abschluss der Zahlung, Benutzer auf ausgewählte Seite weiterleiten."
@@ -4586,7 +4597,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Machen Schüler Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Machen Schüler Batch
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Artikel aus der Stückliste holen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage
@@ -4605,7 +4616,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Genehmigter Betrag
 DocType: GL Entry,Is Opening,Ist Eröffnungsbuchung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über die Einrichtung&gt; Nummerierung ein
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} existiert nicht
 DocType: Account,Cash,Bargeld
 DocType: Employee,Short biography for website and other publications.,Kurzbiographie für die Webseite und andere Publikationen.
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index e996a5f..efd8370 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Παρτίδα Θέση λήξης Κατάσταση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Τραπεζική επιταγή
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Προβολή παραλλαγών
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Προβολή παραλλαγών
 DocType: Academic Term,Academic Term,Ακαδημαϊκός Όρος
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Υλικό
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Ποσότητα
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Δαπάνη παροχής υπηρεσιών
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Χρήσεως {0} απαιτείται
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Διαφήμιση
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ίδια Εταιρεία καταχωρήθηκε περισσότερο από μία φορά
 DocType: Employee,Married,Παντρεμένος
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Δεν επιτρέπεται η {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Δεν επιτρέπεται η {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Πάρτε τα στοιχεία από
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Προϊόν {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Δεν αναγράφονται στοιχεία
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Παντοπωλείο
 DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
 DocType: Process Payroll,Make Bank Entry,Δημιούργησε εγγυητική τραπέζης
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
 DocType: SMS Center,All Sales Person,Όλοι οι πωλητές
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Μηνιαία Κατανομή ** σας βοηθά να διανείμετε το Οικονομικό / Target σε όλη μήνες, αν έχετε την εποχικότητα στην επιχείρησή σας."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Δεν βρέθηκαν στοιχεία
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Δεν βρέθηκαν στοιχεία
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Δομή του μισθού που λείπουν
 DocType: Lead,Person Name,Όνομα Πρόσωπο
 DocType: Sales Invoice Item,Sales Invoice Item,Είδος τιμολογίου πώλησης
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",π.χ. «Δημοτικό Σχολείο» ή «Πανεπιστήμιο»
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Αναφορές απόθεμα
 DocType: Warehouse,Warehouse Detail,Λεπτομέρειες αποθήκης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Το τέλος Όρος ημερομηνία δεν μπορεί να είναι μεταγενέστερη της χρονιάς Ημερομηνία Λήξης του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Είναι Παγίων&quot; δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Είναι Παγίων&quot; δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Φορολογική Τύπος
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
 DocType: BOM,Item Image (if not slideshow),Φωτογραφία είδους (αν όχι slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Υπάρχει πελάτης με το ίδιο όνομα
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ώρα Βαθμολογήστε / 60) * Πραγματικός χρόνος λειτουργίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Επιλέξτε BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Επιλέξτε BOM
 DocType: SMS Log,SMS Log,Αρχείο καταγραφής SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Κόστος των προϊόντων που έχουν παραδοθεί
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Οι διακοπές σε {0} δεν είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Βαθμός
 DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: SMS Center,All Contact,Όλες οι επαφές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Παραγγελία Παραγωγή ήδη δημιουργήσει για όλα τα στοιχεία με BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Παραγγελία Παραγωγή ήδη δημιουργήσει για όλα τα στοιχεία με BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Ετήσιος Μισθός
 DocType: Daily Work Summary,Daily Work Summary,Καθημερινή Σύνοψη εργασίας
 DocType: Period Closing Voucher,Closing Fiscal Year,Κλείσιμο χρήσης
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Επιλέξτε υφιστάμενης εταιρείας για τη δημιουργία Λογιστικού
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Έξοδα αποθέματος
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Επιλέξτε Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Λογιστική εγγραφή ακύρωσης
 DocType: Journal Entry Account,Credit in Company Currency,Πιστωτικές στην Εταιρεία Νόμισμα
 DocType: Delivery Note,Installation Status,Κατάσταση εγκατάστασης
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Θέλετε να ενημερώσετε τη συμμετοχή; <br> Παρόν: {0} \ <br> Απών: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Η αποδεκτή + η απορριπτέα ποσότητα πρέπει να είναι ίση με την ληφθείσα ποσότητα για το είδος {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Παροχή Πρώτων Υλών για Αγορά
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Τουλάχιστον ένα τρόπο πληρωμής απαιτείται για POS τιμολόγιο.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Τουλάχιστον ένα τρόπο πληρωμής απαιτείται για POS τιμολόγιο.
 DocType: Products Settings,Show Products as a List,Εμφάνιση προϊόντων ως Λίστα
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Κατεβάστε το πρότυπο, συμπληρώστε τα κατάλληλα δεδομένα και επισυνάψτε το τροποποιημένο αρχείο. Όλες οι ημερομηνίες και ο συνδυασμός των υπαλλήλων στην επιλεγμένη περίοδο θα εμφανιστεί στο πρότυπο, με τους υπάρχοντες καταλόγους παρουσίας"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Κάντε Αποσβέσεις Έναρξη
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Τύπος αίτησης
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Κάντε Υπάλληλος
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Κάντε Υπάλληλος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Εκπομπή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Εκτέλεση
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Λεπτομέρειες σχετικά με τις λειτουργίες που πραγματοποιούνται.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Σχέδιο για επισκέψεις συντήρησης.
 DocType: SMS Settings,Enter url parameter for message,Εισάγετε παράμετρο url για το μήνυμα
 DocType: POS Profile,Customer Groups,Ομάδες πελατών
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Οικονομικές δηλώσεις
 DocType: Guardian,Students,Φοιτητόκοσμος
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Κανόνες για την εφαρμογή τιμολόγησης και εκπτώσεων.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ο τιμοκατάλογος πρέπει να ισχύει για την αγορά ή πώληση
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
 DocType: Naming Series,Series List for this Transaction,Λίστα σειράς για αυτή τη συναλλαγή
 DocType: Company,Default Payroll Payable Account,Προεπιλογή Μισθοδοσίας με πληρωμή Λογαριασμού
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Ενημέρωση Email Ομάδα
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Ενημέρωση Email Ομάδα
 DocType: Sales Invoice,Is Opening Entry,Είναι αρχική καταχώρηση
 DocType: Customer Group,Mention if non-standard receivable account applicable,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμό εφαρμόζεται
 DocType: Course Schedule,Instructor Name,Διδάσκων Ονοματεπώνυμο
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Κατά το είδος στο τιμολόγιο πώλησης
 ,Production Orders in Progress,Εντολές παραγωγής σε εξέλιξη
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Καθαρές ροές από επενδυτικές
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
 DocType: Lead,Address & Contact,Διεύθυνση & Επαφή
 DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Σύνολο Κοστολόγηση Ποσό (μέσω Ώρα Φύλλο)
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Τράπεζα Καταχωρήσεις
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 DocType: Student Admission,Student Admission,Η είσοδος φοιτητής
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ειδοποίηση μέσω email σχετικά με την αυτόματη δημιουργία αιτήσης υλικού
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
 DocType: Payment Reconciliation Invoice,Invoice Type,Τύπος τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Δελτίο αποστολής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Δελτίο αποστολής
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Κόστος πωληθέντων περιουσιακών στοιχείων
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
-DocType: Grade Interval,Min Score,Ελάχιστη Αποτέλεσμα
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
 DocType: Student Applicant,Admitted,Παράδεκτος
 DocType: Workstation,Rent Cost,Κόστος ενοικίασης
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Τιμή παραγγελίας
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Τράπεζα / Ταμειακές συναλλαγές κατά μέρος ή για εσωτερική μεταφορά
 DocType: Shipping Rule,Valid for Countries,Ισχύει για χώρες
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Αυτό το στοιχείο είναι ένα πρότυπο και δεν μπορεί να χρησιμοποιηθεί στις συναλλαγές. Τα χαρακτηριστικά του θα αντιγραφούν πάνω σε αυτά των παραλλαγών εκτός αν έχει οριστεί το «όχι αντιγραφή '
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Αυτό το στοιχείο είναι ένα πρότυπο και δεν μπορεί να χρησιμοποιηθεί στις συναλλαγές. Τα χαρακτηριστικά του θα αντιγραφούν πάνω σε αυτά των παραλλαγών εκτός αν έχει οριστεί το «όχι αντιγραφή '
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Σύνολο παραγγελιών που μελετήθηκε
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Παρακαλώ εισάγετε τιμή στο πεδίο 'επανάληψη για την ημέρα του μήνα'
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} σε {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Επιλέξτε Προϊόν
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Μετατροπή σε μη-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Παρτίδας (lot) ενός είδους.
 DocType: C-Form Invoice Detail,Invoice Date,Ημερομηνία τιμολογίου
 DocType: GL Entry,Debit Amount,Χρεωστικό ποσό
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Δημιουργία Ομάδων Φοιτητών
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Αίτηση για προσφορά
 DocType: Salary Slip Timesheet,Working Hours,Ώρες εργασίας
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Αλλάξτε τον αρχικό/τρέχων αύξοντα αριθμός μιας υπάρχουσας σειράς.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Αν υπάρχουν πολλοί κανόνες τιμολόγησης που συνεχίζουν να επικρατούν, οι χρήστες καλούνται να ορίσουν προτεραιότητα χειρονακτικά για την επίλυση των διενέξεων."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Δημιουργία Εντολών Αγοράς
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Δημιουργία Εντολών Αγοράς
 ,Purchase Register,Ταμείο αγορών
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Κύρια εγγραφή αργιών.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,Από αρ. συσκευασίας
 DocType: Item Attribute,To Range,Να Σειρά
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Κινητές αξίες και καταθέσεις
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Δεν είναι δυνατή η αλλαγή της μεθόδου αποτίμησης, καθώς υπάρχουν συναλλαγές έναντι ορισμένων στοιχείων που δεν έχουν τη δική της μέθοδο αποτίμησης"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Σύνολο φύλλα που διατίθενται είναι υποχρεωτική
 DocType: Job Opening,Description of a Job Opening,Περιγραφή μιας ανοιχτής θέσης εργασίας
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Εν αναμονή δραστηριότητες για σήμερα
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
 DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Καλλυντικά
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Αγορά
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ορίστε βαθμό για το όριο 0%
 DocType: Sales Order,To Deliver,Να Παραδώσει
 DocType: Purchase Invoice Item,Item,Είδος
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Διαχείριση της υπεργολαβίας
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 DocType: Production Plan Item,Pending Qty,Εν αναμονή Ποσότητα
 DocType: Budget,Ignore,Αγνοήστε
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} δεν είναι ενεργή
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} δεν είναι ενεργή
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS αποστέλλονται στην παρακάτω αριθμούς: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,διαστάσεις Ελέγξτε τις ρυθμίσεις για εκτύπωση
 DocType: Salary Slip,Salary Slip Timesheet,Μισθός Slip Timesheet
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,Συνολική προμήθεια
 DocType: Pricing Rule,Sales Partner,Συνεργάτης πωλήσεων
 DocType: Buying Settings,Purchase Receipt Required,Απαιτείται αποδεικτικό παραλαβής αγοράς
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Αποτίμηση Rate είναι υποχρεωτική εάν εισέλθει Άνοιγμα Χρηματιστήριο
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Αποτίμηση Rate είναι υποχρεωτική εάν εισέλθει Άνοιγμα Χρηματιστήριο
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,συσσωρευμένες Αξίες
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Δημιούργησε παραγγελία πώλησης
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Δημιούργησε παραγγελία πώλησης
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID Σύστασης
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,Συνέχιση Συνημμένο
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Επαναλαμβανόμενοι πελάτες
 DocType: Leave Control Panel,Allocate,Κατανομή
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Επιστροφή πωλήσεων
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Σημείωση: Σύνολο των κατανεμημένων φύλλα {0} δεν πρέπει να είναι μικρότερη από τα φύλλα που έχουν ήδη εγκριθεί {1} για την περίοδο
 DocType: Announcement,Posted By,Αναρτήθηκε από
 DocType: Item,Delivered by Supplier (Drop Ship),Δημοσιεύθηκε από τον Προμηθευτή (Drop Ship)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ρυθμίστε την εταιρεία
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Πωλήσεις Τιμολόγιο Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Επιλέξτε Λογαριασμός Πληρωμή να κάνουν Τράπεζα Έναρξη
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Δημιουργήστε τα αρχεία των εργαζομένων για τη διαχείριση των φύλλων, οι δηλώσεις εξόδων και μισθοδοσίας"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Δημιουργήστε τα αρχεία των εργαζομένων για τη διαχείριση των φύλλων, οι δηλώσεις εξόδων και μισθοδοσίας"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Προσθήκη στη Γνωσιακή Βάση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Συγγραφή πρότασης
 DocType: Payment Entry Deduction,Payment Entry Deduction,Έκπτωση Έναρξη Πληρωμής
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Σχέση με Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Προϊστάμενος
 DocType: Payment Entry,Payment From / To,Πληρωμή Από / Προς
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Εύρος ημερομηνιών
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Νέο πιστωτικό όριο είναι μικρότερο από το τρέχον οφειλόμενο ποσό για τον πελάτη. Πιστωτικό όριο πρέπει να είναι atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Νέο πιστωτικό όριο είναι μικρότερο από το τρέχον οφειλόμενο ποσό για τον πελάτη. Πιστωτικό όριο πρέπει να είναι atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
 DocType: SMS Settings,Receiver Parameter,Παράμετρος παραλήπτη
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
 DocType: Student Batch Name,Batch Name,παρτίδα Όνομα
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Εγγράφω
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Θα δείξει το μαθητή ως Παρόντες στη Φοιτητική Μηνιαία Έκθεση Συμμετοχή
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,Η φοίτηση μαθητή
 DocType: Sales Invoice Timesheet,Time Sheet,Πρόγραμμα
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush πρώτων υλών Βάσει των
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Παρακαλώ εισάγετε τα στοιχεία του είδους
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Παρακαλώ εισάγετε τα στοιχεία του είδους
 DocType: Interest,Interest,Ενδιαφέρον
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Προπωλήσεις
 DocType: Purchase Receipt,Other Details,Άλλες λεπτομέρειες
@@ -726,7 +729,7 @@
 ,Absent Student Report,Απών Έκθεση Φοιτητών
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Offer Letter Term,Offer Letter Term,Προσφορά Επιστολή Όρος
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Η εταιρεία {0} δεν υπάρχει
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,Ημερομηνία λήξης εγγύησης
 DocType: Material Request Item,Quantity and Warehouse,Ποσότητα και αποθήκη
 DocType: Sales Invoice,Commission Rate (%),Ποσοστό (%) προμήθειας
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία Σειράς για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Επιλέξτε Προγράμματα
 DocType: Project,Estimated Cost,Εκτιμώμενο κόστος
 DocType: Purchase Order,Link to material requests,Σύνδεσμος για το υλικό των αιτήσεων
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,Το {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Mode of Payment Account,Default Account,Προεπιλεγμένος λογαριασμός
 DocType: Payment Entry,Received Amount (Company Currency),Ελήφθη Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Η Σύσταση πρέπει να οριστεί αν η Ευκαιρία προέρχεται από Σύσταση
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Η Σύσταση πρέπει να οριστεί αν η Ευκαιρία προέρχεται από Σύσταση
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Παρακαλώ επιλέξτε εβδομαδιαίο ρεπό
 DocType: Production Order Operation,Planned End Time,Προγραμματισμένη ώρα λήξης
 ,Sales Person Target Variance Item Group-Wise,Εύρος στόχου πωλητή ανά ομάδα είδους
@@ -836,7 +838,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Request for Quotation Supplier,Send Email,Αποστολή email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Δεν έχετε άδεια
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
@@ -849,7 +851,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Supplier Quotation,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Η ομάδα σπουδαστών έχει ήδη ενημερωθεί.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Η ομάδα σπουδαστών έχει ήδη ενημερωθεί.
 DocType: SMS Center,All Customer Contact,Όλες οι επαφές πελάτη
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Ανεβάστε υπόλοιπο αποθεμάτων μέσω csv.
 DocType: Warehouse,Tree Details,δέντρο Λεπτομέρειες
@@ -860,8 +862,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Ελάχιστο ποσό του τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Κέντρο Κόστους {2} δεν ανήκει στην εταιρεία {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Ο λογαριασμός {2} δεν μπορεί να είναι μια ομάδα
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Στοιχείο Σειρά {idx}: {doctype} {docname} δεν υπάρχει στην παραπάνω »{doctype} &#39;τραπέζι
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Στοιχείο Σειρά {idx}: {doctype} {docname} δεν υπάρχει στην παραπάνω »{doctype} &#39;τραπέζι
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Δεν καθήκοντα
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί το αυτοματοποιημένο τιμολόγιο, π.Χ. 05, 28 Κλπ"
 DocType: Asset,Opening Accumulated Depreciation,Άνοιγμα Συσσωρευμένες Αποσβέσεις
@@ -877,7 +879,7 @@
 DocType: Bin,Moving Average Rate,Κινητή μέση τιμή
 DocType: Production Planning Tool,Select Items,Επιλέξτε είδη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Πρόγραμμα Μαθημάτων
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Πρόγραμμα Μαθημάτων
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
 DocType: HR Settings,Enter retirement age in years,Εισάγετε την ηλικία συνταξιοδότησης στα χρόνια
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Αποθήκη προορισμού
@@ -885,7 +887,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Όλες οι ομάδες ειδών
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Όλες οι ομάδες ειδών
 DocType: Process Payroll,Activity Log,Αρχείο καταγραφής δραστηριότητας
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Καθαρά κέρδη / ζημίες
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
@@ -896,7 +898,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',«Άνοιγμα»
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ανοικτή To Do
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
@@ -912,7 +914,7 @@
 DocType: Item Reorder,Re-Order Qty,Ποσότητα επαναπαραγγελίας
 DocType: Leave Block List Date,Leave Block List Date,Ημερομηνία λίστας αποκλεισμού ημερών άδειας
 DocType: Pricing Rule,Price or Discount,Τιμή ή έκπτωση
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Σύνολο χρεώσεων που επιβάλλονται στην Αγορά Παραλαβή Είδη πίνακα πρέπει να είναι ίδιο με το συνολικό φόροι και επιβαρύνσεις
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Σύνολο χρεώσεων που επιβάλλονται στην Αγορά Παραλαβή Είδη πίνακα πρέπει να είναι ίδιο με το συνολικό φόροι και επιβαρύνσεις
 DocType: Sales Team,Incentives,Κίνητρα
 DocType: SMS Log,Requested Numbers,Αιτήματα Αριθμοί
 DocType: Production Planning Tool,Only Obtain Raw Materials,Μόνο Αποκτήστε Πρώτες Ύλες
@@ -970,8 +972,7 @@
 DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Fee Structure,Components,εξαρτήματα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
@@ -1023,8 +1024,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Χημικό
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Προεπιλογή του τραπεζικού λογαριασμού / Cash θα ενημερώνεται αυτόματα στο Μισθός Εφημερίδα Έναρξη όταν έχει επιλεγεί αυτή η λειτουργία.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Τα διαστήματα για το βαθμό κώδικα {0} συμπίπτει με τα διαστήματα βαθμό για άλλους βαθμούς. Παρακαλώ ελέγξτε διαστήματα {0} και {1} και προσπαθήστε ξανά
 DocType: BOM,Raw Material Cost(Company Currency),Κόστος των πρώτων υλών (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Σειρά # {0}: Η τιμή δεν μπορεί να είναι μεγαλύτερη από την τιμή {1} {2}
@@ -1036,7 +1035,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Ιστοσελίδα του Είδους
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
 DocType: Timesheet Detail,Bill,Νομοσχέδιο
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Λευκό
 DocType: SMS Center,All Lead (Open),Όλες οι Συστάσεις (ανοιχτές)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Σειρά {0}: Ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} στην απόσπαση χρόνο έναρξης ({2} {3})
@@ -1050,7 +1049,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Ο τύπος παραγγελίας πρέπει να είναι ένα από τα {0}
 DocType: Lead,Next Contact Date,Ημερομηνία επόμενης επικοινωνίας
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Αρχική ποσότητα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
 DocType: Student Batch Name,Student Batch Name,Φοιτητής παρτίδας Όνομα
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
 DocType: Repayment Schedule,Balance Loan Amount,Υπόλοιπο Ποσό Δανείου
@@ -1070,10 +1069,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Παρακαλείστε να προσδιορίσετε ένα {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Έκπτωση
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Έκπτωση
 DocType: Asset,Total Number of Depreciations,Συνολικός αριθμός των Αποσβέσεων
 DocType: Sales Invoice Item,Rate With Margin,Τιμή με περιθώριο
 DocType: Workstation,Wages,Μισθοί
@@ -1101,7 +1100,7 @@
 DocType: Lead,Organization Name,Όνομα οργανισμού
 DocType: Tax Rule,Shipping State,Μέλος αποστολής
 ,Projected Quantity as Source,Προβλεπόμενη ποσότητα ως πηγής
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
 DocType: Employee,A-,Α-
 DocType: Production Planning Tool,Include non-stock items,Περιλαμβάνουν στοιχεία μη-απόθεμα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Έξοδα πωλήσεων
@@ -1109,7 +1108,7 @@
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Ταχυδρομικός κώδικας
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Ταχυδρομικός κώδικας
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
@@ -1151,7 +1150,7 @@
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
 ,Ordered Items To Be Billed,Παραγγελθέντα είδη για τιμολόγηση
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Από το φάσμα πρέπει να είναι μικρότερη από ό, τι στην γκάμα"
 DocType: Global Defaults,Global Defaults,Καθολικές προεπιλογές
@@ -1186,11 +1185,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Παρακαλώ εισάγετε τον κωδικό του Είδους να πάρει Αριθμός Παρτίδας
 DocType: Stock Settings,Default Item Group,Προεπιλεγμένη ομάδα ειδών
 DocType: Employee Loan,Partially Disbursed,"Εν μέρει, προέβη στη χορήγηση"
-DocType: Grading Structure,Grading System Name,Όνομα Σύστημα Βαθμολόγησης
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Βάση δεδομένων προμηθευτών.
 DocType: Account,Balance Sheet,Ισολογισμός
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ο πωλητής σας θα λάβει μια υπενθύμιση την ημερομηνία αυτή για να επικοινωνήσει με τον πελάτη
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Ίδιο αντικείμενο δεν μπορεί να εισαχθεί πολλές φορές.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
@@ -1227,11 +1225,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Η εργασία ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Παρακαλείστε να προσδιορίσετε τουλάχιστον ένα χαρακτηριστικό στον πίνακα Χαρακτηριστικά
 DocType: Announcement,All Students,Όλοι οι φοιτητές
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Προβολή καθολικού
 DocType: Grading Scale,Intervals,διαστήματα
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Φοιτητής Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
@@ -1271,8 +1269,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,εντολές αγοράς σας βοηθήσει να σχεδιάσετε και να παρακολουθούν τις αγορές σας
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,εντολές αγοράς σας βοηθήσει να σχεδιάσετε και να παρακολουθούν τις αγορές σας
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Μικρό
@@ -1296,7 +1294,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
@@ -1313,7 +1311,7 @@
 DocType: Student Group Student,Group Roll Number,Αριθμός Αριθμός Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Σύνολο όλων των βαρών στόχος θα πρέπει να είναι: 1. Παρακαλώ ρυθμίστε τα βάρη όλων των εργασιών του έργου ανάλογα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Κεφάλαιο εξοπλισμών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
@@ -1340,7 +1338,7 @@
 DocType: Depreciation Schedule,Journal Entry,Λογιστική εγγραφή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} αντικείμενα σε εξέλιξη
 DocType: Workstation,Workstation Name,Όνομα σταθμού εργασίας
-DocType: Grade Interval,Grade Code,Βαθμολογία Κωδικός
+DocType: Grading Scale Interval,Grade Code,Βαθμολογία Κωδικός
 DocType: POS Item Group,POS Item Group,POS Θέση του Ομίλου
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
@@ -1356,7 +1354,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,επαναλαμβανόμενες Μέχρι
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Άδεια μετ' αποδοχών
 DocType: Purchase Invoice,Supplier Invoice Date,Ημερομηνία τιμολογίου του προμηθευτή
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Χρειάζεται να ενεργοποιήσετε το καλάθι αγορών
@@ -1372,7 +1370,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Τροφή
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Eύρος γήρανσης 3
 DocType: Maintenance Schedule Item,No of Visits,Αρ. επισκέψεων
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Το πρόγραμμα συντήρησης {0} υπάρχει έναντι του {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Η εγγραφή των φοιτητών
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Νόμισμα του Λογαριασμού κλεισίματος πρέπει να είναι {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Άθροισμα των βαθμών για όλους τους στόχους πρέπει να είναι 100. Πρόκειται για {0}
@@ -1421,13 +1420,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Detail,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
 DocType: Pricing Rule,"Higher the number, higher the priority","Όσο μεγαλύτερος είναι ο αριθμός, τόσο μεγαλύτερη είναι η προτεραιότητα"
 ,Purchase Invoice Trends,Τάσεις τιμολογίου αγοράς
 DocType: Employee,Better Prospects,Καλύτερες προοπτικές
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Σειρά # {0}: Η παρτίδα {1} έχει μόνο {2} qty. Επιλέξτε άλλη παρτίδα που έχει {3} qty διαθέσιμη ή διαχωρίστε τη σειρά σε πολλαπλές σειρές, για παράδοση / έκδοση από πολλαπλές παρτίδες"
 DocType: Vehicle,License Plate,Πινακίδα κυκλοφορίας
 DocType: Appraisal,Goals,Στόχοι
 DocType: Warranty Claim,Warranty / AMC Status,Κατάσταση εγγύησης / Ε.Σ.Υ.
@@ -1445,7 +1445,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Ο υπάλληλος δεν μπορεί να αναφέρει στον ευατό του.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Εάν ο λογαριασμός έχει παγώσει, οι καταχωρήσεις επιτρέπονται σε ορισμένους χρήστες."
 DocType: Email Digest,Bank Balance,Τράπεζα Υπόλοιπο
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Επαγγελματικό προφίλ, τα προσόντα που απαιτούνται κ.λ.π."
 DocType: Journal Entry Account,Account Balance,Υπόλοιπο λογαριασμού
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
@@ -1456,7 +1456,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Εμφάνιση P &amp; L υπόλοιπα unclosed χρήσεως
 DocType: Shipping Rule,Shipping Account,Λογαριασμός αποστολών
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Ο λογαριασμός {2} είναι ανενεργό
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Κάντε Παραγγελίες για να σας βοηθήσει να σχεδιάσετε την εργασία σας και να παραδώσει στο χρόνο
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Κάντε Παραγγελίες για να σας βοηθήσει να σχεδιάσετε την εργασία σας και να παραδώσει στο χρόνο
 DocType: Quality Inspection,Readings,Μετρήσεις
 DocType: Stock Entry,Total Additional Costs,Συνολικό πρόσθετο κόστος
 DocType: Course Schedule,SH,SH
@@ -1467,7 +1467,7 @@
 DocType: Shipping Rule Condition,To Value,Έως αξία
 DocType: Asset Movement,Stock Manager,Διευθυντής Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Δελτίο συσκευασίας
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Δελτίο συσκευασίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Ενοίκιο γραφείου
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
@@ -1493,7 +1493,7 @@
 DocType: Sales Invoice,Source,Πηγή
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Εμφάνιση κλειστά
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Περιουσιακών στοιχείων της κατηγορίας είναι υποχρεωτική για παγίου στοιχείου
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Περιουσιακών στοιχείων της κατηγορίας είναι υποχρεωτική για παγίου στοιχείου
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Αυτό {0} συγκρούσεις με {1} για {2} {3}
 DocType: Student Attendance Tool,Students HTML,φοιτητές HTML
@@ -1511,7 +1511,7 @@
 DocType: Student,Date of Leaving,Ημερομηνία Φεύγοντας
 DocType: Pricing Rule,For Price List,Για τιμοκατάλογο
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Δημιουργήστε Συστάσεις
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Δημιουργήστε Συστάσεις
 DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
@@ -1539,7 +1539,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,πρόγραμμα Εγγραφές
 DocType: Sales Invoice Item,Brand Name,Εμπορική επωνυμία
 DocType: Purchase Receipt,Transporter Details,Λεπτομέρειες Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Κουτί
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,πιθανές Προμηθευτής
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Ο οργανισμός
@@ -1572,7 +1572,7 @@
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Προεπιλεγμένη ΒΟΜ για {0} δεν βρέθηκε για το Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Οι μαθητές βρίσκονται στην καρδιά του συστήματος, προσθέστε όλους τους μαθητές σας"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Οι μαθητές βρίσκονται στην καρδιά του συστήματος, προσθέστε όλους τους μαθητές σας"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Σειρά # {0}: Ημερομηνία Εκκαθάρισης {1} δεν μπορεί να είναι πριν Επιταγή Ημερομηνία {2}
 DocType: Company,Default Holiday List,Προεπιλεγμένη λίστα διακοπών
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Σειρά {0}: από το χρόνο και την ώρα της {1} είναι η επικάλυψη με {2}
@@ -1584,20 +1584,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Επανάληψη αποστολής Πληρωμής Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Νέα εργασία
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Κάντε Προσφορά
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Κάντε Προσφορά
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,άλλες εκθέσεις
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Δοκιμάστε τον προγραμματισμό εργασιών για το X ημέρες νωρίτερα.
 DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσεων γενεθλίων
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Αναζήτηση Είδους
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Αναζήτηση Είδους
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Assessment Plan,Grading Scale,Κλίμακα βαθμολόγησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,έχουν ήδη ολοκληρωθεί
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Αίτηση Πληρωμής υπάρχει ήδη {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
@@ -1635,7 +1635,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Συλλέγω
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Δεν μπορείτε να διαγράψετε Χρήσεως {0}. Φορολογικό Έτος {0} έχει οριστεί ως προεπιλογή στο Καθολικές ρυθμίσεις
 DocType: Journal Entry,Entry Type,Τύπος εισόδου
 ,Customer Credit Balance,Υπόλοιπο πίστωσης πελάτη
@@ -1675,7 +1675,6 @@
 DocType: Student Sibling,Studying in Same Institute,Σπουδάζουν στο ίδιο Ινστιτούτο
 DocType: Territory,Territory Manager,Διευθυντής περιοχής
 DocType: Packed Item,To Warehouse (Optional),Για Αποθήκη (Προαιρετικό)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Payment Entry,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
@@ -1685,9 +1684,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Προβολή Καλάθι
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Δαπάνες marketing
 ,Item Shortage Report,Αναφορά έλλειψης είδους
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Αίτηση υλικού που χρησιμοποιείται για να γίνει αυτήν η καταχώρnση αποθέματος
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Επόμενο Αποσβέσεις ημερομηνία είναι υποχρεωτική για νέο περιουσιακό στοιχείο
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Επόμενο Αποσβέσεις ημερομηνία είναι υποχρεωτική για νέο περιουσιακό στοιχείο
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ξεχωριστή ομάδα μαθημάτων που βασίζεται σε μαθήματα για κάθε παρτίδα
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Μία μονάδα ενός είδους
 DocType: Fee Category,Fee Category,χρέωση Κατηγορία
@@ -1703,8 +1702,7 @@
 DocType: Course Assessment Criteria,Weightage,Ζύγισμα
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Κέντρο κόστος που απαιτείται για την «Αποτελεσμάτων Χρήσεως» του λογαριασμού {2}. Παρακαλείστε να δημιουργήσει ένα προεπιλεγμένο Κέντρο Κόστους για την Εταιρεία.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Νέα Επικοινωνία
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
@@ -1731,20 +1729,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Συμφωνία json
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 DocType: Purchase Invoice Item,Batch No,Αρ. Παρτίδας
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ανίκανος να βρει συναλλαγματική ισοτιμία για {0} έως {1} για τα βασικά ημερομηνία {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Επιτρέψτε πολλαπλές Παραγγελίες εναντίον παραγγελίας του Πελάτη
 DocType: Student Group Instructor,Student Group Instructor,Φοιτητής ομάδας εκπαιδευτών
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Όχι
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Κύριο
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Παραλλαγή
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Κύριο
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Παραλλαγή
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
 DocType: Employee Attendance Tool,Employees HTML,Οι εργαζόμενοι HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Email Digest,Annual Expenses,ετήσια Έξοδα
 DocType: Item,Variants,Παραλλαγές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
@@ -1762,7 +1759,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,εκτιμήσεις
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Μια συνθήκη για έναν κανόνα αποστολής
-DocType: Grading Structure,Grading Intervals,διαστήματα ταξινόμησης
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Παρακαλώ περάστε
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Δεν είναι δυνατή η overbill για Θέση {0} στη γραμμή {1} περισσότερο από {2}. Για να καταστεί δυνατή η υπερβολική τιμολόγηση, ορίστε στην Αγορά Ρυθμίσεις"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Παρακαλούμε να ορίσετε το φίλτρο σύμφωνα με το σημείο ή την αποθήκη
@@ -1775,16 +1771,17 @@
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Πληρωμή
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Διαχειριστείτε τις παραγγελίες σας
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Διαχειριστείτε τις παραγγελίες σας
 DocType: Production Order Operation,Actual Time and Cost,Πραγματικός χρόνος και κόστος
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Αίτηση υλικού με μέγιστο {0} μπορεί να γίνει για το είδος {1} κατά την παραγγελία πώλησης {2}
 DocType: Employee,Salutation,Χαιρετισμός
 DocType: Course,Course Abbreviation,Σύντμηση γκολφ
 DocType: Student Leave Application,Student Leave Application,Φοιτητής Αφήστε Εφαρμογή
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Υπάλληλος {0} για Μισή μέρα στο {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Οι συνολικές ώρες εργασίας δεν πρέπει να είναι μεγαλύτερη από το ωράριο εργασίας max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Στις
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Ομαδοποίηση ειδών κατά τη στιγμή της πώλησης.
 DocType: Quotation Item,Actual Qty,Πραγματική ποσότητα
 DocType: Sales Invoice Item,References,Παραπομπές
@@ -1794,7 +1791,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Έχετε εισάγει διπλότυπα στοιχεία. Παρακαλώ διορθώστε και δοκιμάστε ξανά.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Συνεργάτης
 DocType: Asset Movement,Asset Movement,Asset Κίνημα
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,νέα καλαθιού
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,νέα καλαθιού
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
 DocType: Vehicle,Wheels,τροχοί
@@ -1826,9 +1823,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Απενεργοποιεί τη δημιουργία του χρόνου κορμών κατά Εντολές Παραγωγής. Οι πράξεις δεν θα πρέπει να παρακολουθούνται κατά την παραγωγή διαταγής
 DocType: Student,Student Mobile Number,Φοιτητής Αριθμός Κινητού
 DocType: Item,Has Variants,Έχει παραλλαγές
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Το αναγνωριστικό παρτίδας είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Το αναγνωριστικό παρτίδας είναι υποχρεωτικό
 DocType: Sales Person,Parent Sales Person,Γονικός πωλητής
 DocType: Purchase Invoice,Recurring Invoice,Επαναλαμβανόμενο τιμολόγιο
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Διαχείριση έργων
@@ -1836,7 +1833,7 @@
 DocType: Budget,Fiscal Year,Χρήση
 DocType: Vehicle Log,Fuel Price,των τιμών των καυσίμων
 DocType: Budget,Budget,Προϋπολογισμός
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά {0}, δεδομένου ότι δεν είναι ένας λογαριασμός έσοδα ή έξοδα"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Επιτεύχθηκε
 DocType: Student Admission,Application Form Route,Αίτηση Διαδρομή
@@ -1867,7 +1864,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Ποσό {0} {1} αφαιρούνται από {2}
 DocType: Employee,Salary Information,Πληροφορίες μισθού
 DocType: Sales Person,Name and Employee ID,Όνομα και ID υπαλλήλου
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
 DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Δασμοί και φόροι
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
@@ -1924,7 +1921,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Έσοδα επαναλαμβανόμενων πελατών
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης δαπανών»
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Ζεύγος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
 DocType: Asset,Depreciation Schedule,Πρόγραμμα αποσβέσεις
 DocType: Bank Reconciliation Detail,Against Account,Κατά τον λογαριασμό
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Μισό Ημερομηνία Ημέρα θα πρέπει να είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
@@ -1941,13 +1938,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
 DocType: Purchase Order,Delivered,Παραδόθηκε
 ,Vehicle Expenses,Έξοδα όχημα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
+DocType: Serial No,Invoice Details,Λεπτομέρειες τιμολογίου
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Η ημερομηνία κατά την οποία το επαναλαμβανόμενο τιμολόγιο θα σταματήσει
 DocType: Employee Loan,Loan Amount,Ποσο δανειου
@@ -1970,7 +1968,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Ομάδα για να μη Ομάδα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Αθλητισμός
 DocType: Loan Type,Loan Name,δάνειο Όνομα
@@ -1981,6 +1979,7 @@
 ,Customer Acquisition and Loyalty,Απόκτηση πελατών και πίστη
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Αποθήκη όπου θα γίνεται διατήρηση αποθέματος για απορριφθέντα στοιχεία
 DocType: Production Order,Skip Material Transfer,Παράλειψη μεταφοράς υλικού
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Δεν βρέθηκε συναλλαγματική ισοτιμία {0} έως {1} για ημερομηνία κλειδιού {2}. Δημιουργήστε μια εγγραφή συναλλάγματος με μη αυτόματο τρόπο
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Το οικονομικό έτος σας τελειώνει στις
 DocType: POS Profile,Price List,Τιμοκατάλογος
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} Είναι τώρα η προεπιλεγμένη χρήση. Παρακαλώ ανανεώστε το πρόγραμμα περιήγησής σας για να τεθεί σε ισχύ η αλλαγή.
@@ -2018,9 +2017,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Η χρήση ** αντιπροσωπεύει ένα οικονομικό έτος. Όλες οι λογιστικές εγγραφές και άλλες σημαντικές συναλλαγές παρακολουθούνται ανά ** χρήση **.
 DocType: Opportunity,Customer / Lead Address,Πελάτης / διεύθυνση Σύστασης
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 DocType: Student Admission,Eligibility,Αιρετότητα
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Οδηγεί σας βοηθήσει να πάρετε την επιχείρησή, προσθέστε όλες τις επαφές σας και περισσότερο, όπως σας οδηγεί"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Οδηγεί σας βοηθήσει να πάρετε την επιχείρησή, προσθέστε όλες τις επαφές σας και περισσότερο, όπως σας οδηγεί"
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
@@ -2059,7 +2058,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Επιλέξτε εταιρία...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Process Payroll,Fortnightly,Κατά δεκατετραήμερο
 DocType: Currency Exchange,From Currency,Από το νόμισμα
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
@@ -2075,7 +2074,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Δεν μπορείτε να επιλέξετε τον τύπο επιβάρυνσης ως ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής για την πρώτη γραμμή
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Παιδί στοιχείο δεν πρέπει να είναι ένα Bundle προϊόντων. Παρακαλώ αφαιρέστε το αντικείμενο `{0}` και να αποθηκεύσετε
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Κατάθεση
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Προσθήκη Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Προσθήκη Timesheets
 DocType: Vehicle Service,Service Item,υπηρεσία Στοιχείο
 DocType: Bank Guarantee,Bank Guarantee,Τραπεζική εγγύηση
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
@@ -2123,8 +2122,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Οι τιμές δεν θα εμφανίζεται αν Τιμοκατάλογος δεν έχει οριστεί
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Προσδιορίστε μια χώρα για αυτή την αποστολή κανόνα ή ελέγξτε Παγκόσμια ναυτιλία
 DocType: Stock Entry,Total Incoming Value,Συνολική εισερχόμενη αξία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Χρεωστικό να απαιτείται
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Χρεωστικό να απαιτείται
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Τιμοκατάλογος αγορών
 DocType: Offer Letter Term,Offer Term,Προσφορά Όρος
 DocType: Quality Inspection,Quality Manager,Υπεύθυνος διασφάλισης ποιότητας
@@ -2157,14 +2156,14 @@
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Νέα Διεύθυνση
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Παρακαλούμε, εισάγετε παραστατικό παραλαβής"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Παρακαλούμε, εισάγετε παραστατικό παραλαβής"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Καθορίστε μια έγκυρη τιμή στο πεδίο 'από τον αρ. Υπόθεσης'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Project,External,Εξωτερικός
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Χρήστες και δικαιώματα
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Εντολές Παραγωγής Δημιουργήθηκε: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Εντολές Παραγωγής Δημιουργήθηκε: {0}
 DocType: Branch,Branch,Υποκατάστημα
 DocType: Guardian,Mobile Number,Αριθμός κινητού
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Εκτύπωσης και Branding
@@ -2173,7 +2172,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
 DocType: Scheduling Tool,Student Batch,Batch φοιτητής
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Οι πελάτες σας
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Κάντε Φοιτητής
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Κάντε Φοιτητής
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστούν για το έργο: {0}
 DocType: Leave Block List Date,Block Date,Αποκλεισμός ημερομηνίας
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Κάνε αίτηση τώρα
@@ -2196,8 +2195,9 @@
 DocType: SMS Log,Sent To,Αποστέλλονται
 DocType: Payment Request,Make Sales Invoice,Δημιούργησε τιμολόγιο πώλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,λογισμικά
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Επόμενο Ημερομηνία Επικοινωνήστε δεν μπορεί να είναι στο παρελθόν
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Επόμενο Ημερομηνία Επικοινωνήστε δεν μπορεί να είναι στο παρελθόν
 DocType: Company,For Reference Only.,Για αναφορά μόνο.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Επιλέξτε Αριθμός παρτίδας
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Άκυρη {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-αναδρομική έναρξη
 DocType: Sales Invoice Advance,Advance Amount,Ποσό προκαταβολής
@@ -2211,7 +2211,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ο αρ. Υπόθεσης δεν μπορεί να είναι 0
 DocType: Item,Show a slideshow at the top of the page,Δείτε μια παρουσίαση στην κορυφή της σελίδας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Καταστήματα
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Καταστήματα
 DocType: Serial No,Delivery Time,Χρόνος παράδοσης
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Γήρανση με βάση την
 DocType: Item,End of Life,Τέλος της ζωής
@@ -2227,8 +2227,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Μεταφορά υλικού
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Το έγγραφο αυτό είναι πάνω από το όριο του {0} {1} για το στοιχείο {4}. Κάνετε μια άλλη {3} κατά την ίδια {2};
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
@@ -2239,7 +2239,7 @@
 DocType: Budget Account,Budget Account,Ο λογαριασμός του προϋπολογισμού
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Δεν μπορεί να αλλάξει προεπιλεγμένο νόμισμα της εταιρείας, επειδή υπάρχουν υφιστάμενες συναλλαγές. Οι συναλλαγές πρέπει να ακυρωθούν για να αλλάξετε το εξ 'ορισμού νόμισμα."
-DocType: Grade Interval,Grade Description,βαθμός Περιγραφή
+DocType: Grading Scale Interval,Grade Description,βαθμός Περιγραφή
 DocType: Stock Entry,Purchase Receipt No,Αρ. αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Κερδιζμένα χρήματα
 DocType: Process Payroll,Create Salary Slip,Δημιουργία βεβαίωσης αποδοχών
@@ -2277,7 +2277,7 @@
 DocType: Upload Attendance,Attendance To Date,Προσέλευση μέχρι ημερομηνία
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Gateway Account,Payment Account,Λογαριασμός πληρωμών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Καθαρή Αλλαγή σε εισπρακτέους λογαριασμούς
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Offer Letter,Accepted,Αποδεκτό
@@ -2290,7 +2290,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Φόρουμ Χρηστών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
@@ -2304,7 +2304,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Το όνομα του ιδρύματος για το οποίο είστε δημιουργία αυτού του συστήματος.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Η λογιστική εγγραφή έχει παγώσει μέχρι την ημερομηνία αυτή, κανείς δεν μπορεί να κάνει / τροποποιήσει καταχωρήσεις, εκτός από τον ρόλο που καθορίζεται παρακάτω."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Παρακαλώ αποθηκεύστε το έγγραφο πριν από τη δημιουργία του χρονοδιαγράμματος συντήρησης
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Παρακαλώ αποθηκεύστε το έγγραφο πριν από τη δημιουργία του χρονοδιαγράμματος συντήρησης
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Κατάσταση έργου
 DocType: UOM,Check this to disallow fractions. (for Nos),Επιλέξτε αυτό για να απαγορεύσετε κλάσματα. (Όσον αφορά τους αριθμούς)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Οι ακόλουθες Εντολές Παραγωγής δημιουργήθηκαν:
@@ -2327,6 +2327,7 @@
 DocType: Email Digest,How frequently?,Πόσο συχνά;
 DocType: Purchase Receipt,Get Current Stock,Βρες το τρέχον απόθεμα
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Δέντρο του Πίνακα Υλικών
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Student,Joining Date,Ημερομηνία ένταξης
 ,Employees working on a holiday,Οι εργαζόμενοι που εργάζονται σε διακοπές
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Παρόν
@@ -2427,7 +2428,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Παραγωγή
 DocType: Guardian,Occupation,Κατοχή
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Σύνολο (ποσότητα)
 DocType: Sales Invoice,This Document,Αυτό το έγγραφο
 DocType: Installation Note Item,Installed Qty,Εγκατεστημένη ποσότητα
@@ -2450,7 +2451,7 @@
 DocType: Notification Control,Sales Order Message,Μήνυμα παραγγελίας πώλησης
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ορίστε προεπιλεγμένες τιμές όπως εταιρεία, νόμισμα, τρέχων οικονομικό έτος, κλπ."
 DocType: Payment Entry,Payment Type,Τύπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Επιλέξτε μια παρτίδα για το στοιχείο {0}. Δεν είναι δυνατή η εύρεση μιας ενιαίας παρτίδας που να πληροί αυτή την απαίτηση
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Επιλέξτε μια παρτίδα για το στοιχείο {0}. Δεν είναι δυνατή η εύρεση μιας ενιαίας παρτίδας που να πληροί αυτή την απαίτηση
 DocType: Process Payroll,Select Employees,Επιλέξτε εργαζόμενοι
 DocType: Opportunity,Potential Sales Deal,Πιθανή συμφωνία πώλησης
 DocType: Payment Entry,Cheque/Reference Date,Επιταγή / Ημερομηνία Αναφοράς
@@ -2467,7 +2468,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Παγκόσμια Προφίλ POS {0} έχει ήδη δημιουργηθεί για την εταιρεία {1}
 DocType: Purchase Order,Ref SQ,Ref sq
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Αντικαταστήστε Είδος / Λ.Υ. σε όλες τις Λ.Υ.
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,παραστατικό παραλαβής πρέπει να υποβληθεί
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,παραστατικό παραλαβής πρέπει να υποβληθεί
 DocType: Purchase Invoice Item,Received Qty,Ποσ. Που παραλήφθηκε
 DocType: Stock Entry Detail,Serial No / Batch,Σειριακός αριθμός / παρτίδα
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Που δεν έχει καταβληθεί δεν παραδόθηκαν
@@ -2480,7 +2481,7 @@
 ,To Produce,Για παραγωγή
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Μισθολόγιο
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Για γραμμή {0} {1}. Για να συμπεριλάβετε {2} στην τιμή Θέση, σειρές {3} πρέπει επίσης να συμπεριληφθούν"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Κάντε χρήστη
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Κάντε χρήστη
 DocType: Packing Slip,Identification of the package for the delivery (for print),Αναγνωριστικό του συσκευασίας για την παράδοση (για εκτύπωση)
 DocType: Bin,Reserved Quantity,Δεσμευμένη ποσότητα
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Εισαγάγετε έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου
@@ -2492,11 +2493,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Άτομα με ειδικές ανάγκες προτύπου δεν πρέπει να είναι προεπιλεγμένο πρότυπο
 DocType: Account,Income Account,Λογαριασμός εσόδων
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Παράδοση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Παράδοση
 DocType: Stock Reconciliation Item,Current Qty,Τρέχουσα Ποσότητα
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Ανατρέξτε στην ενότητα κοστολόγησης την 'τιμή υλικών με βάση'
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Προηγ
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Παρτίδες φοιτητής να σας βοηθήσει να παρακολουθείτε φοίτηση, οι εκτιμήσεις και τα τέλη για τους φοιτητές"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Παρτίδες φοιτητής να σας βοηθήσει να παρακολουθείτε φοίτηση, οι εκτιμήσεις και τα τέλη για τους φοιτητές"
 DocType: Payment Entry,Total Allocated Amount,Συνολικό ποσό που χορηγήθηκε
 DocType: Item Reorder,Material Request Type,Τύπος αίτησης υλικού
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Εφημερίδα εισόδου για τους μισθούς από {0} έως {1}
@@ -2519,7 +2521,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
@@ -2529,6 +2531,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Θα στείλει ένα e-mail για την εκδήλωση για τους εργαζόμενους με καθεστώς «Άνοιγμα»
 DocType: Task,Depends on Tasks,Εξαρτάται από Εργασίες
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Διαχειριστείτε το δέντρο ομάδας πελατών.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Τα συνημμένα μπορούν να εμφανίζονται χωρίς να επιτρέπουν το καλάθι αγορών
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Νέο όνομα κέντρου κόστους
 DocType: Leave Control Panel,Leave Control Panel,Πίνακας ελέγχου άδειας
@@ -2541,11 +2544,10 @@
 DocType: Sales Invoice,Debit To,Χρέωση προς
 DocType: Delivery Note,Required only for sample item.,Απαιτείται μόνο για δείγμα
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Πραγματική ποσότητα μετά την συναλλαγή
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Δεν εκκαθαριστικό σημείωμα αποδοχών που διαπιστώθηκαν μεταξύ {0} και {1}
 ,Pending SO Items For Purchase Request,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Εισαγωγή φοιτητής
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
 DocType: Sales Invoice,SINV-RET-,SINV-αναδρομική έναρξη
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Πολύ Μεγάλο
@@ -2562,7 +2564,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Αρχική σελίδα Προτεινόμενο Προϊόν
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Όλες οι Ομάδες Αξιολόγησης
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Νέα Αποθήκη Όνομα
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Σύνολο {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Σύνολο {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Περιοχή
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
@@ -2580,7 +2582,7 @@
 DocType: Price List,Price List Master,Κύρια εγγραφή τιμοκαταλόγου.
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
 ,S.O. No.,Αρ. Παρ. Πώλησης
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
 DocType: Price List,Applicable for Countries,Ισχύει για χώρες
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Αφήστε Εφαρμογές με την ιδιότητα μόνο «Εγκρίθηκε» και «Απορρίπτεται» μπορούν να υποβληθούν
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Ομάδα Φοιτητών Όνομα είναι υποχρεωτικό στη σειρά {0}
@@ -2672,7 +2674,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 DocType: Vehicle Service,Engine Oil,Λάδι μηχανής
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
 DocType: Employee Loan,Loan Details,Λεπτομέρειες δανείου
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Σειρά {0}: Ολοκληρώθηκε Ποσότητα πρέπει να είναι μεγαλύτερη από το μηδέν.
@@ -2736,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Αποθήκες με τα υπάρχοντα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
 DocType: Assessment Result Tool,Result HTML,αποτέλεσμα HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Λήγει στις
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Προσθέστε Φοιτητές
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Προσθέστε Φοιτητές
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Παρακαλώ επιλέξτε {0}
 DocType: C-Form,C-Form No,Αρ. C-Form
 DocType: BOM,Exploded_items,Είδη αναλυτικά
@@ -2800,7 +2802,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,όριο Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Αρχικό κεφάλαιο
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Μια ακαδημαϊκή περίοδο με αυτό το «Ακαδημαϊκό Έτος &#39;{0} και« Term Όνομα »{1} υπάρχει ήδη. Παρακαλείστε να τροποποιήσετε αυτές τις καταχωρήσεις και δοκιμάστε ξανά.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Δεδομένου ότι υπάρχουν συναλλαγές κατά το στοιχείο {0}, δεν μπορείτε να αλλάξετε την τιμή του {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Δεδομένου ότι υπάρχουν συναλλαγές κατά το στοιχείο {0}, δεν μπορείτε να αλλάξετε την τιμή του {1}"
 DocType: UOM,Must be Whole Number,Πρέπει να είναι ακέραιος αριθμός
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Νέες άδειες που κατανεμήθηκαν (σε ημέρες)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Ο σειριακός αριθμός {0} δεν υπάρχει
@@ -2843,7 +2845,7 @@
 DocType: Supplier,Last Day of the Next Month,Τελευταία μέρα του επόμενου μήνα
 DocType: Support Settings,Auto close Issue after 7 days,Αυτόματη κοντά Τεύχος μετά από 7 ημέρες
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Η άδεια δεν μπορεί να χορηγείται πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,φοιτητής Αιτών
 DocType: Asset Category Account,Accumulated Depreciation Account,Συσσωρευμένες Αποσβέσεις Λογαριασμού
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
@@ -2871,7 +2873,7 @@
 DocType: Asset,Item Code,Κωδικός είδους
 DocType: Production Planning Tool,Create Production Orders,Δημιουργία εντολών παραγωγής
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / Ε.Σ.Υ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
@@ -2889,7 +2891,7 @@
 DocType: Production Planning Tool,Create Material Requests,Δημιουργία αιτήσεων υλικού
 DocType: Employee Education,School/University,Σχολείο / πανεπιστήμιο
 DocType: Payment Request,Reference Details,Λεπτομέρειες αναφοράς
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
 DocType: Sales Invoice Item,Available Qty at Warehouse,Διαθέσιμη ποσότητα στην αποθήκη
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Χρεωμένο ποσό
 DocType: Asset,Double Declining Balance,Διπλά φθίνοντος υπολοίπου
@@ -2910,19 +2912,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Εκταμιευόμενο ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Παραγγελία παραγωγή δεν δημιουργήθηκε
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Παραγγελία παραγωγή δεν δημιουργήθηκε
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""Από Ημερομηνία"" πρέπει να είναι μεταγενέστερο από το πεδίο ""Έως Ημερομηνία"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},δεν μπορεί να αλλάξει την κατάσταση ως φοιτητής {0} συνδέεται με την εφαρμογή των φοιτητών {1}
 DocType: Asset,Fully Depreciated,αποσβεσθεί πλήρως
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Αξιοσημείωτη Συμμετοχή HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Οι αναφορές είναι οι προτάσεις, οι προσφορές που έχουν στείλει στους πελάτες σας"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Οι αναφορές είναι οι προτάσεις, οι προσφορές που έχουν στείλει στους πελάτες σας"
 DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Αύξων αριθμός παρτίδας και
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Άθροισμα Δεκάδες Κριτήρια αξιολόγησης πρέπει να είναι {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Παρακαλούμε να ορίσετε Αριθμός Αποσβέσεις κράτηση
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Παρακαλούμε να ορίσετε Αριθμός Αποσβέσεις κράτηση
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Αξία ή ποσ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Λεπτό
@@ -3050,7 +3052,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Ομάδα Φοιτητών
 DocType: Shopping Cart Settings,Quotation Series,Σειρά προσφορών
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Επιλέξτε πελατών
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Επιλέξτε πελατών
 DocType: C-Form,I,εγώ
 DocType: Company,Asset Depreciation Cost Center,Asset Κέντρο Αποσβέσεις Κόστους
 DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
@@ -3069,19 +3071,18 @@
 DocType: Vehicle,Insurance Details,ασφάλιση Λεπτομέρειες
 DocType: Account,Payable,Πληρωτέος
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Παρακαλούμε, εισάγετε περιόδους αποπληρωμής"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Οφειλέτες ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Οφειλέτες ({0})
 DocType: Pricing Rule,Margin,Περιθώριο
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Νέοι πελάτες
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Μικτό κέρδος (%)
 DocType: Appraisal Goal,Weightage (%),Ζύγισμα (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Ημερομηνία εκκαθάρισης
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
 DocType: Lead,Address Desc,Περιγραφή διεύθυνσης
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Κόμμα είναι υποχρεωτική
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,θέμα Όνομα
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Πρέπει να επιλεγεί τουλάχιστον μία από τις επιλογές πωλήση - αγορά
-DocType: Grading Structure,Grade Intervals,διαστήματα βαθμός
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Επιλέξτε τη φύση της επιχείρησής σας.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Που γίνονται οι μεταποιητικές εργασίες
 DocType: Asset Movement,Source Warehouse,Αποθήκη προέλευσης
@@ -3110,6 +3111,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ποσοστό μηνιαίας διανομής
 DocType: Territory,Territory Targets,Στόχοι περιοχών
 DocType: Delivery Note,Transporter Info,Πληροφορίες μεταφορέα
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Παρακαλούμε να ορίσετε προεπιλεγμένες {0} στην εταιρεία {1}
 DocType: Cheque Print Template,Starting position from top edge,Αρχική θέση από το άνω άκρο
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Ίδιο προμηθευτή έχει εισαχθεί πολλές φορές
@@ -3161,7 +3163,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Αναδιάταξη ποσότητας
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Θέσεις Εργασίας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
-DocType: Journal Entry,Write Off,Διαγράφω
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Διαγράφω
 DocType: Timesheet Detail,Operation ID,Λειτουργία ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","(Login) ID για το χρήστη συστήματος. Αν οριστεί, θα γίνει προεπιλογή για όλες τις φόρμες Α.Δ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Από {1}
@@ -3172,8 +3174,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Προμηθευτής παραδίδει στον πελάτη
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# έντυπο / Θέση / {0}) έχει εξαντληθεί
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Επόμενη ημερομηνία πρέπει να είναι μεγαλύτερη από ό, τι Απόσπαση Ημερομηνία"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Εμφάνιση φόρου διάλυση
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Δεδομένα εισαγωγής και εξαγωγής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","υπάρχουν καταχωρήσεις των αποθεμάτων κατά Αποθήκη {0}, ως εκ τούτου, δεν μπορείτε να εκχωρήσετε ξανά ή να το τροποποιήσει"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Δεν μαθητές Βρέθηκαν
@@ -3185,13 +3187,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
 DocType: Program Enrollment,School House,Σχολείο
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Παρακαλώ επιλέξτε Τιμές
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Παρακαλώ επιλέξτε Τιμές
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
 DocType: Company,Default Cash Account,Προεπιλεγμένος λογαριασμός μετρητών
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Αυτό βασίζεται στην συμμετοχή του φοιτητή
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Δεν υπάρχουν φοιτητές στο
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Προσθέστε περισσότερα στοιχεία ή ανοιχτή πλήρη μορφή
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
@@ -3237,9 +3240,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Πριν συμφιλίωση
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Έως {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Φόροι και επιβαρύνσεις που προστέθηκαν (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
 DocType: Sales Order,Partly Billed,Μερικώς τιμολογημένος
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Θέση {0} πρέπει να είναι ένα πάγιο περιουσιακό στοιχείο του Είδους
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Θέση {0} πρέπει να είναι ένα πάγιο περιουσιακό στοιχείο του Είδους
 DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ.
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
@@ -3261,7 +3264,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
 DocType: Purchase Invoice Item,Rate,Τιμή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Εκπαιδευόμενος
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Διεύθυνση
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Διεύθυνση
 DocType: Stock Entry,From BOM,Από BOM
 DocType: Assessment Code,Assessment Code,Κωδικός αξιολόγηση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Βασικός
@@ -3286,7 +3289,7 @@
 DocType: Purchase Invoice,Print Language,Εκτύπωση Γλώσσα
 DocType: Salary Slip,Total Working Hours,Σύνολο ωρών εργασίας
 DocType: Stock Entry,Including items for sub assemblies,Συμπεριλαμβανομένων των στοιχείων για τις επιμέρους συνελεύσεις
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Όλα τα εδάφη
 DocType: Purchase Invoice,Items,Είδη
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Φοιτητής ήδη εγγραφεί.
@@ -3305,16 +3308,14 @@
 DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
 DocType: Assessment Plan,Supervisor Name,Όνομα Επόπτη
 DocType: Program Enrollment Course,Program Enrollment Course,Πρόγραμμα εγγραφής στο πρόγραμμα
-DocType: Grading Structure,Grading Structure,ταξινόμησης Δομή
 DocType: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
 DocType: Tax Rule,Shipping City,Αποστολές Σίτι
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Αυτό το στοιχείο είναι μια παραλλαγή του {0} (προτύπου). Τα χαρακτηριστικά θα αντιγραφούν  από το πρότυπο, εκτός αν έχει οριστεί «όχι αντιγραφή '"
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Ταμειακές ροές από εργασίες
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
@@ -3337,6 +3338,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε την σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 DocType: Leave Control Panel,Carry Forward,Μεταφορά προς τα εμπρός
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Department,Days for which Holidays are blocked for this department.,Οι ημέρες για τις οποίες οι άδειες έχουν αποκλειστεί για αυτό το τμήμα
@@ -3364,7 +3366,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Σύνολο (ποσό)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 DocType: Quality Inspection,Item Serial No,Σειριακός αριθμός είδους
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Δημιουργήστε τα αρχεία των εργαζομένων
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Δημιουργήστε τα αρχεία των εργαζομένων
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Σύνολο παρόντων
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,λογιστικές Καταστάσεις
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ώρα
@@ -3379,7 +3381,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Η νέα Λ.Υ. μετά την αντικατάστασή
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of sale
 DocType: Payment Entry,Received Amount,Ελήφθη Ποσό
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Δημιουργήστε για την πλήρη ποσότητα, αγνοώντας ποσότητα ήδη στην παραγγελία"
 DocType: Account,Tax,Φόρος
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,χωρίς σήμανση
@@ -3390,7 +3391,7 @@
 DocType: C-Form,Invoices,Τιμολόγια
 DocType: Batch,Source Document Name,Όνομα εγγράφου προέλευσης
 DocType: Job Opening,Job Title,Τίτλος εργασίας
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Δημιουργία χρηστών
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Δημιουργία χρηστών
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Γραμμάριο
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Επισκεφθείτε την έκθεση για την έκτακτη συντήρηση.
@@ -3401,8 +3402,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: BOM,Website Description,Περιγραφή δικτυακού τόπου
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδικό, υπάρχει ήδη για {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδικό, υπάρχει ήδη για {0}"
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
 ,Sales Register,Ταμείο πωλήσεων
@@ -3413,16 +3414,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Δεν υπάρχει τίποτα να επεξεργαστείτε.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Κανένας πελάτης ακόμα!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Κατάσταση ταμειακών ροών
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Άδεια
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Παρακαλώ επιλέξτε μεταφορά εάν θέλετε επίσης να περιλαμβάνεται το ισοζύγιο από το προηγούμενο οικονομικό έτος σε αυτό η χρήση
 DocType: GL Entry,Against Voucher Type,Κατά τον τύπο αποδεικτικού
 DocType: Item,Attributes,Γνωρίσματα
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
 DocType: Student,Guardian Details,Guardian Λεπτομέρειες
 DocType: C-Form,C-Form,C-form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark φοίτηση για πολλούς εργαζόμενους
@@ -3447,14 +3450,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Σειρά {0} # Ο λογαριασμός πρέπει να είναι τύπου «Παγίων»
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ποσότητα εκτός
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Κανόνες για τον υπολογισμό του ποσού αποστολής για την πώληση
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Η σειρά είναι απαραίτητη
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Η σειρά είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
 DocType: Student Sibling,Student ID,φοιτητής ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Τύποι δραστηριοτήτων για την Ώρα των αρχείων καταγραφής
 DocType: Tax Rule,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
 DocType: Training Event,Exam,Εξέταση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
@@ -3487,7 +3490,7 @@
 DocType: Payment Entry,Account Paid From,Ο λογαριασμός που αμείβονται από
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Κωδικός είδους πρώτης ύλης
 DocType: Journal Entry,Write Off Based On,Διαγραφή βάσει του
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Δημιουργία Σύστασης
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Δημιουργία Σύστασης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Εκτύπωση και Χαρτικά
 DocType: Stock Settings,Show Barcode Field,Εμφάνιση Barcode πεδίο
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Αποστολή Emails Προμηθευτής
@@ -3502,6 +3505,7 @@
 DocType: Offer Letter,Awaiting Response,Αναμονή Απάντησης
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Παραπάνω
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Αναφέρετε εάν ο μη τυποποιημένος πληρωτέος λογαριασμός
 DocType: Salary Slip,Earning & Deduction,Κέρδος και έκπτωση
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
@@ -3535,7 +3539,7 @@
 DocType: Program Enrollment Tool,Get Students From,Πάρτε φοιτητές από
 DocType: Hub Settings,Seller Country,Χώρα πωλητή
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Δημοσιεύστε Αντικείμενα στην ιστοσελίδα
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Ομάδα μαθητές σας σε παρτίδες
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Ομάδα μαθητές σας σε παρτίδες
 DocType: Authorization Rule,Authorization Rule,Κανόνας εξουσιοδότησης
 DocType: Sales Invoice,Terms and Conditions Details,Λεπτομέρειες όρων και προϋποθέσεων
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Προδιαγραφές
@@ -3594,7 +3598,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Επιτήρηση
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Εξαρτήματα μισθό
 DocType: Program Enrollment Tool,New Academic Year,Νέο Ακαδημαϊκό Έτος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Επιστροφή / Πιστωτική Σημείωση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Επιστροφή / Πιστωτική Σημείωση
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
 DocType: Production Order Item,Transferred Qty,Μεταφερόμενη ποσότητα
@@ -3635,6 +3639,7 @@
 ,Sales Funnel,Χοάνη πωλήσεων
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Το Καλάθι
 ,Qty to Transfer,Ποσότητα για μεταφορά
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Προσφορές σε Συστάσεις ή Πελάτες.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
@@ -3667,7 +3672,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Η ποσότητα ({0}) δεν μπορεί να είναι κλάσμα στη σειρά {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,εισπράττει τέλη
 DocType: Attendance,ATT-,ΑΤΤ
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
 DocType: Lead,Add to calendar on this date,Προσθήκη στο ημερολόγιο την ημερομηνία αυτή
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
 DocType: Item,Opening Stock,άνοιγμα Χρηματιστήριο
@@ -3686,7 +3691,7 @@
 DocType: Customer,From Lead,Από Σύσταση
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Παραγγελίες ανοιχτές για παραγωγή.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Program Enrollment Tool,Enroll Students,εγγραφούν μαθητές
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Πρότυπες πωλήσεις
@@ -3697,7 +3702,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Όνομα έργου
-DocType: Supplier,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
+DocType: Customer,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
 DocType: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
 DocType: Production Order,Required Items,Απαιτούμενα Στοιχεία
 DocType: Stock Ledger Entry,Stock Value Difference,Διαφορά αξίας αποθέματος
@@ -3727,6 +3732,7 @@
 DocType: Item,Taxes,Φόροι
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Καταβληθεί και δεν παραδόθηκαν
 DocType: Project,Default Cost Center,Προεπιλεγμένο κέντρο κόστους
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία Σειράς για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Bank Guarantee,End Date,Ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Συναλλαγές απόθεμα
 DocType: Budget,Budget Accounts,προϋπολογισμός Λογαριασμών
@@ -3791,7 +3797,7 @@
 DocType: Customer,Sales Partner and Commission,Συνεργάτης Πωλήσεων και της Επιτροπής
 DocType: Employee Loan,Rate of Interest (%) / Year,Επιτόκιο (%) / Έτος
 ,Project Quantity,έργο Ποσότητα
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών με βάση το &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών με βάση το &#39;"
 DocType: Opportunity,To Discuss,Για συζήτηση
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} μονάδες {1} απαιτούνται {2} για να ολοκληρώσετε τη συναλλαγή αυτή.
 DocType: Loan Type,Rate of Interest (%) Yearly,Επιτόκιο (%) Ετήσιο
@@ -3814,7 +3820,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Απών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Σειρά {0}: Νόμισμα της BOM # {1} θα πρέπει να είναι ίσο με το επιλεγμένο νόμισμα {2}
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 DocType: Homepage,Tag Line,Γραμμή ετικέτας
 DocType: Fee Component,Fee Component,χρέωση Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Διαχείριση στόλου
@@ -3831,7 +3837,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Η αποθήκη {0} δεν υπάρχει
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Εγγραφή για erpnext hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ποσοστά μηνιαίας διανομής
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ποσοστό αποτίμηση δεν βρέθηκε για το στοιχείο {0}, η οποία απαιτείται για να κάνει λογιστικές εγγραφές για {1} {2}. Εάν το στοιχείο συναλλάσσεται ως ένα στοιχείο του δείγματος στο {1}, παρακαλούμε να αναφέρω ότι στο {1} πίνακα Στοιχείο. Διαφορετικά, παρακαλούμε να δημιουργήσετε μια εισερχόμενη συναλλαγή μετοχών για το ρυθμό αποτίμηση στοιχείο ή αναφορά στο αρχείο του Είδους, και στη συνέχεια προσπαθήστε να αποστείλουν βιογραφικά / ακύρωση αυτήν την καταχώρηση"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Των υλικών που παραδίδονται σε αυτό το δελτίο αποστολής
 DocType: Project,Customer Details,Στοιχεία πελάτη
@@ -3848,7 +3854,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Υποβλήθηκε εντολές δεν μπορούν να διαγραφούν
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Διαχείριση ποιότητας
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Στοιχείο {0} έχει απενεργοποιηθεί
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Στοιχείο {0} έχει απενεργοποιηθεί
 DocType: Employee Loan,Repay Fixed Amount per Period,Εξοφλήσει σταθερό ποσό ανά Περίοδο
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
@@ -3874,7 +3880,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Φοιτητής Email ID
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
 DocType: Tax Rule,Sales Tax Template,Φόρος επί των πωλήσεων Πρότυπο
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
 DocType: Employee,Encashment Date,Ημερομηνία εξαργύρωσης
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Διευθέτηση αποθέματος
@@ -3907,6 +3913,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Χρεωστικό σημείωμα που εκδόθηκε
 DocType: Production Order,Warehouses,Αποθήκες
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} περιουσιακού στοιχείου δεν μπορεί να μεταφερθεί
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Αυτό το στοιχείο είναι μια παραλλαγή του {0} (πρότυπο).
 DocType: Workstation,per hour,Ανά ώρα
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Αγοραστικός
 DocType: Announcement,Announcement,Ανακοίνωση
@@ -3922,7 +3929,7 @@
 DocType: Account,Receivable,Εισπρακτέος
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Σειρά # {0}: Δεν επιτρέπεται να αλλάξουν προμηθευτή, όπως υπάρχει ήδη παραγγελίας"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ρόλος που έχει τη δυνατότητα να υποβάλει τις συναλλαγές που υπερβαίνουν τα όρια πίστωσης.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
 DocType: Item,Material Issue,Έκδοση υλικού
 DocType: Hub Settings,Seller Description,Περιγραφή πωλητή
@@ -3935,7 +3942,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
 DocType: Salary Detail,Component,Συστατικό
 DocType: Assessment Criteria,Assessment Criteria Group,Κριτήρια Αξιολόγησης Ομάδα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Άνοιγμα Συσσωρευμένες Αποσβέσεις πρέπει να είναι μικρότερη από ίση με {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Άνοιγμα Συσσωρευμένες Αποσβέσεις πρέπει να είναι μικρότερη από ίση με {0}
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Παρακαλώ εισάγετε ρόλο έγκρισης ή χρήστη έγκρισης
@@ -3969,7 +3976,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Για να ορίσετε την τρέχουσα χρήση ως προεπιλογή, κάντε κλικ στο 'ορισμός ως προεπιλογή'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Συμμετοχή
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Employee Loan,Repay from Salary,Επιστρέψει από το μισθό
 DocType: Leave Application,LAP/,ΑΓΚΑΛΙΆ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Ζητώντας την καταβολή εναντίον {0} {1} για ποσό {2}
@@ -3987,7 +3994,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Λεπτομέρεια Αποτέλεσμα Αξιολόγησης
 DocType: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Διπλότυπη ομάδα στοιχείο που βρέθηκαν στο τραπέζι ομάδα στοιχείου
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
 DocType: Salary Slip,Net Pay,Καθαρές αποδοχές
 DocType: Account,Account,Λογαριασμός
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Ο σειριακός αριθμός {0} έχει ήδη ληφθεί
@@ -3996,7 +4003,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Αποθήκη {0} δεν συνδέεται με οποιονδήποτε λογαριασμό, δημιουργήστε / συνδέουν την αντίστοιχη (Asset) λογαριασμό για την αποθήκη."
 DocType: Purchase Invoice,Recurring Id,Id επαναλαμβανόμενου
 DocType: Customer,Sales Team Details,Λεπτομέρειες ομάδας πωλήσεων
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Διαγραφή μόνιμα;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Διαγραφή μόνιμα;
 DocType: Expense Claim,Total Claimed Amount,Συνολικό αιτούμενο ποσό αποζημίωσης
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Πιθανές ευκαιρίες για πώληση.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Άκυρη {0}
@@ -4007,13 +4014,14 @@
 DocType: Warehouse,PIN,ΚΑΡΦΊΤΣΑ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Ρύθμιση σχολείο σας ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Βάση Αλλαγή Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
 DocType: Account,Chargeable,Χρεώσιμο
 DocType: Company,Change Abbreviation,Αλλαγή συντομογραφίας
 DocType: Expense Claim Detail,Expense Date,Ημερομηνία δαπάνης
 DocType: Item,Max Discount (%),Μέγιστη έκπτωση (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Ποσό τελευταίας παραγγελίας
+DocType: Task,Is Milestone,Είναι ορόσημο
 DocType: Daily Work Summary,Email Sent To,Email Sent να
 DocType: Budget,Warn,Προειδοποιώ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
@@ -4046,11 +4054,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
 DocType: Tax Rule,Purchase Tax Template,Αγοράστε Φορολογικά Πρότυπο
 ,Project wise Stock Tracking,Παρακολούθηση αποθέματος με βάση το έργο
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Το χρονοδιάγραμμα συντήρησης {0} υπάρχει για {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Πραγματική ποσότητα (στην πηγή / στόχο)
 DocType: Item Customer Detail,Ref Code,Κωδ. Αναφοράς
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Εγγραφές υπαλλήλων
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
 DocType: HR Settings,Payroll Settings,Ρυθμίσεις μισθοδοσίας
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Ταίριαξε μη συνδεδεμένα τιμολόγια και πληρωμές.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Παραγγέλνω
@@ -4073,7 +4080,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Οι επιταγές και καταθέσεις εκκαθαριστεί ορθά
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
 DocType: Purchase Invoice Item,Price List Rate,Τιμή τιμοκαταλόγου
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Δημιουργία εισαγωγικά πελατών
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Δημιουργία εισαγωγικά πελατών
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Εμφάνισε 'διαθέσιμο' ή 'μη διαθέσιμο' με βάση το απόθεμα που είναιι διαθέσιμο στην αποθήκη αυτή.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Λίστα υλικών (Λ.Υ.)
 DocType: Item,Average time taken by the supplier to deliver,Μέσος χρόνος που απαιτείται από τον προμηθευτή να παραδώσει
@@ -4095,7 +4102,7 @@
 DocType: Asset,Disposal Date,Ημερομηνία διάθεσης
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Μηνύματα ηλεκτρονικού ταχυδρομείου θα αποσταλεί σε όλους τους ενεργούς υπαλλήλους της εταιρείας στη δεδομένη ώρα, αν δεν έχουν διακοπές. Σύνοψη των απαντήσεων θα αποσταλούν τα μεσάνυχτα."
 DocType: Employee Leave Approver,Employee Leave Approver,Υπεύθυνος έγκρισης αδειών υπαλλήλου
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,εκπαίδευση Σχόλια
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
@@ -4103,7 +4110,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Φυσικά είναι υποχρεωτική στη σειρά {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
 DocType: Supplier Quotation Item,Prevdoc DocType,Τύπος εγγράφου του προηγούμενου εγγράφου
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
 DocType: Batch,Parent Batch,Γονική Παρτίδα
 DocType: Cheque Print Template,Cheque Print Template,Επιταγή Πρότυπο Εκτύπωση
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Διάγραμμα των κέντρων κόστους
@@ -4147,7 +4154,7 @@
 DocType: Item,Variant Based On,Παραλλαγή Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Οι προμηθευτές σας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
 DocType: Request for Quotation Item,Supplier Part No,Προμηθευτής Μέρος Όχι
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',δεν μπορεί να εκπέσει όταν η κατηγορία είναι για την «Αποτίμηση» ή «Vaulation και Total»
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Ελήφθη Από
@@ -4157,7 +4164,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Από {0} για {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Σειρά {0}: Ώρες τιμή πρέπει να είναι μεγαλύτερη από το μηδέν.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
 DocType: Issue,Content Type,Τύπος περιεχομένου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
@@ -4166,20 +4173,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία
 DocType: Payment Reconciliation,From Invoice Date,Από Ημερομηνία Τιμολογίου
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα ή το λογαριασμό κόμμα νόμισμα είτε προεπιλογή comapany του
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα ή το λογαριασμό κόμμα νόμισμα είτε προεπιλογή comapany του
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Αφήστε Εξαργύρωση
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Τι κάνει;
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Προς αποθήκη
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Όλα Εισαγωγή Φοιτητών
 ,Average Commission Rate,Μέσος συντελεστής προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
 DocType: School House,House Name,Όνομα Σπίτι
 DocType: Purchase Taxes and Charges,Account Head,Κύρια εγγραφή λογαριασμού
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Ενημέρωση πρόσθετων δαπανών για τον υπολογισμό του κόστος μεταφοράς των ειδών
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Ηλεκτρικός
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Προσθέστε το υπόλοιπο του οργανισμού σας καθώς οι χρήστες σας. Μπορείτε επίσης να προσθέσετε προσκαλέσει πελάτες στην πύλη σας με την προσθήκη τους από τις Επαφές
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Προσθέστε το υπόλοιπο του οργανισμού σας καθώς οι χρήστες σας. Μπορείτε επίσης να προσθέσετε προσκαλέσει πελάτες στην πύλη σας με την προσθήκη τους από τις Επαφές
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Το ID χρήστη δεν έχει οριστεί για τον υπάλληλο {0}
@@ -4188,7 +4195,7 @@
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Buying Settings,Naming Series,Σειρά ονομασίας
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ημερομηνία Ασφαλιστική Αρχή θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης Ασφαλιστική
@@ -4203,7 +4210,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
 DocType: Vehicle Log,Odometer,Οδόμετρο
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
@@ -4216,7 +4223,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
 DocType: Sales Invoice Timesheet,Billing Hours,Ώρες χρέωσης
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Προεπιλογή BOM για {0} δεν βρέθηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Πατήστε στοιχεία για να τα προσθέσετε εδώ
 DocType: Fees,Program Enrollment,πρόγραμμα Εγγραφή
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Παρακαλώ να ορίσετε {0}
@@ -4313,7 +4321,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
 DocType: Issue,First Responded On,Πρώτη απάντηση στις
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Εμφάνιση του είδους σε πολλαπλές ομάδες
-DocType: Grade Interval,Grade Interval,Βαθμολογία Διάστημα
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Η ημερομηνία έναρξης και η ημερομηνία λήξης της χρήσης έχουν ήδη τεθεί για τη χρήση {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Εκκαθάριση Ημερομηνία ενημερώθηκε
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Διαχωρίστε παρτίδα
@@ -4321,6 +4328,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Κατεβάστε το αρχείο PDF
 DocType: Production Order,Planned End Date,Προγραμματισμένη ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Πού αποθηκεύονται τα είδη
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Request for Quotation,Supplier Detail,Προμηθευτής Λεπτομέρειες
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Σφάλμα στον τύπο ή την κατάσταση: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Ποσό τιμολόγησης
@@ -4365,7 +4373,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Ρύθμιση μια απλή ιστοσελίδα για τον οργανισμό μου
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Παρακαλώ εισάγετε γονικό κέντρο κόστους
@@ -4422,7 +4430,7 @@
 ,Items To Be Requested,Είδη που θα ζητηθούν
 DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Company,Company Info,Πληροφορίες εταιρείας
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,κέντρο κόστους που απαιτείται για να κλείσετε ένα αίτημα δαπάνη
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Αυτό βασίζεται στην προσέλευση του υπαλλήλου αυτού
@@ -4435,13 +4443,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Σταματήστε τους χρήστες από το να κάνουν αιτήσεις αδειών για τις επόμενες ημέρες.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ποσό αγορά
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Παροχές σε εργαζομένους
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Production Order,Manufactured Qty,Παραγόμενη ποσότητα
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Λογαριασμοί για πελάτες.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
@@ -4450,15 +4458,17 @@
 DocType: Quality Inspection Reading,Reading 3,Μέτρηση 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Employee Loan Application,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
 DocType: Guardian,Guardian,Κηδεμόνας
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε για τον υπάλληλο {1} στο συγκεκριμένο εύρος ημερομηνιών
 DocType: Employee,Education,Εκπαίδευση
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Ονοματοδοσία εκστρατείας με βάση
 DocType: Employee,Current Address Is,Η τρέχουσα διεύθυνση είναι
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Τροποποιήθηκε
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
@@ -4495,7 +4505,7 @@
 DocType: Hub Settings,Hub Settings,Ρυθμίσεις hub
 DocType: Project,Gross Margin %,Μικτό κέρδος (περιθώριο) %
 DocType: BOM,With Operations,Με λειτουργίες
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
 DocType: Asset,Is Existing Asset,Είναι Υφιστάμενες Ενεργητικού
 DocType: Salary Detail,Statistical Component,Στατιστικό στοιχείο
 ,Monthly Salary Register,Μηνιαίο ταμείο μισθοδοσίας
@@ -4549,7 +4559,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Επισύναψη logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Τα επίπεδα των αποθεμάτων
 DocType: Customer,Commission Rate,Ποσό προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Κάντε Παραλλαγή
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Τύπος πληρωμής πρέπει να είναι ένα από Λάβετε, Pay και εσωτερική μεταφορά"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4562,6 +4572,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Επίτρεψε παραγωγή σε αργίες
 DocType: Sales Order,Customer's Purchase Order Date,Ημερομηνία παραγγελίας αγοράς πελάτη
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Μετοχικού Κεφαλαίου
+DocType: Shopping Cart Settings,Show Public Attachments,Εμφάνιση δημόσιων συνημμένων
 DocType: Packing Slip,Package Weight Details,Λεπτομέρειες βάρος συσκευασίας
 DocType: Payment Gateway Account,Payment Gateway Account,Πληρωμή Λογαριασμού Πύλη
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Μετά την ολοκλήρωση πληρωμής ανακατεύθυνση του χρήστη σε επιλεγμένη σελίδα.
@@ -4586,7 +4597,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Κάντε παρτίδας Φοιτητής
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Κάντε παρτίδας Φοιτητής
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Λήψη ειδών από Λ.Υ.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ημέρες ανοχής
@@ -4605,7 +4616,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε την σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
diff --git a/erpnext/translations/es-AR.csv b/erpnext/translations/es-AR.csv
index 74b4eb1..4928064 100644
--- a/erpnext/translations/es-AR.csv
+++ b/erpnext/translations/es-AR.csv
@@ -3,4 +3,4 @@
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La fecha está repetida
 DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdidas
 DocType: Cheque Print Template,Cheque Size,Tamaño de Cheque
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Hacer lotes de Estudiante
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Hacer lotes de Estudiante
diff --git a/erpnext/translations/es-CL.csv b/erpnext/translations/es-CL.csv
index 2d5e982..c9050a9 100644
--- a/erpnext/translations/es-CL.csv
+++ b/erpnext/translations/es-CL.csv
@@ -12,13 +12,11 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Cobrar Tarifas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web
-DocType: Grading Structure,Grading Structure,Estructura de Calificación
 DocType: Delivery Note,% Installed,% Instalado
 DocType: Student,Guardian Details,Detalles del Guardián
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,Nombre de Guardián 1
-DocType: Grade Interval,Grade Code,Grado de Código
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,La moneda de facturación debe ser igual a la moneda por defecto de la compañía o la moneda de la cuenta de la parte
-DocType: Grading Structure,Grade Intervals,intervalos de Grado
+DocType: Grading Scale Interval,Grade Code,Grado de Código
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,La moneda de facturación debe ser igual a la moneda por defecto de la compañía o la moneda de la cuenta de la parte
 DocType: Fee Structure,Fee Structure,Estructura de Tarifas
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Última tasa de compra no encontrada
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Calendario de Cursos creado:
@@ -35,14 +33,11 @@
 DocType: Grading Scale Interval,Grading Scale Interval,Intervalo de Escala de Calificación
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
 DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de cursos
-DocType: Grade Interval,Grade Description,Descripción de Grado
+DocType: Grading Scale Interval,Grade Description,Descripción de Grado
 DocType: Shopping Cart Settings,Checkout Settings,Ajustes de Finalización de Pedido
 DocType: Guardian Interest,Guardian Interest,Interés del Guardián
-DocType: Grading Structure,Grading Intervals,Intervalos de Calificación
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las lecturas se pueden programar."
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Finalizando pedido
 DocType: Sales Invoice,Change Amount,Importe de Cambio
 DocType: Guardian Student,Guardian Student,Guardián del Estudiante
-DocType: Grading Structure,Grading System Name,Nombre de Sistema de Calificación
-DocType: Grade Interval,Grade Interval,Intervalo de Grado
 DocType: BOM Operation,Base Hour Rate(Company Currency),Tarifa Base por Hora (Divisa de Compañía)
diff --git a/erpnext/translations/es-GT.csv b/erpnext/translations/es-GT.csv
index 0205e56..71042bf 100644
--- a/erpnext/translations/es-GT.csv
+++ b/erpnext/translations/es-GT.csv
@@ -4,4 +4,4 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo Pendiente
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Saldo Pendiente
 DocType: Payment Entry Reference,Outstanding,Pendiente
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index 6724dee..3290bd5 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -11,7 +11,7 @@
 DocType: Tax Rule,Billing County,Municipio de Facturación
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Facturación
 DocType: Timesheet,Billing Details,Detalles de Facturación
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la moneda de la empresa o moneda de cuenta de contraparte
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la moneda de la empresa o moneda de cuenta de contraparte
 DocType: Tax Rule,Billing State,Región de Facturación
 DocType: Purchase Order Item,Billed Amt,Monto Facturado
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 6eb87dd..679b6d6 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -69,14 +69,14 @@
 DocType: Production Order,Actual Start Date,Fecha de inicio actual
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta
 DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
 DocType: Employee,Salary Information,Información salarial
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro de artículos como una cadena y almacenada en este campo.
@@ -87,7 +87,7 @@
 DocType: Naming Series,Help HTML,Ayuda HTML
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 DocType: Territory,Territory Targets,Territorios Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
 DocType: Attendance,Employee Name,Nombre del Empleado
@@ -163,12 +163,12 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanza de Estado de Cuenta Bancario según Libro Mayor
 DocType: Naming Series,Setup Series,Serie de configuración
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
 DocType: Item Reorder,Re-Order Level,Reordenar Nivel
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
 DocType: Warranty Claim,Service Address,Dirección del Servicio
@@ -206,21 +206,21 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegúrese que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
 DocType: Shopping Cart Settings,Shopping Cart Settings,Compras Ajustes
 DocType: BOM,Raw Material Cost,Costo de la Materia Prima
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla para las evaluaciones de desempeño .
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Quotation {0} is cancelled,Cotización {0} se cancela
 apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,¿Qué hace?
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Hacer Orden de Venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Hacer Orden de Venta
 apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 DocType: Item Customer Detail,Ref Code,Código Referencia
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
 DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida
 DocType: Quality Inspection,Report Date,Fecha del Informe
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
 DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
@@ -264,7 +264,7 @@
 DocType: Item,Synced With Hub,Sincronizado con Hub
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serie es obligatorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serie es obligatorio
 ,Item Shortage Report,Reportar carencia de producto
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base del cliente
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
@@ -276,7 +276,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Purchase Invoice Item,Serial No,Números de Serie
 ,Bank Reconciliation Statement,Extractos Bancarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
@@ -342,7 +342,7 @@
 DocType: Employee External Work History,Salary,Salario
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Inventario de Pasivos
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
 DocType: Target Detail,Target  Amount,Monto Objtetivo
 ,S.O. No.,S.O. No.
 DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
@@ -378,13 +378,12 @@
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Solicitud de Material {0} creada
 DocType: Item,Has Variants,Tiene Variantes
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} existe en contra de {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Quotation Item,Stock Balance,Balance de Inventarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
 DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
 DocType: Purchase Invoice Item,Net Rate,Tasa neta
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila #
@@ -422,7 +421,7 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
 DocType: Target Detail,Target Qty,Cantidad Objetivo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
 DocType: Account,Accounts,Contabilidad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
@@ -451,7 +450,7 @@
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Tiendas
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Tiendas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
 apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
@@ -461,14 +460,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 DocType: Lead,Lead,Iniciativas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Account,Depreciation,Depreciación
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
 DocType: Payment Request,Make Sales Invoice,Hacer Factura de Venta
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
 DocType: Payment Gateway Account,Payment Account,Pago a cuenta
@@ -498,8 +497,8 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar etiquetas salariales
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Hacer Visita de Mantenimiento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Hacer Visita de Mantenimiento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Workstation,Rent Cost,Renta Costo
 apps/erpnext/erpnext/hooks.py +116,Issues,Problemas
 DocType: BOM Replace Tool,Current BOM,Lista de materiales actual
@@ -522,7 +521,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plantilla Maestra para Salario .
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
 DocType: Email Digest,How frequently?,¿Con qué frecuencia ?
 DocType: C-Form Invoice Detail,Invoice No,Factura No
@@ -611,7 +610,7 @@
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
@@ -644,7 +643,7 @@
 DocType: Serial No,Out of AMC,Fuera de AMC
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer {1} periodicidad, diferencia entre desde y hasta la fecha \
  debe ser mayor que o igual a {2}"
@@ -710,14 +709,14 @@
 ,Open Production Orders,Abrir Ordenes de Producción
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
 DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Volver Ventas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Volver Ventas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotor
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
 DocType: Stock Entry,Delivery Note No,No. de Nota de Entrega
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
 DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root no se puede editar .
@@ -729,7 +728,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
 DocType: Quotation,Quotation To,Cotización Para
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo Disponible
 DocType: Salary Component,Earning,Ganancia
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la moneda en la compañía"
@@ -745,7 +744,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Secretario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
 DocType: Leave Type,Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
@@ -791,7 +790,7 @@
 ,Stock Analytics,Análisis de existencias
 DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
 ,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
@@ -828,7 +827,6 @@
 DocType: Purchase Invoice,Terms,Términos
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
 DocType: Serial No,Serial No Details,Serial No Detalles
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
@@ -842,7 +840,7 @@
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultas de soporte de clientes .
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde fecha' debe ser después de 'Hasta Fecha'
 apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
@@ -891,7 +889,7 @@
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
 DocType: Fiscal Year,Year End Date,Año de Finalización
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Cuenta matriz {0} creada
 apps/erpnext/erpnext/controllers/buying_controller.py +263,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
@@ -944,7 +942,7 @@
 DocType: Process Payroll,Process Payroll,Nómina de Procesos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
 DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
 DocType: Warehouse,Warehouse Detail,Detalle de almacenes
 DocType: Employee,Salutation,Saludo
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
@@ -985,7 +983,7 @@
 DocType: Quotation Item,Quotation Item,Cotización del artículo
 DocType: Employee,Date of Issue,Fecha de emisión
 DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
 DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Entradas en el diario de contabilidad.
@@ -1008,7 +1006,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 apps/erpnext/erpnext/config/accounts.py +267,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las vacaciones para un período .
@@ -1064,7 +1062,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,No puede ser mayor que 100
 DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Notas de Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Notas de Entrega
 DocType: Bin,Stock Value,Valor de Inventario
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
@@ -1085,7 +1083,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Tarjeta de Crédito
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Por proveedor
@@ -1107,7 +1105,7 @@
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Número de orden {0} ya se ha recibido
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Proyecto maestro
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 4c43cf2..5c035ea 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -57,13 +57,13 @@
 ,Batch Item Expiry Status,Lotes artículo Estado de caducidad
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Giro bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostrar variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostrar variantes
 DocType: Academic Term,Academic Term,Término académico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Préstamos (pasivos)
-DocType: Employee Education,Year of Passing,Año de fallecimiento
+DocType: Employee Education,Year of Passing,Año de finalización
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referencia:% s, Código del artículo:% s y el Cliente:% s"
 DocType: Item,Country of Origin,País de origen
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,En inventario
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Asistencia médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retraso en el pago (días)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gasto servicio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año fiscal {0} es necesario
@@ -116,20 +117,22 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La misma Compañia es ingresada mas de una vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No está permitido para {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},No está permitido para {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obtener artículos de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure el sistema de nombres de empleado en recursos humanos&gt; Configuración de recursos humanos"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producto {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hay elementos en la lista
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 DocType: Process Payroll,Make Bank Entry,Crear entrada de banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondo de pensiones
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Siguiente Depreciación La fecha no puede ser anterior a la fecha de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Siguiente Depreciación La fecha no puede ser anterior a la fecha de compra
 DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribución mensual ayuda a distribuir el presupuesto / Target a través de meses si tiene la estacionalidad de su negocio.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,No se encontraron artículos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,No se encontraron artículos
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta Estructura Salarial
 DocType: Lead,Person Name,Nombre de persona
 DocType: Sales Invoice Item,Sales Invoice Item,Producto de factura de venta
 DocType: Account,Credit,Haber
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","por ejemplo, &quot;escuela primaria&quot; o &quot;Universidad&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reportes de Stock
 DocType: Warehouse,Warehouse Detail,Detalles del Almacén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La fecha final de duración no puede ser posterior a la fecha de fin de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
 DocType: Vehicle Service,Brake Oil,Aceite de Frenos
 DocType: Tax Rule,Tax Type,Tipo de impuestos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagen del producto (si no son diapositivas)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por hora / 60) * Tiempo real de la operación
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Seleccione la lista de materiales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Seleccione la lista de materiales
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El día de fiesta en {0} no es entre De la fecha y Hasta la fecha
@@ -190,24 +193,24 @@
 DocType: Training Result Employee,Grade,Grado
 DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Orden de producción ya se ha creado para todos los elementos con la lista de materiales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Orden de producción ya se ha creado para todos los elementos con la lista de materiales
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salario Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumen diario de Trabajo
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} está congelado
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Gastos sobre existencias
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleccionar Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleccionar Almacén Objetivo
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Por favor, introduzca preferido del contacto de correo electrónico"
 DocType: Journal Entry,Contra Entry,Entrada contra
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",¿Quieres actualizar la asistencia? <br> Presente: {0} \ <br> Ausentes: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Suministro de materia prima para la compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Se requiere al menos un modo de pago de la factura POS.
 DocType: Products Settings,Show Products as a List,Mostrar los productos en forma de lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Hacer la entrada de Depreciación
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipo de solicitud
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Crear empleado
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Crear empleado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Ejecución
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalles de las operaciones realizadas.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas
 DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro url para el mensaje
 DocType: POS Profile,Customer Groups,Grupos de clientes
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Estados Financieros
 DocType: Guardian,Students,Estudiantes
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Reglas para la aplicación de distintos precios y descuentos sobre los productos.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La lista de precios debe ser aplicable para las compras o ventas
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Cantidad de avance no puede ser mayor que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
 DocType: Company,Default Payroll Payable Account,La nómina predeterminada de la cuenta por pagar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Editar Grupo de Correo Electrónico
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Editar Grupo de Correo Electrónico
 DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es  aplicable
 DocType: Course Schedule,Instructor Name,Nombre instructor
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
 ,Production Orders in Progress,Órdenes de producción en progreso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectivo neto de financiación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Almacenamiento Local esta lleno, no se guardó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Almacenamiento Local esta lleno, no se guardó"
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir permisos no usados de asignaciones anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Cálculo del coste total Monto (a través de hoja de horas)
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Asientos Bancarios
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admisión de Estudiantes
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,El producto {0} esta cancelado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Solicitud de materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de compra
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Nota de entrega
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costo del activo vendido
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
-DocType: Grade Interval,Min Score,Puntuación min
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Student Applicant,Admitted,Aceptado
 DocType: Workstation,Rent Cost,Costo de arrendamiento
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valor del pedido
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transacciones de Banco/Efectivo contra Empresa o transferencia interna
 DocType: Shipping Rule,Valid for Countries,Válido para Países
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes'"
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ya ha sido asignado para el empleado {1} para el periodo {2} hasta {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Seleccione producto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grupos de estudiantes
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,Solicitud de presupuesto
 DocType: Salary Slip Timesheet,Working Hours,Horas de trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Crear un nuevo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Crear un nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Crear órdenes de compra
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Crear órdenes de compra
 ,Purchase Register,Registro de compras
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master de vacaciones .
@@ -492,7 +495,7 @@
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el importe"
 DocType: Request for Quotation,Message for Supplier,Mensaje para los Proveedores
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,ID de correo electrónico de Guardian2
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,ID de correo electrónico del Tutor2
 DocType: Item,Show in Website (Variant),Mostrar en el sitio web (variante)
 DocType: Employee,Health Concerns,Problemas de salud
 DocType: Process Payroll,Select Payroll Period,Seleccione el período de nómina
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Desde paquete No.
 DocType: Item Attribute,To Range,A rango
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No se puede cambiar el método de valoración, ya que hay transacciones contra algunos elementos que no tiene su propio método de valoración"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hojas totales asignados es obligatorio
 DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Actividades pendientes para hoy
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de emergencia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Comprar
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Por favor defina el grado para el Umbral 0%
 DocType: Sales Order,To Deliver,Para entregar
 DocType: Purchase Invoice Item,Item,Productos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestión de sub-contrataciones
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Production Plan Item,Pending Qty,Cantidad pendiente
 DocType: Budget,Ignore,Pasar por alto
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} no está activo
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} no está activo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensiones de verificación de configuración para la impresión
 DocType: Salary Slip,Salary Slip Timesheet,Parte de horas de salario de deslizamiento
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
 DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valores acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Crear orden de venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Crear orden de venta
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Adjunto curriculum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Devoluciones de ventas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Las hojas totales asignados {0} no debe ser inferior a las hojas ya aprobados {1} para el período
 DocType: Announcement,Posted By,Publicado por
 DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (nave)
@@ -604,9 +608,9 @@
 DocType: Quotation,Quotation To,Presupuesto para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Monto asignado no puede ser negativo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Establecer la empresa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Por favor establezca la empresa
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 DocType: Training Result Employee,Training Result Employee,Empleado Formación Resultado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Almacén lógico contra el que se crean las entradas de inventario
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venta de partes de horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar la cuenta de pago para hacer la entrada del Banco
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Crear registros de los empleados para gestionar los permisos, las reclamaciones de gastos y nómina"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Crear registros de los empleados para gestionar los permisos, las reclamaciones de gastos y nómina"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Añadir a la Base de Conocimiento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Redacción de propuestas
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pago Deducción de Entrada
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relación con Tutor2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gerente
 DocType: Payment Entry,Payment From / To,Pago de / a
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Rango de fechas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basado en' y 'Agrupar por' no pueden ser iguales
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Fecha de resolución
 DocType: Student Batch Name,Batch Name,Nombre del lote
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Parte de horas de creación:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Inscribirse
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mostrará al estudiante como Estudiante Presente en informes mensuales de asistencia
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Asistencia del estudiante
 DocType: Sales Invoice Timesheet,Time Sheet,Hoja de horario
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Adquisición retroactiva de materia prima basada en
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Por favor, ingrese los detalles del producto"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, ingrese los detalles del producto"
 DocType: Interest,Interest,Interesar
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre ventas
 DocType: Purchase Receipt,Other Details,Otros detalles
@@ -727,7 +730,7 @@
 ,Absent Student Report,Informe del alumno ausente
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Producto {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Compañía {0} no existe
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la garantía
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y almacén
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} mediante Configuración&gt; Configuración&gt; Nombrar Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleccione el programa
 DocType: Project,Estimated Cost,Costo estimado
 DocType: Purchase Order,Link to material requests,Enlace a las solicitudes de materiales
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} no es un artículo en existencia
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
 DocType: Payment Entry,Received Amount (Company Currency),Cantidad recibida (Divisa de Compañia)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
 ,Sales Person Target Variance Item Group-Wise,"Variación del objetivo de ventas, por grupo de vendedores"
@@ -762,7 +764,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: Budget,Budget Against,Contra Presupuesto
 DocType: Employee,Cell Number,Número de movil
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Las solicitudes de material auto generada
+apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Solicitudes de material automáticamente generadas
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para la fabricación
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar correo electronico
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Empleado no encontrado
 DocType: Supplier Quotation,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,El grupo de estudiantes ya está actualizado.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,El grupo de estudiantes ya está actualizado.
 DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Subir el balance de existencias a través de un archivo .csv
 DocType: Warehouse,Tree Details,Detalles del árbol
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Monto Mínimo de Factura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: El centro de costos {2} no pertenece a la empresa {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cuenta {2} no puede ser un grupo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {idx}: {doctype} {docname} no existe en la anterior tabla '{doctype}'
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Parte de horas {0} ya se haya completado o cancelado
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {idx}: {doctype} {docname} no existe en la anterior tabla '{doctype}'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Parte de horas {0} ya se haya completado o cancelado
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hay tareas
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Día del mes en el que se generará la factura automática por ejemplo 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,Apertura de la depreciación acumulada
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,Porcentaje de precio medio variable
 DocType: Production Planning Tool,Select Items,Seleccionar productos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} contra la factura {1} de fecha {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Calendario de cursos
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Calendario de cursos
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: HR Settings,Enter retirement age in years,Introduzca la edad de jubilación en años
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Inventario estimado
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Todos los Grupos de Artículos
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Utilidad / Pérdida neta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Orden de compra a pago
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Apertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Lista de tareas abiertas
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,Cantidad mínima para ordenar
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
 DocType: Pricing Rule,Price or Discount,Precio o descuento
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de comisiones aplicables en la compra Tabla de recibos Los artículos deben ser iguales que las tasas totales y cargos
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de comisiones aplicables en la compra Tabla de recibos Los artículos deben ser iguales que las tasas totales y cargos
 DocType: Sales Team,Incentives,Incentivos
 DocType: SMS Log,Requested Numbers,Números solicitados
 DocType: Production Planning Tool,Only Obtain Raw Materials,Sólo obtención de materias primas
@@ -947,7 +949,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Nóminas presentadas
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Configuración principal para el cambio de divisas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referencia Doctype debe ser uno de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Doctype de referencia debe ser uno de {0}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Puntos de venta y Territorio
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Fee Structure,Components,componentes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el punto {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el punto {0}"
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Predeterminado de la cuenta bancaria / efectivo se actualizará automáticamente en el Salario entrada de diario cuando se selecciona este modo.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Los intervalos de Código Grado {0} se superpone con los intervalos de grado para los demás grados. Gracias por confirmar intervalos {0} y {1} e inténtelo de nuevo
 DocType: BOM,Raw Material Cost(Company Currency),Prima Costo de Materiales (Compañía de divisas)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Fila # {0}: La tasa no puede ser mayor que la tasa utilizada en {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM sitio web de artículos
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
 DocType: Timesheet Detail,Bill,Cuenta
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,La depreciación próxima fecha se introduce como fecha pasada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La depreciación próxima fecha se introduce como fecha pasada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} a publicar momento de la entrada ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de apertura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
 DocType: Student Batch Name,Student Batch Name,Nombre de Lote del Estudiante
 DocType: Holiday List,Holiday List Name,Nombre de festividad
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del balance del préstamo
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Por favor especificar un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabla de atributos es obligatoria
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabla de atributos es obligatoria
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Descuento
 DocType: Asset,Total Number of Depreciations,Número total de amortizaciones
 DocType: Sales Invoice Item,Rate With Margin,Tarifa con margen
 DocType: Workstation,Wages,Salarios
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,Nombre de la organización
 DocType: Tax Rule,Shipping State,Estado de envío
 ,Projected Quantity as Source,Cantidad proyectada como Fuente
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Incluir elementos no están en stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Gastos de venta
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de costos por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Código postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Código postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Orden de Venta {0} es {1}
 DocType: Opportunity,Contact Info,Información de contacto
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Crear asientos de stock
@@ -1132,7 +1131,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Ver todos los Productos
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Edad mínima del plomo (días)
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,todas las listas de materiales
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Todas las listas de materiales
 DocType: Company,Default Currency,Divisa / modena predeterminada
 DocType: Expense Claim,From Employee,Desde Empleado
 apps/erpnext/erpnext/controllers/accounts_controller.py +417,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio para el carrito de compras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama
 DocType: Global Defaults,Global Defaults,Predeterminados globales
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Por favor, introduzca el código de artículo para obtener el número de lote"
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
 DocType: Employee Loan,Partially Disbursed,Parcialmente Desembolsado
-DocType: Grading Structure,Grading System Name,Nombre del sistema de clasificación
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en puntos de venta perfil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en puntos de venta perfil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso en esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mismo artículo no se puede introducir varias veces.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
@@ -1213,7 +1211,7 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Cantidad de Pedidos
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
-DocType: Purchase Order,Group same items,Grupo mismos artículos
+DocType: Purchase Order,Group same items,Agrupar mismos artículos
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Employee Loan Application,Repayment Info,Información de la devolución
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entradas' no pueden estar vacías
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Trabajo realizado
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla"
 DocType: Announcement,All Students,Todos los estudiantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Elemento {0} debe ser una posición no de almacén
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Elemento {0} debe ser una posición no de almacén
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Mostrar libro mayor
 DocType: Grading Scale,Intervals,intervalos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Número de Móvil del Estudiante.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Orden de venta {0} no es válida
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Las órdenes de compra le ayudará a planificar y dar seguimiento a sus compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Las órdenes de compra le ayudará a planificar y dar seguimiento a sus compras
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La cantidad total de emisión / Transferencia {0} en la Solicitud de material {1} \ no puede ser mayor que la cantidad solicitada {2} para el artículo {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pequeño
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronización de datos maestros
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Sus Productos o Servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Número del rollo de grupo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de todos los pesos de tareas debe ser 1. Por favor ajusta los pesos de todas las tareas del proyecto en consecuencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,Asiento contable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} artículos en curso
 DocType: Workstation,Workstation Name,Nombre de la estación de trabajo
-DocType: Grade Interval,Grade Code,Código grado
+DocType: Grading Scale Interval,Grade Code,Código grado
 DocType: POS Item Group,POS Item Group,POS Grupo de artículos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Recurrir hasta
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Por favor, seleccione la compañía"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Por favor, seleccione la compañía"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Vacaciones
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Necesita habilitar el carrito de compras
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 DocType: Maintenance Schedule Item,No of Visits,Número de visitas
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Marcar Asistencia
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Marcar Asistencia
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},El programa de mantenimiento {0} existe en contra de {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Inscribiendo estudiante
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La divisa / moneda de la cuenta de cierre debe ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para los objetivos debe ser 100. y es {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licencia sin goce de salario
 DocType: Pricing Rule,"Higher the number, higher the priority","Cuanto mayor sea el número, mayor es la prioridad"
 ,Purchase Invoice Trends,Tendencias de compras
 DocType: Employee,Better Prospects,Mejores Prospectos
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lote {1} tiene sólo {2} cantidad. Por favor, seleccione otro lote que tenga {3} cantidad disponible o dividido la fila en varias filas, para entregar / emitir desde varios lotes"
 DocType: Vehicle,License Plate,Placa
 DocType: Appraisal,Goals,Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantía / Estado de CMA
@@ -1446,7 +1446,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regla de impuestos para las transacciones.
@@ -1457,7 +1457,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar P &amp; L saldos sin cerrar el año fiscal
 DocType: Shipping Rule,Shipping Account,Cuenta de envíos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: La cuenta {2} está inactiva
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Hacer Ordenes de Ventas para ayudar a planificar tu trabajo y entregar en tiempo
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Hacer Ordenes de Ventas para ayudar a planificar tu trabajo y entregar en tiempo
 DocType: Quality Inspection,Readings,Lecturas
 DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
 DocType: Course Schedule,SH,SH
@@ -1468,7 +1468,7 @@
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Asset Movement,Stock Manager,Gerente de almacén
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Lista de embalaje
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Lista de embalaje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ALQUILERES DE LOCAL
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuración de pasarela SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
@@ -1494,7 +1494,7 @@
 DocType: Sales Invoice,Source,Referencia
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar cerrada
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No se encontraron registros en la tabla de pagos
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este {0} conflictos con {1} de {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML de Estudiantes
@@ -1512,7 +1512,7 @@
 DocType: Student,Date of Leaving,Fecha de partida
 DocType: Pricing Rule,For Price List,Por lista de precios
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Crear Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Crear Leads
 DocType: Maintenance Schedule,Schedules,Programas
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
@@ -1540,7 +1540,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Las inscripciones del programa
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de transporte
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Caja
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Posible Proveedor
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organización
@@ -1573,7 +1573,7 @@
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM por defecto para {0} no encontrado para Proyecto {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Los estudiantes son el corazón del sistema, agrega todos tus estudiantes"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Los estudiantes son el corazón del sistema, agrega todos tus estudiantes"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: Fecha de Liquidación {1} no puede ser anterior Cheque Fecha {2}
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del tiempo y Tiempo de {1} se solapan con {2}
@@ -1585,20 +1585,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Vuelva a enviar el pago por correo electrónico
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nueva tarea
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Crear una cotización
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Crear una cotización
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Otros Reportes
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Por favor, establece nómina cuenta por pagar por defecto en la empresa {0}"
 DocType: SMS Center,Receiver List,Lista de receptores
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Busca artículo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Busca artículo
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Cambio Neto en efectivo
 DocType: Assessment Plan,Grading Scale,Escala de calificación
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Ya completado
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Solicitud de pago ya existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
@@ -1636,7 +1636,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Recoger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,registrar el movimiento de activos {0} creado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,registrar el movimiento de activos {0} creado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No se puede eliminar el año fiscal {0}. Año fiscal {0} se establece por defecto en la configuración global
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de clientes
@@ -1659,7 +1659,7 @@
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
 DocType: Pricing Rule,Applicable For,Aplicable para.
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro entrado debe ser mayor que el cuentakilómetros inicial {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro ingresada debe ser mayor que el cuentakilómetros inicial {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ausencia y Asistencia
 DocType: Maintenance Visit,Partially Completed,Parcialmente completado
@@ -1676,7 +1676,6 @@
 DocType: Student Sibling,Studying in Same Institute,Estudian en el mismo Instituto
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Packed Item,To Warehouse (Optional),Para almacenes (Opcional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 DocType: Payment Entry,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
 DocType: Selling Settings,Selling Settings,Configuración de ventas
@@ -1686,9 +1685,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver en Carrito
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de materiales usados para crear esta entrada del inventario
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,La depreciación próxima fecha es obligatorio para los nuevos activos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciación próxima fecha es obligatorio para los nuevos activos
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo independiente basado en el curso para cada lote
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Elemento de producto
 DocType: Fee Category,Fee Category,Categoría de cuota
@@ -1704,8 +1703,7 @@
 DocType: Course Assessment Criteria,Weightage,Asignación
 DocType: Packing Slip,PS-,PD-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: El centros de costos es requerido para la cuenta de 'pérdidas y ganancias' {2}. Por favor, configure un centro de costos por defecto para la compañía."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Existe una categoría de cliente con el mismo nombre. Por favor cambie el nombre de cliente o renombre la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Existe una categoría de cliente con el mismo nombre. Por favor cambie el nombre de cliente o renombre la categoría de cliente
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nuevo contacto
 DocType: Territory,Parent Territory,Territorio principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
@@ -1732,20 +1730,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Purchase Invoice Item,Batch No,Lote No.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},No se puede encontrar el tipo de cambio para {0} a {1} para la fecha clave {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Permitir varias órdenes de venta, para las ordenes de compra de los clientes"
 DocType: Student Group Instructor,Student Group Instructor,Instructor de Grupo Estudiantil
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Móvil del Tutor2
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones pagadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Email Digest,Annual Expenses,Gastos Anuales
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Crear orden de compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Crear orden de compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
@@ -1763,7 +1760,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Evaluaciones
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar No. de serie para el producto {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
-DocType: Grading Structure,Grading Intervals,intervalos de calificación
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Por favor ingrese
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","No se puede cobrar demasiado a Punto de {0} en la fila {1} más {2}. Para permitir que el exceso de facturación, por favor, defina en la compra de Ajustes"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basada en el apartado o Almacén"
@@ -1776,16 +1772,17 @@
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Almacén Rechazado es obligatorio en la partida rechazada {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pago
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestionar sus pedidos
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestionar sus pedidos
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo reales
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Máxima requisición de materiales {0} es posible para el producto {1} en las órdenes de venta {2}
 DocType: Employee,Salutation,Saludo.
 DocType: Course,Course Abbreviation,Abreviatura del Curso
 DocType: Student Leave Application,Student Leave Application,Solicitud de Licencia para Estudiante
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya lo es {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya lo es {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleado {0} del medio día del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Encendido
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Quotation Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
@@ -1795,7 +1792,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Asociado
 DocType: Asset Movement,Asset Movement,Movimiento de Activo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nuevo Carrito
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Nuevo Carrito
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
 DocType: Vehicle,Wheels,ruedas
@@ -1827,9 +1824,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desactiva la creación de registros de tiempo en contra de las órdenes de fabricación. Las operaciones no serán objeto de seguimiento contra la Orden de Producción
 DocType: Student,Student Mobile Number,Número móvil del Estudiante
 DocType: Item,Has Variants,Posee variantes
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,El ID de lote es obligatorio
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,El ID de lote es obligatorio
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
 DocType: Purchase Invoice,Recurring Invoice,Factura recurrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestión de proyectos
@@ -1837,7 +1834,7 @@
 DocType: Budget,Fiscal Year,Año fiscal
 DocType: Vehicle Log,Fuel Price,Precio del combustible
 DocType: Budget,Budget,Presupuesto
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Activos Fijos El artículo debe ser una posición no de almacén.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Activos Fijos El artículo debe ser una posición no de almacén.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","El presupuesto no se puede asignar contra {0}, ya que no es una cuenta de ingresos o gastos"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 DocType: Student Admission,Application Form Route,Ruta Formulario de Solicitud
@@ -1868,7 +1865,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Monto {0} {1} deducido contra {2}
 DocType: Employee,Salary Information,Información salarial.
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de productos en el sitio web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,IMPUESTOS Y ARANCELES
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
@@ -1891,7 +1888,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Línea # {0}: La operación {1} no se ha completado para la cantidad: {2} de productos terminados en orden de producción # {3}. Por favor, actualice el estado de la operación a través de la gestión de tiempos"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,INVERSIONES
 DocType: Issue,Resolution Details,Detalles de la resolución
-apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Las asignaciones
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Asignaciones
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criterios de Aceptación
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Por favor, introduzca Las solicitudes de material en la tabla anterior"
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
@@ -1925,7 +1922,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ingresos de clientes recurrentes
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener el rol de 'Supervisor de gastos'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Seleccione la lista de materiales y de Unidades de Producción
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Seleccione la lista de materiales y Cantidades de Producción
 DocType: Asset,Depreciation Schedule,Programación de la depreciación
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Fecha de medio día debe estar entre la fecha desde y fecha hasta
@@ -1942,13 +1939,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
 ,Quotation Trends,Tendencias de Presupuestos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
 DocType: Purchase Order,Delivered,Enviado
 ,Vehicle Expenses,Los gastos del vehículo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
+DocType: Serial No,Invoice Details,Detalles de la factura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
 DocType: Purchase Receipt,Vehicle Number,Número de Vehículo
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Fecha en que la factura recurrente es detenida
 DocType: Employee Loan,Loan Amount,Monto del préstamo
@@ -1971,8 +1969,8 @@
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para el qty múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
-apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo de No-Grupo
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo a No-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
 DocType: Loan Type,Loan Name,Nombre del préstamo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
@@ -1982,6 +1980,7 @@
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Almacén en el cual se envian los productos rechazados
 DocType: Production Order,Skip Material Transfer,Omitir transferencia de material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,No se puede encontrar el tipo de cambio para {0} a {1} para la fecha clave {2}. Crea un registro de cambio de divisas manualmente
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,El año financiero finaliza el
 DocType: POS Profile,Price List,Lista de precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
@@ -1994,7 +1993,7 @@
 DocType: Workstation,Wages per hour,Salarios por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Después de solicitudes de materiales se han planteado de forma automática según el nivel de re-orden del articulo
-DocType: Email Digest,Pending Sales Orders,A la espera de órdenes de venta
+DocType: Email Digest,Pending Sales Orders,Ordenes de venta pendientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 DocType: Production Plan Item,material_request_item,material_request_item
@@ -2019,9 +2018,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año fiscal** representa un ejercicio financiero. Todos los asientos contables y demás transacciones importantes son registradas contra el **año fiscal**.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 DocType: Student Admission,Eligibility,Elegibilidad
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Las Iniciativas ayudan a obtener negocio, agrega todos tus contactos y más como clientes potenciales"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Las Iniciativas ayudan a obtener negocio, agrega todos tus contactos y más como clientes potenciales"
 DocType: Production Order Operation,Actual Operation Time,Hora de operación real
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
@@ -2039,7 +2038,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Envíos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,El saldo de la cuenta ({0}) para {1} y el valor de la acción ({2}) para el almacén {3} deben ser iguales
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,El saldo de la cuenta ({0}) para {1} y el valor de inventario ({2}) para el almacén {3} deben ser iguales
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Monto Total asignado (Divisa de la Compañia)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
 DocType: BOM,Scrap Material Cost,Costo de Material de Desecho
@@ -2060,7 +2059,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Seleccione la compañía...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deje en blanco si se utilizará para todos los departamentos
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
 DocType: Process Payroll,Fortnightly,Quincenal
 DocType: Currency Exchange,From Currency,Desde moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
@@ -2076,7 +2075,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Niño Artículo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Añadir partes de horas
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Añadir partes de horas
 DocType: Vehicle Service,Service Item,servicio de artículos
 DocType: Bank Guarantee,Bank Guarantee,Garantía bancaria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
@@ -2104,7 +2103,7 @@
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Por favor, seleccione la cuenta correcta"
 DocType: Item,Weight UOM,Unidad de medida (UdM)
-DocType: Salary Structure Employee,Salary Structure Employee,Empleado Estructura salarial
+DocType: Salary Structure Employee,Salary Structure Employee,Estructura Salarial de Empleado
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Production Order Operation,Pending,Pendiente
 DocType: Course,Course Name,Nombre del curso
@@ -2124,8 +2123,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Los precios no se muestran si la lista de precios no se ha establecido
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique un país para esta regla de envió o verifique los precios para envíos mundiales"
 DocType: Stock Entry,Total Incoming Value,Valor total de entradas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Débito Para es requerido
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Tabla de tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Débito Para es requerido
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Tabla de tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
 DocType: Offer Letter Term,Offer Term,Términos de la oferta
 DocType: Quality Inspection,Quality Manager,Gerente de calidad
@@ -2158,14 +2157,14 @@
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nueva direccion
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Por favor, introduzca recepción de documentos"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Por favor, introduzca recepción de documentos"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique un numero de caso válido"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Órdenes de fabricación creadas: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Órdenes de fabricación creadas: {0}
 DocType: Branch,Branch,Sucursal
 DocType: Guardian,Mobile Number,Número de teléfono móvil
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impresión y marcas
@@ -2174,11 +2173,11 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numero de serie {0} no encontrado
 DocType: Scheduling Tool,Student Batch,Lote de Estudiante
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Sus clientes
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Crear Estudiante
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Crear Estudiante
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear fecha
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplicar Ahora
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Cantidad real {0} / Cantidad de espera {1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Cantidad real {0} / Cantidad esperada {1}
 DocType: Sales Order,Not Delivered,No entregado
 ,Bank Clearance Summary,Resumen de Cambios Bancarios
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
@@ -2197,8 +2196,9 @@
 DocType: SMS Log,Sent To,Enviado a
 DocType: Payment Request,Make Sales Invoice,Crear factura de venta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Siguiente Contactar La fecha no puede ser en el pasado
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Siguiente Contactar La fecha no puede ser en el pasado
 DocType: Company,For Reference Only.,Sólo para referencia.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Seleccione Lote No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No válido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
@@ -2212,7 +2212,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Nº de caso no puede ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Sucursales
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Sucursales
 DocType: Serial No,Delivery Time,Tiempo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en
 DocType: Item,End of Life,Final de vida útil
@@ -2228,8 +2228,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Por favor conjunto recurrente después de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Seleccione el cambio importe de la cuenta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Por favor conjunto recurrente después de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Seleccione el cambio importe de la cuenta
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,El usuario deberá elegir siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
@@ -2240,7 +2240,7 @@
 DocType: Budget Account,Budget Account,Cuenta de Presupuesto
 DocType: Quality Inspection,Verified By,Verificado por
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla"
-DocType: Grade Interval,Grade Description,grado Descripción
+DocType: Grading Scale Interval,Grade Description,grado Descripción
 DocType: Stock Entry,Purchase Receipt No,Recibo de compra No.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,GANANCIAS PERCIBIDAS
 DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
@@ -2278,7 +2278,7 @@
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Gateway Account,Payment Account,Cuenta de pagos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Cambio neto en las cuentas por cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Compensatorio
 DocType: Offer Letter,Accepted,Aceptado
@@ -2291,7 +2291,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Asiento Contable Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
@@ -2305,7 +2305,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,El nombre del instituto para el que está configurando este sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Asiento contable actualmente congelado. Nadie puede generar / modificar el asiento, excepto el rol especificado a continuación."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del proyecto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opción para deshabilitar las fracciones.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Se crearon las siguientes órdenes de fabricación:
@@ -2328,6 +2328,7 @@
 DocType: Email Digest,How frequently?,¿Con qué frecuencia?
 DocType: Purchase Receipt,Get Current Stock,Verificar inventario actual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de lista de materiales
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 DocType: Student,Joining Date,Dia de ingreso
 ,Employees working on a holiday,Empleados que trabajan en un día festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marcar Presente
@@ -2428,12 +2429,12 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Fecha de liquidación no definida
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producción
 DocType: Guardian,Occupation,Ocupación
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Sales Invoice,This Document,Este documento
 DocType: Installation Note Item,Installed Qty,Cantidad instalada
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Formación Resultado
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Resultado del Entrenamiento
 DocType: Purchase Invoice,Is Paid,Está pagado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
@@ -2451,7 +2452,7 @@
 DocType: Notification Control,Sales Order Message,Mensaje de la orden de venta
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer los valores predeterminados como: empresa, moneda / divisa, año fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipo de pago
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccione un lote para el artículo {0}. No se puede encontrar un solo lote que cumpla este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccione un lote para el artículo {0}. No se puede encontrar un solo lote que cumpla este requisito
 DocType: Process Payroll,Select Employees,Seleccione los empleados
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Fecha de referencia
@@ -2468,7 +2469,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},El perfil de TPV global {0} ya se ha creado para la compañía {1}
 DocType: Purchase Order,Ref SQ,Ref. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Reemplazar elemento / Solicitud de Materiales en todas las Solicitudes de Materiales
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,documento de recepción debe ser presentado
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,documento de recepción debe ser presentado
 DocType: Purchase Invoice Item,Received Qty,Cantidad recibida
 DocType: Stock Entry Detail,Serial No / Batch,No. de serie / lote
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,No pago y no entregado
@@ -2481,7 +2482,7 @@
 ,To Produce,Producir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Nómina de sueldos
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Crear Usuario
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Crear Usuario
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor ingrese una dirección de correo electrónico válida
@@ -2493,11 +2494,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Plantilla deshabilitada no debe ser la plantilla predeterminada
 DocType: Account,Income Account,Cuenta de ingresos
 DocType: Payment Request,Amount in customer's currency,Monto en divisa del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Entregar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Entregar
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Los lotes de los estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Los lotes de los estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
 DocType: Payment Entry,Total Allocated Amount,Monto Total Asignado
 DocType: Item Reorder,Material Request Type,Tipo de requisición
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Entrada de diario Accural para salarios de {0} a {1}
@@ -2520,7 +2522,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del producto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
@@ -2530,6 +2532,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Enviará un correo electrónico sobre el evento a los empleados con el estado &#39;abierto&#39;
 DocType: Task,Depends on Tasks,Depende de Tareas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Los archivos adjuntos se pueden mostrar sin habilitar el carrito de la compra
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nombre del nuevo centro de costes
 DocType: Leave Control Panel,Leave Control Panel,Panel de control de ausencias
@@ -2542,11 +2545,10 @@
 DocType: Sales Invoice,Debit To,Debitar a
 DocType: Delivery Note,Required only for sample item.,Solicitado únicamente para muestra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad real después de transacción
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sin nómina encontrado entre {0} y {1}
 ,Pending SO Items For Purchase Request,A la espera de la orden de compra (OC) para crear solicitud de compra (SC)
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admisión de Estudiantes
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} está desactivado
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra grande
@@ -2563,7 +2565,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Producto destacado en página de inicio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Todos los grupos de evaluación
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Almacén nuevo nombre
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
@@ -2581,7 +2583,7 @@
 DocType: Price List,Price List Master,Lista de precios principal
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar para múltiples **vendedores** de esta manera usted podrá definir y monitorear objetivos.
 ,S.O. No.,OV No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
 DocType: Price List,Applicable for Countries,Aplicable para los Países
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Sólo Deja aplicaciones con estado &quot;Aprobado&quot; y &quot;Rechazado&quot; puede ser presentado
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Estudiante Nombre del grupo es obligatorio en la fila {0}
@@ -2673,7 +2675,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Asiento contable para inventario
 DocType: Vehicle Service,Engine Oil,Aceite de motor
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Employee Loan,Loan Details,Detalles de préstamo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Completo Cantidad debe ser mayor que cero.
@@ -2737,7 +2739,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Complejos de transacción existentes no pueden ser convertidos en grupo.
 DocType: Assessment Result Tool,Result HTML,Resultado HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira el
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Añadir estudiantes
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Añadir estudiantes
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2801,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Límite Cruzado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de riesgo
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un término académico con esto &#39;Año Académico&#39; {0} y &#39;Nombre término&#39; {1} ya existe. Por favor, modificar estas entradas y vuelva a intentarlo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el elemento {0}, no se puede cambiar el valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el elemento {0}, no se puede cambiar el valor de {1}"
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas ausencias asignadas (en días)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,El número de serie {0} no existe
@@ -2828,7 +2830,7 @@
 DocType: Guardian Student,Guardian Student,Tutor del Estudiante
 DocType: Supplier,Credit Limit,Límite de crédito
 DocType: Production Plan Sales Order,Salse Order Date,Salse Fecha del pedido
-DocType: Salary Component,Salary Component,Componente salario
+DocType: Salary Component,Salary Component,Componente Salarial
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Las entradas de pago {0} estan no-relacionadas
 DocType: GL Entry,Voucher No,Comprobante No.
 ,Lead Owner Efficiency,Eficiencia del propietario principal
@@ -2844,7 +2846,7 @@
 DocType: Supplier,Last Day of the Next Month,Último día del siguiente mes
 DocType: Support Settings,Auto close Issue after 7 days,Cierre automático de incidencia después de 7 días
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deje no pueden ser distribuidas antes {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,estudiante solicitante
 DocType: Asset Category Account,Accumulated Depreciation Account,Cuenta de depreciación acumulada
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
@@ -2855,7 +2857,7 @@
 ,Stock Analytics,Análisis de existencias.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Las operaciones no pueden dejarse en blanco
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra documento No.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Tipo del partido es obligatorio
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Tipo de parte es obligatorio
 DocType: Quality Inspection,Outgoing,Saliente
 DocType: Material Request,Requested For,Solicitado por
 DocType: Quotation Item,Against Doctype,Contra 'DocType'
@@ -2872,7 +2874,7 @@
 DocType: Asset,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear órdenes de producción
 DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
@@ -2890,7 +2892,7 @@
 DocType: Production Planning Tool,Create Material Requests,Crear requisición de materiales
 DocType: Employee Education,School/University,Escuela / Universidad.
 DocType: Payment Request,Reference Details,Detalles Referencia
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperado después de la vida útil debe ser inferior al importe bruto de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperado después de la vida útil debe ser inferior al importe bruto de compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Importe facturado
 DocType: Asset,Double Declining Balance,Doble saldo decreciente
@@ -2911,19 +2913,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Monto desembolsado no puede ser mayor que Monto del préstamo {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Orden de producción no se ha creado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Orden de producción no se ha creado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
 DocType: Asset,Fully Depreciated,Estando totalmente amortizados
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Asistencia Marcada HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Las citas son propuestas, las ofertas que ha enviado a sus clientes"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Las citas son propuestas, las ofertas que ha enviado a sus clientes"
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de serie y de lote
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma de las puntuaciones de criterios de evaluación tiene que ser {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Por favor, ajuste el número de amortizaciones Reservados"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Por favor, ajuste el número de amortizaciones Reservados"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valor o Cantidad
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Pedidos producciones no pueden ser criados para:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuto
@@ -3051,7 +3053,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Estudiantes
 DocType: Shopping Cart Settings,Quotation Series,Series de Presupuestos
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Por favor, seleccione al cliente"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,"Por favor, seleccione al cliente"
 DocType: C-Form,I,yo
 DocType: Company,Asset Depreciation Cost Center,Centro de la amortización del coste de los activos
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
@@ -3070,19 +3072,18 @@
 DocType: Vehicle,Insurance Details,Detalles de Seguros
 DocType: Account,Payable,Pagadero
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Por favor, introduzca plazos de amortización"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Deudores ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Deudores ({0})
 DocType: Pricing Rule,Margin,Margen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuevos clientes
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Beneficio Bruto%
 DocType: Appraisal Goal,Weightage (%),Porcentaje (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Compra importe bruto es obligatorio
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Compra importe bruto es obligatorio
 DocType: Lead,Address Desc,Dirección
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Parte es obligatoria
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nombre del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
-DocType: Grading Structure,Grade Intervals,intervalos de grado
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccione la naturaleza de su negocio.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción
 DocType: Asset Movement,Source Warehouse,Almacén de origen
@@ -3111,6 +3112,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Por favor seleccione el valor por defecto {0} en la empresa {1}
 DocType: Cheque Print Template,Starting position from top edge,posición desde el borde superior de partida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Mismo proveedor se ha introducido varias veces
@@ -3162,7 +3164,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Cantidad a reabastecer
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Ofertas de empleo actuales
 DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias
-DocType: Journal Entry,Write Off,Desajuste
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Desajuste
 DocType: Timesheet Detail,Operation ID,ID de Operación
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Si se define el ID de usuario 'Login', este sera el predeterminado para todos los documentos de recursos humanos (RRHH)"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
@@ -3173,8 +3175,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Proveedor entrega al Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) está agotado
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,La fecha siguiente debe ser mayor que la fecha de publicación
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar impuesto fragmentado
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Mostrar impuesto fragmentado
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vencimiento / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Existen entradas en existencias de almacén en contra {0}, por lo tanto, no se puede volver a asignar o modificarlo"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No se han encontrado estudiantes
@@ -3186,13 +3188,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Por favor, seleccione Fecha de entrada antes de seleccionar la fiesta"
 DocType: Program Enrollment,School House,Casa de la escuela
 DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Seleccione Citas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Crear visita de mantenimiento
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Seleccione Citas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Crear visita de mantenimiento
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Configuración general del sistema.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basado en la asistencia de este estudiante
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,No hay estudiantes en
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Añadir más elementos o abrir formulario completo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
@@ -3238,9 +3241,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente facturado
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Elemento {0} debe ser un elemento de activo fijo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Elemento {0} debe ser un elemento de activo fijo
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto total pendiente
@@ -3262,7 +3265,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
 DocType: Purchase Invoice Item,Rate,Precio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interno
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nombre de la dirección
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Nombre de la dirección
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
 DocType: Assessment Code,Assessment Code,Código evaluación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Base
@@ -3287,7 +3290,7 @@
 DocType: Purchase Invoice,Print Language,Lenguaje de impresión
 DocType: Salary Slip,Total Working Hours,Horas de trabajo total
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,El valor introducido debe ser positivo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,El valor introducido debe ser positivo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Estudiante ya está inscrito.
@@ -3306,16 +3309,14 @@
 DocType: Issue,Opening Time,Hora de apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
 DocType: Assessment Plan,Supervisor Name,Nombre del supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscripción en el programa
-DocType: Grading Structure,Grading Structure,Estructura de clasificación
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
 DocType: Tax Rule,Shipping City,Ciudad de envió
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este producto es una variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que la opción 'No copiar' esté seleccionada
 DocType: Notification Control,Customize the Notification,Personalizar notificación
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flujo de caja operativo
 DocType: Sales Invoice,Shipping Rule,Regla de envío
@@ -3338,6 +3339,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Fecha de apertura debe ser antes de la Fecha de Cierre
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia mediante Configuración&gt; Serie de numeración
 DocType: Leave Control Panel,Carry Forward,Trasladar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,El centro de costos con transacciones existentes no se puede convertir a libro mayor
 DocType: Department,Days for which Holidays are blocked for this department.,Días en que las vacaciones / permisos se bloquearan para este departamento.
@@ -3348,7 +3350,7 @@
 DocType: Training Event,Trainer Name,Nombre del entrenador
 DocType: Mode of Payment,General,General
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Adjuntar membrete
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última comunicación
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última Comunicación
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
@@ -3365,7 +3367,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Crear registros de empleados
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Crear registros de empleados
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Presente
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Declaraciones de contabilidad
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
@@ -3380,7 +3382,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Nueva lista de materiales después de la sustitución
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punto de Venta
 DocType: Payment Entry,Received Amount,Cantidad recibida
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure el sistema de nombres de empleado en recursos humanos&gt; Configuración de recursos humanos"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Crear para la cantidad completa, haciendo caso omiso de la cantidad que ya están en orden"
 DocType: Account,Tax,Impuesto
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,No Marcado
@@ -3391,7 +3392,7 @@
 DocType: C-Form,Invoices,Facturas
 DocType: Batch,Source Document Name,Nombre del documento de origen
 DocType: Job Opening,Job Title,Título del trabajo
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Crear usuarios
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Crear usuarios
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Reporte de visitas para mantenimiento
@@ -3402,8 +3403,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: BOM,Website Description,Descripción del sitio web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Cambio en el Patrimonio Neto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Recibo
 ,Sales Register,Registro de ventas
@@ -3414,19 +3415,21 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,¡Aún no hay clientes!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estado de Flujos de Efectivo
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Fecha del último pedido
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
 DocType: Student,Guardian Details,Detalles del Tutor
 DocType: C-Form,C-Form,C - Forma
-apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcos de Asistencia para varios empleados
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Asistencia para múltiples empleados
 DocType: Vehicle,Chassis No,N° de Chasis
 DocType: Payment Request,Initiated,Iniciado
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
@@ -3448,14 +3451,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Cant. enviada
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,La secuencia es obligatoria
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,La secuencia es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 DocType: Student Sibling,Student ID,Identificación del Estudiante
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipos de actividades para los registros de tiempo
 DocType: Tax Rule,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe base
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
 DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cred
 DocType: Tax Rule,Billing State,Región de facturación
@@ -3488,7 +3491,7 @@
 DocType: Payment Entry,Account Paid From,De cuenta de pago
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Hacer una Iniciativa
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Hacer una Iniciativa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impresión y Papelería
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo de código de barras
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
@@ -3497,12 +3500,13 @@
 DocType: Guardian Interest,Guardian Interest,Interés del Tutor
 apps/erpnext/erpnext/config/hr.py +177,Training,Formación
 DocType: Timesheet,Employee Detail,Detalle de los empleados
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1 ID de correo electrónico
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,ID de correo electrónico del Tutor1
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,"El día ""siguiente fecha"" y ""repetir un día del mes"" deben ser iguales"
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustes para la página de inicio página web
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Arriba
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atributo no válido {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Mencionar si la cuenta no estándar a pagar
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
@@ -3528,7 +3532,7 @@
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia 'Desde fecha' y 'Hasta fecha' son obligatorias
 apps/erpnext/erpnext/controllers/buying_controller.py +146,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Fecha de la última comunicación
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Fecha de la Última Comunicación
 DocType: Sales Team,Contact No.,Contacto No.
 DocType: Bank Reconciliation,Payment Entries,Entradas de Pago
 DocType: Production Order,Scrap Warehouse,Almacén de chatarra
@@ -3536,7 +3540,7 @@
 DocType: Program Enrollment Tool,Get Students From,Recibe estudiantes de
 DocType: Hub Settings,Seller Country,País de vendedor
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar artículos en la página web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Agrupar sus estudiantes en lotes
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Agrupar sus estudiantes en lotes
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
 DocType: Sales Invoice,Terms and Conditions Details,Detalle de términos y condiciones
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Especificaciones
@@ -3595,7 +3599,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Período de prueba
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,componentes de sueldos
 DocType: Program Enrollment Tool,New Academic Year,Nuevo Año Académico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Devolución / Nota de Crédito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Devolución / Nota de Crédito
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Importe total pagado
 DocType: Production Order Item,Transferred Qty,Cantidad Transferida
@@ -3636,6 +3640,7 @@
 ,Sales Funnel,"""Embudo"" de ventas"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,La abreviatura es obligatoria
 DocType: Project,Task Progress,Progreso de Tarea
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carrito
 ,Qty to Transfer,Cantidad a transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
@@ -3658,7 +3663,7 @@
 DocType: POS Profile,Apply Discount On,Aplicar de descuento en
 ,Reqd By Date,Fecha de solicitud
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Acreedores
-DocType: Assessment Plan,Assessment Name,Nombre evaluación
+DocType: Assessment Plan,Assessment Name,Nombre de la evaluación
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Línea # {0}: El número de serie es obligatorio
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Abreviatura del Instituto
@@ -3668,7 +3673,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantidad ({0}) no puede ser una fracción en la fila {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Cobrar cuotas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
 DocType: Item,Opening Stock,Stock de apertura
@@ -3686,7 +3691,7 @@
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
 DocType: Program Enrollment Tool,Enroll Students,Inscribir Estudiantes
 DocType: Hub Settings,Name Token,Nombre de Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venta estándar
@@ -3697,7 +3702,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra la factura de ventas {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nombre de proyecto
-DocType: Supplier,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
+DocType: Customer,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
 DocType: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso
 DocType: Production Order,Required Items,Artículos Requeridos
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia del valor de inventario
@@ -3727,6 +3732,7 @@
 DocType: Item,Taxes,Impuestos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Pagados y no entregados
 DocType: Project,Default Cost Center,Centro de costos por defecto
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} mediante Configuración&gt; Configuración&gt; Nombrar Series
 DocType: Bank Guarantee,End Date,Fecha final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transacciones de Valores
 DocType: Budget,Budget Accounts,Cuentas de Presupuesto
@@ -3791,7 +3797,7 @@
 DocType: Customer,Sales Partner and Commission,Comisiones y socios de ventas
 DocType: Employee Loan,Rate of Interest (%) / Year,Tasa de interés (%) / Año
 ,Project Quantity,Cantidad de Proyecto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede ser que usted debe cambiar en &quot;Distribuir los cargos basados en &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede ser que usted debe cambiar en &quot;Distribuir los cargos basados en &#39;"
 DocType: Opportunity,To Discuss,Para discusión
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unidades de {1} necesaria en {2} para completar esta transacción.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tasa de interés (%) Anual
@@ -3814,7 +3820,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la lista de materiales # {1} debe ser igual a la moneda seleccionada {2}
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Componente de Couta
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestión de flotas
@@ -3831,7 +3837,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,El almacén {0} no existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Porcentajes de distribución mensuales
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tasa de valorización no encontrado para el elemento {0}, que se requiere para hacer asientos contables para {1} {2}. Si el artículo está tramitando como un elemento de la muestra en el {1}, por favor mencionar que en la tabla {1} artículo. De lo contrario, por favor crea una transacción de acciones de entrada para la tasa de valorización artículo o mención en el registro de artículos y, a continuación, tratar de enviar / cancelación de esta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados contra esta nota de entrega
 DocType: Project,Customer Details,Datos de cliente
@@ -3848,7 +3854,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,pedidos presentados no se pueden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestión de calidad
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Elemento {0} ha sido desactivado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Elemento {0} ha sido desactivado
 DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una cantidad fija por Período
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
@@ -3862,7 +3868,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Línea #{0}: tiene conflictos de tiempo con la linea {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir tasa de valoración cero
 DocType: Training Event Employee,Invited,Invitado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructuras salariales activos encontrados para el empleado {0} para las fechas indicadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructuras salariales activas encontradas para el empleado {0} para las fechas indicadas
 DocType: Opportunity,Next Contact,Siguiente contacto
 apps/erpnext/erpnext/config/accounts.py +277,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
 DocType: Employee,Employment Type,Tipo de empleo
@@ -3874,7 +3880,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Estudiante ID de correo electrónico
 DocType: Employee,Notice (days),Aviso (días)
 DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Seleccione artículos para guardar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Seleccione artículos para guardar la factura
 DocType: Employee,Encashment Date,Fecha de cobro
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajuste de existencias
@@ -3907,6 +3913,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota de Débito Emitida
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activo no se puede transferir
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Este elemento es una variante de {0} (plantilla).
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Adquisitivo
 DocType: Announcement,Announcement,Anuncio
@@ -3922,8 +3929,8 @@
 DocType: Account,Receivable,A cobrar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Seleccionar artículos para Fabricación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Maestro sincronización de datos, que podría tomar algún tiempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Seleccionar artículos para Fabricación
+apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Sincronización de datos Maestros,  puede tomar algún tiempo"
 DocType: Item,Material Issue,Expedición de material
 DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
@@ -3935,7 +3942,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criterios de evaluación del Grupo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior o igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior o igual a {0}
 DocType: Warehouse,Warehouse Name,Nombre del almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
@@ -3969,7 +3976,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este año fiscal por defecto, haga clic en 'Establecer como predeterminado'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Unirse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Employee Loan,Repay from Salary,Pagar de su sueldo
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Solicitando el pago contra {0} {1} para la cantidad {2}
@@ -3987,7 +3994,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Evaluación de Resultados Detalle
 DocType: Employee Education,Employee Education,Educación del empleado
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Se encontró grupo de artículos duplicado  en la table de grupo de artículos
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
 DocType: Salary Slip,Net Pay,Pago Neto
 DocType: Account,Account,Cuenta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
@@ -3996,7 +4003,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Almacén {0} no está vinculada a ninguna cuenta, por favor crear / enlazar la cuenta correspondiente (Activo) para el almacén."
 DocType: Purchase Invoice,Recurring Id,ID recurrente
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminar de forma permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Eliminar de forma permanente?
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},No válida {0}
@@ -4007,13 +4014,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Configura tu Escuela en ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Importe de Cambio Base (Divisa de la Empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
 DocType: Company,Change Abbreviation,Cambiar abreviación
 DocType: Expense Claim Detail,Expense Date,Fecha de gasto
 DocType: Item,Max Discount (%),Descuento máximo (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Monto de la última orden
+DocType: Task,Is Milestone,¿Qué es Milestone?
 DocType: Daily Work Summary,Email Sent To,Correo electrónico enviado a
 DocType: Budget,Warn,Advertir
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
@@ -4046,11 +4054,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
 ,Project wise Stock Tracking,Seguimiento preciso del stock--
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} ya existe para {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cantidad real (en origen/destino)
 DocType: Item Customer Detail,Ref Code,Código de referencia
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de los empleados.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
 DocType: HR Settings,Payroll Settings,Configuración de nómina
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Realizar pedido
@@ -4073,7 +4080,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Los cheques y depósitos borran de forma incorrecta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignarse a sí misma como cuenta padre
 DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Crear cotizaciones de clientes
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Crear cotizaciones de clientes
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostrar 'En stock' o 'No disponible' basado en el stock disponible del almacén.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiales (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para el envío
@@ -4095,7 +4102,7 @@
 DocType: Asset,Disposal Date,disposición Fecha
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Los correos electrónicos serán enviados a todos los empleados activos de la empresa a la hora determinada, si no tienen vacaciones. Resumen de las respuestas será enviado a la medianoche."
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque se ha hecho el Presupuesto"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Comentarios del entrenamiento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
@@ -4103,7 +4110,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Curso es obligatorio en la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Previo
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Añadir / Editar Precios
 DocType: Batch,Parent Batch,Lote padre
 DocType: Cheque Print Template,Cheque Print Template,Plantilla de impresión de cheques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Centros de costos
@@ -4147,7 +4154,7 @@
 DocType: Item,Variant Based On,Variante basada en
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Sus proveedores
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 DocType: Request for Quotation Item,Supplier Part No,Proveedor de parte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"No se puede deducir cuando la categoría es 'de Valoración ""o"" Vaulation y Total'"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Recibido de
@@ -4157,7 +4164,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Asignar Proveedor para el elemento {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Horas debe ser mayor que cero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
 DocType: Issue,Content Type,Tipo de contenido
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
@@ -4166,20 +4173,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
 DocType: Payment Reconciliation,From Invoice Date,Desde Fecha de la Factura
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturación debe ser igual a la moneda o divisa de cuenta del partido, ya sea por defecto de comapany"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturación debe ser igual a la moneda o divisa de cuenta del partido, ya sea por defecto de comapany"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Deja Cobro
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,¿A qué se dedica?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Para Almacén
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todos Admisión de Estudiantes
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas las admisiones de estudiantes
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: School House,House Name,Nombre de la casa
 DocType: Purchase Taxes and Charges,Account Head,Encabezado de cuenta
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Eléctrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Añadir el resto de su organización como a sus usuarios. También puede agregar invitar a los clientes a su portal con la adición de ellos desde Contactos
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Añadir el resto de su organización como a sus usuarios. También puede agregar invitar a los clientes a su portal con la adición de ellos desde Contactos
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
@@ -4188,7 +4195,7 @@
 DocType: Item,Customer Code,Código de cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde la última orden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,La fecha de comienzo del seguro debe ser menos que la fecha de fin del seguro
@@ -4203,7 +4210,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},El resbalón de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
 DocType: Vehicle Log,Odometer,Cuentakilómetros
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM no contiene ningún artículo común
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
@@ -4216,7 +4223,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de facturación
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM por defecto para {0} no encontrado
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toca los elementos para agregarlos aquí
 DocType: Fees,Program Enrollment,programa de Inscripción
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, configure {0}"
@@ -4314,7 +4322,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
-DocType: Grade Interval,Grade Interval,grado de intervalo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidación Fecha actualiza
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lote dividido
@@ -4322,6 +4329,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Descargar PDF
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Dónde se almacenarán los productos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Request for Quotation,Supplier Detail,Detalle del proveedor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Error Fórmula o Condición: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Cantidad facturada
@@ -4366,7 +4374,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configuración de un sitio web sencillo para mi organización
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
 DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, ingrese el centro de costos principal"
@@ -4423,7 +4431,7 @@
 ,Items To Be Requested,Solicitud de Productos
 DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Seleccionar o añadir nuevo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Seleccionar o añadir nuevo cliente
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Centro de coste es requerido para reservar una reclamación de gastos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esto se basa en la presencia de este empleado
@@ -4436,13 +4444,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia en los siguientes días.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Monto de la compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Presupuesto de Proveedor {0} creado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Año de finalización no puede ser anterior al ano de inicio
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Año de finalización no puede ser anterior al ano de inicio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Beneficios de empleados
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Production Order,Manufactured Qty,Cantidad producida
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de fiesta por Empleado {0} o de su empresa {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
@@ -4451,15 +4459,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Employee Loan Application,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Guardian,Guardian,Tutor
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Elim
 DocType: Selling Settings,Campaign Naming By,Nombrar campañas por
 DocType: Employee,Current Address Is,La dirección actual es
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificado
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Asientos en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Camtidad Disponible Desde el Almacén
@@ -4496,7 +4506,7 @@
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
 DocType: BOM,With Operations,Con operaciones
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
 DocType: Asset,Is Existing Asset,Es Activo Existente
 DocType: Salary Detail,Statistical Component,Componente estadístico
 ,Monthly Salary Register,Registar salario mensual
@@ -4550,7 +4560,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Adjuntar logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveles de Stock
 DocType: Customer,Commission Rate,Comisión de ventas
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Crear variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo de pago debe ser uno de Recibir, Pagar y Transferencia interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analítica
@@ -4563,6 +4573,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir producción en días festivos
 DocType: Sales Order,Customer's Purchase Order Date,Fecha de pedido de compra del cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital de inventario
+DocType: Shopping Cart Settings,Show Public Attachments,Mostrar adjuntos públicos
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 DocType: Payment Gateway Account,Payment Gateway Account,Cuenta de Pasarela de Pago
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Después de la realización del pago redirigir el usuario a la página seleccionada.
@@ -4587,7 +4598,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Hacer Lote de Estudiantes
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Hacer Lote de Estudiantes
 DocType: Leave Type,Is Carry Forward,Es un traslado
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
@@ -4606,7 +4617,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: GL Entry,Is Opening,De apertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia mediante Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía para la página web y otras publicaciones.
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index c6961d1..cd516c7 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Partii Punkt lõppemine staatus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Pangaveksel
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Näita variandid
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Näita variandid
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materjal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kvantiteet
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Tervishoid
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Makseviivitus (päevad)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Teenuse kulu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Arve
 DocType: Maintenance Schedule Item,Periodicity,Perioodilisus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} on vajalik
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklaam
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama firma on kantud rohkem kui üks kord
 DocType: Employee,Married,Abielus
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei ole lubatud {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ei ole lubatud {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Võta esemed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun setup Töötaja nimesüsteemile Human Resource&gt; HR Seaded
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Toote {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nr loetletud
 DocType: Payment Reconciliation,Reconcile,Sobita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toiduained
 DocType: Quality Inspection Reading,Reading 1,Lugemine 1
 DocType: Process Payroll,Make Bank Entry,Tee Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionifondid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Järgmine kulum kuupäev ei saa olla enne Ostukuupäevale
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Järgmine kulum kuupäev ei saa olla enne Ostukuupäevale
 DocType: SMS Center,All Sales Person,Kõik Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Kuu Distribution ** aitab levitada Eelarve / Target üle kuu, kui teil on sesoonsus firma."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ei leitud esemed
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Ei leitud esemed
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Palgastruktuur Kadunud
 DocType: Lead,Person Name,Person Nimi
 DocType: Sales Invoice Item,Sales Invoice Item,Müügiarve toode
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",nt &quot;algkool&quot; või &quot;Ülikool&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock aruanded
 DocType: Warehouse,Warehouse Detail,Ladu Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term lõppkuupäev ei saa olla hilisem kui aasta lõpu kuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Kas Põhivarade&quot; ei saa märkimata, kui Asset Olemas vastu kirje"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Kas Põhivarade&quot; ei saa märkimata, kui Asset Olemas vastu kirje"
 DocType: Vehicle Service,Brake Oil,Piduri õli
 DocType: Tax Rule,Tax Type,Maksu- Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sa ei ole volitatud lisada või uuendada oma andmeid enne {0}
 DocType: BOM,Item Image (if not slideshow),Punkt Image (kui mitte slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kliendi olemas sama nimega
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Hinda / 60) * Tegelik tööaeg
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Vali Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Vali Bom
 DocType: SMS Log,SMS Log,SMS Logi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kulud Tarnitakse Esemed
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Puhkus on {0} ei ole vahel From kuupäev ja To Date
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,hinne
 DocType: Sales Invoice Item,Delivered By Supplier,Toimetab tarnija
 DocType: SMS Center,All Contact,Kõik Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Tootmise Telli juba loodud kõik esemed Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Tootmise Telli juba loodud kõik esemed Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Aastapalka
 DocType: Daily Work Summary,Daily Work Summary,Igapäevase töö kokkuvõte
 DocType: Period Closing Voucher,Closing Fiscal Year,Sulgemine Fiscal Year
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} on külmutatud
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} on külmutatud
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Palun valige olemasoleva äriühingu loomise kontoplaani
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock kulud
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vali Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company Valuuta
 DocType: Delivery Note,Installation Status,Paigaldamine staatus
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Kas soovite värskendada käimist? <br> Present: {0} \ <br> Puudub: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aktsepteeritud + Tõrjutud Kogus peab olema võrdne saadud koguse Punkt {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Supply tooraine ostmiseks
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Vähemalt üks makseviis on vajalik POS arve.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Vähemalt üks makseviis on vajalik POS arve.
 DocType: Products Settings,Show Products as a List,Näita tooteid listana
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lae mall, täitke asjakohaste andmete ja kinnitage muudetud faili. Kõik kuupäevad ning töötaja kombinatsioon valitud perioodil tulevad malli, olemasolevate töölkäimise"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee kulum Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Hankelepingu liik
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tee Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tee Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rahvusringhääling
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Hukkamine
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Andmed teostatud.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan hooldus külastused.
 DocType: SMS Settings,Enter url parameter for message,Sisesta url parameeter sõnum
 DocType: POS Profile,Customer Groups,kliendigruppide
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finantsaruanded
 DocType: Guardian,Students,õpilased
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Eeskirjad hinnakujunduse ja soodushinnaga.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Hinnakiri peab olema rakendatav ostmine või müümine
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
 DocType: Naming Series,Series List for this Transaction,Seeria nimekiri selle Tehing
 DocType: Company,Default Payroll Payable Account,Vaikimisi palgaarvestuse tasulised konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Uuenda e Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Uuenda e Group
 DocType: Sales Invoice,Is Opening Entry,Avab Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nimetatakse mittestandardsete saadaoleva arvesse kohaldatavat
 DocType: Course Schedule,Instructor Name,Juhendaja nimi
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Vastu müügiarve toode
 ,Production Orders in Progress,Tootmine Tellimused in Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Rahavood finantseerimistegevusest
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
 DocType: Lead,Address & Contact,Aadress ja Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisa kasutamata lehed eelmisest eraldised
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Järgmine Korduvad {0} loodud {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Kokku kuluarvestus summa (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Punkt Koduleht spetsifikatsioon
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Sissekanded
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Aastane
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock leppimise toode
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,Avaldab Hub
 DocType: Student Admission,Student Admission,üliõpilane
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Punkt {0} on tühistatud
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
 DocType: Item,Purchase Details,Ostu üksikasjad
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,"Soovin e-postiga loomiseks, automaatne Material taotlus"
 DocType: Journal Entry,Multi Currency,Multi Valuuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Arve Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Toimetaja märkus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Toimetaja märkus
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Seadistamine maksud
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Müüdava vara
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Makse Entry on muudetud pärast seda, kui tõmbasin. Palun tõmmake uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
 DocType: Student Applicant,Admitted,Tunnistas
 DocType: Workstation,Rent Cost,Üürile Cost
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Tellimus väärtus
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Raha vastu tehing poole või sisene ülekanne
 DocType: Shipping Rule,Valid for Countries,Kehtib Riigid
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"See toode on Mall ja seda ei saa kasutada tehingutes. Punkt atribuute kopeerida üle võetud variante, kui &quot;No Copy&quot; on seatud"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"See toode on Mall ja seda ei saa kasutada tehingutes. Punkt atribuute kopeerida üle võetud variante, kui &quot;No Copy&quot; on seatud"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kokku Tellimus Peetakse
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Palun sisestage &quot;Korda päev kuus väljale väärtus
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,Maksumäär
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on juba eraldatud Töötaja {1} ajaks {2} et {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Vali toode
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partii nr peaks olema sama mis {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Teisenda mitte-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Partii (palju) objekti.
 DocType: C-Form Invoice Detail,Invoice Date,Arve kuupäev
 DocType: GL Entry,Debit Amount,Deebetsummat
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Seal saab olla ainult 1 konto kohta Company {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Seal saab olla ainult 1 konto kohta Company {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Palun vt lisa
 DocType: Purchase Order,% Received,% Vastatud
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Loo Üliõpilasgrupid
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Hinnapäring
 DocType: Salary Slip Timesheet,Working Hours,Töötunnid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Muuda algus / praegune järjenumber olemasoleva seeria.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Loo uus klient
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Loo uus klient
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Kui mitu Hinnakujundusreeglid jätkuvalt ülekaalus, kasutajate palutakse määrata prioriteedi käsitsi lahendada konflikte."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Loo Ostutellimuste
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Loo Ostutellimuste
 ,Purchase Register,Ostu Registreeri
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Kohaldatavate tasudega
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global seaded kõik tootmisprotsessid.
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod Külmutatud Upto
 DocType: SMS Log,Sent On,Saadetud
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday kapten.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,Siit Package No.
 DocType: Item Attribute,To Range,Vahemik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Väärtpaberitesse ja hoiustesse
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ei saa muuta hindamismeetod, kuna seal on tehingute vastu mõned kirjed, mis ei ole ta enda hindamismeetodi"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kokku lehed eraldatud on kohustuslik
 DocType: Job Opening,Description of a Job Opening,Kirjeldus töökoht
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kuni tegevusi täna
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
 DocType: Production Order,Additional Operating Cost,Täiendav töökulud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmeetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
 DocType: Shipping Rule,Net Weight,Netokaal
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ostma
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Palun määratleda hinne Threshold 0%
 DocType: Sales Order,To Deliver,Andma
 DocType: Purchase Invoice Item,Item,Kirje
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
 DocType: Journal Entry,Difference (Dr - Cr),Erinevus (Dr - Cr)
 DocType: Account,Profit and Loss,Kasum ja kahjum
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Tegevjuht Alltöövõtt
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,Paigaldamine Märkus Punkt
 DocType: Production Plan Item,Pending Qty,Kuni Kogus
 DocType: Budget,Ignore,Ignoreerima
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ei ole aktiivne
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ei ole aktiivne
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS saadetakse järgmised numbrid: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup check mõõtmed trükkimiseks
 DocType: Salary Slip,Salary Slip Timesheet,Palgatõend Töögraafik
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,Kokku Komisjoni
 DocType: Pricing Rule,Sales Partner,Müük Partner
 DocType: Buying Settings,Purchase Receipt Required,Ostutšekk Vajalikud
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Hindamine Rate on kohustuslik, kui algvaru sisestatud"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Hindamine Rate on kohustuslik, kui algvaru sisestatud"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Salvestusi ei leitud Arvel tabelis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financial / eelarveaastal.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,kogunenud väärtused
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Vabandame, Serial nr saa liita"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Tee Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Tee Sales Order
 DocType: Project Task,Project Task,Projekti töörühma
 ,Lead Id,Plii Id
 DocType: C-Form Invoice Detail,Grand Total,Üldtulemus
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,Jätka Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Korrake klientidele
 DocType: Leave Control Panel,Allocate,Eraldama
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Müügitulu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Müügitulu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Märkus: Kokku eraldatakse lehed {0} ei tohiks olla väiksem kui juba heaks lehed {1} perioodiks
 DocType: Announcement,Posted By,postitas
 DocType: Item,Delivered by Supplier (Drop Ship),Andis Tarnija (Drop Laev)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Määrake Company
 DocType: Purchase Order Item,Billed Amt,Arve Amt
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Müügiarve Töögraafik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Viitenumber &amp; Reference kuupäev on vajalik {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Vali Maksekonto teha Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Loo töötaja kirjete haldamiseks lehed, kulu nõuete ja palgaarvestuse"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Loo töötaja kirjete haldamiseks lehed, kulu nõuete ja palgaarvestuse"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Lisa teabebaasi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Ettepanek kirjutamine
 DocType: Payment Entry Deduction,Payment Entry Deduction,Makse Entry mahaarvamine
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Seos Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Juhataja
 DocType: Payment Entry,Payment From / To,Makse edasi / tagasi
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Kuupäevavahemik
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uus krediidilimiit on alla praeguse tasumata summa kliendi jaoks. Krediidilimiit peab olema atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uus krediidilimiit on alla praeguse tasumata summa kliendi jaoks. Krediidilimiit peab olema atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Sama objekt on kantud mitu korda.
 DocType: SMS Settings,Receiver Parameter,Vastuvõtja Parameeter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Tuleneb"" ja ""Grupeeri alusel"" ei saa olla sama"
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,Resolutsioon kuupäev
 DocType: Student Batch Name,Batch Name,partii Nimi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Töögraafik on loodud:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,registreerima
 DocType: Selling Settings,Customer Naming By,Kliendi nimetamine By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Näitab õpilase kui Praegused Student Kuu osavõtt aruanne
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,Student osavõtt
 DocType: Sales Invoice Timesheet,Time Sheet,ajaandmik
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush tooraine põhineb
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Palun sisestage kirje üksikasjad
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Palun sisestage kirje üksikasjad
 DocType: Interest,Interest,huvi
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Müügieelne
 DocType: Purchase Receipt,Other Details,Muud andmed
@@ -726,7 +729,7 @@
 ,Absent Student Report,Puudub Student Report
 DocType: Email Digest,Next email will be sent on:,Järgmine email saadetakse edasi:
 DocType: Offer Letter Term,Offer Letter Term,Paku kiri Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Punkt on variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Punkt {0} ei leitud
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Ettevõte {0} ei ole olemas
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,Garantii Aegumisaja
 DocType: Material Request Item,Quantity and Warehouse,Kogus ja Warehouse
 DocType: Sales Invoice,Commission Rate (%),Komisjoni Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Määrake nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Palun valige Program
 DocType: Project,Estimated Cost,Hinnanguline maksumus
 DocType: Purchase Order,Link to material requests,Link materjali taotlusi
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ei ole laos toode
 DocType: Mode of Payment Account,Default Account,Vaikimisi konto
 DocType: Payment Entry,Received Amount (Company Currency),Saadud summa (firma Valuuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Palun valige iganädalane off päev
 DocType: Production Order Operation,Planned End Time,Planeeritud End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Dispersioon Punkt Group-Wise
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Hinnakiri ole valitud
 DocType: Employee,Family Background,Perekondlik taust
 DocType: Request for Quotation Supplier,Send Email,Saada E-
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ei Luba
 DocType: Company,Default Bank Account,Vaikimisi Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ükski töötaja leitud
 DocType: Supplier Quotation,Stopped,Peatatud
 DocType: Item,If subcontracted to a vendor,Kui alltöövõtjaks müüja
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Student Group on juba uuendatud.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Student Group on juba uuendatud.
 DocType: SMS Center,All Customer Contact,Kõik Kliendi Kontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Laadi laoseisu kaudu csv.
 DocType: Warehouse,Tree Details,Tree detailid
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimaalne Arve summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} ei kuulu Company {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} ei saa olla Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {DOCNAME} ei eksisteeri eespool {doctype} &quot;tabelis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {DOCNAME} ei eksisteeri eespool {doctype} &quot;tabelis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei ülesanded
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Päeval kuule auto arve genereeritakse nt 05, 28 jne"
 DocType: Asset,Opening Accumulated Depreciation,Avamine akumuleeritud kulum
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,Libisev keskmine hind
 DocType: Production Planning Tool,Select Items,Vali kaubad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} vastu Bill {1} dateeritud {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursuse ajakava
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursuse ajakava
 DocType: Maintenance Visit,Completion Status,Lõpetamine staatus
 DocType: HR Settings,Enter retirement age in years,Sisesta pensioniiga aastat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Laske üle väljasaatmisel või vastuvõtmisel upto see protsenti
 DocType: Stock Entry,STE-,STE
 DocType: Upload Attendance,Import Attendance,Import Osavõtt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Kõik Punkt Groups
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Kõik Punkt Groups
 DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto kasum / kahjum
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaatselt kirjutada sõnumi esitamise tehingud.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ostutellimuse maksmine
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Kavandatav Kogus
 DocType: Sales Invoice,Payment Due Date,Maksetähtpäevast
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Avamine&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avatud teha
 DocType: Notification Control,Delivery Note Message,Toimetaja märkus Message
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Kogus
 DocType: Leave Block List Date,Leave Block List Date,Jäta Block loetelu kuupäev
 DocType: Pricing Rule,Price or Discount,Hind või Soodus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Kokku kohaldatavate tasude kohta ostutšekk Esemed tabel peab olema sama Kokku maksud ja tasud
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Kokku kohaldatavate tasude kohta ostutšekk Esemed tabel peab olema sama Kokku maksud ja tasud
 DocType: Sales Team,Incentives,Soodustused
 DocType: SMS Log,Requested Numbers,Taotletud numbrid
 DocType: Production Planning Tool,Only Obtain Raw Materials,Saada ainult tooraine
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
 DocType: Fee Structure,Components,komponendid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ostuarve Advance
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: tasumises Müük / Ostutellimuse peaks alati olema märgistatud varem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Keemilised
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Vaikimisi Bank / arvelduskontole uuendatakse automaatselt sisse palk päevikusissekanne kui see režiim on valitud.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallid Hinne Kood {0} kattub hinne intervallidega teised klassid. Palun kontrollige intervallidega {0} ja {1} ja proovi uuesti
 DocType: BOM,Raw Material Cost(Company Currency),Tooraine hind (firma Valuuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Kõik esemed on juba üle selle tootmine Order.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Rate ei saa olla suurem kui määr, mida kasutatakse {1} {2}"
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,Bom Koduleht toode
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Laadi üles oma kirjas pea ja logo. (seda saab muuta hiljem).
 DocType: Timesheet Detail,Bill,arve
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Järgmine kulum kuupäev on sisestatud viimase kuupäeva
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Järgmine kulum kuupäev on sisestatud viimase kuupäeva
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Valge
 DocType: SMS Center,All Lead (Open),Kõik Plii (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rida {0}: Kogus ole saadaval {4} laos {1} postitama aeg kanne ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tellimus tüüp peab olema üks {0}
 DocType: Lead,Next Contact Date,Järgmine Kontakt kuupäev
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Avamine Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
 DocType: Student Batch Name,Student Batch Name,Student Partii Nimi
 DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
 DocType: Repayment Schedule,Balance Loan Amount,Tasakaal Laenusumma
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Palun täpsusta {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
 DocType: Delivery Note,Delivery To,Toimetaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Planning Tool,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ei tohi olla negatiivne
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Soodus
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Soodus
 DocType: Asset,Total Number of Depreciations,Kokku arv Amortisatsiooniaruanne
 DocType: Sales Invoice Item,Rate With Margin,Määra Margin
 DocType: Workstation,Wages,Palgad
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,Organisatsiooni nimi
 DocType: Tax Rule,Shipping State,Kohaletoimetamine riik
 ,Projected Quantity as Source,Planeeritav kogus nagu Allikas
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades &quot;Võta Kirjed Ostutšekid&quot; nuppu"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades &quot;Võta Kirjed Ostutšekid&quot; nuppu"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Kaasa mitte laos toodet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Müügikulud
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,Vastu
 DocType: Item,Default Selling Cost Center,Vaikimisi müügikulude Center
 DocType: Sales Partner,Implementation Partner,Rakendamine Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postiindeks
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Postiindeks
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} on {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock kanded
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,Edasimüüja
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostukorv kohaletoimetamine reegel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Tootmine Tellimus {0} tuleb tühistada enne tühistades selle Sales Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
 ,Ordered Items To Be Billed,Tellitud esemed arve
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
 DocType: Global Defaults,Global Defaults,Global Vaikeväärtused
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Palun sisesta Kood saada Partii number
 DocType: Stock Settings,Default Item Group,Vaikimisi Punkt Group
 DocType: Employee Loan,Partially Disbursed,osaliselt Väljastatud
-DocType: Grading Structure,Grading System Name,Hindamissüsteem Nimi
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tarnija andmebaasis.
 DocType: Account,Balance Sheet,Eelarve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Makserežiimi ei ole seadistatud. Palun kontrollige, kas konto on seadistatud režiim maksed või POS profiili."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Makserežiimi ei ole seadistatud. Palun kontrollige, kas konto on seadistatud režiim maksed või POS profiili."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Teie müügi isik saab meeldetuletus sellest kuupäevast ühendust kliendi
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama objekt ei saa sisestada mitu korda.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Lisaks kontod saab rühma all, kuid kanded saab teha peale mitte-Groups"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Töö
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Palun täpsustage vähemalt üks atribuut atribuudid tabelis
 DocType: Announcement,All Students,Kõik õpilased
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Punkt {0} peab olema mitte-laoartikkel
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Punkt {0} peab olema mitte-laoartikkel
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vaata Ledger
 DocType: Grading Scale,Intervals,intervallid
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Esimesed
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobiilne No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Ülejäänud maailm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Võta Tasumata arved
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Ostutellimuste aidata teil planeerida ja jälgida oma ostud
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Ostutellimuste aidata teil planeerida ja jälgida oma ostud
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kogu Issue / Transfer koguse {0} Material taotlus {1} \ saa olla suurem kui nõutud koguse {2} jaoks Punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Väike
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master andmed
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Oma tooteid või teenuseid
 DocType: Mode of Payment,Mode of Payment,Makseviis
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,Group Roll arv
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Sest {0}, ainult krediitkaardi kontod võivad olla seotud teise vastu deebetkanne"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kokku kõigi ülesanne kaalu peaks 1. Palun reguleerida kaalu kõikide Project ülesandeid vastavalt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital seadmed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnakujundus Reegel on esimene valitud põhineb &quot;Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,Päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} objekte pooleli
 DocType: Workstation,Workstation Name,Workstation nimi
-DocType: Grade Interval,Grade Code,Hinne kood
+DocType: Grading Scale Interval,Grade Code,Hinne kood
 DocType: POS Item Group,POS Item Group,POS Artikliklasside
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Saatke Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Riistvara
 DocType: Sales Order,Recurring Upto,korduvad Upto
 DocType: Attendance,HR Manager,personalijuht
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Palun valige Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Palun valige Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Tarnija Arve kuupäev
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Sa pead lubama Ostukorv
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Toit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vananemine Range 3
 DocType: Maintenance Schedule Item,No of Visits,No visiit
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark kohalolijate
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark kohalolijate
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Hoolduskava {0} on olemas vastu {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,registreerimisega üliõpilane
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuuta sulgemise tuleb arvesse {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summa võrra kõik eesmärgid peaksid olema 100. On {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontoplaan
 DocType: Material Request,Terms and Conditions Content,Tingimused sisu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
 DocType: Employee,Owned,Omanik
 DocType: Salary Detail,Depends on Leave Without Pay,Oleneb palgata puhkust
 DocType: Pricing Rule,"Higher the number, higher the priority","Suurem arv, seda suurem on prioriteet"
 ,Purchase Invoice Trends,Ostuarve Trends
 DocType: Employee,Better Prospects,Paremad väljavaated
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Portsjoni {1} omab ainult {2} tk. Palun valige mõni teine partii, mis on {3} Kogus kättesaadav või jagada järjest mitmeks rida, et pakkuda / küsimust mitmed partiid"
 DocType: Vehicle,License Plate,Numbrimärk
 DocType: Appraisal,Goals,Eesmärgid
 DocType: Warranty Claim,Warranty / AMC Status,Garantii / AMC staatus
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Töötaja ei saa aru ise.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Kui konto on külmutatud, kanded on lubatud piiratud kasutajatele."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Ametijuhendite, nõutav kvalifikatsioon jms"
 DocType: Journal Entry Account,Account Balance,Kontojääk
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Maksu- reegli tehingud.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näita sulgemata eelarve aasta P &amp; L saldod
 DocType: Shipping Rule,Shipping Account,Laevandus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ei ole aktiivne
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Tee müügitellimuste aitavad teil planeerida oma tööd ja täitma-time
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Tee müügitellimuste aitavad teil planeerida oma tööd ja täitma-time
 DocType: Quality Inspection,Readings,Näidud
 DocType: Stock Entry,Total Additional Costs,Kokku Lisakulud
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,Hindama
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Allikas lattu on kohustuslik rida {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakkesedel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Pakkesedel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS gateway seaded
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ebaõnnestus!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,Allikas
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näita suletud
 DocType: Leave Type,Is Leave Without Pay,Kas palgata puhkust
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Salvestusi ei leitud Makseinfo tabelis
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},See {0} konflikte {1} jaoks {2} {3}
 DocType: Student Attendance Tool,Students HTML,õpilased HTML
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,Lahkumise kuupäev
 DocType: Pricing Rule,For Price List,Sest hinnakiri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Loo Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Loo Leads
 DocType: Maintenance Schedule,Schedules,Sõiduplaanid
 DocType: Purchase Invoice Item,Net Amount,Netokogus
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Ei
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,programm sooviavaldused
 DocType: Sales Invoice Item,Brand Name,Brändi nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Üksikasjad
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,võimalik Tarnija
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisatsioon
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,Lugemine 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Vaikimisi Bom {0} ei leitud Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Nõuded firma kulul.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Õpilased on keskmes süsteem, lisada kõik oma õpilasi"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Õpilased on keskmes süsteem, lisada kõik oma õpilasi"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rida # {0} kliirens kuupäeva {1} ei saa enne tšeki kuupäev {2}
 DocType: Company,Default Holiday List,Vaikimisi Holiday nimekiri
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rida {0}: From ajal ja aeg {1} kattub {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päev (ad), millal te taotlete puhkuse puhkepäevadel. Sa ei pea taotlema puhkust."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Saada uuesti Makse Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Uus ülesanne
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Tee Tsitaat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Tee Tsitaat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Teised aruanded
 DocType: Dependent Task,Dependent Task,Sõltub Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Proovige plaanis operatsioonide X päeva ette.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Palun määra Vaikimisi palgaarvestuse tasulised konto Company {0}
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Otsi toode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Otsi toode
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tarbitud
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Net muutus Cash
 DocType: Assessment Plan,Grading Scale,hindamisskaala
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,juba lõpetatud
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kulud Väljastatud Esemed
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Koguma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Vastu Tarnija Arve {0} dateeritud {1}
 DocType: Customer,Default Price List,Vaikimisi hinnakiri
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sa ei saa kustutada eelarveaastal {0}. Eelarveaastal {0} on määratud vaikimisi Global Settings
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Kliendi kreeditjääk
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,Õppimine Sama Instituut
 DocType: Territory,Territory Manager,Territoorium Manager
 DocType: Packed Item,To Warehouse (Optional),Et Warehouse (valikuline)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kood&gt; Punkt Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Paide summa (firma Valuuta)
 DocType: Purchase Invoice,Additional Discount,Täiendav Soodus
 DocType: Selling Settings,Selling Settings,Müük Seaded
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vaata Ostukorv
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Turundus kulud
 ,Item Shortage Report,Punkt Puuduse aruanne
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materjal taotlus kasutatakse selle Stock Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Järgmine kulum kuupäev on kohustuslik uus vara
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Järgmine kulum kuupäev on kohustuslik uus vara
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Eraldi muidugi põhineb Group iga partii
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single üksuse objekt.
 DocType: Fee Category,Fee Category,Fee Kategooria
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Cost Center on vajalik kasumi ja kahjumi &quot;kontole {2}. Palun luua vaikimisi Cost Center for Company.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Kliendi Group olemas sama nimega siis muuta kliendi nimi või ümber Kliendi Group
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kliendi&gt; Kliendi Group&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Kliendi Group olemas sama nimega siis muuta kliendi nimi või ümber Kliendi Group
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,New Contact
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lugemine 2
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Leppimine JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Liiga palju veerge. Eksport aruande ja printida tabelarvutuse rakenduse.
 DocType: Purchase Invoice Item,Batch No,Partii ei
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ei leia vahetuskursi {0} kuni {1} võti kuupäeva {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laske mitu müügitellimuste vastu Kliendi ostutellimuse
 DocType: Student Group Instructor,Student Group Instructor,Student Group juhendaja
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
 DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
 DocType: Employee,Leave Encashed?,Jäta realiseeritakse?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity From väli on kohustuslik
 DocType: Email Digest,Annual Expenses,Aastane kulu
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Tee Ostutellimuse
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Tee Ostutellimuse
 DocType: SMS Center,Send To,Saada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Eraldatud summa
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,hindamisest
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serial No sisestatud Punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Tingimuseks laevandus reegel
-DocType: Grading Structure,Grading Intervals,Grading intervallid
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Palun sisesta
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",Ei saa liigtasu eest Oksjoni {0} järjest {1} rohkem kui {2}. Et võimaldada üle-arvete määrake ostmine Seaded
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Palun määra filter põhineb toode või Warehouse
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: lükata Warehouse on kohustuslik vastu rahuldamata Punkt {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Makse
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Manage oma korraldusi
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Manage oma korraldusi
 DocType: Production Order Operation,Actual Time and Cost,Tegelik aeg ja maksumus
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materjal Request maksimaalselt {0} ei tehta Punkt {1} vastu Sales Order {2}
 DocType: Employee,Salutation,Tervitus
 DocType: Course,Course Abbreviation,muidugi lühend
 DocType: Student Leave Application,Student Leave Application,Student Jäta ostusoov
 DocType: Item,Will also apply for variants,Kehtib ka variandid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Töötaja {0} on Half päeval {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Kokku tööaeg ei tohi olla suurem kui max tööaeg {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,edasi
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle esemed müümise ajal.
 DocType: Quotation Item,Actual Qty,Tegelik Kogus
 DocType: Sales Invoice Item,References,Viited
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Te olete sisenenud eksemplaris teemad. Palun paranda ja proovige uuesti.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset liikumine
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,uus ostukorvi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,uus ostukorvi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Punkt {0} ei ole seeriasertide toode
 DocType: SMS Center,Create Receiver List,Loo vastuvõtja loetelu
 DocType: Vehicle,Wheels,rattad
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Keelab loomise aeg palke vastu Tootmistellimused. Operations ei jälgita vastu Production Telli
 DocType: Student,Student Mobile Number,Student Mobile arv
 DocType: Item,Has Variants,Omab variandid
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nimi Kuu Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Partii nr on kohustuslik
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partii nr on kohustuslik
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Korduvad Arve
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektide juhtimisel
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,Eelarveaasta
 DocType: Vehicle Log,Fuel Price,kütuse hind
 DocType: Budget,Budget,Eelarve
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Eelarve ei saa liigitada vastu {0}, sest see ei ole tulu või kuluna konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Saavutatud
 DocType: Student Admission,Application Form Route,Taotlusvormi Route
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Summa {0} {1} maha vastu {2}
 DocType: Employee,Salary Information,Palk Information
 DocType: Sales Person,Name and Employee ID,Nimi ja Töötaja ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
 DocType: Website Item Group,Website Item Group,Koduleht Punkt Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Lõivud ja maksud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Palun sisestage Viitekuupäev
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Korrake Kliendi tulu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) peab olema roll kulul Approver &quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vali Bom ja Kogus Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Vali Bom ja Kogus Production
 DocType: Asset,Depreciation Schedule,amortiseerumise kava
 DocType: Bank Reconciliation Detail,Against Account,Vastu konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pool päeva kuupäev peab olema vahemikus From kuupäev ja To Date
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
 ,Quotation Trends,Tsitaat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Punkt Group mainimata punktis kapteni kirje {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
 DocType: Shipping Rule Condition,Shipping Amount,Kohaletoimetamine summa
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kuni Summa
 DocType: Purchase Invoice Item,Conversion Factor,Tulemus Factor
 DocType: Purchase Order,Delivered,Tarnitakse
 ,Vehicle Expenses,Sõidukite kulud
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
+DocType: Serial No,Invoice Details,arve andmed
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
 DocType: Purchase Receipt,Vehicle Number,Sõidukite arv
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Kuupäev, mil korduv arve lõpetada"
 DocType: Employee Loan,Loan Amount,Laenusumma
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Täiendav Allahindluse summa
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupi Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spordi-
 DocType: Loan Type,Loan Name,laenu Nimi
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,Klientide võitmiseks ja lojaalsus
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Ladu, kus hoiad varu tagasi teemad"
 DocType: Production Order,Skip Material Transfer,Otse Materjal Transfer
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Ei leia Vahetuskurss {0} kuni {1} peamiste kuupäeva {2}. Looge Valuutavahetus rekord käsitsi
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Teie majandusaasta lõpeb
 DocType: POS Profile,Price List,Hinnakiri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} on nüüd vaikimisi eelarveaastal. Palun värskendage brauserit muudatuse jõustumist.
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Punkt {0} on juba tagasi
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** esindab majandusaastal. Kõik raamatupidamiskanded ja teiste suuremate tehingute jälgitakse vastu ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Klienditeenindus / Plii Aadress
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
 DocType: Student Admission,Eligibility,kõlblikkus
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Testrijuhtmed aitavad teil äri, lisada kõik oma kontaktid ja rohkem kui oma viib"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Testrijuhtmed aitavad teil äri, lisada kõik oma kontaktid ja rohkem kui oma viib"
 DocType: Production Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Valige ettevõtte ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Jäta tühjaks, kui arvestada kõik osakonnad"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tüübid tööhõive (püsiv, leping, intern jne)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
 DocType: Process Payroll,Fortnightly,iga kahe nädala tagant
 DocType: Currency Exchange,From Currency,Siit Valuuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Palun valige eraldatud summa, arve liik ja arve number atleast üks rida"
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ei saa valida tasuta tüübiks &quot;On eelmise rea summa&quot; või &quot;On eelmise rea kokku&quot; esimese rea
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Lapse toode ei tohiks olla Toote Bundle. Palun eemalda kirje `{0}` ja säästa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Pangandus
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Lisa Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Lisa Timesheets
 DocType: Vehicle Service,Service Item,Teenuse toode
 DocType: Bank Guarantee,Bank Guarantee,Panga garantii
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Palun kliki &quot;Loo Ajakava&quot; saada ajakava
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnad ei näidata, kui hinnakiri ei ole valitud"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Palun täpsustage riik seda kohaletoimetamine eeskirja või vaadake Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Kokku Saabuva Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Kanne on vajalik
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Kanne on vajalik
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostu hinnakiri
 DocType: Offer Letter Term,Offer Term,Tähtajaline
 DocType: Quality Inspection,Quality Manager,Kvaliteedi juht
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,Kaotatud Reason
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Address
 DocType: Quality Inspection,Sample Size,Valimi suurus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Palun sisesta laekumine Dokumendi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Kõik esemed on juba arve
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Palun sisesta laekumine Dokumendi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Kõik esemed on juba arve
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Palun täpsustage kehtiv &quot;From Juhtum nr&quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Lisaks kuluallikad on võimalik teha rühma all, kuid kanded saab teha peale mitte-Groups"
 DocType: Project,External,Väline
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kasutajad ja reeglid
 DocType: Vehicle Log,VLOG.,Videoblogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Tootmistellimused Loodud: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Tootmistellimused Loodud: {0}
 DocType: Branch,Branch,Oks
 DocType: Guardian,Mobile Number,Mobiili number
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trükkimine ja Branding
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ei leitud
 DocType: Scheduling Tool,Student Batch,Student Partii
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Sinu kliendid
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Tee Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Tee Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sind on kutsutud koostööd projekti: {0}
 DocType: Leave Block List Date,Block Date,Block kuupäev
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Rakendatakse kohe
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,Saadetud
 DocType: Payment Request,Make Sales Invoice,Tee müügiarve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,tarkvara
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Järgmine Kontakt kuupäev ei saa olla minevikus
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Järgmine Kontakt kuupäev ei saa olla minevikus
 DocType: Company,For Reference Only.,Üksnes võrdluseks.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Valige Partii nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Vale {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance summa
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Juhtum nr saa olla 0
 DocType: Item,Show a slideshow at the top of the page,Näita slaidiseansi ülaosas lehele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Kauplused
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Kauplused
 DocType: Serial No,Delivery Time,Tarne aeg
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vananemine Põhineb
 DocType: Item,End of Life,End of Life
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Materjal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Määrake tegevuse töökulud ja annab ainulaadse operatsiooni ei oma tegevuse.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,See dokument on üle piiri {0} {1} artiklijärgse {4}. Kas tegemist teise {3} samade {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Palun määra korduvate pärast salvestamist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vali muutus summa kontole
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Palun määra korduvate pärast salvestamist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vali muutus summa kontole
 DocType: Purchase Invoice,Price List Currency,Hinnakiri Valuuta
 DocType: Naming Series,User must always select,Kasutaja peab alati valida
 DocType: Stock Settings,Allow Negative Stock,Laske Negatiivne Stock
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,Eelarve konto
 DocType: Quality Inspection,Verified By,Kontrollitud
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ei saa muuta ettevõtte default valuutat, sest seal on olemasolevate tehingud. Tehingud tuleb tühistada muuta default valuutat."
-DocType: Grade Interval,Grade Description,Hinne kirjeldus
+DocType: Grading Scale Interval,Grade Description,Hinne kirjeldus
 DocType: Stock Entry,Purchase Receipt No,Ostutšekk pole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Käsiraha
 DocType: Process Payroll,Create Salary Slip,Loo palgatõend
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,Osalemine kuupäev
 DocType: Warranty Claim,Raised By,Tõstatatud
 DocType: Payment Gateway Account,Payment Account,Maksekonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Palun täpsustage Company edasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Palun täpsustage Company edasi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Net muutus Arved
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Tasandusintress Off
 DocType: Offer Letter,Accepted,Lubatud
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Kohaletoimetamine Reegel Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Kasutaja Foorum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
 DocType: Employee,Previous Work Experience,Eelnev töökogemus
@@ -2285,7 +2285,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Tingimused ja tingimuste kohta1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Nimi instituut, mida te Selle süsteemi rajamisel."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Raamatupidamise kirje külmutatud kuni see kuupäev, keegi ei saa / muuda kande arvatud rolli allpool."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Palun dokumendi salvestada enne teeniva hooldusgraafiku
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Palun dokumendi salvestada enne teeniva hooldusgraafiku
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekti staatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Vaata seda keelata fraktsioonid. (NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Järgmised Tootmistellimused loodi:
@@ -2308,6 +2308,7 @@
 DocType: Email Digest,How frequently?,Kui sageli?
 DocType: Purchase Receipt,Get Current Stock,Võta Laoseis
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kood&gt; Punkt Group&gt; Brand
 DocType: Student,Joining Date,Liitumine kuupäev
 ,Employees working on a holiday,Töötajat puhkusele
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark olevik
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Kliirens kuupäev ei ole nimetatud
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Toodang
 DocType: Guardian,Occupation,okupatsioon
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kokku (tk)
 DocType: Sales Invoice,This Document,See dokument
 DocType: Installation Note Item,Installed Qty,Paigaldatud Kogus
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Vaikeväärtuste nagu firma, valuuta, jooksval majandusaastal jms"
 DocType: Payment Entry,Payment Type,Makse tüüp
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Palun valige partii Oksjoni {0}. Ei leia ühe partii, mis vastab sellele nõudele"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Palun valige partii Oksjoni {0}. Ei leia ühe partii, mis vastab sellele nõudele"
 DocType: Process Payroll,Select Employees,Vali Töötajad
 DocType: Opportunity,Potential Sales Deal,Potentsiaalne Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Tšekk / Reference kuupäev
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} on juba loodud ettevõte {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Vahetage toode / Bom kõik BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Laekumine dokument tuleb esitada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Laekumine dokument tuleb esitada
 DocType: Purchase Invoice Item,Received Qty,Vastatud Kogus
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Partii
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Mitte Paide ja ei ole esitanud
@@ -2441,7 +2442,7 @@
 ,To Produce,Toota
 apps/erpnext/erpnext/config/hr.py +93,Payroll,palgafond
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Juba rida {0} on {1}. Lisada {2} Punkti kiirus, rida {3} peab olema ka"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Tee User
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Tee User
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifitseerimine pakett sünnitust (trüki)
 DocType: Bin,Reserved Quantity,Reserveeritud Kogus
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Sisestage kehtiv e-posti aadress
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Puudega template ei tohi olla vaikemalliga
 DocType: Account,Income Account,Tulukonto
 DocType: Payment Request,Amount in customer's currency,Summa kliendi valuuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Tarne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Tarne
 DocType: Stock Reconciliation Item,Current Qty,Praegune Kogus
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vt &quot;määr materjalide põhjal&quot; on kuluarvestus jaos
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Eelmine
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastutus Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Partiidele aitab teil jälgida käimist, hinnanguid ja tasude õpilased"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Partiidele aitab teil jälgida käimist, hinnanguid ja tasude õpilased"
 DocType: Payment Entry,Total Allocated Amount,Eraldati kokku
 DocType: Item Reorder,Material Request Type,Materjal Hankelepingu liik
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural päevikusissekanne palgad alates {0} kuni {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Rada viib Tööstuse tüüp.
 DocType: Item Supplier,Item Supplier,Punkt Tarnija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Kõik aadressid.
 DocType: Company,Stock Settings,Stock Seaded
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Ühendamine on võimalik ainult siis, kui järgmised omadused on samad nii arvestust. Kas nimel, Root tüüp, Firmade"
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Saadab talle umbes sündmuse töötajatele staatuse &quot;avatud&quot;
 DocType: Task,Depends on Tasks,Oleneb Ülesanded
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Hallata klientide Group Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Manused saab näidata eelnevalt lubanud ostukorv
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Cost Center nimi
 DocType: Leave Control Panel,Leave Control Panel,Jäta Control Panel
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,Kanne
 DocType: Delivery Note,Required only for sample item.,Vajalik ainult proovi objekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tegelik Kogus Pärast Tehing
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pakkuja&gt; Pakkuja tüüp
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palgatõend vahel leiti {0} ja {1}
 ,Pending SO Items For Purchase Request,Kuni SO Kirjed osta taotlusel
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Sisseastujale
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} on keelatud
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} on keelatud
 DocType: Supplier,Billing Currency,Arved Valuuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Väga suur
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Kodulehekülg Valitud toode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Kõik hindamine Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uus Warehouse Nimi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Kokku {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Kokku {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territoorium
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Palume mainida ei külastuste vaja
 DocType: Stock Settings,Default Valuation Method,Vaikimisi hindamismeetod
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,Hinnakiri Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Kõik müügitehingud saab kodeeritud vastu mitu ** Sales Isikud ** nii et saate määrata ja jälgida eesmärgid.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
 DocType: Price List,Applicable for Countries,Rakendatav Riigid
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ainult Jäta rakendusi staatuse &quot;Kinnitatud&quot; ja &quot;Tõrjutud&quot; saab esitada
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Group Nimi on kohustuslik järjest {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Vehicle Service,Engine Oil,mootoriõli
 DocType: Sales Invoice,Sales Team1,Müük Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Punkt {0} ei ole olemas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Punkt {0} ei ole olemas
 DocType: Sales Invoice,Customer Address,Kliendi aadress
 DocType: Employee Loan,Loan Details,laenu detailid
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rida {0}: Teostatud Kogus peab olema suurem kui null.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Laod olemasolevate tehing ei ole ümber rühmitada.
 DocType: Assessment Result Tool,Result HTML,tulemus HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Aegub
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Lisa Õpilased
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Lisa Õpilased
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Palun valige {0}
 DocType: C-Form,C-Form No,C-vorm pole
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akadeemilise perspektiivis selle &quot;Academic Year &#39;{0} ja&quot; Term nimi &quot;{1} on juba olemas. Palun muuda neid sissekandeid ja proovi uuesti.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Nagu on olemasolevate tehingute vastu objekti {0}, sa ei saa muuta väärtust {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Nagu on olemasolevate tehingute vastu objekti {0}, sa ei saa muuta väärtust {1}"
 DocType: UOM,Must be Whole Number,Peab olema täisarv
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Uus Lehed Eraldatud (päevades)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} ei ole olemas
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,Viimane päev järgmise kuu
 DocType: Support Settings,Auto close Issue after 7 days,Auto lähedale Issue 7 päeva pärast
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa eraldada enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student esitaja
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumuleeritud kulum konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock kanded
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,Asja kood
 DocType: Production Planning Tool,Create Production Orders,Loo Tootmistellimused
 DocType: Serial No,Warranty / AMC Details,Garantii / AMC Üksikasjad
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
 DocType: Journal Entry,User Remark,Kasutaja Märkus
 DocType: Lead,Market Segment,Turusegment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Paide summa ei saa olla suurem kui kogu negatiivne tasumata summa {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,Loo Material taotlused
 DocType: Employee Education,School/University,Kool / Ülikool
 DocType: Payment Request,Reference Details,Viide Üksikasjad
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Oodatud väärtus pärast Kasulik Elu peab olema väiksem kui Gross ostusumma
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Oodatud väärtus pärast Kasulik Elu peab olema väiksem kui Gross ostusumma
 DocType: Sales Invoice Item,Available Qty at Warehouse,Saadaval Kogus lattu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Arve summa
 DocType: Asset,Double Declining Balance,Double Degressiivne
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erinevus konto peab olema vara / kohustuse tüübist võtta, sest see Stock leppimine on mõra Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Väljastatud summa ei saa olla suurem kui Laenusumma {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ostutellimuse numbri vaja Punkt {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Tootmise et mitte loodud
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Tootmise et mitte loodud
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;From Date&quot; tuleb pärast &quot;To Date&quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Selleks ei saa muuta üliõpilaste {0} on seotud õpilase taotluse {1}
 DocType: Asset,Fully Depreciated,täielikult amortiseerunud
 ,Stock Projected Qty,Stock Kavandatav Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Märkimisväärne osavõtt HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Hinnapakkumised on ettepanekuid, pakkumiste saadetud oma klientidele"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Hinnapakkumised on ettepanekuid, pakkumiste saadetud oma klientidele"
 DocType: Sales Order,Customer's Purchase Order,Kliendi ostutellimuse
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Järjekorra number ja partii
 DocType: Warranty Claim,From Company,Allikas: Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa hulgaliselt Hindamiskriteeriumid peab olema {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Palun määra arv Amortisatsiooniaruanne Broneeritud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Palun määra arv Amortisatsiooniaruanne Broneeritud
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Väärtus või Kogus
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tsitaat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Elementi on olemas sama nimega ({0}), siis muutke kirje grupi nimi või ümbernimetamiseks kirje"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Palun valige kliendile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Palun valige kliendile
 DocType: C-Form,I,mina
 DocType: Company,Asset Depreciation Cost Center,Vara amortisatsioonikulu Center
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,Kindlustus detailid
 DocType: Account,Payable,Maksmisele kuuluv
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Palun sisesta tagasimakseperioodid
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Nõuded ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Nõuded ({0})
 DocType: Pricing Rule,Margin,varu
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uutele klientidele
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Brutokasum%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Kliirens kuupäev
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross ostusumma on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross ostusumma on kohustuslik
 DocType: Lead,Address Desc,Aadress otsimiseks
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partei on kohustuslik
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Teema nimi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast üks müümine või ostmine tuleb valida
-DocType: Grading Structure,Grade Intervals,Hinne intervallid
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vali laadi oma äri.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kus tootmistegevus viiakse.
 DocType: Asset Movement,Source Warehouse,Allikas Warehouse
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Kuu Distribution osakaal
 DocType: Territory,Territory Targets,Territoorium Eesmärgid
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kliendi&gt; Kliendi Group&gt; Territory
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Palun määra vaikimisi {0} Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Lähteasend ülevalt servast
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Sama tarnija on sisestatud mitu korda
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder Kogus
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Praegune noorele
 DocType: Company,Stock Adjustment Account,Stock korrigeerimine konto
-DocType: Journal Entry,Write Off,Maha kirjutama
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Maha kirjutama
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Süsteemi kasutaja (login) ID. Kui määratud, siis saab vaikimisi kõigi HR vormid."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: From {1}
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Tarnija tarnib Tellija
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# vorm / Punkt / {0}) on otsas
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Järgmine kuupäev peab olema suurem kui Postitamise kuupäev
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Näita maksu break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Näita maksu break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Andmete impordi ja ekspordi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock kirjed on ikka vastu Warehouse {0}, seega sa ei saa uuesti määrata või muuta"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No õpilased Leitud
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Palun valige tsitaadid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Tee hooldus Külasta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Palun pöörduge kasutaja, kes on Sales Master Manager {0} rolli"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Palun valige tsitaadid
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Tee hooldus Külasta
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Palun pöörduge kasutaja, kes on Sales Master Manager {0} rolli"
 DocType: Company,Default Cash Account,Vaikimisi arvelduskontole
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (mitte kliendi või hankija) kapten.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,See põhineb käimist Selle Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nr Õpilased
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lisa rohkem punkte või avatud täiskujul
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Palun sisestage &quot;Oodatud Toimetaja Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Saatekirjad {0} tuleb tühistada enne tühistades selle Sales Order
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Enne leppimist
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Maksude ja tasude lisatud (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
 DocType: Sales Order,Partly Billed,Osaliselt Maksustatakse
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Punkt {0} peab olema põhivara objektile
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Punkt {0} peab olema põhivara objektile
 DocType: Item,Default BOM,Vaikimisi Bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Palun ümber kirjutada firma nime kinnitamiseks
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Kokku Tasumata Amt
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Hinnakiri Vahetuskurss
 DocType: Purchase Invoice Item,Rate,Määr
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,aadress Nimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,aadress Nimi
 DocType: Stock Entry,From BOM,Siit Bom
 DocType: Assessment Code,Assessment Code,Hinnang kood
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Põhiline
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,Prindi keel
 DocType: Salary Slip,Total Working Hours,Töötundide
 DocType: Stock Entry,Including items for sub assemblies,Sealhulgas esemed sub komplektid
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Sisesta väärtus peab olema positiivne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Sisesta väärtus peab olema positiivne
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Kõik aladel
 DocType: Purchase Invoice,Items,Esemed
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student juba registreerunud.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ja sealt soovitud vaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Väärtpaberite ja kaubabörsil
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
 DocType: Assessment Plan,Supervisor Name,Juhendaja nimi
 DocType: Program Enrollment Course,Program Enrollment Course,Programm Registreerimine Course
-DocType: Grading Structure,Grading Structure,astmete
 DocType: Purchase Taxes and Charges,Valuation and Total,Hindamine ja kokku
 DocType: Tax Rule,Shipping City,Kohaletoimetamine City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"See toode on variant {0} (Mall). Näitajad kopeeritaksegi malli, kui &quot;No Copy&quot; on seatud"
 DocType: Notification Control,Customize the Notification,Kohanda teatamine
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Rahavoog äritegevusest
 DocType: Sales Invoice,Shipping Rule,Kohaletoimetamine reegel
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Avamise kuupäev peaks olema enne sulgemist kuupäev
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numbrite seeria osavõtt Setup&gt; numbrite seeria
 DocType: Leave Control Panel,Carry Forward,Kanda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Cost Center olemasolevate tehingut ei saa ümber arvestusraamatust
 DocType: Department,Days for which Holidays are blocked for this department.,"Päeva, mis pühadel blokeeritakse selle osakonda."
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kokku (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Meelelahutus ja vaba aeg
 DocType: Quality Inspection,Item Serial No,Punkt Järjekorranumber
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Loo töötaja kirjete
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Loo töötaja kirjete
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Kokku olevik
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,raamatupidamise aastaaruanne
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Tund
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Uus Bom pärast asendamine
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Müügikoht
 DocType: Payment Entry,Received Amount,Saadud summa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun setup Töötaja nimesüsteemile Human Resource&gt; HR Seaded
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Loo täieliku koguse, ignoreerides kogus juba tellitud"
 DocType: Account,Tax,Maks
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ei Märgistatud
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,Arved
 DocType: Batch,Source Document Name,Allikas Dokumendi nimi
 DocType: Job Opening,Job Title,Töö nimetus
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Kasutajate loomine
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Kasutajate loomine
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gramm
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Külasta aruande hooldus kõne.
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
 DocType: BOM,Website Description,Koduleht kirjeldus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net omakapitali
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kviitung
 ,Sales Register,Müügiregister
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei ole midagi muuta.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Kokkuvõte Selle kuu ja kuni tegevusi
 DocType: Customer Group,Customer Group Name,Kliendi Group Nimi
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nr Kliendid veel!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavoogude aruanne
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,litsents
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Palun valige kanda, kui soovite ka lisada eelnenud eelarveaasta saldo jätab see eelarveaastal"
 DocType: GL Entry,Against Voucher Type,Vastu Voucher Type
 DocType: Item,Attributes,Näitajad
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Palun sisestage maha konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Viimati Order Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
 DocType: Student,Guardian Details,Guardian detailid
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark õpib mitu töötajat
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rida {0} # Konto tüüp peab olema &quot;Põhivarade&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kogus
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reeglid arvutada laevandus summa müük
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seeria on kohustuslik
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seeria on kohustuslik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finantsteenused
 DocType: Student Sibling,Student ID,Õpilase ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tüübid tegevused aeg kajakad
 DocType: Tax Rule,Sales,Läbimüük
 DocType: Stock Entry Detail,Basic Amount,Põhisummat
 DocType: Training Event,Exam,eksam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
 DocType: Leave Allocation,Unused leaves,Kasutamata lehed
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Kr
 DocType: Tax Rule,Billing State,Arved riik
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,Konto makstud
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Kood
 DocType: Journal Entry,Write Off Based On,Kirjutage Off põhineb
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Tee Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Tee Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Prindi ja Stationery
 DocType: Stock Settings,Show Barcode Field,Näita vöötkoodi Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Saada Tarnija kirjad
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,Vastuse ootamine
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ülal
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Vale atribuut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Mainida, kui mittestandardsete makstakse konto"
 DocType: Salary Slip,Earning & Deduction,Teenimine ja mahaarvamine
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valikuline. See seadistus filtreerida erinevate tehingute.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,Saada üliõpilast
 DocType: Hub Settings,Seller Country,Müüja Riik
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Avalda Kirjed Koduleht
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Group õpilased partiidena
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Group õpilased partiidena
 DocType: Authorization Rule,Authorization Rule,Luba reegel
 DocType: Sales Invoice,Terms and Conditions Details,Tingimused Detailid
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Tehnilisi
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Karistusest
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,palk komponendid
 DocType: Program Enrollment Tool,New Academic Year,Uus õppeaasta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Tagasi / kreeditarve
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Tagasi / kreeditarve
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto sisestada Hinnakiri määra, kui puuduvad"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Kokku Paide summa
 DocType: Production Order Item,Transferred Qty,Kantud Kogus
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,Müügi lehtri
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Lühend on kohustuslik
 DocType: Project,Task Progress,ülesanne Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Ostukorvi
 ,Qty to Transfer,Kogus Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Hinnapakkumisi Leads või klientidele.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Lubatud muuta külmutatud laos
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kogus ({0}) ei saa olla vaid murdosa reas {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,koguda lõive
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
 DocType: Lead,Add to calendar on this date,Lisa kalendrisse selle kuupäeva
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reeglid lisamiseks postikulud.
 DocType: Item,Opening Stock,algvaru
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,Plii
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Tellimused lastud tootmist.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vali Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 DocType: Program Enrollment Tool,Enroll Students,õppima üliõpilasi
 DocType: Hub Settings,Name Token,Nimi Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3645,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} vastu müügiarve {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projekti nimi
-DocType: Supplier,Mention if non-standard receivable account,Nimetatakse mittestandardsete saadaoleva konto
+DocType: Customer,Mention if non-standard receivable account,Nimetatakse mittestandardsete saadaoleva konto
 DocType: Journal Entry Account,If Income or Expense,Kui tulu või kuluna
 DocType: Production Order,Required Items,VAJAMINEVA
 DocType: Stock Ledger Entry,Stock Value Difference,Stock väärtuse erinevused
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,Maksud
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Paide ja ei ole esitanud
 DocType: Project,Default Cost Center,Vaikimisi Cost Center
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Määrake nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 DocType: Bank Guarantee,End Date,End Date
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock tehingud
 DocType: Budget,Budget Accounts,Eelarve Accounts
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,Müük Partner ja komisjoni
 DocType: Employee Loan,Rate of Interest (%) / Year,Intressimäär (%) / Aasta
 ,Project Quantity,projekti Kogus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kokku {0} kõik elemendid on null, võib olla sa peaksid muutma &quot;Hajuta põhinevad maksud&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kokku {0} kõik elemendid on null, võib olla sa peaksid muutma &quot;Hajuta põhinevad maksud&quot;"
 DocType: Opportunity,To Discuss,Arutama
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ühikut {1} vaja {2} tehingu lõpuleviimiseks.
 DocType: Loan Type,Rate of Interest (%) Yearly,Intressimäär (%) Aastane
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark leidu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rida {0}: valuuta Bom # {1} peaks olema võrdne valitud valuuta {2}
 DocType: Journal Entry Account,Exchange Rate,Vahetuskurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Ladu {0} ei ole olemas
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registreeru For ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Kuu jaotusprotsentide
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Valitud parameetrit ei ole partii
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valitud parameetrit ei ole partii
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Hindamine määr ei leitud Punkt {0}, mis on vaja teha, raamatupidamise kandeid {1} {2}. Kui objekt on tehinguid prooviks elemendi {1}, palume mainida, et {1} Punkt tabelis. Vastasel juhul palun luua sissetuleva börsitehingu objekt või mainimist hindamise määr Punkt rekord, ja proovige seejärel saata ühe / tühistades sõnadest"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materjalidest tarnitud vastu Saateleht
 DocType: Project,Customer Details,Kliendi andmed
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Esitatud tellimusi ei saa kustutada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kvaliteedijuhtimine
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} on keelatud
 DocType: Employee Loan,Repay Fixed Amount per Period,Maksta kindlaksmääratud summa Periood
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Palun sisestage koguse Punkt {0}
 DocType: Employee External Work History,Employee External Work History,Töötaja Väline tööandjad
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student E-ID
 DocType: Employee,Notice (days),Teade (päeva)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Valige objekt, et salvestada arve"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Valige objekt, et salvestada arve"
 DocType: Employee,Encashment Date,Inkassatsioon kuupäev
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock reguleerimine
@@ -3855,6 +3861,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Deebetarvega
 DocType: Production Order,Warehouses,Laod
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} vara ei saa üle
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,See toode on variant {0} (Template).
 DocType: Workstation,per hour,tunnis
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ostmine
 DocType: Announcement,Announcement,teade
@@ -3870,7 +3877,7 @@
 DocType: Account,Receivable,Nõuete
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ei ole lubatud muuta tarnija Ostutellimuse juba olemas
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Roll, mis on lubatud esitada tehinguid, mis ületavad laenu piirmäärade."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vali Pane Tootmine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Vali Pane Tootmine
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
 DocType: Item,Material Issue,Materjal Issue
 DocType: Hub Settings,Seller Description,Müüja kirjeldus
@@ -3883,7 +3890,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Tellitud
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hindamiskriteeriumid Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Avamine akumuleeritud kulum peab olema väiksem kui võrdne {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Avamine akumuleeritud kulum peab olema väiksem kui võrdne {0}
 DocType: Warehouse,Warehouse Name,Ladu nimi
 DocType: Naming Series,Select Transaction,Vali Tehing
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Palun sisestage kinnitamine Role või heaks Kasutaja
@@ -3917,7 +3924,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Et määrata selle Fiscal Year as Default, kliki &quot;Set as Default&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,liituma
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Puuduse Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
 DocType: Employee Loan,Repay from Salary,Tagastama alates Palk
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},TELLIN tasumises {0} {1} jaoks kogus {2}
@@ -3935,7 +3942,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Hindamise tulemused teave
 DocType: Employee Education,Employee Education,Töötajate haridus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate kirje rühm leidis elemendi rühma tabelis
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
 DocType: Salary Slip,Net Pay,Netopalk
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} on juba saanud
@@ -3944,7 +3951,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Ladu {0} ei ole seotud ühegi kontot, siis loo / link vastava (Asset) konto lattu."
 DocType: Purchase Invoice,Recurring Id,Korduvad Id
 DocType: Customer,Sales Team Details,Sales Team Üksikasjad
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Kustuta jäädavalt?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Kustuta jäädavalt?
 DocType: Expense Claim,Total Claimed Amount,Kokku nõutav summa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentsiaalne võimalusi müüa.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Vale {0}
@@ -3955,13 +3962,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup oma kooli ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Põhimuutus summa (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Säästa dokumendi esimene.
 DocType: Account,Chargeable,Maksustatav
 DocType: Company,Change Abbreviation,Muuda lühend
 DocType: Expense Claim Detail,Expense Date,Kulu kuupäev
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Viimati tellimuse summa
+DocType: Task,Is Milestone,Kas Milestone
 DocType: Daily Work Summary,Email Sent To,Saadetud e-
 DocType: Budget,Warn,Hoiatama
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Muid märkusi, tähelepanuväärne jõupingutusi, et peaks minema arvestust."
@@ -3994,11 +4002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Varud Vanemad Than` peab olema väiksem kui% d päeva.
 DocType: Tax Rule,Purchase Tax Template,Ostumaks Mall
 ,Project wise Stock Tracking,Projekti tark Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Hoolduskava {0} on olemas vastu {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tegelik Kogus (tekkekohas / target)
 DocType: Item Customer Detail,Ref Code,Ref kood
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Töötaja arvestust.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
 DocType: HR Settings,Payroll Settings,Palga Seaded
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match mitte seotud arved ja maksed.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Esita tellimus
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Tšekid ja hoiused valesti puhastatud
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0} Te ei saa määrata ise vanemakonto
 DocType: Purchase Invoice Item,Price List Rate,Hinnakiri Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Loo klientide hinnapakkumisi
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Loo klientide hinnapakkumisi
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Show &quot;In Stock&quot; või &quot;Ei ole laos&quot; põhineb laos olemas see lattu.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Materjaliandmik (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Keskmine aeg, mis kulub tarnija andma"
@@ -4043,7 +4050,7 @@
 DocType: Asset,Disposal Date,müügikuupäevaga
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Kirjad saadetakse kõigile aktiivsetele Ettevõtte töötajad on teatud tunnil, kui neil ei ole puhkus. Vastuste kokkuvõte saadetakse keskööl."
 DocType: Employee Leave Approver,Employee Leave Approver,Töötaja Jäta Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,koolitus tagasiside
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Tootmine Tellimus {0} tuleb esitada
@@ -4051,7 +4058,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Muidugi on kohustuslik järjest {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Praeguseks ei saa enne kuupäevast alates
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
 DocType: Batch,Parent Batch,Vanem Partii
 DocType: Cheque Print Template,Cheque Print Template,Tšekk Prindi Mall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Graafik kulukeskuste
@@ -4095,7 +4102,7 @@
 DocType: Item,Variant Based On,Põhinev variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kokku weightage määratud peaks olema 100%. On {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Sinu Tarnijad
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
 DocType: Request for Quotation Item,Supplier Part No,Tarnija osa pole
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Vaulation ja kokku&quot;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Saadud
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: From {0} ja {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rida {0}: Tundi väärtus peab olema suurem kui null.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
 DocType: Issue,Content Type,Sisu tüüp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Arvuti
 DocType: Item,List this Item in multiple groups on the website.,Nimekiri see toode mitmes rühmade kodulehel.
@@ -4114,20 +4121,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Teil ei ole seada Külmutatud väärtus
 DocType: Payment Reconciliation,Get Unreconciled Entries,Võta unreconciled kanded
 DocType: Payment Reconciliation,From Invoice Date,Siit Arve kuupäev
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Arveldusvaluuta peab olema võrdne kas vaikimisi comapany valuuta või partei konto valuuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Arveldusvaluuta peab olema võrdne kas vaikimisi comapany valuuta või partei konto valuuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Jäta Inkassatsioon
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Mida ta teeb?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Et Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Kõik Student Sisseastujale
 ,Average Commission Rate,Keskmine Komisjoni Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
 DocType: Pricing Rule,Pricing Rule Help,Hinnakujundus Reegel Abi
 DocType: School House,House Name,House Nimi
 DocType: Purchase Taxes and Charges,Account Head,Konto Head
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Uuenda lisakulude arvutamise maandus objektide soetusmaksumus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektriline
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisa oma ülejäänud organisatsiooni kasutajatele. Võite lisada ka kutsuda kliente oma portaalis lisades neid Kontaktid
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisa oma ülejäänud organisatsiooni kasutajatele. Võite lisada ka kutsuda kliente oma portaalis lisades neid Kontaktid
 DocType: Stock Entry,Total Value Difference (Out - In),Kokku Väärtus Difference (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Vahetuskurss on kohustuslik
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Kasutaja ID ei seatud Töötaja {0}
@@ -4136,7 +4143,7 @@
 DocType: Item,Customer Code,Kliendi kood
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Päeva eelmisest Telli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
 DocType: Buying Settings,Naming Series,Nimetades Series
 DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Kindlustus Alguse kuupäev peaks olema väiksem kui Kindlustus Lõppkuupäev
@@ -4151,7 +4158,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Palgatõend töötaja {0} on juba loodud ajaandmik {1}
 DocType: Vehicle Log,Odometer,odomeetri
 DocType: Sales Order Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Punkt {0} on keelatud
 DocType: Stock Settings,Stock Frozen Upto,Stock Külmutatud Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Bom ei sisalda laoartikkel
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Ajavahemikul ja periood soovitud kohustuslik korduvad {0}
@@ -4164,7 +4171,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjutage Off summa (firma Valuuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Arved Tundi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Vaikimisi Bom {0} ei leitud
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Puuduta Toodete lisamiseks neid siin
 DocType: Fees,Program Enrollment,programm Registreerimine
 DocType: Landed Cost Voucher,Landed Cost Voucher,Maandus Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Palun määra {0}
@@ -4261,7 +4269,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Jae- ja hulgimüük
 DocType: Issue,First Responded On,Esiteks vastas
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Risti noteerimine Punkt mitu rühmad
-DocType: Grade Interval,Grade Interval,Hinne intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiscal Year Alguse kuupäev ja Fiscal Year End Date on juba eelarveaastal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Kliirens Date updated
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Partii
@@ -4269,6 +4276,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Lae pDF
 DocType: Production Order,Planned End Date,Planeeritud End Date
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Kus esemed hoitakse.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pakkuja&gt; Pakkuja tüüp
 DocType: Request for Quotation,Supplier Detail,tarnija Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Viga valemis või seisund: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Arve kogusumma
@@ -4313,7 +4321,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup lihtne veebilehel oma organisatsiooni
 DocType: Payment Reconciliation,Receivable / Payable Account,Laekumata / maksmata konto
 DocType: Delivery Note Item,Against Sales Order Item,Vastu Sales Order toode
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Palun sisestage vanem kulukeskus
@@ -4370,7 +4378,7 @@
 ,Items To Be Requested,"Esemed, mida tuleb taotleda"
 DocType: Purchase Order,Get Last Purchase Rate,Võta Viimati ostmise korral
 DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Valige või lisage uus klient
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Valige või lisage uus klient
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kuluüksus on vaja broneerida kulu nõude
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Application of Funds (vara)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,See põhineb käimist selle töötaja
@@ -4383,13 +4391,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Peatus kasutajad tegemast Jäta Rakendused järgmistel päevadel.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ostusummast
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Töövõtjate hüvitised
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakitud kogus peab olema võrdne koguse Punkt {0} järjest {1}
 DocType: Production Order,Manufactured Qty,Toodetud Kogus
 DocType: Purchase Receipt Item,Accepted Quantity,Aktsepteeritud Kogus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Palun Algsete Holiday nimekiri Töötajaportaali {0} või ettevõtte {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} pole olemas
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} pole olemas
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Arveid tõstetakse klientidele.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rea nr {0}: summa ei saa olla suurem kui Kuni summa eest kuluhüvitussüsteeme {1}. Kuni Summa on {2}
@@ -4398,15 +4406,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lugemine 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Hinnakiri ei leitud või puudega
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Hinnakiri ei leitud või puudega
 DocType: Employee Loan Application,Approved,Kinnitatud
 DocType: Pricing Rule,Price,Hind
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Töötaja vabastati kohta {0} tuleb valida &#39;Vasak&#39;
 DocType: Guardian,Guardian,hooldaja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Hinnang {0} loodud Töötaja {1} antud ajavahemikus
 DocType: Employee,Education,Haridus
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampaania nimetamine By
 DocType: Employee,Current Address Is,Praegune aadress
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifitseeritud
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valikuline. Lavakujundus ettevõtte default valuutat, kui ei ole täpsustatud."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Raamatupidamine päevikukirjete.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Saadaval Kogus kell laost
@@ -4443,7 +4453,7 @@
 DocType: Hub Settings,Hub Settings,Hub Seaded
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Mis Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
 DocType: Asset,Is Existing Asset,Kas Olemasolevad Asset
 DocType: Salary Detail,Statistical Component,Statistilised Component
 ,Monthly Salary Register,Kuupalga Registreeri
@@ -4497,7 +4507,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Kinnita Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,varude
 DocType: Customer,Commission Rate,Komisjonitasu määr
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block puhkuse taotluste osakonda.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Makse tüüp peab olema üks vastuvõtmine, palk ja Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4510,6 +4520,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Laske Production Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Kliendi ostutellimuse kuupäev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Aktsiakapitali
+DocType: Shopping Cart Settings,Show Public Attachments,Näita avalikud failid
 DocType: Packing Slip,Package Weight Details,Pakendi kaal Üksikasjad
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pärast makse lõpetamist suunata kasutaja valitud leheküljele.
@@ -4534,7 +4545,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ära näita tahes sümbol nagu $ jne kõrval valuutades.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pool päeva)
 DocType: Supplier,Credit Days,Krediidi päeva
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Tee Student Partii
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Tee Student Partii
 DocType: Leave Type,Is Carry Forward,Kas kanda
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Võta Kirjed Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ooteaeg päeva
@@ -4553,7 +4564,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktsioneeritud summa
 DocType: GL Entry,Is Opening,Kas avamine
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: deebetkanne ei saa siduda koos {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numbrite seeria osavõtt Setup&gt; numbrite seeria
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} ei ole olemas
 DocType: Account,Cash,Raha
 DocType: Employee,Short biography for website and other publications.,Lühike elulugu kodulehel ja teistes väljaannetes.
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 429c21a..2896844 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,دسته ای مورد وضعیت انقضاء
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,حواله بانکی
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,نمایش انواع
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,نمایش انواع
 DocType: Academic Term,Academic Term,ترم تحصیلی
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ماده
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,مقدار
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,بهداشت و درمان
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),تاخیر در پرداخت (روز)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,هزینه خدمات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,سال مالی {0} مورد نیاز است
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,تبلیغات
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همان شرکت است وارد بیش از یک بار
 DocType: Employee,Married,متاهل
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},برای مجاز نیست {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},برای مجاز نیست {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,گرفتن اقلام از
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},محصولات {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,بدون موارد ذکر شده
 DocType: Payment Reconciliation,Reconcile,وفق دادن
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,خواربار
 DocType: Quality Inspection Reading,Reading 1,خواندن 1
 DocType: Process Payroll,Make Bank Entry,را بانک ورودی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
 DocType: SMS Center,All Sales Person,تمام ماموران فروش
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماهانه ** شما کمک می کند توزیع بودجه / هدف در سراسر ماه اگر شما فصلی در کسب و کار خود را.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,نمی وسایل یافت شده
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,نمی وسایل یافت شده
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Invoice Item,Sales Invoice Item,مورد فاکتور فروش
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",به عنوان مثال &quot;مدرسه ابتدایی&quot; یا &quot;دانشگاه&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,گزارش سهام
 DocType: Warehouse,Warehouse Detail,جزئیات انبار
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاریخ پایان ترم نمی تواند بعد از تاریخ سال پایان سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا دارایی ثابت&quot; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا دارایی ثابت&quot; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
 DocType: Vehicle Service,Brake Oil,روغن ترمز
 DocType: Tax Rule,Tax Type,نوع مالیات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 DocType: BOM,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,مشتری با همین نام وجود دارد
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,انتخاب BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,انتخاب BOM
 DocType: SMS Log,SMS Log,SMS ورود
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل شده
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,تعطیلات در {0} است بین از تاریخ و تا به امروز نیست
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,مقطع تحصیلی
 DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: SMS Center,All Contact,همه تماس
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,تولید سفارش در حال حاضر برای همه موارد با BOM ایجاد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,تولید سفارش در حال حاضر برای همه موارد با BOM ایجاد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,حقوق سالانه
 DocType: Daily Work Summary,Daily Work Summary,خلاصه کار روزانه
 DocType: Period Closing Voucher,Closing Fiscal Year,بستن سال مالی
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} فریز شده است
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} فریز شده است
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,لطفا موجود شرکت برای ایجاد نمودار از حساب را انتخاب کنید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,هزینه سهام
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,انتخاب هدف انبار
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,کنترا ورود
 DocType: Journal Entry Account,Credit in Company Currency,اعتبار در شرکت ارز
 DocType: Delivery Note,Installation Status,وضعیت نصب و راه اندازی
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",آیا شما می خواهید برای به روز رسانی حضور؟ <br> در حال حاضر: {0} \ <br> وجود ندارد: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,عرضه مواد اولیه برای خرید
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,باید حداقل یک حالت پرداخت برای فاکتور POS مورد نیاز است.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,باید حداقل یک حالت پرداخت برای فاکتور POS مورد نیاز است.
 DocType: Products Settings,Show Products as a List,نمایش محصولات به عنوان یک فهرست
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود الگو، داده مناسب پر کنید و ضمیمه فایل تغییر یافتهاست. همه تاریخ و کارمند ترکیبی در دوره زمانی انتخاب شده در قالب آمده، با سوابق حضور و غیاب موجود
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ورود استهلاک
 DocType: Appraisal Template Goal,KRA,ناحیه جنوبی
 DocType: Lead,Request Type,درخواست نوع
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,کارمند
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,کارمند
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,رادیو و تلویزیون
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,اعدام
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,جزئیات عملیات انجام شده است.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,برنامه ریزی برای بازدیدکننده داشته است نگهداری.
 DocType: SMS Settings,Enter url parameter for message,پارامتر URL برای پیام را وارد کنید
 DocType: POS Profile,Customer Groups,گروه های مشتری
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,صورت های مالی
 DocType: Guardian,Students,دانش آموزان
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,مشاهده قوانین برای استفاده از قیمت گذاری و تخفیف.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,لیست قیمت ها باید قابل استفاده برای خرید و یا فروش است
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
 DocType: Naming Series,Series List for this Transaction,فهرست سری ها برای این تراکنش
 DocType: Company,Default Payroll Payable Account,به طور پیش فرض حقوق و دستمزد پرداختنی حساب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,به روز رسانی ایمیل گروه
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,به روز رسانی ایمیل گروه
 DocType: Sales Invoice,Is Opening Entry,باز ورودی
 DocType: Customer Group,Mention if non-standard receivable account applicable,اگر حساب دریافتنی ذکر غیر استاندارد قابل اجرا
 DocType: Course Schedule,Instructor Name,نام مربی
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,در برابر آیتم فاکتور فروش
 ,Production Orders in Progress,سفارشات تولید در پیشرفت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,نقدی خالص از تامین مالی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
 DocType: Lead,Address & Contact,آدرس و تلفن تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),مجموع هزینه یابی مقدار (از طریق زمان ورق)
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,مطالب بانک
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,انتشار در توپی
 DocType: Student Admission,Student Admission,پذیرش دانشجو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,مورد {0} لغو شود
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 DocType: Item,Purchase Details,جزئیات خرید
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,با رایانامه آگاه کن در ایجاد درخواست مواد اتوماتیک
 DocType: Journal Entry,Multi Currency,چند ارز
 DocType: Payment Reconciliation Invoice,Invoice Type,فاکتور نوع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,رسید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,رسید
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,هزینه دارایی فروخته شده
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
-DocType: Grade Interval,Min Score,حداقل امتیاز
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
 DocType: Student Applicant,Admitted,پذیرفته
 DocType: Workstation,Rent Cost,اجاره هزینه
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,سفارش ارزش
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,معاملات بانک / پول نقد در برابر حزب و یا برای انتقال داخلی
 DocType: Shipping Rule,Valid for Countries,معتبر برای کشورهای
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,این مورد از یک الگو است و می تواند در معاملات مورد استفاده قرار گیرد. ویژگی های مورد خواهد بود بیش از به انواع کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,این مورد از یک الگو است و می تواند در معاملات مورد استفاده قرار گیرد. ویژگی های مورد خواهد بود بیش از به انواع کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ترتیب مجموع در نظر گرفته شده
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,لطفا وارد کنید &#39;تکرار در روز از ماه مقدار فیلد
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,نرخ مالیات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} در حال حاضر برای کارکنان اختصاص داده {1} برای مدت {2} به {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,انتخاب مورد
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,تبدیل به غیر گروه
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,دسته ای (زیادی) از آیتم استفاده کنید.
 DocType: C-Form Invoice Detail,Invoice Date,تاریخ فاکتور
 DocType: GL Entry,Debit Amount,مقدار بدهی
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ایجاد گروه دانشجویی
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,درخواست برای نقل قول
 DocType: Salary Slip Timesheet,Working Hours,ساعات کاری
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغییر شروع / شماره توالی فعلی از یک سری موجود است.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ایجاد یک مشتری جدید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,ایجاد یک مشتری جدید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",اگر چند در قوانین قیمت گذاری ادامه غالب است، از کاربران خواسته به تنظیم اولویت دستی برای حل و فصل درگیری.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ایجاد سفارشات خرید
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ایجاد سفارشات خرید
 ,Purchase Register,خرید ثبت نام
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تنظیمات جهانی برای تمام فرآیندهای تولید.
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا حد
 DocType: SMS Log,Sent On,فرستاده شده در
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,کارشناسی ارشد تعطیلات.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,از شماره بسته بندی
 DocType: Item Attribute,To Range,به محدوده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,اوراق بهادار و سپرده ها
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",می توانید از روش ارزشگذاری را تغییر دهید، به عنوان معاملات در برابر برخی از موارد که آن را ندارد وجود دارد روش ارزشگذاری خود است
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع برگ اختصاص داده الزامی است
 DocType: Job Opening,Description of a Job Opening,شرح یک شغل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,فعالیت های در انتظار برای امروز
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
 DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,خرید
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا درجه برای آستانه 0٪ تعریف
 DocType: Sales Order,To Deliver,رساندن
 DocType: Purchase Invoice Item,Item,بخش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
 DocType: Account,Profit and Loss,حساب سود و زیان
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 DocType: Production Plan Item,Pending Qty,انتظار تعداد
 DocType: Budget,Ignore,نادیده گرفتن
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} غیر فعال است
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} غیر فعال است
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS با شماره های زیر ارسال گردید: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ابعاد چک راه اندازی برای چاپ
 DocType: Salary Slip,Salary Slip Timesheet,برنامه زمانی حقوق و دستمزد لغزش
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,کمیسیون ها
 DocType: Pricing Rule,Sales Partner,شریک فروش
 DocType: Buying Settings,Purchase Receipt Required,رسید خرید مورد نیاز
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,نرخ ارزش گذاری الزامی است باز کردن سهام وارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,نرخ ارزش گذاری الزامی است باز کردن سهام وارد
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ارزش انباشته
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,را سفارش فروش
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,را سفارش فروش
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,پیوست رزومه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,مشتریان تکرار
 DocType: Leave Control Panel,Allocate,اختصاص دادن
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,برگشت فروش
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,برگشت فروش
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,توجه: مجموع برگ اختصاص داده {0} نباید کمتر از برگ حال حاضر مورد تایید {1} برای دوره
 DocType: Announcement,Posted By,ارسال شده توسط
 DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,لطفا مجموعه ای از شرکت
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاکتور فروش برنامه زمانی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب حساب پرداخت به ورود بانک
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",درست سوابق کارمند به مدیریت برگ، ادعاهای هزینه و حقوق و دستمزد
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",درست سوابق کارمند به مدیریت برگ، ادعاهای هزینه و حقوق و دستمزد
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,اضافه کردن به پایگاه دانش
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,نوشتن طرح های پیشنهادی
 DocType: Payment Entry Deduction,Payment Entry Deduction,پرداخت کسر ورود
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ارتباط با Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدیر
 DocType: Payment Entry,Payment From / To,پرداخت از / به
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,محدوده زمانی
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},حد اعتبار جدید کمتر از مقدار برجسته فعلی برای مشتری است. حد اعتبار به حداقل می شود {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},حد اعتبار جدید کمتر از مقدار برجسته فعلی برای مشتری است. حد اعتبار به حداقل می شود {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
 DocType: SMS Settings,Receiver Parameter,گیرنده پارامتر
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,قطعنامه عضویت
 DocType: Student Batch Name,Batch Name,نام دسته ای
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,برنامه زمانی ایجاد شده:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ثبت نام کردن
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,آیا دانش آموز به عنوان دانش آموزان حضور و غیاب گزارش ماهانه در حال حاضر را نشان می دهد
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,حضور دانش آموز
 DocType: Sales Invoice Timesheet,Time Sheet,ورقه ثبت ساعات کار
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush مواد اولیه بر اساس
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,لطفا جزئیات آیتم را وارد کنید
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,لطفا جزئیات آیتم را وارد کنید
 DocType: Interest,Interest,علاقه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پیش فروش
 DocType: Purchase Receipt,Other Details,سایر مشخصات
@@ -726,7 +729,7 @@
 ,Absent Student Report,وجود ندارد گزارش دانشجو
 DocType: Email Digest,Next email will be sent on:,ایمیل بعدی خواهد شد در ارسال:
 DocType: Offer Letter Term,Offer Letter Term,ارائه نامه مدت
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,شرکت {0} وجود ندارد
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,گارانتی تاریخ انقضاء
 DocType: Material Request Item,Quantity and Warehouse,مقدار و انبار
 DocType: Sales Invoice,Commission Rate (%),نرخ کمیسیون (٪)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,لطفا انتخاب برنامه
 DocType: Project,Estimated Cost,هزینه تخمین زده شده
 DocType: Purchase Order,Link to material requests,لینک به درخواست مواد
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}  یک آیتم انباری نیست
 DocType: Mode of Payment Account,Default Account,به طور پیش فرض حساب
 DocType: Payment Entry,Received Amount (Company Currency),دریافت مبلغ (شرکت ارز)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
 DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
 ,Sales Person Target Variance Item Group-Wise,فرد از فروش مورد هدف واریانس گروه حکیم
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Request for Quotation Supplier,Send Email,ارسال ایمیل
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,بدون اجازه
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,بدون کارمند یافت
 DocType: Supplier Quotation,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,دانشجویی گروه در حال حاضر به روز شده است.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,دانشجویی گروه در حال حاضر به روز شده است.
 DocType: SMS Center,All Customer Contact,همه مشتری تماس
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,تعادل سهام از طریق CSV را بارگذاری کنید.
 DocType: Warehouse,Tree Details,جزییات درخت
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,حداقل مبلغ فاکتور
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: مرکز هزینه {2} به شرکت تعلق ندارد {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: حساب {2} نمی تواند یک گروه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,مورد ردیف {IDX}: {} {DOCTYPE DOCNAME} در بالا وجود ندارد &#39;{} DOCTYPE جدول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,مورد ردیف {IDX}: {} {DOCTYPE DOCNAME} در بالا وجود ندارد &#39;{} DOCTYPE جدول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,وظایف
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",روز از ماه که در آن خودکار صورتحساب خواهد شد به عنوان مثال 05، 28 و غیره تولید
 DocType: Asset,Opening Accumulated Depreciation,باز کردن استهلاک انباشته
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,میانگین متحرک نرخ
 DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,برنامه های آموزشی
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,برنامه های آموزشی
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
 DocType: HR Settings,Enter retirement age in years,سن بازنشستگی را وارد کنید در سال های
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,هدف انبار
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,همه گروه مورد
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,همه گروه مورد
 DocType: Process Payroll,Activity Log,گزارش فعالیت
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,سود خالص / از دست دادن
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,سفارش خرید به پرداخت
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;افتتاح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,گسترش برای این کار
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,تعداد نقطه سفارش
 DocType: Leave Block List Date,Leave Block List Date,ترک فهرست بلوک عضویت
 DocType: Pricing Rule,Price or Discount,قیمت و یا تخفیف
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع اتهامات قابل اجرا در خرید اقلام دریافت جدول باید همان مجموع مالیات و هزینه شود
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع اتهامات قابل اجرا در خرید اقلام دریافت جدول باید همان مجموع مالیات و هزینه شود
 DocType: Sales Team,Incentives,انگیزه
 DocType: SMS Log,Requested Numbers,شماره درخواست شده
 DocType: Production Planning Tool,Only Obtain Raw Materials,فقط دست آوردن مواد خام
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,فاکتور خرید پیشرفته
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,شیمیایی
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,به طور پیش فرض حساب بانک / نقدی به طور خودکار در حقوق ورودی مجله به روز هنگامی که این حالت انتخاب شده است.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",فواصل کد کلاس {0} همپوشانی با فواصل درجه برای دیگر نمرات. لطفا بررسی کنید فواصل {0} و {1} و دوباره سعی کنید
 DocType: BOM,Raw Material Cost(Company Currency),خام هزینه مواد (شرکت ارز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ردیف # {0}: نرخ نمی تواند بیشتر از نرخ مورد استفاده در {1} {2}
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM مورد وب سایت
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
 DocType: Timesheet Detail,Bill,لایحه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,سفید
 DocType: SMS Center,All Lead (Open),همه سرب (باز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ردیف {0}: تعداد برای در دسترس نیست {4} در انبار {1} در زمان ارسال از ورود ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},نوع سفارش باید یکی از است {0}
 DocType: Lead,Next Contact Date,تماس با آمار بعدی
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,باز کردن تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
 DocType: Student Batch Name,Student Batch Name,دانشجو نام دسته ای
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
 DocType: Repayment Schedule,Balance Loan Amount,تعادل وام مبلغ
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},لطفا مشخص {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} نمی تواند منفی باشد
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,تخفیف
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,تعداد کل Depreciations
 DocType: Sales Invoice Item,Rate With Margin,نرخ با حاشیه
 DocType: Workstation,Wages,مزد
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,نام سازمان
 DocType: Tax Rule,Shipping State,حمل و نقل دولت
 ,Projected Quantity as Source,تعداد بینی به عنوان منبع
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,شامل اقلام غیر سهام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,هزینه فروش
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,مرکز هزینه پیش فرض فروش
 DocType: Sales Partner,Implementation Partner,شریک اجرای
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,کد پستی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,کد پستی
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},سفارش فروش {0} است {1}
 DocType: Opportunity,Contact Info,اطلاعات تماس
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ساخت نوشته های سهام
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
 ,Ordered Items To Be Billed,آیتم ها دستور داد تا صورتحساب
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,از محدوده است که به کمتر از به محدوده
 DocType: Global Defaults,Global Defaults,به طور پیش فرض جهانی
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,لطفا کد کالا وارد کنید برای دریافت شماره بچ
 DocType: Stock Settings,Default Item Group,به طور پیش فرض مورد گروه
 DocType: Employee Loan,Partially Disbursed,نیمه پرداخت شده
-DocType: Grading Structure,Grading System Name,نام سیستم درجه بندی
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پایگاه داده تامین کننده.
 DocType: Account,Balance Sheet,ترازنامه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,فروشنده شما در این تاریخ برای تماس با مشتری یاداوری خواهد داشت
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,آیتم همان نمی تواند وارد شود چند بار.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,لطفا حداقل یک ویژگی در جدول صفات مشخص
 DocType: Announcement,All Students,همه ی دانش آموزان
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,مشخصات لجر
 DocType: Grading Scale,Intervals,فواصل
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,شماره دانشجویی موبایل
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,سفارشات خرید به شما کمک کند برنامه ریزی و پیگیری خرید خود را
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,سفارشات خرید به شما کمک کند برنامه ریزی و پیگیری خرید خود را
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,کوچک
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,همگام سازی داده های کارشناسی ارشد
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,محصولات  یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,گروه شماره رول
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,در کل از همه وزن وظیفه باید باشد 1. لطفا وزن همه وظایف پروژه تنظیم بر این اساس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,تجهیزات سرمایه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,ورودی دفتر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} اقلام در پیشرفت
 DocType: Workstation,Workstation Name,نام ایستگاه های کاری
-DocType: Grade Interval,Grade Code,کد کلاس
+DocType: Grading Scale Interval,Grade Code,کد کلاس
 DocType: POS Item Group,POS Item Group,POS مورد گروه
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ایمیل خلاصه:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,سخت افزار
 DocType: Sales Order,Recurring Upto,در محدوده زمانی معین تا حد
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,لطفا یک شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,لطفا یک شرکت را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید هستید
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,غذا
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,محدوده سالمندی 3
 DocType: Maintenance Schedule Item,No of Visits,تعداد بازدید ها
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,علامت گذاری به عنوان حضور و غیاب
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,علامت گذاری به عنوان حضور و غیاب
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},برنامه تعمیر و نگهداری {0} در برابر وجود دارد {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,دانش آموز ثبت نام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},نرخ ارز از بستن حساب باید {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع امتیاز ها برای تمام اهداف باید 100. شود این است که {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Detail,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
 DocType: Pricing Rule,"Higher the number, higher the priority",شماره بالاتر، بالاتر اولویت
 ,Purchase Invoice Trends,خرید روند فاکتور
 DocType: Employee,Better Prospects,چشم انداز بهتر
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",ردیف # {0}: دسته {1} تنها {2} تعداد. لطفا دسته ای دیگر است که {3} تعداد موجود را انتخاب کنید و یا تقسیم ردیف به ردیف های متعدد، برای ارائه / موضوع از دسته های متعدد
 DocType: Vehicle,License Plate,پلاک وسیله نقلیه
 DocType: Appraisal,Goals,اهداف
 DocType: Warranty Claim,Warranty / AMC Status,گارانتی / AMC وضعیت
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارمند نمی تواند به خود گزارش دهید.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اگر حساب منجمد است، ورودی ها را به کاربران محدود شده مجاز می باشد.
 DocType: Email Digest,Bank Balance,بانک تعادل
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",مشخصات شغلی، شرایط مورد نیاز و غیره
 DocType: Journal Entry Account,Account Balance,موجودی حساب
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,نمایش P &amp; L مانده سال مالی بستهنشده است
 DocType: Shipping Rule,Shipping Account,حساب های حمل و نقل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: حساب {2} غیر فعال است
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,سفارشات فروش به شما کمک کند برنامه کار خود را و تحویل در زمان
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,سفارشات فروش به شما کمک کند برنامه کار خود را و تحویل در زمان
 DocType: Quality Inspection,Readings,خوانش
 DocType: Stock Entry,Total Additional Costs,مجموع هزینه های اضافی
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,به ارزش
 DocType: Asset Movement,Stock Manager,سهام مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,بسته بندی لغزش
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,بسته بندی لغزش
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,دفتر اجاره
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,منبع
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,نمایش بسته
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,دارایی رده برای آیتم دارائی های ثابت الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,دارایی رده برای آیتم دارائی های ثابت الزامی است
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},این {0} درگیری با {1} برای {2} {3}
 DocType: Student Attendance Tool,Students HTML,دانش آموزان HTML
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,تاریخ ترک
 DocType: Pricing Rule,For Price List,برای اطلاع از قیمت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرایی جستجو
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ایجاد منجر می شود
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ایجاد منجر می شود
 DocType: Maintenance Schedule,Schedules,برنامه
 DocType: Purchase Invoice Item,Net Amount,مقدار خالص
 DocType: Purchase Order Item Supplied,BOM Detail No,جزئیات BOM بدون
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,ثبت برنامه
 DocType: Sales Invoice Item,Brand Name,نام تجاری
 DocType: Purchase Receipt,Transporter Details,اطلاعات حمل و نقل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,جعبه
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,کننده ممکن
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,سازمان
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM پیش فرض برای {0} برای پروژه یافت نشد {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ادعای هزینه شرکت.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",دانش آموزان در قلب سیستم، اضافه کردن تمام دانش آموزان خود را
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",دانش آموزان در قلب سیستم، اضافه کردن تمام دانش آموزان خود را
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ردیف # {0}: تاریخ ترخیص کالا از {1} می توانید قبل از تاریخ چک شود {2}
 DocType: Company,Default Holiday List,پیش فرض لیست تعطیلات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ردیف {0}: از زمان و به زمان از {1} با هم تداخل دارند {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ارسال مجدد ایمیل پرداخت
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,وظیفه جدید
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,را نقل قول
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,را نقل قول
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,سایر گزارش
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,سعی کنید برنامه ریزی عملیات به مدت چند روز X در پیش است.
 DocType: HR Settings,Stop Birthday Reminders,توقف تولد یادآوری
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
 DocType: SMS Center,Receiver List,فهرست گیرنده
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,جستجو مورد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,جستجو مورد
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,مقدار مصرف
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,تغییر خالص در نقدی
 DocType: Assessment Plan,Grading Scale,مقیاس درجه بندی
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,قبلا کامل شده
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},درخواست پرداخت از قبل وجود دارد {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع آوری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,شما نمی توانید حذف سال مالی {0}. سال مالی {0} به عنوان پیش فرض در تنظیمات جهانی تنظیم
 DocType: Journal Entry,Entry Type,نوع ورودی
 ,Customer Credit Balance,تعادل اعتباری مشتری
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,تحصیل در همان موسسه
 DocType: Territory,Territory Manager,مدیر منطقه
 DocType: Packed Item,To Warehouse (Optional),به انبار (اختیاری)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 DocType: Payment Entry,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,نمایش سبد خرید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,درخواست مواد مورد استفاده در ساخت این سهام ورود
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,بعدی تاریخ استهلاک برای دارایی جدید الزامی است
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بعدی تاریخ استهلاک برای دارایی جدید الزامی است
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جدا البته گروه بر اساس برای هر دسته ای
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,تنها واحد آیتم استفاده کنید.
 DocType: Fee Category,Fee Category,هزینه رده
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,بین وزنها
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: مرکز هزینه برای سود و زیان، حساب مورد نیاز است {2}. لطفا راه اندازی یک مرکز هزینه به طور پیش فرض برای شرکت.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,تماس جدید
 DocType: Territory,Parent Territory,منطقه مرجع
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,آشتی JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 DocType: Purchase Invoice Item,Batch No,دسته بدون
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},قادر به پیدا کردن نرخ ارز برای {0} به {1} برای تاریخ های کلیدی {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,اجازه چندین سفارشات فروش در برابر خرید سفارش مشتری
 DocType: Student Group Instructor,Student Group Instructor,مربی دانشجویی گروه
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 موبایل بدون
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,اصلی
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,نوع دیگر
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,اصلی
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,نوع دیگر
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
 DocType: Employee Attendance Tool,Employees HTML,کارمندان HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
 DocType: Employee,Leave Encashed?,ترک نقد شدنی؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Email Digest,Annual Expenses,هزینه سالانه
 DocType: Item,Variants,انواع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ارزیابی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
-DocType: Grading Structure,Grading Intervals,بازه درجه بندی
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,لطفا وارد
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",آیا می توانم برای مورد {0} در ردیف overbill {1} بیش از {2}. برای اجازه بیش از حد صدور صورت حساب، لطفا در خرید تنظیمات
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,لطفا فیلتر بر اساس مورد یا انبار مجموعه
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,پرداخت
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,مدیریت سفارشات خود را
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,مدیریت سفارشات خود را
 DocType: Production Order Operation,Actual Time and Cost,زمان و هزینه های واقعی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},درخواست مواد از حداکثر {0} را می توان برای مورد {1} در برابر سفارش فروش ساخته شده {2}
 DocType: Employee,Salutation,سلام
 DocType: Course,Course Abbreviation,مخفف دوره
 DocType: Student Leave Application,Student Leave Application,دانشجو مرخصی کاربرد
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارمند {0} در روز نیمه در {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},کل ساعات کار نباید از ساعات کار حداکثر است بیشتر {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,بر
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,آیتم های همراه  در زمان فروش.
 DocType: Quotation Item,Actual Qty,تعداد واقعی
 DocType: Sales Invoice Item,References,مراجع
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,شما وارد آیتم های تکراری شده اید   لطفا تصحیح و دوباره سعی کنید.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,وابسته
 DocType: Asset Movement,Asset Movement,جنبش دارایی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,سبد خرید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,سبد خرید
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,مورد {0} است مورد سریال نه
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
 DocType: Vehicle,Wheels,چرخ ها
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,غیر فعال ایجاد سیاهههای مربوط به زمان در برابر سفارشات تولید. عملیات باید در برابر سفارش تولید ردیابی نیست
 DocType: Student,Student Mobile Number,دانشجو شماره موبایل
 DocType: Item,Has Variants,دارای انواع
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,دسته ID الزامی است
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته ID الزامی است
 DocType: Sales Person,Parent Sales Person,شخص پدر و مادر فروش
 DocType: Purchase Invoice,Recurring Invoice,فاکتور در محدوده زمانی معین
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,مدیریت پروژه
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,سال مالی
 DocType: Vehicle Log,Fuel Price,قیمت سوخت
 DocType: Budget,Budget,بودجه
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",بودجه می توانید در برابر {0} اختصاص داده نمی شود، آن را به عنوان یک حساب کاربری درآمد یا هزینه نیست
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,به دست آورد
 DocType: Student Admission,Application Form Route,فرم درخواست مسیر
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},مقدار {0} {1} کسر شود {2}
 DocType: Employee,Salary Information,اطلاعات حقوق و دستمزد
 DocType: Sales Person,Name and Employee ID,نام و کارمند ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
 DocType: Website Item Group,Website Item Group,وب سایت مورد گروه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,وظایف و مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا تاریخ مرجع وارد
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار درآمد و ضوابط
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,جفت
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
 DocType: Asset,Depreciation Schedule,برنامه استهلاک
 DocType: Bank Reconciliation Detail,Against Account,به حساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,نیم تاریخ روز باید بین از تاریخ و به روز می شود
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
 DocType: Purchase Order,Delivered,تحویل
 ,Vehicle Expenses,هزینه های خودرو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
+DocType: Serial No,Invoice Details,جزئیات فاکتور
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,از تاریخ تکرار می شود فاکتور را متوقف خواهد کرد
 DocType: Employee Loan,Loan Amount,مبلغ وام
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,تخفیف اضافی مبلغ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,گروه به غیر گروه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ورزشی
 DocType: Loan Type,Loan Name,نام وام
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,مشتری خرید و وفاداری
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,انبار که در آن شما می حفظ سهام از اقلام را رد کرد
 DocType: Production Order,Skip Material Transfer,پرش انتقال مواد
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,قادر به پیدا کردن نرخ ارز برای {0} به {1} برای تاریخ های کلیدی {2}. لطفا یک رکورد ارز دستی ایجاد کنید
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,سال مالی خود را به پایان می رسد در
 DocType: POS Profile,Price List,لیست قیمت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} در حال حاضر به طور پیش فرض سال مالی. لطفا مرورگر خود را برای تغییر تاثیر گذار تازه کردن.
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** سال مالی نشان دهنده یک سال مالی. تمام پست های حسابداری و دیگر معاملات عمده در برابر سال مالی ** ** ردیابی.
 DocType: Opportunity,Customer / Lead Address,مشتری / سرب آدرس
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
 DocType: Student Admission,Eligibility,شایستگی
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",آگهی های کمک به شما کسب و کار، اضافه کردن اطلاعات تماس خود را و بیشتر به عنوان منجر خود را
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",آگهی های کمک به شما کسب و کار، اضافه کردن اطلاعات تماس خود را و بیشتر به عنوان منجر خود را
 DocType: Production Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,انتخاب شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
 DocType: Process Payroll,Fortnightly,دوهفتگی
 DocType: Currency Exchange,From Currency,از ارز
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,می توانید نوع اتهام به عنوان &#39;در مقدار قبلی Row را انتخاب کنید و یا&#39; در ردیف قبلی مجموع برای سطر اول
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,مورد کودک باید یک بسته نرم افزاری محصولات. لطفا آیتم های حذف `{0}` و صرفه جویی در
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداری
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,اضافه کردن برنامه های زمانی
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,اضافه کردن برنامه های زمانی
 DocType: Vehicle Service,Service Item,مورد خدمات
 DocType: Bank Guarantee,Bank Guarantee,تضمین بانکی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا بر روی &#39;ایجاد برنامه&#39; کلیک کنید برای دریافت برنامه
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت نشان داده نخواهد شد اگر لیست قیمت تنظیم نشده است
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,لطفا یک کشور برای این قانون حمل و نقل مشخص و یا بررسی حمل و نقل در سراسر جهان
 DocType: Stock Entry,Total Incoming Value,مجموع ارزش ورودی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,بدهکاری به مورد نیاز است
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,بدهکاری به مورد نیاز است
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,خرید لیست قیمت
 DocType: Offer Letter Term,Offer Term,مدت پیشنهاد
 DocType: Quality Inspection,Quality Manager,مدیر کیفیت
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,از دست داده دلیل
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,آدرس جدید
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,لطفا سند دریافت وارد کنید
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,لطفا سند دریافت وارد کنید
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا یک معتبر را مشخص &#39;از مورد شماره&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Project,External,خارجی
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کاربران و ویرایش
 DocType: Vehicle Log,VLOG.,را ثبت کنید.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},سفارشات تولید ایجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},سفارشات تولید ایجاد شده: {0}
 DocType: Branch,Branch,شاخه
 DocType: Guardian,Mobile Number,شماره موبایل
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,چاپ و علامت گذاری
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,سریال بدون {0} یافت نشد
 DocType: Scheduling Tool,Student Batch,دسته ای دانشجویی
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,مشتریان شما
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,دانشجویی
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,دانشجویی
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},از شما دعوت شده برای همکاری در این پروژه: {0}
 DocType: Leave Block List Date,Block Date,بلوک عضویت
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,درخواست کن
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,فرستادن به
 DocType: Payment Request,Make Sales Invoice,ایجاد فاکتور فروش
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,نرم افزارها
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,بعد تماس با آمار نمی تواند در گذشته باشد
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,بعد تماس با آمار نمی تواند در گذشته باشد
 DocType: Company,For Reference Only.,برای مرجع تنها.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,انتخاب دسته ای بدون
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},نامعتبر {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,جستجوی پیشرفته مقدار
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,شماره مورد نمی تواند 0
 DocType: Item,Show a slideshow at the top of the page,نمایش تصاویر به صورت خودکار در بالای صفحه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM ها
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,فروشگاه
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,فروشگاه
 DocType: Serial No,Delivery Time,زمان تحویل
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,سالمندی بر اساس
 DocType: Item,End of Life,پایان زندگی
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,مواد انتقال
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,این سند بیش از حد مجاز است {0} {1} برای آیتم {4}. آیا شما ساخت یکی دیگر از {3} در برابر همان {2}.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,انتخاب تغییر حساب مقدار
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,انتخاب تغییر حساب مقدار
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,حساب بودجه
 DocType: Quality Inspection,Verified By,تایید شده توسط
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",می تواند به طور پیش فرض ارز شرکت را تغییر نمی، چرا که معاملات موجود وجود دارد. معاملات باید لغو شود برای تغییر ارز به طور پیش فرض.
-DocType: Grade Interval,Grade Description,درجه باشرکت
+DocType: Grading Scale Interval,Grade Description,درجه باشرکت
 DocType: Stock Entry,Purchase Receipt No,رسید خرید بدون
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیعانه
 DocType: Process Payroll,Create Salary Slip,ایجاد لغزش حقوق
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,حضور و غیاب به روز
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Gateway Account,Payment Account,حساب پرداخت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,تغییر خالص در حساب های دریافتنی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,جبرانی فعال
 DocType: Offer Letter,Accepted,پذیرفته
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,انجمن کاربران
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
@@ -2285,7 +2285,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,نام این موسسه که شما در حال راه اندازی این سیستم.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ثبت حسابداری تا این تاریخ منجمد، هیچ کس نمی تواند انجام / اصلاح ورود به جز نقش های مشخص شده زیر.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,لطفا قبل از ایجاد برنامه های تعمیر و نگهداری سند را ذخیره کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,لطفا قبل از ایجاد برنامه های تعمیر و نگهداری سند را ذخیره کنید
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,وضعیت پروژه
 DocType: UOM,Check this to disallow fractions. (for Nos),بررسی این به ندهید فراکسیون. (برای NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,سفارشات تولید زیر ایجاد شد:
@@ -2308,6 +2308,7 @@
 DocType: Email Digest,How frequently?,چگونه غالبا؟
 DocType: Purchase Receipt,Get Current Stock,دریافت سهام کنونی
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,درخت بیل از مواد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 DocType: Student,Joining Date,پیوستن به تاریخ
 ,Employees working on a holiday,کارمندان کار در یک روز تعطیل
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,علامت گذاری به عنوان در حال حاضر
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,تولید
 DocType: Guardian,Occupation,اشتغال
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),مجموع (تعداد)
 DocType: Sales Invoice,This Document,این سند
 DocType: Installation Note Item,Installed Qty,نصب تعداد
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,سفارش فروش پیام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تنظیم مقادیر پیش فرض مثل شرکت، ارز، سال مالی جاری، و غیره
 DocType: Payment Entry,Payment Type,نوع پرداخت
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا یک دسته ای برای آیتم را انتخاب کنید {0}. قادر به پیدا کردن یک دسته واحد است که این شرط را برآورده
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا یک دسته ای برای آیتم را انتخاب کنید {0}. قادر به پیدا کردن یک دسته واحد است که این شرط را برآورده
 DocType: Process Payroll,Select Employees,انتخاب کارمندان
 DocType: Opportunity,Potential Sales Deal,معامله فروش بالقوه
 DocType: Payment Entry,Cheque/Reference Date,چک / تاریخ مرجع
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},نمایش POS جهانی {0} در حال حاضر برای شرکت ایجاد {1}
 DocType: Purchase Order,Ref SQ,SQ کد عکس
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,جایگزین مورد / BOM در تمام BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,سند دریافت باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,سند دریافت باید ارائه شود
 DocType: Purchase Invoice Item,Received Qty,دریافت تعداد
 DocType: Stock Entry Detail,Serial No / Batch,سریال بدون / دسته
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,پرداخت نمی شود و تحویل داده نشده است
@@ -2441,7 +2442,7 @@
 ,To Produce,به تولید
 apps/erpnext/erpnext/config/hr.py +93,Payroll,لیست حقوق
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",برای ردیف {0} در {1}. شامل {2} در مورد نرخ، ردیف {3} نیز باید گنجانده شود
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,را کاربر
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,را کاربر
 DocType: Packing Slip,Identification of the package for the delivery (for print),شناسایی بسته برای تحویل (برای چاپ)
 DocType: Bin,Reserved Quantity,تعداد محفوظ است
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا آدرس ایمیل معتبر وارد کنید
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,قالب غیر فعال نباید قالب پیش فرض
 DocType: Account,Income Account,حساب درآمد
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,تحویل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,تحویل
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",نگاه کنید به &quot;نرخ مواد بر اساس&quot; در هزینه یابی بخش
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",دسته های دانشجویی شما کمک کند پیگیری حضور و غیاب، ارزیابی ها و هزینه های برای دانش آموزان
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",دسته های دانشجویی شما کمک کند پیگیری حضور و غیاب، ارزیابی ها و هزینه های برای دانش آموزان
 DocType: Payment Entry,Total Allocated Amount,مجموع مقدار اختصاص داده شده
 DocType: Item Reorder,Material Request Type,مواد نوع درخواست
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ورود مجله Accural برای حقوق از {0} به {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',یک ایمیل در مورد این رویداد به کارکنان با وضعیت ارسال را &#39;Open&#39;
 DocType: Task,Depends on Tasks,بستگی به وظایف
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,مدیریت درختواره گروه مشتری
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,فایل های پیوست را می توان بدون فعال کردن سبد خرید نشان داده شده است
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,نام مرکز هزینه
 DocType: Leave Control Panel,Leave Control Panel,ترک کنترل پنل
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,بدهی به
 DocType: Delivery Note,Required only for sample item.,فقط برای نمونه مورد نیاز است.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},بدون لغزش حقوق و دستمزد پیدا شده بین {0} و {1}
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,پذیرش دانشجو
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} غیر فعال است
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} غیر فعال است
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,خیلی بزرگ
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,صفحه خانگی محصول ویژه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,همه گروه ارزیابی
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,جدید نام انبار
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),مجموع {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),مجموع {0} ({1})
 DocType: C-Form Invoice Detail,Territory,منطقه
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,لیست قیمت مستر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,تمام معاملات فروش را می توان در برابر چند ** ** افراد فروش برچسب به طوری که شما می توانید تعیین و نظارت بر اهداف.
 ,S.O. No.,SO شماره
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
 DocType: Price List,Applicable for Countries,قابل استفاده برای کشورهای
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,تنها برنامه های کاربردی با وضعیت ترک &#39;تایید&#39; و &#39;رد&#39; را می توان ارسال
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},دانشجو نام گروه را در ردیف الزامی است {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ثبت حسابداری برای انبار
 DocType: Vehicle Service,Engine Oil,روغن موتور
 DocType: Sales Invoice,Sales Team1,Team1 فروش
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
 DocType: Employee Loan,Loan Details,وام جزییات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ردیف {0}: پایان تعداد باید بزرگتر از صفر باشد.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,انبارها با معامله موجود می توانید به گروه تبدیل نمی کند.
 DocType: Assessment Result Tool,Result HTML,نتیجه HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,منقضی در
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,اضافه کردن دانش آموزان
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,اضافه کردن دانش آموزان
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},لطفا انتخاب کنید {0}
 DocType: C-Form,C-Form No,C-فرم بدون
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,محدودیت عبور
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,مدت علمی با این سال تحصیلی &#39;{0} و نام مدت:&#39; {1} قبل وجود دارد. لطفا این نوشته را تغییر دهید و دوباره امتحان کنید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",به عنوان تراکنش های موجود در برابر آیتم {0} وجود دارد، شما می توانید مقدار را تغییر دهید {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",به عنوان تراکنش های موجود در برابر آیتم {0} وجود دارد، شما می توانید مقدار را تغییر دهید {1}
 DocType: UOM,Must be Whole Number,باید عدد
 DocType: Leave Control Panel,New Leaves Allocated (In Days),برگ جدید اختصاص داده شده (در روز)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,سریال بدون {0} وجود ندارد
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,آخرین روز از ماه آینده
 DocType: Support Settings,Auto close Issue after 7 days,خودرو موضوع نزدیک پس از 7 روز
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",می توانید قبل از ترک نمی اختصاص داده شود {0}، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,دانشجو متقاضی
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب استهلاک انباشته
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,کد مورد
 DocType: Production Planning Tool,Create Production Orders,ایجاد سفارشات تولید
 DocType: Serial No,Warranty / AMC Details,گارانتی / AMC اطلاعات بیشتر
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
 DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,ایجاد درخواست مواد
 DocType: Employee Education,School/University,مدرسه / دانشگاه
 DocType: Payment Request,Reference Details,اطلاعات مرجع
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
 DocType: Sales Invoice Item,Available Qty at Warehouse,تعداد موجود در انبار
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,مقدار فاکتور شده
 DocType: Asset,Double Declining Balance,دو موجودی نزولی
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},میزان مبالغ هزینه نمی تواند بیشتر از وام مبلغ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,تولید سفارش ایجاد نمی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,تولید سفارش ایجاد نمی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},می توانید تغییر وضعیت به عنوان دانش آموز نمی {0} است با استفاده از دانش آموزان مرتبط {1}
 DocType: Asset,Fully Depreciated,به طور کامل مستهلک
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,حضور و غیاب مشخص HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",نقل قول پیشنهادات، مناقصه شما را به مشتریان خود ارسال
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",نقل قول پیشنهادات، مناقصه شما را به مشتریان خود ارسال
 DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,سریال نه و دسته ای
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,مجموع نمرات از معیارهای ارزیابی نیاز به {0} باشد.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,لطفا تعداد مجموعه ای از Depreciations رزرو
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,لطفا تعداد مجموعه ای از Depreciations رزرو
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ارزش و یا تعداد
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,دقیقه
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,گروه دانشجویی
 DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,لطفا به مشتریان را انتخاب کنید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,لطفا به مشتریان را انتخاب کنید
 DocType: C-Form,I,من
 DocType: Company,Asset Depreciation Cost Center,دارایی مرکز استهلاک هزینه
 DocType: Sales Order Item,Sales Order Date,تاریخ سفارش فروش
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,جزئیات بیمه
 DocType: Account,Payable,قابل پرداخت
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,لطفا دوره بازپرداخت وارد کنید
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),بدهکاران ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),بدهکاران ({0})
 DocType: Pricing Rule,Margin,حاشیه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,مشتریان جدید
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,سود ناخالص٪
 DocType: Appraisal Goal,Weightage (%),بین وزنها (٪)
 DocType: Bank Reconciliation Detail,Clearance Date,ترخیص کالا از تاریخ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,مبلغ خرید خالص الزامی است
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,مبلغ خرید خالص الزامی است
 DocType: Lead,Address Desc,نشانی محصول
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,حزب الزامی است
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,نام موضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,حداقل یکی از خرید و یا فروش باید انتخاب شود
-DocType: Grading Structure,Grade Intervals,بازه درجه
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ماهیت کسب و کار خود را انتخاب کنید.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,که در آن عملیات ساخت در حال انجام شده است.
 DocType: Asset Movement,Source Warehouse,انبار منبع
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,درصد ماهانه توزیع
 DocType: Territory,Territory Targets,اهداف منطقه
 DocType: Delivery Note,Transporter Info,حمل و نقل اطلاعات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},لطفا پیش فرض {0} در {1} شرکت
 DocType: Cheque Print Template,Starting position from top edge,موقعیت شروع از لبه بالا
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,منبع همان وارد شده است چندین بار
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ترتیب مجدد تعداد
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,فرصت های شغلی فعلی
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
-DocType: Journal Entry,Write Off,کسر کردن
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,کسر کردن
 DocType: Timesheet Detail,Operation ID,عملیات ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",سیستم کاربر (ورود به سایت) ID. اگر تعیین شود، آن را تبدیل به طور پیش فرض برای همه اشکال HR.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: از {1}
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ارائه کننده به مشتری
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (فرم # / کالا / {0}) خارج از بورس
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,تاریخ بعدی باید بزرگتر از ارسال تاریخ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,نمایش مالیاتی تجزیه
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,اطلاعات واردات و صادرات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",نوشته سهام برابر انبار {0} وجود داشته باشد، از این رو شما می توانید دوباره اختصاص و یا آن را تغییر دهید
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,هیچ دانش آموزان یافت
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
 DocType: Program Enrollment,School House,مدرسه خانه
 DocType: Serial No,Out of AMC,از AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,لطفا نقل قول انتخاب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,را نگهداری سایت
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,لطفا نقل قول انتخاب
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,را نگهداری سایت
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
 DocType: Company,Default Cash Account,به طور پیش فرض حساب های نقدی
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,این است که در حضور این دانش آموز بر اساس
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,هیچ دانشآموزی در
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,اضافه کردن آیتم های بیشتر و یا به صورت کامل باز
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,قبل از آشتی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},به {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیات و هزینه اضافه شده (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
 DocType: Sales Order,Partly Billed,تا حدودی صورتحساب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,مورد {0} باید مورد دارائی های ثابت شود
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,مورد {0} باید مورد دارائی های ثابت شود
 DocType: Item,Default BOM,به طور پیش فرض BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,مجموع برجسته AMT
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
 DocType: Purchase Invoice Item,Rate,نرخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,انترن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,نام آدرس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,نام آدرس
 DocType: Stock Entry,From BOM,از BOM
 DocType: Assessment Code,Assessment Code,کد ارزیابی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,پایه
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,چاپ زبان
 DocType: Salary Slip,Total Working Hours,کل ساعات کار
 DocType: Stock Entry,Including items for sub assemblies,از جمله موارد زیر را برای مجامع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,همه مناطق
 DocType: Purchase Invoice,Items,اقلام
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,دانشجو در حال حاضر ثبت نام.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,زمان باز شدن
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,از و به تاریخ های الزامی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
 DocType: Assessment Plan,Supervisor Name,نام استاد راهنما
 DocType: Program Enrollment Course,Program Enrollment Course,برنامه ثبت نام دوره
-DocType: Grading Structure,Grading Structure,ساختار درجه بندی
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
 DocType: Tax Rule,Shipping City,حمل و نقل شهر
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,این مورد یک نوع از {0} (الگو) است. ویژگی خواهد شد بیش از قالب کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 DocType: Notification Control,Customize the Notification,سفارشی اطلاع رسانی
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,جریان وجوه نقد از عملیات
 DocType: Sales Invoice,Shipping Rule,قانون حمل و نقل
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,باز کردن تاریخ باید قبل از بسته شدن تاریخ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
 DocType: Leave Control Panel,Carry Forward,حمل به جلو
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,مرکز هزینه با معاملات موجود را نمی توان تبدیل به لجر
 DocType: Department,Days for which Holidays are blocked for this department.,روز که تعطیلات برای این بخش مسدود شده است.
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),مجموع (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 DocType: Quality Inspection,Item Serial No,مورد سریال بدون
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,درست کارمند سوابق
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,درست کارمند سوابق
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,در حال حاضر مجموع
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,بیانیه های حسابداری
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ساعت
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,BOM جدید پس از تعویض
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,نقطه ای از فروش
 DocType: Payment Entry,Received Amount,دریافت مبلغ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",درست برای مقدار کامل، نادیده گرفتن مقدار در حال حاضر در سفارش
 DocType: Account,Tax,مالیات
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,مشخص شده نیست
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,فاکتورها
 DocType: Batch,Source Document Name,منبع نام سند
 DocType: Job Opening,Job Title,عنوان شغلی
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ایجاد کاربران
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ایجاد کاربران
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,گرم
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,گزارش تماس نگهداری مراجعه کنید.
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: BOM,Website Description,وب سایت توضیحات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,اعلام وصول
 ,Sales Register,ثبت فروش
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,چیزی برای ویرایش وجود دارد.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
 DocType: Customer Group,Customer Group Name,نام گروه مشتری
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,بدون مشتریان هنوز!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,صورت جریان وجوه نقد
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,مجوز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,لطفا انتخاب کنید حمل به جلو اگر شما نیز می خواهید که شامل تعادل سال گذشته مالی برگ به سال مالی جاری
 DocType: GL Entry,Against Voucher Type,در برابر نوع کوپن
 DocType: Item,Attributes,ویژگی های
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
 DocType: Student,Guardian Details,نگهبان جزییات
 DocType: C-Form,C-Form,C-فرم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,حضور و غیاب علامت برای کارکنان متعدد
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ردیف {0} # حساب باید از این نوع باشد، دارایی ثابت &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,از تعداد
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,مشاهده قوانین برای محاسبه مقدار حمل و نقل برای فروش
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,سری الزامی است
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,سری الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,خدمات مالی
 DocType: Student Sibling,Student ID,ID دانش آموز
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,نوع فعالیت برای سیاهههای مربوط زمان
 DocType: Tax Rule,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
 DocType: Training Event,Exam,امتحان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,کروم
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,حساب پرداخت از
 DocType: Purchase Order Item Supplied,Raw Material Item Code,مواد اولیه کد مورد
 DocType: Journal Entry,Write Off Based On,ارسال فعال بر اساس
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,را سرب
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,را سرب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,چاپ و لوازم التحریر
 DocType: Stock Settings,Show Barcode Field,نمایش بارکد درست
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ارسال ایمیل کننده
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,در انتظار پاسخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,در بالا
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ذکر است اگر غیر استاندارد حساب های قابل پرداخت
 DocType: Salary Slip,Earning & Deduction,سود و کسر
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,مطلع دانش آموزان از
 DocType: Hub Settings,Seller Country,فروشنده کشور
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,انتشار موارد در وب سایت
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,گروه دانش آموزان خود را در دسته
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,گروه دانش آموزان خود را در دسته
 DocType: Authorization Rule,Authorization Rule,قانون مجوز
 DocType: Sales Invoice,Terms and Conditions Details,قوانین و مقررات جزئیات
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,مشخصات
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,عفو مشروط
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,قطعات حقوق و دستمزد
 DocType: Program Enrollment Tool,New Academic Year,سال تحصیلی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,بازگشت / اعتباری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,بازگشت / اعتباری
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,کل مقدار پرداخت
 DocType: Production Order Item,Transferred Qty,انتقال تعداد
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,قیف فروش
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,مخفف الزامی است
 DocType: Project,Task Progress,وظیفه پیشرفت
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,گاری
 ,Qty to Transfer,تعداد می توان به انتقال
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,پیشنهاد قیمت برای مشتریان یا مشتریان بالقوه
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},تعداد ({0}) نمی تواند یک کسر در ردیف {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,جمع آوری هزینه
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
 DocType: Item,Opening Stock,سهام باز کردن
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,سفارشات برای تولید منتشر شد.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,انتخاب سال مالی ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Program Enrollment Tool,Enroll Students,ثبت نام دانش آموزان
 DocType: Hub Settings,Name Token,نام رمز
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,فروش استاندارد
@@ -3645,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,نام پروژه
-DocType: Supplier,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
+DocType: Customer,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
 DocType: Production Order,Required Items,اقلام مورد نیاز
 DocType: Stock Ledger Entry,Stock Value Difference,تفاوت ارزش سهام
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,عوارض
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,پرداخت و تحویل داده نشده است
 DocType: Project,Default Cost Center,مرکز هزینه به طور پیش فرض
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 DocType: Bank Guarantee,End Date,تاریخ پایان
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,معاملات سهام
 DocType: Budget,Budget Accounts,حساب بودجه
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,شریک فروش و کمیسیون
 DocType: Employee Loan,Rate of Interest (%) / Year,نرخ بهره (٪) / سال
 ,Project Quantity,تعداد پروژه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما باید &#39;اتهامات بر اساس توزیع را تغییر
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما باید &#39;اتهامات بر اساس توزیع را تغییر
 DocType: Opportunity,To Discuss,به بحث در مورد
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} واحد از {1} مورد نیاز در {2} برای تکمیل این معامله.
 DocType: Loan Type,Rate of Interest (%) Yearly,نرخ بهره (٪) سالانه
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,علامت گذاری به عنوان غایب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ردیف {0}: ارز BOM # در {1} باید به ارز انتخاب شده برابر باشد {2}
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 DocType: Homepage,Tag Line,نقطه حساس
 DocType: Fee Component,Fee Component,هزینه یدکی
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,مدیریت ناوگان
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,انبار {0} وجود ندارد
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ثبت نام برای ERPNext توپی
 DocType: Monthly Distribution,Monthly Distribution Percentages,درصد ماهانه توزیع
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",نرخ ارزش گذاری برای آیتم {0}، که لازم است برای انجام ورودی حسابداری برای یافت نشد {1} {2}. در صورتی که آیتم به عنوان یک آیتم نمونه در طرف قرارداد {1}، لطفا ذکر است که در {1} جدول مورد. در غیر این صورت، لطفا ایجاد یک معامله سهام های دریافتی را برای آیتم و یا ذکر میزان ارزش در پرونده مورد، و سپس سعی کنید از ارسال / لغو این مطلب
 DocType: Delivery Note,% of materials delivered against this Delivery Note,درصد از مواد در برابر این تحویل توجه تحویل
 DocType: Project,Customer Details,اطلاعات مشتری
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,سفارشات ارسال شده را نمی توان حذف
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,مدیریت کیفیت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,مورد {0} غیرفعال شده است
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,مورد {0} غیرفعال شده است
 DocType: Employee Loan,Repay Fixed Amount per Period,بازپرداخت مقدار ثابت در هر دوره
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,دانشجو ID ایمیل
 DocType: Employee,Notice (days),مقررات (روز)
 DocType: Tax Rule,Sales Tax Template,قالب مالیات بر فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
 DocType: Employee,Encashment Date,Encashment عضویت
 DocType: Training Event,Internet,اینترنت
 DocType: Account,Stock Adjustment,تنظیم سهام
@@ -3855,6 +3861,7 @@
 DocType: Purchase Invoice,Debit Note Issued,بدهی توجه صادر
 DocType: Production Order,Warehouses,ساختمان و ذخیره سازی
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} دارایی نمی تواند منتقل شود
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,این مورد یک نوع از {0} (الگو) است.
 DocType: Workstation,per hour,در ساعت
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,خرید
 DocType: Announcement,Announcement,اعلان
@@ -3870,7 +3877,7 @@
 DocType: Account,Receivable,دریافتنی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ردیف # {0}: مجاز به تغییر به عنوان کننده سفارش خرید در حال حاضر وجود
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,انتخاب موارد برای ساخت
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,انتخاب موارد برای ساخت
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
 DocType: Item,Material Issue,شماره مواد
 DocType: Hub Settings,Seller Description,فروشنده توضیحات
@@ -3883,7 +3890,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,مرتب
 DocType: Salary Detail,Component,مولفه
 DocType: Assessment Criteria,Assessment Criteria Group,معیارهای ارزیابی گروه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},باز کردن استهلاک انباشته باید کمتر از برابر شود {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},باز کردن استهلاک انباشته باید کمتر از برابر شود {0}
 DocType: Warehouse,Warehouse Name,نام انبار
 DocType: Naming Series,Select Transaction,انتخاب معامله
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,لطفا تصویب نقش و یا تصویب کاربر وارد
@@ -3917,7 +3924,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی &quot;تنظیم به عنوان پیش فرض &#39;
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,پیوستن
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Employee Loan,Repay from Salary,بازپرداخت از حقوق و دستمزد
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},درخواست پرداخت در مقابل {0} {1} برای مقدار {2}
@@ -3935,7 +3942,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ارزیابی جزئیات نتیجه
 DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,گروه مورد تکراری در جدول گروه مورد
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
 DocType: Salary Slip,Net Pay,پرداخت خالص
 DocType: Account,Account,حساب
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,سریال بدون {0} در حال حاضر دریافت شده است
@@ -3944,7 +3951,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",انبار {0} است به هر حساب در ارتباط نیست، لطفا ایجاد / لینک مربوطه (دارایی) حساب کاربری برای انبار.
 DocType: Purchase Invoice,Recurring Id,تکرار کد
 DocType: Customer,Sales Team Details,جزییات تیم فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,به طور دائم حذف کنید؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,به طور دائم حذف کنید؟
 DocType: Expense Claim,Total Claimed Amount,مجموع مقدار ادعا
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرصت های بالقوه برای فروش.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},نامعتبر {0}
@@ -3955,13 +3962,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,راه اندازی مدرسه خود را در ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),پایه تغییر مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ذخیره سند اول است.
 DocType: Account,Chargeable,پرشدنی
 DocType: Company,Change Abbreviation,تغییر اختصار
 DocType: Expense Claim Detail,Expense Date,هزینه عضویت
 DocType: Item,Max Discount (%),حداکثر تخفیف (٪)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,مبلغ آخرین سفارش
+DocType: Task,Is Milestone,است نقطه عطف
 DocType: Daily Work Summary,Email Sent To,ایمیل ارسال شده به
 DocType: Budget,Warn,هشدار دادن
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
@@ -3994,11 +4002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
 DocType: Tax Rule,Purchase Tax Template,خرید قالب مالیات
 ,Project wise Stock Tracking,پروژه پیگیری سهام عاقلانه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},نگهداری و تعمیرات برنامه {0} در برابر وجود دارد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),تعداد واقعی (در منبع / هدف)
 DocType: Item Customer Detail,Ref Code,کد
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سوابق کارکنان.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
 DocType: HR Settings,Payroll Settings,تنظیمات حقوق و دستمزد
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,مطابقت فاکتورها غیر مرتبط و پرداخت.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,محل سفارش
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,چک و واریز وجه به اشتباه پاک
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
 DocType: Purchase Invoice Item,Price List Rate,لیست قیمت نرخ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,درست به نقل از مشتری
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,درست به نقل از مشتری
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",نمایش &quot;در انبار&quot; و یا &quot;نه در بورس&quot; بر اساس سهام موجود در این انبار.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),صورت مواد (BOM)
 DocType: Item,Average time taken by the supplier to deliver,میانگین زمان گرفته شده توسط منبع برای ارائه
@@ -4043,7 +4050,7 @@
 DocType: Asset,Disposal Date,تاریخ دفع
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ایمیل خواهد شد به تمام کارمندان فعال این شرکت در ساعت داده ارسال می شود، اگر آنها تعطیلات ندارد. خلاصه ای از پاسخ های خواهد شد در نیمه شب فرستاده شده است.
 DocType: Employee Leave Approver,Employee Leave Approver,کارمند مرخصی تصویب
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,آموزش فیدبک
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
@@ -4051,7 +4058,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},البته در ردیف الزامی است {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
 DocType: Supplier Quotation Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,افزودن / ویرایش قیمت ها
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,افزودن / ویرایش قیمت ها
 DocType: Batch,Parent Batch,دسته ای پدر و مادر
 DocType: Cheque Print Template,Cheque Print Template,چک الگو چاپ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,نمودار مراکز هزینه
@@ -4095,7 +4102,7 @@
 DocType: Item,Variant Based On,بر اساس نوع
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,تامین کنندگان شما
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
 DocType: Request for Quotation Item,Supplier Part No,کننده قسمت بدون
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',نمی توانید کسر وقتی دسته است برای ارزش گذاری &quot;یا&quot; Vaulation و مجموع:
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,دریافت شده از
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: از {0} برای {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ردیف {0}: ارزش ساعت باید بزرگتر از صفر باشد.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
 DocType: Issue,Content Type,نوع محتوا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
@@ -4114,20 +4121,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
 DocType: Payment Reconciliation,From Invoice Date,از تاریخ فاکتور
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ارز صورتحساب باید به ارز یا به حساب حزب ارز هم به طور پیش فرض comapany برابر شود
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ارز صورتحساب باید به ارز یا به حساب حزب ارز هم به طور پیش فرض comapany برابر شود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ترک مجموعه
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,چه کاری انجام میدهد؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,به انبار
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,همه پذیرش دانشجو
 ,Average Commission Rate,اوسط نرخ کمیشن
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: School House,House Name,نام خانه
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,به روز رسانی هزینه های اضافی برای محاسبه هزینه فرود آمد از اقلام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,برق
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,اضافه کردن بقیه سازمان خود را به عنوان کاربران خود را. شما همچنین می توانید دعوت مشتریان به پورتال خود را اضافه کنید با اضافه کردن آنها از اطلاعات تماس
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,اضافه کردن بقیه سازمان خود را به عنوان کاربران خود را. شما همچنین می توانید دعوت مشتریان به پورتال خود را اضافه کنید با اضافه کردن آنها از اطلاعات تماس
 DocType: Stock Entry,Total Value Difference (Out - In),تفاوت ارزش ها (خارج - در)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID کاربر برای کارمند تنظیم نشده {0}
@@ -4136,7 +4143,7 @@
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,روز پس از آخرین سفارش
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
 DocType: Buying Settings,Naming Series,نامگذاری سری
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,تاریخ بیمه شروع باید کمتر از تاریخ پایان باشد بیمه
@@ -4151,7 +4158,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
 DocType: Vehicle Log,Odometer,کیلومتر شمار
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
@@ -4164,7 +4171,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعت صدور صورت حساب
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM به طور پیش فرض برای {0} یافت نشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ضربه بزنید اقلام به آنها اضافه کردن اینجا
 DocType: Fees,Program Enrollment,برنامه ثبت نام
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا {0}
@@ -4261,7 +4269,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
 DocType: Issue,First Responded On,اول پاسخ در
 DocType: Website Item Group,Cross Listing of Item in multiple groups,صلیب فهرست مورد در گروه های متعدد
-DocType: Grade Interval,Grade Interval,درجه فاصله
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},سال مالی تاریخ شروع و تاریخ پایان سال مالی در حال حاضر در سال مالی مجموعه {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تاریخ ترخیص کالا از به روز رسانی
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,دسته تقسیم
@@ -4269,6 +4276,7 @@
 DocType: Request for Quotation Supplier,Download PDF,دانلود PDF
 DocType: Production Order,Planned End Date,برنامه ریزی پایان تاریخ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,که در آن موارد ذخیره می شود.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 DocType: Request for Quotation,Supplier Detail,جزئیات کننده
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},اشکال در فرمول یا شرایط: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,مقدار صورتحساب
@@ -4313,7 +4321,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,راه اندازی یک وب سایت ساده برای سازمان من
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,لطفا پدر و مادر مرکز هزینه وارد
@@ -4370,7 +4378,7 @@
 ,Items To Be Requested,گزینه هایی که درخواست شده
 DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Company,Company Info,اطلاعات شرکت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,مرکز هزینه مورد نیاز است به کتاب ادعای هزینه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,این است که در حضور این کارمند بر اساس
@@ -4383,13 +4391,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,توقف کاربران از ساخت نرم افزار مرخصی در روز بعد.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,مبلغ خرید
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,مزایای کارکنان
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Production Order,Manufactured Qty,تولید تعداد
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} وجود ندارد
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} وجود ندارد
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
@@ -4398,15 +4406,17 @@
 DocType: Quality Inspection Reading,Reading 3,خواندن 3
 ,Hub,قطب
 DocType: GL Entry,Voucher Type,کوپن نوع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Employee Loan Application,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
 DocType: Guardian,Guardian,نگهبان
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزیابی {0} برای کارمند {1} در محدوده تاریخ ایجاد شود
 DocType: Employee,Education,آموزش و پرورش
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,دل
 DocType: Selling Settings,Campaign Naming By,نامگذاری کمپین توسط
 DocType: Employee,Current Address Is,آدرس فعلی است
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,اصلاح شده
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
@@ -4443,7 +4453,7 @@
 DocType: Hub Settings,Hub Settings,تنظیمات توپی
 DocType: Project,Gross Margin %,حاشیه ناخالص٪
 DocType: BOM,With Operations,با عملیات
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
 DocType: Asset,Is Existing Asset,موجود است دارایی
 DocType: Salary Detail,Statistical Component,کامپوننت آماری
 ,Monthly Salary Register,ماهانه حقوق ثبت نام
@@ -4497,7 +4507,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ضمیمه لوگو
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,سطح سهام
 DocType: Customer,Commission Rate,کمیسیون نرخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,متغیر را
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",نوع پرداخت باید یکی از دریافت شود، پرداخت و انتقال داخلی
 apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیه و تحلیل ترافیک
@@ -4510,6 +4520,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,اجازه تولید در تعطیلات
 DocType: Sales Order,Customer's Purchase Order Date,مشتری سفارش خرید عضویت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,سرمایه سهام
+DocType: Shopping Cart Settings,Show Public Attachments,نمایش فایل های پیوست عمومی
 DocType: Packing Slip,Package Weight Details,بسته بندی جزییات وزن
 DocType: Payment Gateway Account,Payment Gateway Account,پرداخت حساب دروازه
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,پس از اتمام پرداخت هدایت کاربر به صفحه انتخاب شده است.
@@ -4534,7 +4545,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,را نشان نمی مانند هر نماد $ و غیره در کنار ارزهای.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,را دسته ای دانشجویی
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,را دسته ای دانشجویی
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,گرفتن اقلام از BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,سرب زمان روز
@@ -4553,7 +4564,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,حساب {0} وجود ندارد
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 3e32b9a..dcb0b44 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Erä Item Käyt tila
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,pankki sekki
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Näytä mallivaihtoehdot
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Näytä mallivaihtoehdot
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiaali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Määrä
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Viivästyminen (päivää)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,palvelu Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,Jaksotus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,mainonta
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama yhtiö on merkitty enemmän kuin kerran
 DocType: Employee,Married,Naimisissa
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei saa {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ei saa {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Hae nimikkeet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource&gt; HR Asetukset
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Tuotteen {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ei luetellut
 DocType: Payment Reconciliation,Reconcile,Yhteensovitus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Lukema 1
 DocType: Process Payroll,Make Bank Entry,tee pankkikirjaus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Eläkerahastot
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Seuraava Poistot Date ei voi olla ennen Ostopäivä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Seuraava Poistot Date ei voi olla ennen Ostopäivä
 DocType: SMS Center,All Sales Person,kaikki myyjät
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Kuukausijako ** auttaa kausiluonteisen liiketoiminnan budjetoinnissa ja tavoiteasetannassa.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ei kohdetta löydetty
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Ei kohdetta löydetty
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Palkka rakenne Puuttuvat
 DocType: Lead,Person Name,Henkilö
 DocType: Sales Invoice Item,Sales Invoice Item,"Myyntilasku, tuote"
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",esimerkiksi &quot;Primary School&quot; tai &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Perusraportit
 DocType: Warehouse,Warehouse Detail,Varaston lisätiedot
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan  {0} luottoraja on ylittynyt: {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan  {0} luottoraja on ylittynyt: {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term Päättymispäivä ei voi olla myöhemmin kuin vuosi Päättymispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Fixed Asset&quot; ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Fixed Asset&quot; ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Verotyyppi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
 DocType: BOM,Item Image (if not slideshow),tuotekuva (jos diaesitys ei käytössä)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Asiakkaan olemassa samalla nimellä
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tuntihinta / 60) * todellinen käytetty aika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Valitse BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Valitse BOM
 DocType: SMS Log,SMS Log,Tekstiviesti loki
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,toimitettujen tuotteiden kustannukset
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Loma {0} ei ajoitu aloitus- ja lopetuspäivän välille
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Arvosana
 DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: SMS Center,All Contact,kaikki yhteystiedot
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Tuotantotilaus jo luotu kaikille kohteita BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Tuotantotilaus jo luotu kaikille kohteita BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,vuosipalkka
 DocType: Daily Work Summary,Daily Work Summary,Päivittäinen työ Yhteenveto
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} on jäädytetty
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} on jäädytetty
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Valitse Olemassa Company luoda tilikartan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,varaston kulut
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Valitse Target Varasto
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,vastakirjaus
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
 DocType: Delivery Note,Installation Status,Asennuksen tila
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Haluatko päivittää läsnäolo? <br> Present: {0} \ <br> Ei lainkaan: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,toimita raaka-aineita ostoon
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Ainakin yksi maksutavan vaaditaan POS laskun.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Ainakin yksi maksutavan vaaditaan POS laskun.
 DocType: Products Settings,Show Products as a List,Näytä tuotteet listana
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee Poistot Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,pyydä tyyppi
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tee työntekijä
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tee työntekijä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,julkaisu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,suoritus
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Suunnittele huoltokäyntejä
 DocType: SMS Settings,Enter url parameter for message,syötä url parametrin viesti
 DocType: POS Profile,Customer Groups,asiakas Ryhmät
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Tilinpäätös
 DocType: Guardian,Students,opiskelijat
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,sääntö hinnoitteluun ja alennuksiin
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Hinnastoa tulee sovelletaa ostamiseen tai myymiseen
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance määrä ei voi olla suurempi kuin {0} {1}
 DocType: Naming Series,Series List for this Transaction,Sarjalistaus tähän tapahtumaan
 DocType: Company,Default Payroll Payable Account,Oletus Payroll Maksettava Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Päivitys Sähköpostiryhmä
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Päivitys Sähköpostiryhmä
 DocType: Sales Invoice,Is Opening Entry,on avauskirjaus
 DocType: Customer Group,Mention if non-standard receivable account applicable,maininta ellei sovelletaan saataien perustiliä käytetä
 DocType: Course Schedule,Instructor Name,ohjaaja Name
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Myyntilaskun kohdistus / nimike
 ,Production Orders in Progress,Tuotannon tilaukset on käsittelyssä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Rahoituksen nettokassavirta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
 DocType: Lead,Address & Contact,osoitteet ja yhteystiedot
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisää käyttämättömät lähtee edellisestä määrärahoista
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Kohteen verkkosivustoasetukset
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,vapaa kielletty
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank merkinnät
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,Julkaista Hub
 DocType: Student Admission,Student Admission,Opiskelijavalinta
 ,Terretory,Alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Nimike {0} on peruutettu
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Nimike {0} on peruutettu
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,Päivitä tilityspäivä
 DocType: Item,Purchase Details,Oston lisätiedot
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ilmoita automaattisen materiaalipyynnön luomisesta sähköpostitse
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,lähete
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,lähete
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Verojen perusmääritykset
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kustannukset Myyty Asset
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksukirjausta on muutettu siirron jälkeen, siirrä se uudelleen"
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Student Applicant,Admitted,Hyväksytty
 DocType: Workstation,Rent Cost,vuokrakustannukset
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,tilauksen arvo
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Pankki / Cash liiketoimien vastaan osapuolelle tai sisäinen siirto
 DocType: Shipping Rule,Valid for Countries,Voimassa maissa
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tämä tuote on mallipohja, eikä sitä voi käyttää tapahtumissa, tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tämä tuote on mallipohja, eikä sitä voi käyttää tapahtumissa, tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,pidetään kokonaistilauksena
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Syötä &quot;Toista päivänä Kuukausi &#39;kentän arvo
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,Veroaste
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on jo myönnetty Työsuhde {1} kauden {2} ja {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Valitse tuote
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Ostolasku {0} on lähetetty
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Nimikkeen eräkoodi
 DocType: C-Form Invoice Detail,Invoice Date,laskun päiväys
 DocType: GL Entry,Debit Amount,Debit Määrä
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Kohdassa {0} {1} voi olla vain yksi tili per yritys
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Kohdassa {0} {1} voi olla vain yksi tili per yritys
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Katso liitetiedosto
 DocType: Purchase Order,% Received,% vastaanotettu
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Luo Student Groups
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Tarjouspyyntö
 DocType: Salary Slip Timesheet,Working Hours,Työaika
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Luo uusi asiakas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Luo uusi asiakas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",mikäli useampi hinnoittelu sääntö jatkaa vaikuttamista käyttäjäjiä pyydetään asettamaan prioriteetti manuaalisesti ristiriidan ratkaisemiseksi
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Luo ostotilaukset
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Luo ostotilaukset
 ,Purchase Register,Osto Rekisteröidy
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,sovellettavat maksut
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,lomien valvonta
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,pakkauksesta
 DocType: Item Attribute,To Range,Vaihtuakseen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Arvopaperit ja talletukset
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Voi muuttaa arvonmäärittämismenetelmää koska on olemassa tapahtumia vastaan joitakin kohtia, joita ei ole se oma arviointimenetelmää"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hyväksyttävien vapaiden kokonaismäärä on pakollinen
 DocType: Job Opening,Description of a Job Opening,Työpaikan kuvaus
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Vireillä toimintaa tänään
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",Seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",Seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Shipping Rule,Net Weight,Nettopaino
 DocType: Employee,Emergency Phone,hätänumero
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Ostaa
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Tarkentakaa arvosana Threshold 0%
 DocType: Sales Order,To Deliver,Toimitukseen
 DocType: Purchase Invoice Item,Item,Nimike
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,Tuloslaskelma
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Alihankintojen hallinta
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 DocType: Production Plan Item,Pending Qty,Odottaa Kpl
 DocType: Budget,Ignore,ohita
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ei ole aktiivinen
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ei ole aktiivinen
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},Tekstiviesti lähetetään seuraaviin numeroihin: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup tarkistaa mitat tulostettavaksi
 DocType: Salary Slip,Salary Slip Timesheet,Tuntilomake
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,Provisio yhteensä
 DocType: Pricing Rule,Sales Partner,Myyntikumppani
 DocType: Buying Settings,Purchase Receipt Required,Ostokuitti vaaditaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Arvostustaso on pakollinen, jos avausvarasto on merkitty"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Arvostustaso on pakollinen, jos avausvarasto on merkitty"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Valitse ensin yritys ja osapuoli tyyppi
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Tili- / Kirjanpitokausi
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,kertyneet Arvot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",Sarjanumeroita ei voi yhdistää
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,tee myyntitilaus
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,tee myyntitilaus
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,Liidin tunnus
 DocType: C-Form Invoice Detail,Grand Total,kokonaissumma
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,Resume'n liite
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toistuvat asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Myynti Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Myynti Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Huomautus: Total varattu lehdet {0} ei saa olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
 DocType: Announcement,Posted By,Lähettänyt
 DocType: Item,Delivered by Supplier (Drop Ship),Toimittaja lähettää asiakkaalle (ns. suoratoimitus)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Tarjouksen kohde
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,kohdennettu määrä ei voi olla negatiivinen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Aseta Yhtiö
 DocType: Purchase Order Item,Billed Amt,"Laskutettu, pankkipääte"
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Tuntilomake
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Valitse Maksutili tehdä Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Luo Työntekijä kirjaa hallita lehtiä, korvaushakemukset ja palkkahallinnon"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Luo Työntekijä kirjaa hallita lehtiä, korvaushakemukset ja palkkahallinnon"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Lisää Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Ehdotus Kirjoittaminen
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment Entry Vähennys
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Suhde Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Hallinta
 DocType: Payment Entry,Payment From / To,Maksaminen / To
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Ajanjakso
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uusi luottoraja on pienempi kuin nykyinen jäljellä asiakkaalle. Luottoraja on oltava atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uusi luottoraja on pienempi kuin nykyinen jäljellä asiakkaalle. Luottoraja on oltava atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Sama tuote on syötetty monta kertaa
 DocType: SMS Settings,Receiver Parameter,Vastaanottoparametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'perustaja' ja 'ryhmä' ei voi olla samat
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,johtopäätös päivä
 DocType: Student Batch Name,Batch Name,erä Name
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tuntilomake luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,kirjoittautua
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Näyttää opiskelijan Läsnä Student Kuukauden Läsnäolo Report
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,Student Läsnäolo
 DocType: Sales Invoice Timesheet,Time Sheet,Tuntilista
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raaka-aineet Perustuvat
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Syötä tuotten lisätiedot
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Syötä tuotten lisätiedot
 DocType: Interest,Interest,Kiinnostaa
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,muut lisätiedot
@@ -726,7 +729,7 @@
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Työtarjouksen ehto
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Nimikettä {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Yritys {0} ei ole olemassa
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,Takuu umpeutumispäivä
 DocType: Material Request Item,Quantity and Warehouse,Määrä ja Warehouse
 DocType: Sales Invoice,Commission Rate (%),provisio (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} Setup&gt; Asetukset&gt; nimeäminen Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Valitse ohjelma
 DocType: Project,Estimated Cost,Kustannusarvio
 DocType: Purchase Order,Link to material requests,Linkki materiaaliin pyyntöihin
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ei ole varastonimike
 DocType: Mode of Payment Account,Default Account,oletustili
 DocType: Payment Entry,Received Amount (Company Currency),Vastaanotetut Summa (Company valuutta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Liidi on pakollinen tieto, jos myyntimahdollisuus on muodostettu liidistä"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Liidi on pakollinen tieto, jos myyntimahdollisuus on muodostettu liidistä"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ole hyvä ja valitse viikoittain off päivä
 DocType: Production Order Operation,Planned End Time,Suunniteltu päättymisaika
 ,Sales Person Target Variance Item Group-Wise,"Tuoteryhmä työkalu, myyjä ja vaihtelu tavoite"
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,Perhetausta
 DocType: Request for Quotation Supplier,Send Email,Lähetä sähköposti
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ei oikeuksia
 DocType: Company,Default Bank Account,oletus pankkitili
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Yhtään työntekijää ei löytynyt
 DocType: Supplier Quotation,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Opiskelijaryhmän on jo päivitetty.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Opiskelijaryhmän on jo päivitetty.
 DocType: SMS Center,All Customer Contact,kaikki asiakkaan yhteystiedot
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Tuo varastotase .csv-tiedoston kautta
 DocType: Warehouse,Tree Details,Tree Tietoja
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Pienin Laskun summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kustannuspaikka {2} ei kuulu yhtiön {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Tili {2} ei voi olla ryhmä
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Kohta Rivi {idx}: {DOCTYPE} {DOCNAME} ei ole olemassa edellä {DOCTYPE} table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Tuntilomake {0} on jo täytetty tai peruttu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Kohta Rivi {idx}: {DOCTYPE} {DOCNAME} ei ole olemassa edellä {DOCTYPE} table
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Tuntilomake {0} on jo täytetty tai peruttu
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei tehtäviä
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Kuukauden päivä jolloin automaattinen lasku muodostetaan, esim 05, 28 jne"
 DocType: Asset,Opening Accumulated Depreciation,Avaaminen Kertyneet poistot
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,liukuva keskiarvo taso
 DocType: Production Planning Tool,Select Items,Valitse tuotteet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,kurssin aikataulu
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,kurssin aikataulu
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: HR Settings,Enter retirement age in years,Anna eläkeikä vuosina
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Tavoite varasto
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Kaikki nimikeryhmät
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Kaikki nimikeryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,netto voitto/tappio
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ostotilaus to Payment
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,Maksun eräpäivä
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Avattu'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avaa tehtävä
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,Täydennystilauksen yksikkömäärä
 DocType: Leave Block List Date,Leave Block List Date,päivä
 DocType: Pricing Rule,Price or Discount,Hinta tai Alennus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Yhteensä Sovellettava Lataus Ostokuitti erät taulukossa on oltava sama kuin koko verot ja maksut
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Yhteensä Sovellettava Lataus Ostokuitti erät taulukossa on oltava sama kuin koko verot ja maksut
 DocType: Sales Team,Incentives,kannustimet/bonukset
 DocType: SMS Log,Requested Numbers,vaaditut numerot
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanki vain raaka-aineet
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
 DocType: Fee Structure,Components,komponentit
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Tuotemallit {0} päivitetty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
 DocType: Quality Inspection Reading,Reading 6,Lukema 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"Ostolasku, edistynyt"
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemiallinen
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Oletus Bank / rahatililleen automaattisesti päivitetään Palkka Päiväkirjakirjaus kun tämä tila on valittuna.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Kuinka usein Grade Koodi {0} päällekkäinen luokka välein muita papereita. Tarkista välein {0} ja {1} ja yritä uudelleen
 DocType: BOM,Raw Material Cost(Company Currency),Raaka-ainekustannukset (Company valuutta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Rivi # {0}: Luokitus ei voi olla suurempi kuin määrä käyttää {1} {2}
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM-sivuston Kohta
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Tuo kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
 DocType: Timesheet Detail,Bill,Laskuttaa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Seuraavaksi Poistot Date kirjataan ohi päivämäärä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Seuraavaksi Poistot Date kirjataan ohi päivämäärä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Valkoinen
 DocType: SMS Center,All Lead (Open),Kaikki Liidit (Avoimet)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rivi {0}: Määrä ei saatavilla {4} varasto {1} klo lähettämistä tullessa ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tilaustyypin pitää olla jokin seuraavista '{0}'
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Avaus yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Anna Account for Change Summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Anna Account for Change Summa
 DocType: Student Batch Name,Student Batch Name,Opiskelijan Erä Name
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lainamäärä
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Määritä {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,Toimitus vastaanottajalle
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ei voi olla negatiivinen
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,alennus
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,alennus
 DocType: Asset,Total Number of Depreciations,Poistojen kokonaismäärä
 DocType: Sales Invoice Item,Rate With Margin,Hinta kanssa marginaali
 DocType: Workstation,Wages,Palkat
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,Organisaatio
 DocType: Tax Rule,Shipping State,Lähettävällä valtiolla
 ,Projected Quantity as Source,Ennustettu Määrä lähdemuodossa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
 DocType: Employee,A-,A -
 DocType: Production Planning Tool,Include non-stock items,Ovat ei-varastosta löytyvät
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Myynnin kulut
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postinumero
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Postinumero
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Myyntitilaus {0} on {1}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Varastotapahtumien tekeminen
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ostoskorin toimitussääntö
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 DocType: Global Defaults,Global Defaults,yleiset oletusasetukset
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Syötä tuotenumero saada eränumero
 DocType: Stock Settings,Default Item Group,oletus tuoteryhmä
 DocType: Employee Loan,Partially Disbursed,osittain maksettu
-DocType: Grading Structure,Grading System Name,Arvostelu Järjestelmän nimi
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,toimittaja tietokanta
 DocType: Account,Balance Sheet,tasekirja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Päivämäärä jona myyjää muistutetaan ottamaan yhteyttä asiakkaaseen
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samaa kohdetta ei voi syöttää useita kertoja.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Työ tehty
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ilmoitathan ainakin yksi määrite Määritteet taulukossa
 DocType: Announcement,All Students,kaikki opiskelijat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Nimike {0} ei saa olla varastonimike
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Nimike {0} ei saa olla varastonimike
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Näytä tilikirja
 DocType: Grading Scale,Intervals,väliajoin
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Samanniminen nimikeryhmä on jo olemassa, vaihda nimikkeen nimeä tai nimeä nimikeryhmä uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Samanniminen nimikeryhmä on jo olemassa, vaihda nimikkeen nimeä tai nimeä nimikeryhmä uudelleen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Muu maailma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Tuote {0} ei voi olla erä
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Myyntitilaus {0} ei ole kelvollinen
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Ostotilaukset auttaa suunnittelemaan ja seurata ostoksistasi
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Ostotilaukset auttaa suunnittelemaan ja seurata ostoksistasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Yhteensä Issue / Transfer määrä {0} in Material pyyntö {1} \ ei voi olla suurempi kuin pyydetty määrä {2} alamomentin {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pieni
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Tarjotut tuotteet ja/tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tämä on kantatuoteryhmä eikä sitä voi muokata
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,Ryhmä rullanumero
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Yhteensä Kaikkien tehtävän painojen tulisi olla 1. Säädä painoja Project tehtävien mukaisesti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Nimikkeen {0} pitää olla alihankittava nimike
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} kohdetta käynnissä
 DocType: Workstation,Workstation Name,Työaseman nimi
-DocType: Grade Interval,Grade Code,Grade koodi
+DocType: Grading Scale Interval,Grade Code,Grade koodi
 DocType: POS Item Group,POS Item Group,POS Kohta Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,kova tavara
 DocType: Sales Order,Recurring Upto,Toistuvat Jopa
 DocType: Attendance,HR Manager,Henkilöstön hallinta
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Valitse Yritys
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Valitse Yritys
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Poistumisoikeus
 DocType: Purchase Invoice,Supplier Invoice Date,toimittajan laskun päiväys
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Ruoka
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,vanhentumisen skaala 3
 DocType: Maintenance Schedule Item,No of Visits,Vierailujen lukumäärä
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Tapahtumaan
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Tapahtumaan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Huolto aikataulu {0} on olemassa vastaan {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ilmoittautumalla opiskelija
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuutta sulkeminen on otettava {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},"kaikista tavoitteiden pisteiden summa  tulee olla 100, nyt se on {0}"
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,tilikartta
 DocType: Material Request,Terms and Conditions Content,Ehdot ja säännöt sisältö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
 DocType: Maintenance Visit,Unscheduled,Aikatauluttamaton
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Detail,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
 DocType: Pricing Rule,"Higher the number, higher the priority","mitä korkeampi numero, sitä korkeampi prioriteetti"
 ,Purchase Invoice Trends,"Ostolasku, trendit"
 DocType: Employee,Better Prospects,Parempi Näkymät
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rivi # {0}: Erä {1} on vain {2} kpl. Valitse toinen erä, joka on {3} kpl saatavilla tai jakaa rivin tulee useita rivejä, antaa / kysymys useista eristä"
 DocType: Vehicle,License Plate,Rekisterikilpi
 DocType: Appraisal,Goals,tavoitteet
 DocType: Warranty Claim,Warranty / AMC Status,Takuun / huollon tila
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","mikäli tili on jäädytetty, kirjaukset on rajattu tietyille käyttäjille"
 DocType: Email Digest,Bank Balance,Pankkitilin tase
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","työprofiili, vaaditut pätevydet jne"
 DocType: Journal Entry Account,Account Balance,Tilin tase
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Verosääntöön liiketoimia.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näytä unclosed tilikaudesta P &amp; L saldot
 DocType: Shipping Rule,Shipping Account,Toimituskulutili
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Tili {2} on aktiivinen
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Tee Myyntitilaukset auttaa suunnittelemaan työtä ja toimittaa oikea-aikaisesti
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Tee Myyntitilaukset auttaa suunnittelemaan työtä ja toimittaa oikea-aikaisesti
 DocType: Quality Inspection,Readings,Lukemat
 DocType: Stock Entry,Total Additional Costs,Lisäkustannusten kokonaismäärää
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,Arvoon
 DocType: Asset Movement,Stock Manager,Varastohallinta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Lähde varasto on pakollinen rivin {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakkauslappu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Pakkauslappu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Toimisto Vuokra
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,Lähde
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näytäsuljetut
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Tämä {0} on ristiriidassa {1} ja {2} {3}
 DocType: Student Attendance Tool,Students HTML,opiskelijat HTML
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,Lähdön päivämäärä
 DocType: Pricing Rule,For Price List,hinnastoon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Luo liidejä
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Luo liidejä
 DocType: Maintenance Schedule,Schedules,Aikataulut
 DocType: Purchase Invoice Item,Net Amount,netto
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Ohjelma Ilmoittautumiset
 DocType: Sales Invoice Item,Brand Name,brändin nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Lisätiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,pl
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mahdollinen toimittaja
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisaatio
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,Lukema 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Oletus BOM on {0} ei löytynyt Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Yrityksen maksettaviksi vaaditut kulut
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Opiskelijat ytimessä järjestelmän, lisää kaikki opiskelijat"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Opiskelijat ytimessä järjestelmän, lisää kaikki opiskelijat"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rivi # {0}: Tilityspäivä {1} ei voi olla ennen shekin päivää {2}
 DocType: Company,Default Holiday List,oletus lomaluettelo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rivi {0}: From Time ja To aika {1} on päällekkäinen {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Lähettää maksu Sähköposti
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,uusi tehtävä
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,tee tarjous
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,tee tarjous
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Muut raportit
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} -tyyppinen vapaa ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Aseta Default Payroll maksullisia tilin Yrityksen {0}
 DocType: SMS Center,Receiver List,Vastaanotin List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,haku Tuote
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,haku Tuote
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Rahavarojen muutos
 DocType: Assessment Plan,Grading Scale,Arvosteluasteikko
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jo valmiiksi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Kerätä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Movement record {0} luotu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Movement record {0} luotu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Et voi poistaa tilikautta {0}. Tilikausi {0} on asetettu oletustilikaudeksi järjestelmäasetuksissa.
 DocType: Journal Entry,Entry Type,Entry Tyyppi
 ,Customer Credit Balance,Asiakkaan kredit tase
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,Opiskelu Sama Institute
 DocType: Territory,Territory Manager,Aluepäällikkö
 DocType: Packed Item,To Warehouse (Optional),Varastoon (valinnainen)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Tuote Group&gt; Merkki
 DocType: Payment Entry,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennus
 DocType: Selling Settings,Selling Settings,Myynnin asetukset
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View Cart
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,markkinointikulut
 ,Item Shortage Report,Tuotevajausraportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,varaston kirjaus materiaalipyynnöstä
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Seuraava Poistot Date on pakollinen uutta sisältöä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Seuraava Poistot Date on pakollinen uutta sisältöä
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Erillinen perustuu luonnollisesti ryhmän kutakin Erä
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Tuotteen yksittäisyksikkö
 DocType: Fee Category,Fee Category,Fee Luokka
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,Painoarvo
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kustannuspaikka vaaditaan &quot;Tuloslaskelma&quot; tilin {2}. Määritä oletuksena kustannukset Center for the Company.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Uusi yhteystieto
 DocType: Territory,Parent Territory,Pääalue
 DocType: Quality Inspection Reading,Reading 2,Lukema 2
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,JSON täsmäytys
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 DocType: Purchase Invoice Item,Batch No,Erän nro
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ei löydy valuuttakurssin {0} ja {1} keskeisille date {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
 DocType: Student Group Instructor,Student Group Instructor,Opiskelijaryhmän Ohjaaja
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Ei
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Tärkein
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Malli
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Tärkein
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,Aseta sarjojen numeroinnin etuliite tapahtumiin
 DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
 DocType: Employee,Leave Encashed?,vapaa kuitattu rahana?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Email Digest,Annual Expenses,Vuosittaiset kulut
 DocType: Item,Variants,Mallit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,Lähetä kenelle
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Vapaatyypille {0} ei ole tarpeeksi vapaata jäljellä
 DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Kehityskeskustelut
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,edellyttää toimitustapaa
-DocType: Grading Structure,Grading Intervals,Arvostelu intervallit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Käy sisään
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",Nimikettä {0} ei pysty ylilaskuttamaan rivillä {1} enempää kuin {2}. Muuta oston asetuksia salliaksesi ylilaskutus.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätyt Warehouse on pakollinen vastaan hylätään Tuote {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Maksu
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Hallitse tilauksia
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Hallitse tilauksia
 DocType: Production Order Operation,Actual Time and Cost,todellinen aika ja hinta
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},materiaalipyyntö max {0} voidaan tehdä tuotteelle {1} kohdistettuna myyntitilaukseen {2}
 DocType: Employee,Salutation,Tervehdys
 DocType: Course,Course Abbreviation,Course lyhenne
 DocType: Student Leave Application,Student Leave Application,Student Jätä Application
 DocType: Item,Will also apply for variants,Sovelletaan myös tuotemalleissa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Työntekijän {0} Half päivä {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Yhteensä työaika ei saisi olla suurempi kuin max työaika {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Päällä
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Kokoomatuotteet myyntihetkellä
 DocType: Quotation Item,Actual Qty,kiinteä yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Olet syöttänyt kohteen joka on jo olemassa. Korjaa ja yritä uudelleen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,kolleega
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,uusi koriin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,uusi koriin
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Nimike {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
 DocType: Vehicle,Wheels,Pyörät
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Poistaa luominen Aika Lokit vastaan toimeksiantoja. Toimia ei seurata vastaan Tuotantotilaus
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,useita tuotemalleja
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Erätunnuksesi on pakollinen
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Erätunnuksesi on pakollinen
 DocType: Sales Person,Parent Sales Person,Päämyyjä
 DocType: Purchase Invoice,Recurring Invoice,Toistuva Lasku
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Toimitusjohtaja Projektit
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,Tilikausi
 DocType: Vehicle Log,Fuel Price,polttoaineen hinta
 DocType: Budget,Budget,budjetti
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Talousarvio ei voi luovuttaa vastaan {0}, koska se ei ole tuottoa tai kulua tili"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,saavutettu
 DocType: Student Admission,Application Form Route,Hakulomake Route
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
 DocType: Employee,Salary Information,Palkkatietoja
 DocType: Sales Person,Name and Employee ID,Nimi ja Työntekijän ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
 DocType: Website Item Group,Website Item Group,Tuoteryhmän verkkosivu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,tullit ja verot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Anna Viiteajankohta
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Toistuvien asiakkuuksien liikevaihto
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kulujen hyväksyjä'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pari
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
 DocType: Asset,Depreciation Schedule,Poistot aikataulu
 DocType: Bank Reconciliation Detail,Against Account,tili kohdistus
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date pitäisi olla välillä Päivästä ja Päivään
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
 ,Quotation Trends,"Tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
 DocType: Shipping Rule Condition,Shipping Amount,Toimituskustannus arvomäärä
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
 DocType: Purchase Order,Delivered,toimitettu
 ,Vehicle Expenses,ajoneuvojen kulut
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
+DocType: Serial No,Invoice Details,laskun tiedot
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvon rekisterinumero
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Päivä jolloin toistuva lasku lakkaa
 DocType: Employee Loan,Loan Amount,Lainan määrä
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,lisäalennus
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, kun kohde on kiinteän omaisuuden. Käytä erillistä rivi useita kpl."
 DocType: Leave Block List Allow,Leave Block List Allow,Salli
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Ryhmä Non-ryhmän
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
 DocType: Loan Type,Loan Name,laina Name
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Hylkyvarasto
 DocType: Production Order,Skip Material Transfer,Ohita materiaalin siirto
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Pysty löytämään vaihtokurssi {0} ja {1} avaimen päivämäärä {2}. Luo Valuutanvaihto ennätys manuaalisesti
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Tilikautesi päättyy
 DocType: POS Profile,Price List,Hinnasto
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} nyt on oletustilikausi. päivitä selain, jotta muutos tulee voimaan."
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Nimike {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** sisältää kaikki sen kuluessa kirjatut kirjanpito- ym. taloudenhallinnan tapahtumat
 DocType: Opportunity,Customer / Lead Address,Asiakkaan / Liidin osoite
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
 DocType: Student Admission,Eligibility,kelpoisuus
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",Liidien avulla liiketoimintaasi ja kontaktiesi määrä kasvaa ja niistä syntyy uusia mahdollisuuksia
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",Liidien avulla liiketoimintaasi ja kontaktiesi määrä kasvaa ja niistä syntyy uusia mahdollisuuksia
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Valitse yritys...
 DocType: Leave Control Panel,Leave blank if considered for all departments,tyhjä mikäli se pidetään vaihtoehtona kaikilla osastoilla
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Process Payroll,Fortnightly,joka toinen viikko
 DocType: Currency Exchange,From Currency,valuutasta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Lapsi Tuote ei pitäisi olla tuote Bundle. Poista toiminto `{0}` ja säästä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Pankkitoiminta
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Lisää kellokortit
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Lisää kellokortit
 DocType: Vehicle Service,Service Item,palvelu Tuote
 DocType: Bank Guarantee,Bank Guarantee,Pankkitakaus
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnat ei näytetä, jos hinnasto ei ole asetettu"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ilmoitathan maa tälle toimitus säännön tai tarkistaa Postikuluja
 DocType: Stock Entry,Total Incoming Value,"Kokonaisarvo, saapuva"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Veloituksen tarvitaan
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Kellokortit auttaa seurata aikaa, kustannuksia ja laskutusta aktiviteetti tehdä tiimisi"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Veloituksen tarvitaan
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Kellokortit auttaa seurata aikaa, kustannuksia ja laskutusta aktiviteetti tehdä tiimisi"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
 DocType: Offer Letter Term,Offer Term,Tarjouksen voimassaolo
 DocType: Quality Inspection,Quality Manager,Laatuhallinta
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,Häviämissyy
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Uusi osoite
 DocType: Quality Inspection,Sample Size,Näytteen koko
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Anna kuitti asiakirja
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,kaikki tuotteet on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Anna kuitti asiakirja
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,kaikki tuotteet on jo laskutettu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Määritä kelvollinen &quot;Case No.&quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
 DocType: Project,External,ulkoinen
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Käyttäjät ja käyttöoikeudet
 DocType: Vehicle Log,VLOG.,Vlogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Tuotanto Tilaukset Luotu: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Tuotanto Tilaukset Luotu: {0}
 DocType: Branch,Branch,Sivutoimiala
 DocType: Guardian,Mobile Number,Puhelinnumero
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tulostus ja brändäys
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Sarjanumeroa {0} ei löydy
 DocType: Scheduling Tool,Student Batch,Student Erä
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Omat asiakkaat
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Tee Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Tee Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyöhön projektissa {0}
 DocType: Leave Block List Date,Block Date,estopäivä
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Hae nyt
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,Lähetetty kenelle
 DocType: Payment Request,Make Sales Invoice,tee myyntilasku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Ohjelmistot
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Seuraava Ota Date ei voi olla menneisyydessä
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Seuraava Ota Date ei voi olla menneisyydessä
 DocType: Company,For Reference Only.,vain viitteeksi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Valitse Erä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},virheellinen {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-jälkikä-
 DocType: Sales Invoice Advance,Advance Amount,ennakko
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,asianumero ei voi olla 0
 DocType: Item,Show a slideshow at the top of the page,Näytä diaesitys sivun yläreunassa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,varastoi
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,varastoi
 DocType: Serial No,Delivery Time,toimitusaika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,vanhentuminen perustuu
 DocType: Item,End of Life,elinkaaren loppu
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,materiaalisiirto
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tämä asiakirja on yli rajan {0} {1} alkion {4}. Teetkö toisen {3} vasten samalla {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Valitse muutoksen suuruuden tili
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Valitse muutoksen suuruuden tili
 DocType: Purchase Invoice,Price List Currency,"Hinnasto, valuutta"
 DocType: Naming Series,User must always select,Käyttäjän tulee aina valita
 DocType: Stock Settings,Allow Negative Stock,salli negatiivinen varastoarvo
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,Talousarviotili
 DocType: Quality Inspection,Verified By,Vahvistanut
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Yrityksen oletusvaluuttaa ei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
-DocType: Grade Interval,Grade Description,Grade Kuvaus
+DocType: Grading Scale Interval,Grade Description,Grade Kuvaus
 DocType: Stock Entry,Purchase Receipt No,Ostokuitti No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,aikaisintaan raha
 DocType: Process Payroll,Create Salary Slip,Tee palkkalaskelma
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 DocType: Warranty Claim,Raised By,Pyynnön tekijä
 DocType: Payment Gateway Account,Payment Account,Maksutili
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,korvaava on pois
 DocType: Offer Letter,Accepted,hyväksytyt
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Toimitussäännön nimike
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Käyttäjäfoorumi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"hintaa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
@@ -2285,7 +2285,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Ehdot ja säännöt 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nimi Instituutin jolle olet luomassa tätä järjestelmää.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","kirjanpidon kirjaus on toistaiseksi jäädytetty, vain alla mainitussa roolissa voi tällä hetkellä kirjata / muokata tiliä"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Tallenna asiakirja ennen huoltoaikataulun muodostusta
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Tallenna asiakirja ennen huoltoaikataulun muodostusta
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektin tila
 DocType: UOM,Check this to disallow fractions. (for Nos),täppää ellet halua murtolukuja (Nos:iin)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Seuraavat tuotantotilaukset luotiin:
@@ -2308,6 +2308,7 @@
 DocType: Email Digest,How frequently?,kuinka usein
 DocType: Purchase Receipt,Get Current Stock,hae nykyinen varasto
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,materiaalilaskupuu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Tuote Group&gt; Merkki
 DocType: Student,Joining Date,liittyminen Date
 ,Employees working on a holiday,Virallisena lomapäivänä työskentelevät työntekijät
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Nykyinen
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,tilityspäivää ei ole mainittu
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Tuotanto
 DocType: Guardian,Occupation,Ammatti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömäärä)
 DocType: Sales Invoice,This Document,Tämä asiakirja
 DocType: Installation Note Item,Installed Qty,asennettu yksikkömäärä
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,"Myyntitilaus, viesti"
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Aseta oletusarvot kuten yritys, valuutta, kuluvan tilikausi jne"
 DocType: Payment Entry,Payment Type,Maksun tyyppi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valitse Erä momentille {0}. Pysty löytämään yhden erän, joka täyttää tämän vaatimuksen"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valitse Erä momentille {0}. Pysty löytämään yhden erän, joka täyttää tämän vaatimuksen"
 DocType: Process Payroll,Select Employees,Valitse työntekijät
 DocType: Opportunity,Potential Sales Deal,Potentiaaliset Myynti Deal
 DocType: Payment Entry,Cheque/Reference Date,Sekki / Viitepäivä
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},yritykselle {1} on jo tehty yleinen POS profiili {0}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,korvaa tuote / BOM kaikissa BOM:ssa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kuitti asiakirja on esitettävä
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kuitti asiakirja on esitettävä
 DocType: Purchase Invoice Item,Received Qty,Saapunut yksikkömäärä
 DocType: Stock Entry Detail,Serial No / Batch,Sarjanumero / erä
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ei makseta ja ei toimiteta
@@ -2441,7 +2442,7 @@
 ,To Produce,Tuotantoon
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Palkanmaksu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Tee Käyttäjän
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Tee Käyttäjän
 DocType: Packing Slip,Identification of the package for the delivery (for print),pakkauksen tunnistus toimitukseen (tulostus)
 DocType: Bin,Reserved Quantity,Varattu Määrä
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Anna voimassa oleva sähköpostiosoite
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Vammaiset mallia saa olla oletuspohja
 DocType: Account,Income Account,tulotili
 DocType: Payment Request,Amount in customer's currency,Summa asiakkaan valuutassa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Toimitus
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Katso ""materiaaleihin perustuva arvo"" kustannuslaskenta osiossa"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Taaksepäin
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Erät avulla voit seurata läsnäoloa, arvioinnit ja palkkiot opiskelijoille"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Erät avulla voit seurata läsnäoloa, arvioinnit ja palkkiot opiskelijoille"
 DocType: Payment Entry,Total Allocated Amount,Yhteensä osuutensa
 DocType: Item Reorder,Material Request Type,materiaalipyynnön tyyppi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Päiväkirjakirjaus palkkojen välillä {0} ja {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seuraa vihjeitä toimialan mukaan
 DocType: Item Supplier,Item Supplier,tuote toimittaja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Lähettää sähköpostia tapahtumasta työntekijöiden tilassa &#39;Open&#39;
 DocType: Task,Depends on Tasks,Riippuu Tehtävät
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Liitteet voidaan osoittaa toiminnon ottamatta ostoskorin
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,uuden kustannuspaikan nimi
 DocType: Leave Control Panel,Leave Control Panel,poistu ohjauspaneelista
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,debet kirjaus kohteeseen
 DocType: Delivery Note,Required only for sample item.,vain demoerä on pyydetty
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; toimittaja tyyppi
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palkkakuitin välillä havaittu {0} ja {1}
 ,Pending SO Items For Purchase Request,"Ostettavat pyyntö, odottavat myyntitilaukset"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Opiskelijavalinta
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} on poistettu käytöstä
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} on poistettu käytöstä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 DocType: Sales Invoice,SINV-RET-,SINV-jälkikä-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,erittäin suuri
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Kotisivu Erityistuotteet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Kaikki Assessment Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uusi varasto Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Yhteensä {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Yhteensä {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Alue
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vierailujen määrä vaaditaan
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,Hinnasto valvonta
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,kaikki myyntitapahtumat voidaan kohdistaa useammalle ** myyjälle ** tavoitteiden asettamiseen ja seurantaan
 ,S.O. No.,Myyntitilaus nro
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Luo asiakkuus vihjeestä {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Luo asiakkuus vihjeestä {0}
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Vain Jätä Sovellukset tilassa &#39;Hyväksytty&#39; ja &#39;Hylätty &quot;voi jättää
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Opiskelija Ryhmän nimi on pakollinen rivin {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,kirjanpidon varaston kirjaus
 DocType: Vehicle Service,Engine Oil,Moottoriöljy
 DocType: Sales Invoice,Sales Team1,Myyntitiimi 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,Asiakkaan osoite
 DocType: Employee Loan,Loan Details,Loan tiedot
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Varastoissa nykyisten tapahtumaa ei voida muuntaa ryhmään.
 DocType: Assessment Result Tool,Result HTML,tulos HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vanhemee
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Lisää Opiskelijat
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Lisää Opiskelijat
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Ole hyvä ja valitse {0}
 DocType: C-Form,C-Form No,C-muoto nro
 DocType: BOM,Exploded_items,räjäytetyt_tuotteet
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Raja ylitetty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Pääomasijoitus
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Lukukaudessa tällä &quot;Lukuvuosi {0} ja&quot; Term Name &#39;{1} on jo olemassa. Ole hyvä ja muokata näitä merkintöjä ja yritä uudelleen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Koska on olemassa nykyisiä tapahtumia vastaan kohde {0}, et voi muuttaa arvoa {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Koska on olemassa nykyisiä tapahtumia vastaan kohde {0}, et voi muuttaa arvoa {1}"
 DocType: UOM,Must be Whole Number,täytyy olla kokonaisluku
 DocType: Leave Control Panel,New Leaves Allocated (In Days),uusi poistumisten kohdennus (päiviä)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Sarjanumeroa {0} ei ole olemassa
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,seuraavan kuukauden viimeinen päivä
 DocType: Support Settings,Auto close Issue after 7 days,Auto lähellä Issue 7 päivän jälkeen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Vapaita ei voida käyttää ennen {0}, koska käytettävissä olevat vapaat on jo siirretty eteenpäin jaksolle {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Hakija
 DocType: Asset Category Account,Accumulated Depreciation Account,Kertyneiden poistojen tili
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,tuotekoodi
 DocType: Production Planning Tool,Create Production Orders,tee tuotannon tilaus
 DocType: Serial No,Warranty / AMC Details,Takuun / huollon lisätiedot
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
 DocType: Journal Entry,User Remark,Käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,tee materiaalipyyntö
 DocType: Employee Education,School/University,Koulu/Yliopisto
 DocType: Payment Request,Reference Details,Viite Tietoja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Odotusarvo jälkeen käyttöiän on oltava alle Gross Purchase Määrä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Odotusarvo jälkeen käyttöiän on oltava alle Gross Purchase Määrä
 DocType: Sales Invoice Item,Available Qty at Warehouse,saatava varaston yksikkömäärä
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,laskutettu
 DocType: Asset,Double Declining Balance,Double jäännösarvopoisto
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Maksettu summa ei voi olla suurempi kuin lainan määrä {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ostotilauksen numero vaaditaan tuotteelle {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Tuotantotilaus ei luonut
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Tuotantotilaus ei luonut
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Aloituspäivän tulee olla ennen päättymispäivää
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
 DocType: Asset,Fully Depreciated,täydet poistot
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merkitty Läsnäolo HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Lainaukset ovat ehdotuksia, tarjouksia olet lähettänyt asiakkaille"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Lainaukset ovat ehdotuksia, tarjouksia olet lähettänyt asiakkaille"
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Sarjanumero ja erä
 DocType: Warranty Claim,From Company,yrityksestä
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa Kymmeniä Arviointikriteerit on oltava {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Aseta määrä Poistot varatut
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Aseta määrä Poistot varatut
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Arvo tai yksikkömäärä
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuutti
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,"Tarjous, sarjat"
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Samanniminen nimike on jo olemassa ({0}), vaihda nimikeryhmän nimeä tai nimeä nimike uudelleen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Valitse asiakas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Valitse asiakas
 DocType: C-Form,I,minä
 DocType: Company,Asset Depreciation Cost Center,Poistojen kustannuspaikka
 DocType: Sales Order Item,Sales Order Date,"Myyntitilaus, päivä"
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,vakuutus Lisätiedot
 DocType: Account,Payable,Maksettava
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Anna takaisinmaksuajat
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Velalliset ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Velalliset ({0})
 DocType: Pricing Rule,Margin,Marginaali
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uudet asiakkaat
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,bruttovoitto %
 DocType: Appraisal Goal,Weightage (%),Painoarvo (%)
 DocType: Bank Reconciliation Detail,Clearance Date,tilityspäivä
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
 DocType: Lead,Address Desc,osoitetiedot
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Osapuoli on pakollinen
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Aihe Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Ainakin yksi tai myyminen ostaminen on valittava
-DocType: Grading Structure,Grade Intervals,Grade intervallit
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Valitse liiketoiminnan luonteesta.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Missä valmistus tapahtuu
 DocType: Asset Movement,Source Warehouse,Lähde varasto
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
 DocType: Territory,Territory Targets,Aluetavoite
 DocType: Delivery Note,Transporter Info,kuljetuksen info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Aseta oletus {0} in Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Alkuasentoon yläreunasta
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Sama toimittaja on syötetty useita kertoja
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Täydennystilauksen yksikkömäärä
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Avoimet työpaikat
 DocType: Company,Stock Adjustment Account,Varastonsäätötili
-DocType: Journal Entry,Write Off,Poisto
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Poisto
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","järjestelmäkäyttäjä (kirjautuminen) tunnus, mikäli annetaan siitä tulee oletus kaikkiin HR muotoihin"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1}:stä
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Toimittaja toimittaa Asiakkaalle
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) on loppunut
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Seuraava Päivämäärä on oltava suurempi kuin julkaisupäivämäärä
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Näytä vero hajottua
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,tietojen tuonti ja vienti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Kanta on merkinnät vastaan Varasto {0}, joten et voi uudelleen määrittää tai muuttaa sitä"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ei opiskelijat Todettu
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Valitse julkaisupäivä ennen valintaa Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Valitse Lainaukset
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,tee huoltokäynti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Valitse Lainaukset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,tee huoltokäynti
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
 DocType: Company,Default Cash Account,oletus kassatili
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tämä perustuu läsnäolo tämän Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Ei opiskelijat
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lisätä kohteita tai avata koko lomakkeen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Ennen täsmäytystä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}:lle
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Lisätyt verot ja maksut (yrityksen valuutassa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
 DocType: Sales Order,Partly Billed,Osittain Laskutetaan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Kohta {0} on oltava käyttö- omaisuuserän
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Kohta {0} on oltava käyttö- omaisuuserän
 DocType: Item,Default BOM,oletus BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Kirjoita yrityksen nimi uudelleen vahvistukseksi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,valuuttakurssi
 DocType: Purchase Invoice Item,Rate,Hinta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,harjoitella
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Osoite Nimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Osoite Nimi
 DocType: Stock Entry,From BOM,BOM:sta
 DocType: Assessment Code,Assessment Code,arviointi koodi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,perustiedot
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,käytettävä tulosteiden kieli
 DocType: Salary Slip,Total Working Hours,Kokonaistyöaika
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Anna-arvon on oltava positiivinen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Anna-arvon on oltava positiivinen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Kaikki alueet
 DocType: Purchase Invoice,Items,tuotteet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Opiskelijan on jo ilmoittautunut.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,alkaen- ja päätyen päivä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Arvopaperit & hyödykkeet vaihto
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
 DocType: Assessment Plan,Supervisor Name,ohjaaja Name
 DocType: Program Enrollment Course,Program Enrollment Course,Ohjelma Ilmoittautuminen kurssi
-DocType: Grading Structure,Grading Structure,Arvostelu rakenne
 DocType: Purchase Taxes and Charges,Valuation and Total,Arvo ja Summa
 DocType: Tax Rule,Shipping City,Toimitus Kaupunki
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tämä on malli tuotteesta {0} (mallipohja), tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 DocType: Notification Control,Customize the Notification,muokkaa ilmoitusta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
 DocType: Sales Invoice,Shipping Rule,Toimitussääntö
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Aukiolopäivä pitäisi olla ennen Tarjouksentekijä
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi Setup&gt; numerointi Series
 DocType: Leave Control Panel,Carry Forward,siirrä
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa tilikirjaksi
 DocType: Department,Days for which Holidays are blocked for this department.,päivät jolloin lomat on estetty tälle osastolle
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (summa)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Luo Työntekijä Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Luo Työntekijä Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Nykyarvo yhteensä
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,tilinpäätöksen
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,tunti
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Uusi materiaaliluettelo korvauksen jälkeen
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Myyntipiste
 DocType: Payment Entry,Received Amount,Vastaanotetut Määrä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource&gt; HR Asetukset
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Luo täyden määrän, välittämättä määrä jo tilattuihin"
 DocType: Account,Tax,Vero
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ei Merkitty
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,laskut
 DocType: Batch,Source Document Name,Lähde Asiakirjan nimi
 DocType: Job Opening,Job Title,Työtehtävä
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Luo Käyttäjät
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Luo Käyttäjät
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Käyntiraportti huoltopyynnöille
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
 DocType: BOM,Website Description,Verkkosivuston kuvaus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettomuutos Equity
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kuitti
 ,Sales Register,Myyntirekisteri
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei muokattavaa.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
 DocType: Customer Group,Customer Group Name,asiakasryhmän nimi
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ei Asiakkaat vielä!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavirtalaskelma
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisenssi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
 DocType: GL Entry,Against Voucher Type,tositteen tyyppi kohdistus
 DocType: Item,Attributes,tuntomerkkejä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Syötä poistotili
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Viimeinen tilaus päivämäärä
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
 DocType: Student,Guardian Details,Guardian Tietoja
 DocType: C-Form,C-Form,C-muoto
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Läsnäolo useita työntekijöitä
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä &quot;Käyttöomaisuuden&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ulkona yksikkömäärä
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Sarjat ovat pakollisia
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Sarjat ovat pakollisia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Talouspalvelu
 DocType: Student Sibling,Student ID,opiskelijanumero
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Toimintamuodot Aika Lokit
 DocType: Tax Rule,Sales,Myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
 DocType: Training Event,Exam,Koe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Laskutus valtion
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,Tilin maksettu
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raaka-aineen tuotekoodi
 DocType: Journal Entry,Write Off Based On,Poisto perustuu
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Luo liidi
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Luo liidi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tulosta ja Paperi
 DocType: Stock Settings,Show Barcode Field,Näytä Viivakoodi Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Lähetä toimittaja Sähköpostit
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,Odottaa vastausta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Yläpuolella
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Mainitse jos standardista maksetaan tilille
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get opiskelijaa
 DocType: Hub Settings,Seller Country,Myyjä maa
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Julkaise kohteet Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Group opiskelijat erissä
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Group opiskelijat erissä
 DocType: Authorization Rule,Authorization Rule,Valtuutus Rule
 DocType: Sales Invoice,Terms and Conditions Details,Ehdot ja säännöt lisätiedot
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Tekniset tiedot
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Koeaika
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Palkanosat
 DocType: Program Enrollment Tool,New Academic Year,Uusi Lukuvuosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Tuotto / hyvityslasku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Tuotto / hyvityslasku
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,maksettu arvomäärä yhteensä
 DocType: Production Order Item,Transferred Qty,siirretty yksikkömäärä
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,Myyntihankekantaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Lyhenne on pakollinen
 DocType: Project,Task Progress,tehtävä Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,kori
 ,Qty to Transfer,Siirrettävä yksikkömäärä
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Noteerauksesta vihjeeksi tai asiakkaaksi
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Määrä ({0}) ei voi olla osa rivillä {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Kerää maksut
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
 DocType: Lead,Add to calendar on this date,lisää kalenteriin (tämä päivä)
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
 DocType: Item,Opening Stock,Aloitusvarasto
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,Liidistä
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,tuotantoon luovutetut tilaukset
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Program Enrollment Tool,Enroll Students,Ilmoittaudu Opiskelijat
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,perusmyynti
@@ -3645,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektin nimi
-DocType: Supplier,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
+DocType: Customer,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
 DocType: Journal Entry Account,If Income or Expense,mikäli tulot tai kulut
 DocType: Production Order,Required Items,Tarvittavat kohteet
 DocType: Stock Ledger Entry,Stock Value Difference,"varastoarvo, ero"
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,Verot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Maksettu ja ei toimitettu
 DocType: Project,Default Cost Center,oletus kustannuspaikka
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} Setup&gt; Asetukset&gt; nimeäminen Series
 DocType: Bank Guarantee,End Date,päättymispäivä
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Varastotapahtumat
 DocType: Budget,Budget Accounts,talousarviokirjanpito
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,Myynti Partner ja komission
 DocType: Employee Loan,Rate of Interest (%) / Year,Korkokanta (%) / vuosi
 ,Project Quantity,Project Määrä
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Yhteensä {0} kaikki kohteet on nolla, voi olla sinun pitäisi muuttaa &quot;välit perustuvat maksujen &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Yhteensä {0} kaikki kohteet on nolla, voi olla sinun pitäisi muuttaa &quot;välit perustuvat maksujen &#39;"
 DocType: Opportunity,To Discuss,Keskusteluun
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} tapahtuman suorittamiseen.
 DocType: Loan Type,Rate of Interest (%) Yearly,Korkokanta (%) Vuotuinen
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rivi {0}: valuutta BOM # {1} pitäisi olla yhtä suuri kuin valittu valuutta {2}
 DocType: Journal Entry Account,Exchange Rate,Valuuttakurssi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Myyntitilausta {0} ei ole lähetetty
 DocType: Homepage,Tag Line,Iskulause
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Kaluston hallinta
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Ilmoittaudu ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,"toimitus kuukaudessa, prosenttiosuudet"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Valittu tuote ei voi olla erä
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valittu tuote ei voi olla erä
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Arvostus korko ei löytynyt Item {0}, jota vaaditaan tekemään kirjauksia varten {1} {2}. Jos kohde on kaupankäyntiosapuolten näytteenä eränä {1}, mainitse, että {1} Item taulukossa. Muussa tapauksessa luo saapuvan osakekauppaohjelman alkion tai maininta arvostus korko on Item kirjaa, ja yritä submiting / peruuttamalla tämän merkinnän"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% lähetteen materiaaleista toimitettu
 DocType: Project,Customer Details,"asiakas, lisätiedot"
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Toimitettu tilauksia ei voi poistaa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Määrähallinta
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
 DocType: Employee Loan,Repay Fixed Amount per Period,Repay kiinteä määrä Period
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä tuotteelle {0}
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Opiskelijan Sähköposti ID
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Valitse kohteita tallentaa laskun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Valitse kohteita tallentaa laskun
 DocType: Employee,Encashment Date,perintä päivä
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Varastonsäätö
@@ -3857,6 +3863,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Annettu
 DocType: Production Order,Warehouses,Varastot
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} hyödykkeen ei voida siirtää
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Tämä kohta on muunnelma {0} (malli).
 DocType: Workstation,per hour,Tunnissa
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Ostot
 DocType: Announcement,Announcement,Ilmoitus
@@ -3872,7 +3879,7 @@
 DocType: Account,Receivable,Saatava
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Valitse tuotteet Valmistus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Valitse tuotteet Valmistus
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
 DocType: Item,Material Issue,materiaali aihe
 DocType: Hub Settings,Seller Description,Myyjän kuvaus
@@ -3885,7 +3892,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
 DocType: Salary Detail,Component,komponentti
 DocType: Assessment Criteria,Assessment Criteria Group,Arviointikriteerit Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Avaaminen Kertyneet poistot on oltava pienempi tai yhtä suuri kuin {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Avaaminen Kertyneet poistot on oltava pienempi tai yhtä suuri kuin {0}
 DocType: Warehouse,Warehouse Name,Varaston nimi
 DocType: Naming Series,Select Transaction,Valitse tapahtuma
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Anna hyväksyminen rooli tai hyväksyminen Käyttäjä
@@ -3919,7 +3926,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Liittyä seuraan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Employee Loan,Repay from Salary,Maksaa maasta Palkka
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Maksupyynnön vastaan {0} {1} määräksi {2}
@@ -3937,7 +3944,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Arviointi Tulos Detail
 DocType: Employee Education,Employee Education,työntekijä koulutus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Monista kohde ryhmä löysi erään ryhmätaulukkoon
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
 DocType: Salary Slip,Net Pay,Nettomaksu
 DocType: Account,Account,tili
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Sarjanumero {0} on jo saapunut
@@ -3946,7 +3953,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Varasto {0} ei ole sidoksissa mihinkään tilin, luo / yhdistää vastaava (Asset) osuus varastoon."
 DocType: Purchase Invoice,Recurring Id,Toistuva Id
 DocType: Customer,Sales Team Details,Myyntitiimin lisätiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,poista pysyvästi?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,poista pysyvästi?
 DocType: Expense Claim,Total Claimed Amount,Vaatimukset arvomäärä yhteensä
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Myynnin potentiaalisia tilaisuuksia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Virheellinen {0}
@@ -3957,13 +3964,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup School ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Muuta Summa (Company valuutta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Tallenna asiakirja ensin
 DocType: Account,Chargeable,veloitettava
 DocType: Company,Change Abbreviation,muuta lyhennettä
 DocType: Expense Claim Detail,Expense Date,"kulu, päivä"
 DocType: Item,Max Discount (%),Max Alennus (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Viimeisen tilauksen arvo
+DocType: Task,Is Milestone,on Milestone
 DocType: Daily Work Summary,Email Sent To,Sähköposti lähetetään
 DocType: Budget,Warn,Varoita
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
@@ -3996,11 +4004,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Kylmävarasto pitäisi olla vähemmän kuin % päivää
 DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
 ,Project wise Stock Tracking,"projekt työkalu, varastoseuranta"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},huoltoaikataulu {0} on olemassa kohdistettuna{0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),todellinen yksikkömäärä (lähde/tavoite)
 DocType: Item Customer Detail,Ref Code,Viite Koodi
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,työntekijä tietue
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
 DocType: HR Settings,Payroll Settings,Palkanlaskennan asetukset
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Tee tilaus
@@ -4023,7 +4030,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Sekkejä ja Talletukset virheellisesti selvitetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
 DocType: Purchase Invoice Item,Price List Rate,hinta
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Luoda asiakkaalle lainausmerkit
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Luoda asiakkaalle lainausmerkit
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Näytä tämän varaston saatavat ""varastossa"" tai ""ei varastossa"" perusteella"
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Osaluettelo (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Keskimääräinen aika toimittajan toimittamaan
@@ -4045,7 +4052,7 @@
 DocType: Asset,Disposal Date,hävittäminen Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Sähköpostit lähetetään kaikille aktiivinen Yrityksen työntekijät on tietyn tunnin, jos heillä ei ole loma. Yhteenveto vastauksista lähetetään keskiyöllä."
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Rivi {0}: täydennystilaus on jo kirjattu tälle varastolle {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rivi {0}: täydennystilaus on jo kirjattu tälle varastolle {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Palaute
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Tuotannon tilaus {0} on lähetettävä
@@ -4053,7 +4060,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurssi on pakollinen rivi {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Päivään ei voi olla ennen aloituspäivää
 DocType: Supplier Quotation Item,Prevdoc DocType,Edellinen tietuetyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Lisää / muokkaa hintoja
 DocType: Batch,Parent Batch,Parent Erä
 DocType: Cheque Print Template,Cheque Print Template,Shekki Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,kustannuspaikkakaavio
@@ -4097,7 +4104,7 @@
 DocType: Item,Variant Based On,Variant perustuvat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},nimetty painoarvo yhteensä tulee olla 100% nyt se on {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,omat toimittajat
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
 DocType: Request for Quotation Item,Supplier Part No,Toimittaja osanumero
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Saadut
@@ -4107,7 +4114,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: valitse {0} on {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rivi {0}: Tuntia arvon on oltava suurempi kuin nolla.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Sivsuton kuvaa {0} kohteelle {1} ei löydy
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Sivsuton kuvaa {0} kohteelle {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
@@ -4116,20 +4123,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
 DocType: Payment Reconciliation,Get Unreconciled Entries,hae täsmäämättömät kirjaukset
 DocType: Payment Reconciliation,From Invoice Date,Alkaen Laskun päiväys
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Laskutusvaluutta on oltava yhtä suuri kuin joko oletus comapany valuuttaa tai osapuoli tilivaluutta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Laskutusvaluutta on oltava yhtä suuri kuin joko oletus comapany valuuttaa tai osapuoli tilivaluutta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,jätä perintä
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Mitä tämä tekee?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Varastoon
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Kaikki Opiskelijavalinta
 ,Average Commission Rate,keskimääräinen provisio
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,Varastoimattoman nimikkeen 'Sarjanumeroitu' -arvo ei voi olla 'kyllä'
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,Varastoimattoman nimikkeen 'Sarjanumeroitu' -arvo ei voi olla 'kyllä'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"Hinnoittelusääntö, ohjeet"
 DocType: School House,House Name,Talon nimi
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Päivitä lisäkustannukset jotta tuotteisiin kohdistuneet kustannukset voidaan laskea
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,sähköinen
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisää loput organisaatiosi käyttäjille. Voit myös lisätä kutsua Asiakkaat portaaliin lisäämällä ne Yhteydet
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisää loput organisaatiosi käyttäjille. Voit myös lisätä kutsua Asiakkaat portaaliin lisäämällä ne Yhteydet
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Käyttäjätunnusta ei asetettu työntekijälle {0}
@@ -4138,7 +4145,7 @@
 DocType: Item,Customer Code,asiakkaan koodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,päivää edellisestä tilauksesta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
 DocType: Buying Settings,Naming Series,Nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Vakuutus Aloituspäivä pitäisi olla alle Insurance Päättymispäivä
@@ -4153,7 +4160,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
 DocType: Vehicle Log,Odometer,Matkamittari
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Nimike {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Nimike {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Osaluettelo ei sisällä yhtäkään varastonimikettä
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Ajanjakso mistä ja mihin päivämäärään ovat pakollisia toistuville {0}
@@ -4166,7 +4173,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
 DocType: Sales Invoice Timesheet,Billing Hours,Laskutus tuntia
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Oletus BOM varten {0} ei löytynyt
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Kosketa kohteita lisätä ne tästä
 DocType: Fees,Program Enrollment,Ohjelma Ilmoittautuminen
 DocType: Landed Cost Voucher,Landed Cost Voucher,"Kohdistetut kustannukset, tosite"
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Aseta {0}
@@ -4263,7 +4271,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vähittäismyynti &amp; Tukkukauppa
 DocType: Issue,First Responded On,Ensimmäiset vastaavat
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ristiluettelo tuotteille jotka on useammissa ryhmissä
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tilikauden alkamispäivä ja tilikauden päättymispäivä on asetettu tilikaudelle {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Tilityspäivä päivitetty
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Erä
@@ -4271,6 +4278,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Lataa PDF
 DocType: Production Order,Planned End Date,Suunniteltu päättymispäivä
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Missä tuotteet varastoidaan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; toimittaja tyyppi
 DocType: Request for Quotation,Supplier Detail,Toimittaja Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Virhe kaavassa tai tila: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,laskutettu
@@ -4315,7 +4323,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Asennus yksinkertainen sivusto organisaatiolleni
 DocType: Payment Reconciliation,Receivable / Payable Account,Saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,Myyntitilauksen kohdistus / nimike
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Syötä pääkustannuspaikka
@@ -4372,7 +4380,7 @@
 ,Items To Be Requested,tuotteet joita on pyydettävä
 DocType: Purchase Order,Get Last Purchase Rate,käytä viimeisimmän edellisen oston hintoja
 DocType: Company,Company Info,yrityksen tiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Valitse tai lisätä uuden asiakkaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Valitse tai lisätä uuden asiakkaan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kustannuspaikkaa vaaditaan varata kulukorvauslasku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tämä perustuu työntekijän läsnäoloihin
@@ -4385,13 +4393,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,estä käyttäjiä tekemästä poistumissovelluksia seuraavina päivinä
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Osto Määrä
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,työntekijä etuudet
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Production Order,Manufactured Qty,valmistettu yksikkömäärä
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Aseta oletus Holiday List Työntekijä {0} tai Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ei löydy
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Laskut nostetaan asiakkaille.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
@@ -4400,15 +4408,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lukema 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,Tositetyyppi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Hinnastoa ei löydy tai se on poistettu käytöstä
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Employee Loan Application,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
 DocType: Guardian,Guardian,holhooja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,työntekijälle {1} on tehty arviointi {0} ilmoitettuna päivänä
 DocType: Employee,Education,koulutus
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,kampanja nimennyt
 DocType: Employee,Current Address Is,nykyinen osoite on
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,muokattu
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Vapaaehtoinen. Asettaa yhtiön oletusvaluuttaa, jos ei ole määritelty."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
@@ -4445,7 +4455,7 @@
 DocType: Hub Settings,Hub Settings,hubi asetukset
 DocType: Project,Gross Margin %,bruttokate %
 DocType: BOM,With Operations,Toiminnoilla
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
 DocType: Asset,Is Existing Asset,Onko Olemassa Asset
 DocType: Salary Detail,Statistical Component,tilastollinen Komponentti
 ,Monthly Salary Register,Kuukaisittainen palkkakirjanpito
@@ -4499,7 +4509,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Kiinnitä Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Levels
 DocType: Customer,Commission Rate,provisio
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,estä poistumissovellukset osastoittain
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksu tyyppi on yksi vastaanottaminen, Pay ja sisäinen siirto"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytiikka
@@ -4512,6 +4522,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,salli tuotanto lomapäivinä
 DocType: Sales Order,Customer's Purchase Order Date,asiakkaan ostotilaus päivä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,osakepääoma
+DocType: Shopping Cart Settings,Show Public Attachments,Näytä Julkinen Liitteet
 DocType: Packing Slip,Package Weight Details,"Pakkauspaino, lisätiedot"
 DocType: Payment Gateway Account,Payment Gateway Account,Maksu Gateway tili
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Maksun jälkeen valmistumisen ohjata käyttäjän valitulle sivulle.
@@ -4536,7 +4547,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita,  $ jne valuuttojen vieressä"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Tee Student Erä
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Tee Student Erä
 DocType: Leave Type,Is Carry Forward,siirretääkö
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,hae tuotteita BOM:sta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,"virtausaika, päivää"
@@ -4555,7 +4566,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioitujen arvomäärä
 DocType: GL Entry,Is Opening,on avaus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi Setup&gt; numerointi Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,tiliä {0} ei löydy
 DocType: Account,Cash,Käteinen
 DocType: Employee,Short biography for website and other publications.,Lyhyt historiikki verkkosivuille ja muihin julkaisuihin
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 3bb30cf..0a6b30f 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Statut d'Expiration d'Article du Lot
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Traite Bancaire
 DocType: Mode of Payment Account,Mode of Payment Account,Compte du Mode de Paiement
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Afficher les Variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Afficher les Variantes
 DocType: Academic Term,Academic Term,Terme Académique
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Matériel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantité
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Soins de Santé
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard de paiement (jours)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Frais de Service
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de série: {0} est déjà référencé dans la facture de vente: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Exercice Fiscal {0} est nécessaire
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicité
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La même Société a été entrée plus d'une fois
 DocType: Employee,Married,Marié
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non autorisé pour {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Non autorisé pour {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obtenir les articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produit {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Aucun article référencé
 DocType: Payment Reconciliation,Reconcile,Réconcilier
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Épicerie
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
 DocType: Process Payroll,Make Bank Entry,Créer une Écriture Bancaire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fonds de Pension
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,La Date de l’Amortissement Suivant ne peut pas être avant la Date d’Achat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La Date de l’Amortissement Suivant ne peut pas être avant la Date d’Achat
 DocType: SMS Center,All Sales Person,Tous les Commerciaux
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**Répartition Mensuelle** vous aide à diviser le Budget / la Cible sur plusieurs mois si vous avez de la saisonnalité dans votre entreprise.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Pas d'objets trouvés
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Pas d'objets trouvés
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Grille des Salaires Manquante
 DocType: Lead,Person Name,Nom de la Personne
 DocType: Sales Invoice Item,Sales Invoice Item,Article de la Facture de Vente
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","e.g. ""École Primaire"" ou ""Université"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Rapports de Stock
 DocType: Warehouse,Warehouse Detail,Détail de l'Entrepôt
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},La limite de crédit a été franchie pour le client {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},La limite de crédit a été franchie pour le client {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être postérieure à la Date de Fin de l'Année Académique à laquelle le terme est lié (Année Académique {}). Veuillez corriger les dates et essayer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article
 DocType: Vehicle Service,Brake Oil,Liquide de Frein
 DocType: Tax Rule,Tax Type,Type de Taxe
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des écritures avant le {0}
 DocType: BOM,Item Image (if not slideshow),Image de l'Article (si ce n'est diaporama)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Un Client existe avec le même nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif Horaire / 60) * Temps Réel d’Opération
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Sélectionner LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Sélectionner LDM
 DocType: SMS Log,SMS Log,Journal des SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Coût des Articles Livrés
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Le jour de vacances {0} n’est pas compris entre la Date Initiale et la Date Finale
@@ -190,24 +193,24 @@
 DocType: Training Result Employee,Grade,Note
 DocType: Sales Invoice Item,Delivered By Supplier,Livré par le Fournisseur
 DocType: SMS Center,All Contact,Tout Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordre de Production déjà créé pour tous les articles avec LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Ordre de Production déjà créé pour tous les articles avec LDM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salaire Annuel
 DocType: Daily Work Summary,Daily Work Summary,Récapitulatif Quotidien de Travail
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l'Exercice
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} est gelée
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} est gelée
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Veuillez sélectionner une Société Existante pour créer un Plan de Compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Charges de Stock
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Sélectionnez Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Sélectionner l'Entrepôt Cible
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Veuillez entrer l’Email de Contact Préférré
 DocType: Journal Entry,Contra Entry,Contre-passation
 DocType: Journal Entry Account,Credit in Company Currency,Crédit dans la Devise de la Société
 DocType: Delivery Note,Installation Status,Etat de l'Installation
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Voulez-vous mettre à jour la fréquentation? <br> Présents: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La Qté Acceptée + Rejetée doit être égale à la quantité Reçue pour l'Article {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Fournir les Matières Premières pour l'Achat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,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
 DocType: Products Settings,Show Products as a List,Afficher les Produits en Liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Téléchargez le modèle, remplissez les données appropriées et joignez le fichier modifié.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Créer une Écriture d'Amortissement
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Type de Demande
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Créer un Employé
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Créer un Employé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radio/Télévision
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Exécution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Détails des opérations effectuées.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan pour les visites de maintenance.
 DocType: SMS Settings,Enter url parameter for message,Entrez le paramètre url pour le message
 DocType: POS Profile,Customer Groups,Groupes de Clients
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,États financiers
 DocType: Guardian,Students,Étudiants
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Règles pour l’application des tarifs et des remises.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La Liste de Prix doit être applicable pour les Achats et les Ventes
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Montant de l'avance ne peut être supérieur à {0} {1}
 DocType: Naming Series,Series List for this Transaction,Liste des Séries pour cette Transaction
 DocType: Company,Default Payroll Payable Account,Compte de Paie par Défaut
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Metter à jour le Groupe d'Email
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Metter à jour le Groupe d'Email
 DocType: Sales Invoice,Is Opening Entry,Est Écriture Ouverte
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si le compte débiteur applicable n'est pas standard
 DocType: Course Schedule,Instructor Name,Nom de l'Instructeur
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Pour l'Article de la Facture de Vente
 ,Production Orders in Progress,Ordres de Production en Cours
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Trésorerie Nette des Financements
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Le Stockage Local est plein, l’enregistrement n’a pas fonctionné"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Le Stockage Local est plein, l’enregistrement n’a pas fonctionné"
 DocType: Lead,Address & Contact,Adresse &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les congés inutilisés des précédentes allocations
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Récurrent Suivant {0} sera créé le {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Montant Total des Coûts (via Feuille de Temps)
 DocType: Item Website Specification,Item Website Specification,Spécification de l'Article sur le Site Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Laisser Verrouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Écritures Bancaires
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Article de Réconciliation du Stock
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Publier dans le Hub
 DocType: Student Admission,Student Admission,Admission des Étudiants
 ,Terretory,Territoire
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Article {0} est annulé
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Article {0} est annulé
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Demande de Matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à Jour la Date de Compensation
 DocType: Item,Purchase Details,Détails de l'Achat
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifier par Email lors de la création automatique de la Demande de Matériel
 DocType: Journal Entry,Multi Currency,Multi-Devise
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de Facture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Bon de Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Bon de Livraison
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuration des Impôts
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Coût des Immobilisations Vendus
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,L’Écriture de Paiement a été modifié après que vous l’ayez récupérée. Veuillez la récupérer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
-DocType: Grade Interval,Min Score,Score Minimal
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Résumé de la semaine et des activités en suspens
 DocType: Student Applicant,Admitted,Admis
 DocType: Workstation,Rent Cost,Coût de la Location
@@ -387,10 +390,10 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Veuillez sélectionner le mois et l'année
 DocType: Employee,Company Email,E-mail de la Société
 DocType: GL Entry,Debit Amount in Account Currency,Montant Débiteur en Devise du Compte
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valeur de la commande
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valeur de la Commande
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transactions Bancaires/de Trésorerie avec une partie ou pour transfert interne
 DocType: Shipping Rule,Valid for Countries,Valable pour les Pays
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Cet Article est un Modèle et ne peut être utilisé dans les transactions. Les Attributs d’Articles seront copiés dans les variantes sauf si ‘Pas de Copie’ est coché
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Cet Article est un Modèle et ne peut être utilisé dans les transactions. Les Attributs d’Articles seront copiés dans les variantes sauf si ‘Pas de Copie’ est coché
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la Commande Considéré
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Intitulé de poste (e.g.  Directeur Général, Directeur...)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Veuillez entrer une valeur pour 'Répéter le jour du mois'
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Taux d'Imposition
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} déjà alloué pour l’Employé {1} pour la période {2} à {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Sélectionner l'Article
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Facture d’Achat {0} est déjà soumise
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La Facture d’Achat {0} est déjà soumise
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ligne # {0} : Le N° de Lot doit être le même que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir en non-groupe
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lot d'un Article.
 DocType: C-Form Invoice Detail,Invoice Date,Date de la Facture
 DocType: GL Entry,Debit Amount,Montant du Débit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir qu’un Compte par Société dans {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir qu’un Compte par Société dans {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Veuillez voir la pièce jointe
 DocType: Purchase Order,% Received,% Reçu
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Créer des Groupes d'Étudiants
@@ -425,8 +428,8 @@
 DocType: Packed Item,Packed Item,Article Emballé
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Paramètres par défaut pour les transactions d'achat.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Des Coûts d'Activité existent pour l'Employé {0} pour le Type d'Activité - {1}
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Champ obligatoire - Obtenir des étudiants de
-DocType: Program Enrollment,Enrolled courses,Cours inscrits
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Champ Obligatoire - Obtenir des étudiants de
+DocType: Program Enrollment,Enrolled courses,Cours Inscrits
 DocType: Currency Exchange,Currency Exchange,Change de Devise
 DocType: Asset,Item Name,Nom d'Article
 DocType: Authorization Rule,Approving User  (above authorized value),Utilisateur Approbateur (valeurs autorisées ci-dessus)
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,Appel d'Offre
 DocType: Salary Slip Timesheet,Working Hours,Heures de Travail
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Créer un nouveau Client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Créer un nouveau Client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si plusieurs Règles de Prix continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité pour résoudre les conflits."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Créer des Commandes d'Achat
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Créer des Commandes d'Achat
 ,Purchase Register,Registre des Achats
 DocType: Course Scheduling Tool,Rechedule,Replanifier
 DocType: Landed Cost Item,Applicable Charges,Frais Applicables
@@ -475,12 +478,12 @@
 DocType: Production Order,Not Started,Non Commencé
 DocType: Lead,Channel Partner,Partenaire de Canal
 DocType: Account,Old Parent,Grand Parent
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Champ obligatoire - Année académique
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Champ Obligatoire - Année Académique
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personnaliser le texte d'introduction qui fera partie de cet Email. Chaque transaction a une introduction séparée.
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes Gelés Jusqu'au
 DocType: SMS Log,Sent On,Envoyé le
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
 DocType: HR Settings,Employee record is created using selected field. ,Le dossier de l'employé est créé en utilisant le champ sélectionné.
 DocType: Sales Order,Not Applicable,Non Applicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Données de Base des Vacances
@@ -492,7 +495,7 @@
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si cochée, le montant de la taxe sera considéré comme déjà inclus dans le Taux d'Impression / Prix d'Impression"
 DocType: Request for Quotation,Message for Supplier,Message pour le Fournisseur
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qté Totale
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,ID Email du Tuteur2
 DocType: Item,Show in Website (Variant),Afficher dans le Website (Variant)
 DocType: Employee,Health Concerns,Problèmes de Santé
 DocType: Process Payroll,Select Payroll Period,Sélectionner la Période de Paie
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Du N° de Colis
 DocType: Item Attribute,To Range,Au Rang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et Dépôts
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossible de modifier la méthode d&#39;évaluation, car il existe des transactions contre certains éléments qui ne possèdent pas leur propre méthode d&#39;évaluation"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total des Congés attribués est obligatoire
 DocType: Job Opening,Description of a Job Opening,Description d'une Nouvelle Offre d’Emploi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activités en Attente pour aujourd'hui
@@ -519,7 +523,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Revenu Direct
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur le Compte , si les lignes sont regroupées par Compte"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Agent Administratif
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Sélectionnez le cours
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Veuillez sélectionner un Cours
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Veuillez sélectionner une Société
 DocType: Stock Entry Detail,Difference Account,Compte d’Écart
@@ -527,16 +531,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Veuillez entrer l’Entrepôt pour lequel une Demande de Matériel sera faite
 DocType: Production Order,Additional Operating Cost,Coût d'Exploitation Supplémentaires
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Produits de Beauté
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles"
 DocType: Shipping Rule,Net Weight,Poids Net
 DocType: Employee,Emergency Phone,Téléphone d'Urgence
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Acheter
 ,Serial No Warranty Expiry,Expiration de Garantie du N° de Série
 DocType: Sales Invoice,Offline POS Name,Nom du PDV Hors-ligne`
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Veuillez définir la note pour le Seuil 0%
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Veuillez définir une note pour le Seuil 0%
 DocType: Sales Order,To Deliver,À Livrer
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,N° de série de l'article ne peut pas être une fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,N° de série de l'article ne peut pas être une fraction
 DocType: Journal Entry,Difference (Dr - Cr),Écart (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et Profits
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestion de la Sous-traitance
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Article Remarque d'Installation
 DocType: Production Plan Item,Pending Qty,Qté en Attente
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} n'est pas actif
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} n'est pas actif
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS envoyé aux numéros suivants : {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurez les dimensions du chèque pour l'impression
 DocType: Salary Slip,Salary Slip Timesheet,Feuille de Temps de la Fiche de Paie
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Total de la Commission
 DocType: Pricing Rule,Sales Partner,Partenaire Commercial
 DocType: Buying Settings,Purchase Receipt Required,Reçu d’Achat Requis
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Le Taux de Valorisation est obligatoire si un Stock Initial est entré
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Le Taux de Valorisation est obligatoire si un Stock Initial est entré
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Veuillez d’abord sélectionner une Société et le Type de la Partie
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Exercice comptable / financier
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valeurs Accumulées
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé, les N° de Série ne peut pas être fusionnés"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Créer une Commande Client
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Créer une Commande Client
 DocType: Project Task,Project Task,Tâche du Projet
 ,Lead Id,Id du Prospect
 DocType: C-Form Invoice Detail,Grand Total,Total TTC
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Reprendre la Pièce Jointe
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter Clients
 DocType: Leave Control Panel,Allocate,Allouer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Retour de Ventes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Remarque : Le total des congés alloués {0} ne doit pas être inférieur aux congés déjà approuvés {1} pour la période
 DocType: Announcement,Posted By,Posté par
 DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Expédition Directe)
@@ -604,9 +608,9 @@
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu Intermédiaire
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Ouverture (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Le montant alloué ne peut être négatif
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Configurez la société
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Veuillez définir la Société
 DocType: Purchase Order Item,Billed Amt,Mnt Facturé
 DocType: Training Result Employee,Training Result Employee,Résultat de la Formation – Employé
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stock sont faites.
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Feuille de Temps de la Facture de Vente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N° et Date de Référence sont nécessaires pour {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Sélectionner Compte de Crédit pour faire l'Écriture Bancaire
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Créer des dossiers Employés pour gérer les congés, les notes de frais et la paie"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Créer des dossiers Employés pour gérer les congés, les notes de frais et la paie"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Ajouter à la Base de Connaissances
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Rédaction de Propositions
 DocType: Payment Entry Deduction,Payment Entry Deduction,Déduction d’Écriture de Paiement
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relation avec Tuteur2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Directeur
 DocType: Payment Entry,Payment From / To,Paiement De / À
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervalle de Date
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Le même article a été saisi plusieurs fois.
 DocType: SMS Settings,Receiver Parameter,Paramètre Récepteur
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peuvent pas être identiques
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Date de Résolution
 DocType: Student Batch Name,Batch Name,Nom du Lot
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Feuille de Temps créée :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Inscrire
 DocType: Selling Settings,Customer Naming By,Client Nommé par
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Affichera l'étudiant comme Présent dans le Rapport Mensuel de Présence des Étudiants
@@ -700,7 +703,7 @@
 DocType: Journal Entry,Write Off Amount,Montant de la Reprise
 DocType: Journal Entry,Bill No,Numéro de Facture
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte de Cessions des Immobilisations
-DocType: Vehicle Log,Service Details,Détails du service
+DocType: Vehicle Log,Service Details,Détails du Service
 DocType: Purchase Invoice,Quarterly,Trimestriel
 DocType: Selling Settings,Delivery Note Required,Bon de Livraison Requis
 DocType: Bank Guarantee,Bank Guarantee Number,Numéro de Garantie Bancaire
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Présence des Étudiants
 DocType: Sales Invoice Timesheet,Time Sheet,Feuille de Temps
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Enregistrer les Matières Premières sur la Base de
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Veuillez entrer les détails de l’article
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Veuillez entrer les détails de l’article
 DocType: Interest,Interest,Intérêt
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prévente
 DocType: Purchase Receipt,Other Details,Autres Détails
@@ -727,7 +730,7 @@
 ,Absent Student Report,Rapport des Absences
 DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
 DocType: Offer Letter Term,Offer Letter Term,Terme de la Lettre de Proposition
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,L'article a des variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,L'article a des variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable
 DocType: Bin,Stock Value,Valeur du Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Société {0} n'existe pas
@@ -736,8 +739,7 @@
 DocType: Serial No,Warranty Expiry Date,Date d'Expiration de la Garantie
 DocType: Material Request Item,Quantity and Warehouse,Quantité et Entrepôt
 DocType: Sales Invoice,Commission Rate (%),Taux de Commission (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez configurer Naming Series pour {0} via Setup&gt; Paramètres&gt; Naming Series
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sélectionnez le programme
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Veuillez sélectionner un Programme
 DocType: Project,Estimated Cost,Coût Estimé
 DocType: Purchase Order,Link to material requests,Lien vers les demandes de matériaux
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aérospatial
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} n'est pas un Article de stock
 DocType: Mode of Payment Account,Default Account,Compte par Défaut
 DocType: Payment Entry,Received Amount (Company Currency),Montant Reçu (Devise Société)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Un prospect doit être sélectionné si l'Opportunité est créée à partir d’un Prospect
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Un prospect doit être sélectionné si l'Opportunité est créée à partir d’un Prospect
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Veuillez sélectionnez les jours de congé hebdomadaires
 DocType: Production Order Operation,Planned End Time,Heure de Fin Prévue
 ,Sales Person Target Variance Item Group-Wise,Variance d'Objectifs des Commerciaux par Groupe d'Articles
@@ -838,7 +840,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Liste des Prix non sélectionnée
 DocType: Employee,Family Background,Antécédents Familiaux
 DocType: Request for Quotation Supplier,Send Email,Envoyer un Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Attention : Pièce jointe non valide {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Attention : Pièce jointe non valide {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Aucune Autorisation
 DocType: Company,Default Bank Account,Compte Bancaire par Défaut
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pour filtrer en fonction du Parti, sélectionnez d’abord le Type de Parti"
@@ -851,7 +853,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Aucun employé trouvé
 DocType: Supplier Quotation,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si sous-traité à un fournisseur
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Le groupe d&#39;étudiants est déjà mis à jour.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Le Groupe d'Étudiants est déjà mis à jour.
 DocType: SMS Center,All Customer Contact,Tout Contact Client
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Charger solde de stock via csv.
 DocType: Warehouse,Tree Details,Détails de l’Arbre
@@ -862,8 +864,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montant Minimum de Facturation
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1} : Le Centre de Coûts {2} ne fait pas partie de la Société {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} : Compte {2} ne peut pas être un Groupe
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ligne d'Article {idx}: {doctype} {docname} n'existe pas dans la table '{doctype}' ci-dessus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ligne d'Article {idx}: {doctype} {docname} n'existe pas dans la table '{doctype}' ci-dessus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Aucune tâche
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Le jour du mois où la facture automatique sera générée. e.g. 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,Amortissement Cumulé d'Ouverture
@@ -879,7 +881,7 @@
 DocType: Bin,Moving Average Rate,Taux Mobile Moyen
 DocType: Production Planning Tool,Select Items,Sélectionner les Articles
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} pour la Facture {1} du {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Horaire du Cours
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horaire du Cours
 DocType: Maintenance Visit,Completion Status,État d'Achèvement
 DocType: HR Settings,Enter retirement age in years,Entrez l'âge de la retraite en années
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Entrepôt Cible
@@ -887,7 +889,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Autoriser le dépassement des capacités livraison ou de réception jusqu'à ce pourcentage
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importer Participation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tous les Groupes d'Articles
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tous les Groupes d'Articles
 DocType: Process Payroll,Activity Log,Journal d'Activité
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Bénéfice Net / Perte Nette
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
@@ -898,7 +900,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Du Bon de Commande au Paiement
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qté Projetée
 DocType: Sales Invoice,Payment Due Date,Date d'Échéance de Paiement
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Ouverture'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ouvrir To Do
 DocType: Notification Control,Delivery Note Message,Message du Bon de Livraison
@@ -914,7 +916,7 @@
 DocType: Item Reorder,Re-Order Qty,Qté de Réapprovisionnement
 DocType: Leave Block List Date,Leave Block List Date,Date de la Liste de Blocage des Congés
 DocType: Pricing Rule,Price or Discount,Prix ou Réduction
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total des Frais Applicables dans la Table des Articles de Reçus d’Achat doit être égal au Total des Taxes et Frais
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total des Frais Applicables dans la Table des Articles de Reçus d’Achat doit être égal au Total des Taxes et Frais
 DocType: Sales Team,Incentives,Incitations
 DocType: SMS Log,Requested Numbers,Numéros Demandés
 DocType: Production Planning Tool,Only Obtain Raw Materials,Obtenir seulement des Matières Premières
@@ -972,8 +974,7 @@
 DocType: Supplier,Default Payable Accounts,Comptes Créditeur par Défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
 DocType: Fee Structure,Components,Composants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Variantes de l'Article {0} mises à jour
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avance sur Facture d’Achat
@@ -1025,11 +1026,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ligne {0} : Paiements contre Commandes Client / Fournisseur doivent toujours être marqués comme des avances
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimique
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Le compte par défaut de Banque / Caisse sera automatiquement mis à jour dans l’écriture de Journal de Salaire lorsque ce mode est sélectionné.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Les intervalles pour les Codes de Notation {0} chevauchent les intervalles de notation pour les autres notations. Veuillez vérifier les intervalles {0} et {1} et essayer à nouveau
 DocType: BOM,Raw Material Cost(Company Currency),Coût des Matières Premières (Devise Société)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet Ordre de Fabrication.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ligne # {0}: Le taux ne peut pas être supérieur au taux utilisé dans {1} {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ligne # {0}: Le Taux ne peut pas être supérieur au taux utilisé dans {1} {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Mètre
 DocType: Workstation,Electricity Cost,Coût de l'Électricité
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pas envoyer de rappel pour le Jour d'Anniversaire des Employés
@@ -1038,12 +1037,12 @@
 DocType: BOM Website Item,BOM Website Item,Article de LDM du Site Internet
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Charger votre en-tête et logo. (vous pouvez les modifier ultérieurement).
 DocType: Timesheet Detail,Bill,Facture
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,La Date de l’Amortissement Suivant est obligatoire pour un nouvel Actif
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La Date de l’Amortissement Suivant est obligatoire pour un nouvel Actif
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Blanc
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ligne {0} : Qté non disponible pour {4} dans l'entrepôt {1} au moment de la comptabilisation de l’écriture ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtenir Acomptes Payés
-DocType: Item,Automatically Create New Batch,Créer automatiquement un nouveau lot
+DocType: Item,Automatically Create New Batch,Créer un Nouveau Lot Automatiquement
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Faire
 DocType: Student Admission,Admission Start Date,Date de Début de l'Admission
 DocType: Journal Entry,Total Amount in Words,Montant Total En Toutes Lettres
@@ -1052,7 +1051,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Type de Commande doit être l'un des {0}
 DocType: Lead,Next Contact Date,Date du Prochain Contact
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'Ouverture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
 DocType: Student Batch Name,Student Batch Name,Nom du Lot d'Étudiants
 DocType: Holiday List,Holiday List Name,Nom de la Liste de Vacances
 DocType: Repayment Schedule,Balance Loan Amount,Solde du Montant du Prêt
@@ -1072,12 +1071,12 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Veuillez spécifier un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Les articles avec aucune modification de quantité ou de valeur ont étés retirés.
 DocType: Delivery Note,Delivery To,Livraison à
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Table d'Attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Table d'Attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenir les Commandes Client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne peut pas être négatif
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Remise
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Remise
 DocType: Asset,Total Number of Depreciations,Nombre Total d’Amortissements
-DocType: Sales Invoice Item,Rate With Margin,Tarif avec marge
+DocType: Sales Invoice Item,Rate With Margin,Tarif Avec Marge
 DocType: Workstation,Wages,Salaires
 DocType: Project,Internal,Interne
 DocType: Task,Urgent,Urgent
@@ -1103,7 +1102,7 @@
 DocType: Lead,Organization Name,Nom de l'Organisation
 DocType: Tax Rule,Shipping State,État de livraison
 ,Projected Quantity as Source,Quantité Projetée comme Source
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide du bouton 'Obtenir des éléments de Reçus d'Achat'
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide du bouton 'Obtenir des éléments de Reçus d'Achat'
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Inclure des articles hors stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Charges de Vente
@@ -1111,7 +1110,7 @@
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Centre de Coût Vendeur par Défaut
 DocType: Sales Partner,Implementation Partner,Partenaire d'Implémentation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Code Postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Code Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Commande Client {0} est {1}
 DocType: Opportunity,Contact Info,Information du Contact
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Faire des Écritures de Stock
@@ -1128,11 +1127,11 @@
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des Fournisseurs.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},À {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Âge Moyen
-DocType: School Settings,Attendance Freeze Date,Date de congélation
+DocType: School Settings,Attendance Freeze Date,Date du Gel des Présences
 DocType: Opportunity,Your sales person who will contact the customer in future,Votre commercial qui prendra contact avec le client ultérieurement
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Listez quelques-uns de vos fournisseurs. Ils peuvent être des entreprises ou des individus.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Voir Tous Les Produits
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Âge minimum du plomb (jours)
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Âge Minimum du Prospect (Jours)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Toutes les LDM
 DocType: Company,Default Currency,Devise par Défaut
 DocType: Expense Claim,From Employee,De l'Employé
@@ -1153,7 +1152,7 @@
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Règles de Livraison du Panier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,L'Ordre de Production {0} doit être annulé avant d’annuler cette Commande Client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Veuillez définir ‘Appliquer Réduction Supplémentaire Sur ‘
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Veuillez définir ‘Appliquer Réduction Supplémentaire Sur ‘
 ,Ordered Items To Be Billed,Articles Commandés À Facturer
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,La Plage Initiale doit être inférieure à la Plage Finale
 DocType: Global Defaults,Global Defaults,Valeurs par Défaut Globales
@@ -1188,11 +1187,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Veuillez entrer le Code d'Article pour obtenir le Numéro de Lot
 DocType: Stock Settings,Default Item Group,Groupe d'Éléments par Défaut
 DocType: Employee Loan,Partially Disbursed,Partiellement Décaissé
-DocType: Grading Structure,Grading System Name,Nom du Système de Notation
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de données fournisseurs.
 DocType: Account,Balance Sheet,Bilan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centre de Coûts Pour Article ayant un Code Article '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Le Mode de Paiement n’est pas configuré. Veuillez vérifier si le compte a été réglé sur Mode de Paiement ou sur Profil de Point de Vente.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centre de Coûts Pour Article ayant un Code Article '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Le Mode de Paiement n’est pas configuré. Veuillez vérifier si le compte a été réglé sur Mode de Paiement ou sur Profil de Point de Vente.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Votre commercial recevra un rappel à cette date pour contacter le client
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Le même article ne peut pas être entré plusieurs fois.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","D'autres comptes individuels peuvent être créés dans les groupes, mais les écritures ne peuvent être faites que sur les comptes individuels"
@@ -1209,10 +1207,10 @@
 DocType: Holiday,Holiday,Vacances
 DocType: Support Settings,Close Issue After Days,Fermer Problème Après Jours
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laisser vide pour toutes les branches
-DocType: Bank Guarantee,Validity in Days,Validité en jours
+DocType: Bank Guarantee,Validity in Days,Validité en Jours
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},Formulaire-C n'est pas applicable pour la Facture: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Détails des Paiements Non Réconciliés
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Décompte
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Compte de Commandes
 DocType: Global Defaults,Current Fiscal Year,Exercice en Cours
 DocType: Purchase Order,Group same items,Groupe les éléments identiques
 DocType: Global Defaults,Disable Rounded Total,Désactiver le Total Arrondi
@@ -1229,11 +1227,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Travaux Effectués
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Veuillez spécifier au moins un attribut dans la table Attributs
 DocType: Announcement,All Students,Tous les Etudiants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,L'article {0} doit être un article hors stock
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,L'article {0} doit être un article hors stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Voir Grand Livre
 DocType: Grading Scale,Intervals,Intervalles
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Au plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Un Groupe d'Article existe avec le même nom, veuillez changer le nom de l'article ou renommer le groupe d'article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Un Groupe d'Article existe avec le même nom, veuillez changer le nom de l'article ou renommer le groupe d'article"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,N° de Mobile de l'Étudiant
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Reste du Monde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'Article {0} ne peut être en Lot
@@ -1251,8 +1249,8 @@
 DocType: Purchase Invoice,Supplied Items,Articles Fournis
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Quantité À Fabriquer
-DocType: Email Digest,New Income,Nouveau Revenu
-DocType: School Settings,School Settings,Paramètres scolaires
+DocType: Email Digest,New Income,Nouveaux Revenus
+DocType: School Settings,School Settings,Paramètres Scolaires
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le même taux durant le cycle d'achat
 DocType: Opportunity Item,Opportunity Item,Article de l'Opportunité
 ,Student and Guardian Contact Details,Détails des Contacts Étudiant et Tuteur
@@ -1273,8 +1271,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Vous n'êtes pas autorisé à modifier le compte gelé {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtenir les Factures Impayées
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Commande Client {0} invalide
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Les Bons de Commande vous aider à planifier et à assurer le suivi de vos achats
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Les Bons de Commande vous aider à planifier et à assurer le suivi de vos achats
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantité totale d’Émission / Transfert {0} dans la Demande de Matériel {1} \ ne peut pas être supérieure à la quantité demandée {2} pour l’Article {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Petit
@@ -1298,7 +1296,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Données de Base
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vos Produits ou Services
 DocType: Mode of Payment,Mode of Payment,Mode de Paiement
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,LDM (Liste de Matériaux)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Il s’agit d’un groupe d'élément racine qui ne peut être modifié.
@@ -1312,10 +1310,10 @@
 DocType: Email Digest,Annual Income,Revenu Annuel
 DocType: Serial No,Serial No Details,Détails du N° de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
-DocType: Student Group Student,Group Roll Number,Numéro de groupe
+DocType: Student Group Student,Group Roll Number,Numéro de Groupe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre écriture de débit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Le total des poids des tâches doit être égal à 1. Veuillez ajuster les poids de toutes les tâches du Projet en conséquence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,L'article {0} doit être un Article Sous-traité
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capitaux Immobilisés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La Règle de Tarification est d'abord sélectionnée sur la base du champ ‘Appliquer Sur’, qui peut être un Article, un Groupe d'Articles ou une Marque."
@@ -1342,7 +1340,7 @@
 DocType: Depreciation Schedule,Journal Entry,Écriture de Journal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} articles en cours
 DocType: Workstation,Workstation Name,Nom du Bureau
-DocType: Grade Interval,Grade Code,Code de la Note
+DocType: Grading Scale Interval,Grade Code,Code de la Note
 DocType: POS Item Group,POS Item Group,Groupe d'Articles PDV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Compte Rendu par Email :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},LDM {0} n’appartient pas à l'article {1}
@@ -1358,7 +1356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Matériel
 DocType: Sales Order,Recurring Upto,Récurrent Jusqu'au
 DocType: Attendance,HR Manager,Responsable RH
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Veuillez sélectionner une Société
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Veuillez sélectionner une Société
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Congé de Privilège
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la Facture du Fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Vous devez activer le Panier
@@ -1374,7 +1372,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Alimentation
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamme de Vieillissement 3
 DocType: Maintenance Schedule Item,No of Visits,Nb de Visites
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Valider la Présence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Valider la Présence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Un Calendrier de Maintenance {0} existe pour {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Inscrire un étudiant
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La devise du Compte Cloturé doit être {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somme des points pour tous les objectifs devraient être 100. Il est {0}
@@ -1423,13 +1422,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plan Comptable
 DocType: Material Request,Terms and Conditions Content,Contenu des Termes et Conditions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenu
 DocType: Salary Detail,Depends on Leave Without Pay,Dépend de Congé Non Payé
 DocType: Pricing Rule,"Higher the number, higher the priority","Plus le nombre est grand, plus la priorité est haute"
 ,Purchase Invoice Trends,Tendances des Factures d'Achat
 DocType: Employee,Better Prospects,Meilleures Perspectives
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ligne # {0}: Le lot {1} n'a que {2} qté(s). Veuillez sélectionner un autre lot contenant {3} qtés disponible ou diviser la rangée en plusieurs lignes, pour livrer / émettre à partir de plusieurs lots"
 DocType: Vehicle,License Plate,Plaque d'Immatriculation
 DocType: Appraisal,Goals,Objectifs
 DocType: Warranty Claim,Warranty / AMC Status,Garantie / Statut AMC
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,L'employé ne peut pas rendre de compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé, les écritures ne sont autorisés que pour un nombre restreint d'utilisateurs."
 DocType: Email Digest,Bank Balance,Solde Bancaire
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",Profil de l’Emploi. qualifications requises ect...
 DocType: Journal Entry Account,Account Balance,Solde du Compte
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Règle de Taxation pour les transactions.
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afficher le solde du compte de résulat des exercices non cloturés
 DocType: Shipping Rule,Shipping Account,Compte de Livraison
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} : Compte {2} inactif
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Créer des Commandes Clients pour vous aider à planifier votre travail et livrer à temps
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Créer des Commandes Clients pour vous aider à planifier votre travail et livrer à temps
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total des Coûts Additionnels
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Valeur Finale
 DocType: Asset Movement,Stock Manager,Responsable des Stocks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Entrepôt source est obligatoire à la ligne {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Bordereau de Colis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Bordereau de Colis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Loyer du Bureau
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuration de la passerelle SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Échec de l'Importation !
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afficher fermé
 DocType: Leave Type,Is Leave Without Pay,Est un Congé Sans Solde
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Aucun enregistrement trouvé dans la table Paiement
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ce {0} est en conflit avec {1} pour {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML Étudiants
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,Date de Départ
 DocType: Pricing Rule,For Price List,Pour la Liste de Prix
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recrutement de Cadres
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Créer des Prospects
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Créer des Prospects
 DocType: Maintenance Schedule,Schedules,Horaires
 DocType: Purchase Invoice Item,Net Amount,Montant Net
 DocType: Purchase Order Item Supplied,BOM Detail No,N° de Détail LDM
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Inscriptions au Programme
 DocType: Sales Invoice Item,Brand Name,Nom de la Marque
 DocType: Purchase Receipt,Transporter Details,Détails du Transporteur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Un Entrepôt par défaut est nécessaire pour l’Article sélectionné
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Un Entrepôt par défaut est nécessaire pour l’Article sélectionné
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Boîte
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Fournisseur Potentiel
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,L’Organisation
@@ -1551,7 +1551,7 @@
 DocType: Sales Partner,Sales Partner Target,Objectif du Partenaire Commercial
 DocType: Loan Type,Maximum Loan Amount,Montant Max du Prêt
 DocType: Pricing Rule,Pricing Rule,Règle de Tarification
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Numéro de rôle en double pour l&#39;élève {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Numéro de liste en double pour l'élève {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action si le Budget Annuel est Dépassé
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Demande de Matériel au Bon de Commande
 DocType: Shopping Cart Settings,Payment Success URL,URL pour Paiement Effectué avec Succès
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},LDM par défaut pour {0} introuvable pour le Projet {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Notes de frais de la société
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Les étudiants sont au cœur du système, ajouter tous vos étudiants"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Les étudiants sont au cœur du système, ajouter tous vos étudiants"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ligne #{0} : Date de compensation {1} ne peut pas être antérieure à la Date du Chèque {2}
 DocType: Company,Default Holiday List,Liste de Vacances par Défaut
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Ligne {0} : Heure de Début et Heure de Fin de {1} sont en conflit avec {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le(s) jour(s) pour le(s)quel(s) vous demandez un congé sont des jour(s) férié(s). Vous n’avez pas besoin d’effectuer de demande.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Email de Paiement
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nouvelle tâche
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Faire un Devis
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Faire un Devis
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Autres Rapports
 DocType: Dependent Task,Dependent Task,Tâche Dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Les Congés de type {0} ne peuvent pas être plus long que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez de planifer des opérations X jours à l'avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter les Rappels d'Anniversaire
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Veuillez définir le Compte Créditeur de Paie par Défaut pour la Société {0}
 DocType: SMS Center,Receiver List,Liste de Destinataires
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Rechercher Article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Rechercher Article
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Montant Consommé
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variation Nette de Trésorerie
 DocType: Assessment Plan,Grading Scale,Échelle de Notation
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Déjà terminé
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Demande de Paiement existe déjà {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût des Marchandises Vendues
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Collecte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Pour la Facture Fournisseur {0} datée {1}
 DocType: Customer,Default Price List,Liste des Prix par Défaut
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Vous ne pouvez pas supprimer l'Exercice {0}. L'exercice {0} est défini par défaut dans les Réglages Globaux
 DocType: Journal Entry,Entry Type,Type d'Écriture
 ,Customer Credit Balance,Solde de Crédit des Clients
@@ -1646,14 +1646,14 @@
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Mettre à jour les dates de paiement bancaires avec les journaux.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Tarification
 DocType: Quotation,Term Details,Détails du Terme
-DocType: Project,Total Sales Cost (via Sales Order),Coût total des ventes (par commande client)
+DocType: Project,Total Sales Cost (via Sales Order),Coût Total des Ventes (par Commande Client)
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Inscription de plus de {0} étudiants impossible pour ce groupe d'étudiants.
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Nombre de chefs d&#39;accusation
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Nombre de Prospects
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} doit être supérieur à 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de Capacité Pendant (Jours)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Approvisionnement
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Aucun des Articles n’a de changement en quantité ou en valeur.
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Champ obligatoire - Programme
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Champ Obligatoire - Programme
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Réclamation de Garantie
 ,Lead Details,Détails du Prospect
 DocType: Salary Slip,Loan repayment,Remboursement de Prêt
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,Étudier au même Institut
 DocType: Territory,Territory Manager,Responsable Régional
 DocType: Packed Item,To Warehouse (Optional),À l'Entrepôt (Facultatif)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 DocType: Payment Entry,Paid Amount (Company Currency),Montant Payé (Devise Société)
 DocType: Purchase Invoice,Additional Discount,Remise Supplémentaire
 DocType: Selling Settings,Selling Settings,Réglages de Vente
@@ -1687,10 +1686,10 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Voir Panier
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Dépenses de Marketing
 ,Item Shortage Report,Rapport de Rupture de Stock d'Article
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné,\nVeuillez aussi mentionner ""UDM de Poids"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné,\nVeuillez aussi mentionner ""UDM de Poids"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisée pour réaliser cette Écriture de Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Date de l’Amortissement Suivant est obligatoire pour un nouvel actif
-DocType: Student Group Creation Tool,Separate course based Group for every Batch,Groupe séparé basé sur les cours pour chaque lot
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Date de l’Amortissement Suivant est obligatoire pour un nouvel actif
+DocType: Student Group Creation Tool,Separate course based Group for every Batch,Groupes basés sur les cours différents pour chaque Lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Seule unité d'un Article.
 DocType: Fee Category,Fee Category,Catégorie d'Honoraires
 ,Student Fee Collection,Frais de Scolarité
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,Poids
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1} : Un Centre de Coûts est requis pour le compte ""Pertes et Profits"" {2}.Veuillez mettre en place un centre de coûts par défaut pour la Société."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Un Groupe de Clients existe avec le même nom, veuillez changer le nom du Client ou renommer le Groupe de Clients"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Un Groupe de Clients existe avec le même nom, veuillez changer le nom du Client ou renommer le Groupe de Clients"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nouveau Contact
 DocType: Territory,Parent Territory,Territoire Parent
 DocType: Quality Inspection Reading,Reading 2,Lecture 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exportez le rapport et imprimez-le à l'aide d'un tableur.
 DocType: Purchase Invoice Item,Batch No,N° du Lot
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Impossible de trouver le taux de change pour {0} - {1} pour la date clé {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs Commandes Clients pour un Bon de Commande d'un Client
-DocType: Student Group Instructor,Student Group Instructor,Instructeur de groupe étudiant
+DocType: Student Group Instructor,Student Group Instructor,Instructeur de Groupe d'Étudiant
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,N° du Mobile du Tuteur 1
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe des séries numérotées pour vos transactions
 DocType: Employee Attendance Tool,Employees HTML,Employés HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,LDM par défaut ({0}) doit être actif pour ce produit ou son modèle
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,LDM par défaut ({0}) doit être actif pour ce produit ou son modèle
 DocType: Employee,Leave Encashed?,Laisser Encaissé ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Le champ Opportunité De est obligatoire
 DocType: Email Digest,Annual Expenses,Dépenses Annuelles
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Faire un Bon de Commande
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Faire un Bon de Commande
 DocType: SMS Center,Send To,Envoyer À
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés pour les Congés de Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
@@ -1758,13 +1755,12 @@
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidat à un Emploi.
 DocType: Purchase Order Item,Warehouse and Reference,Entrepôt et Référence
 DocType: Supplier,Statutory info and other general information about your Supplier,Informations légales et autres informations générales au sujet de votre Fournisseur
-DocType: Item,Serial Nos and Batches,N ° de série et lots
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Force du groupe étudiant
+DocType: Item,Serial Nos and Batches,N° de Série et Lots
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Force du Groupe d'Étudiant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,L'Écriture de Journal {0} n'a pas d'entrée non associée {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Évaluation
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupliquer N° de Série pour l'Article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une Règle de Livraison
-DocType: Grading Structure,Grading Intervals,Intervalles de Notation
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Veuillez entrer
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Surfacturation supérieure à {2} impossible pour l'Article {0} à la ligne {1}. Pour permettre la surfacturation, veuillez le définir dans les Réglages d'Achat"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Veuillez définir un filtre basé sur l'Article ou l'Entrepôt
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,Contrôle d'Autorisation
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ligne #{0} : Entrepôt de Rejet est obligatoire pour l’Article rejeté {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Paiement
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gérer vos commandes
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gérer vos commandes
 DocType: Production Order Operation,Actual Time and Cost,Temps et Coût Réels
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Demande de Matériel d'un maximum de {0} peut être faite pour l'article {1} pour la Commande Client {2}
 DocType: Employee,Salutation,Salutations
 DocType: Course,Course Abbreviation,Abréviation du Cours
 DocType: Student Leave Application,Student Leave Application,Demande de Congé d'Étudiant
 DocType: Item,Will also apply for variants,S'appliquera également pour les variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employé {0} sur une demi-journée sur {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Le nombre total d'heures travaillées ne doit pas être supérieur à la durée maximale du travail {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Sur
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Grouper les articles au moment de la vente.
 DocType: Quotation Item,Actual Qty,Quantité Réelle
 DocType: Sales Invoice Item,References,Références
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Vous avez entré un doublon. Veuillez rectifier et essayer à nouveau.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associé
 DocType: Asset Movement,Asset Movement,Mouvement d'Actif
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nouveau Panier
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Nouveau Panier
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'article {0} n'est pas un Article avec un numéro de serie
 DocType: SMS Center,Create Receiver List,Créer une Liste de Réception
 DocType: Vehicle,Wheels,Roues
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Désactive la création de registres de temps pour les Ordres de Fabrication. Le suivi des Opérations ne nécessite pas d’Ordres de Fabrication
 DocType: Student,Student Mobile Number,Numéro de Mobile de l'Étudiant
 DocType: Item,Has Variants,A Variantes
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Vous avez déjà choisi des articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Vous avez déjà choisi des articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Répartition Mensuelle
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Le N° du lot est obligatoire
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Le N° du lot est obligatoire
 DocType: Sales Person,Parent Sales Person,Commercial Parent
 DocType: Purchase Invoice,Recurring Invoice,Facture Récurrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestion de Projets
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,Exercice Fiscal
 DocType: Vehicle Log,Fuel Price,Prix du Carburant
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Un Article Immobilisé doit être un élément non stocké.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Un Article Immobilisé doit être un élément non stocké.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget ne peut pas être affecté pour {0}, car ce n’est pas un compte de produits ou de charges"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Atteint
 DocType: Student Admission,Application Form Route,Chemin du Formulaire de Candidature
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Montant {0} {1} déduit de {2}
 DocType: Employee,Salary Information,Information sur le Salaire
 DocType: Sales Person,Name and Employee ID,Nom et ID de l’Employé
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
 DocType: Website Item Group,Website Item Group,Groupe d'Articles du Site Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Droits de Douane et Taxes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Veuillez entrer la date de Référence
@@ -1917,17 +1914,17 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être demandé / annulé avant le {0}, car le solde de congés a déjà été reporté dans la feuille d'allocation de congés futurs {1}"
 DocType: Activity Cost,Costing Rate,Taux des Coûts
 ,Customer Addresses And Contacts,Adresses et Contacts des Clients
-,Campaign Efficiency,Efficacité des campagnes
+,Campaign Efficiency,Efficacité des Campagnes
 DocType: Discussion,Discussion,Discussion
 DocType: Payment Entry,Transaction ID,Identifiant de Transaction
 DocType: Employee,Resignation Letter Date,Date de la Lettre de Démission
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Les Règles de Tarification sont d'avantage filtrés en fonction de la quantité.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Configurez la Date d&#39;inscription pour l&#39;employé {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Veuillez définir la Date d'Embauche pour l'employé {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Montant Total de Facturation (via Feuille de Temps)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répéter Revenu Clientèle
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de Frais"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Paire
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
 DocType: Asset,Depreciation Schedule,Calendrier d'Amortissement
 DocType: Bank Reconciliation Detail,Against Account,Pour le Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,La Date de Demi-Journée doit être entre la Date de Début et la Date de Fin
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
 ,Quotation Trends,Tendances des Devis
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Le Groupe d'Articles n'est pas mentionné dans la fiche de l'article pour l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
 DocType: Shipping Rule Condition,Shipping Amount,Montant de la Livraison
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Montant en Attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de Conversion
 DocType: Purchase Order,Delivered,Livré
 ,Vehicle Expenses,Frais de Véhicule
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valeur attendue après utilisation complète doit être supérieure ou égale à {0}
+DocType: Serial No,Invoice Details,Détails de la facture
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valeur attendue après utilisation complète doit être supérieure ou égale à {0}
 DocType: Purchase Receipt,Vehicle Number,Numéro de Véhicule
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La date à laquelle la facture récurrente sera arrêtée
 DocType: Employee Loan,Loan Amount,Montant du Prêt
@@ -1962,7 +1960,7 @@
 DocType: Salary Structure,Select employees for current Salary Structure,Sélectionner les Employés pour la Grille de Salaire actuelle
 DocType: Production Order,Use Multi-Level BOM,Utiliser LDM à Plusieurs Niveaux
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les Écritures Réconciliées
-DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Parent Course (Laissez vide, si cela ne fait pas partie du cours Parent)"
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Cours Parent (Laisser vide, si cela ne fait pas partie du Cours Parent)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide pour tous les types d'employés
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer les Charges sur la Base de
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Feuilles de Temps
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Montant de la Remise Supplémentaire
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Autoriser la Liste de Blocage des Congés
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Groupe vers Non-Groupe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportif
 DocType: Loan Type,Loan Name,Nom du Prêt
@@ -1983,7 +1981,8 @@
 apps/erpnext/erpnext/stock/get_item_details.py +131,Please specify Company,Veuillez spécifier la Société
 ,Customer Acquisition and Loyalty,Acquisition et Fidélisation des Clients
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,L'entrepôt où vous conservez le stock d'objets refusés
-DocType: Production Order,Skip Material Transfer,Skip Material Transfer
+DocType: Production Order,Skip Material Transfer,Sauter le Transfert de Materiel
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Impossible de trouver le taux de change pour {0} à {1} pour la date clé {2}. Créez un enregistrement de l&#39;échange de devise manuellement
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Date de fin de la période comptable
 DocType: POS Profile,Price List,Liste de Prix
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} est désormais l’Exercice par défaut. Veuillez actualiser la page pour que les modifications soient prises en compte.
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,L'article {0} a déjà été retourné
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Exercice** représente un Exercice Financier. Toutes les écritures comptables et autres transactions majeures sont suivis en **Exercice**.
 DocType: Opportunity,Customer / Lead Address,Adresse du Client / Prospect
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Attention : certificat SSL non valide sur la pièce jointe {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Attention : certificat SSL non valide sur la pièce jointe {0}
 DocType: Student Admission,Eligibility,Admissibilité
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Les prospects vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de prospects"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Les prospects vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de prospects"
 DocType: Production Order Operation,Actual Operation Time,Temps d'Exploitation Réel
 DocType: Authorization Rule,Applicable To (User),Applicable À (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
@@ -2041,7 +2040,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},N° de Série {0} est sous garantie jusqu'au {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Séparer le Bon de Livraison dans des paquets.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Livraisons
-apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Le solde du compte ({0}) pour {1} et la valeur de stock ({2}) pour l&#39;entrepôt {3} doit être identique
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Le solde du compte ({0}) pour {1} et la valeur du stock ({2}) pour l'entrepôt {3} doivent être identiques
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Montant Total Alloué (Devise Société)
 DocType: Purchase Order Item,To be delivered to customer,À livrer à la clientèle
 DocType: BOM,Scrap Material Cost,Coût de Mise au Rebut des Matériaux
@@ -2058,11 +2057,11 @@
 DocType: Employee Loan,Employee Loan Account,Compte de Prêt d'un Employé
 DocType: Leave Application,Total Leave Days,Total des Jours de Congé
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque : Email ne sera pas envoyé aux utilisateurs désactivés
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d&#39;interactions
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d'Interactions
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Sélectionner la Société ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide pour tous les départements
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Type d’emploi (CDI, CDD, Stagiaire, etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
 DocType: Process Payroll,Fortnightly,Bimensuel
 DocType: Currency Exchange,From Currency,De la Devise
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Veuillez sélectionner le Montant Alloué, le Type de Facture et le Numéro de Facture dans au moins une ligne"
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Impossible de sélectionner le type de charge comme étant «Le Montant de la Ligne Précédente» ou «Montant Total de la Ligne Précédente» pour la première ligne
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Le sous-article ne doit pas être un ensemble de produit. S'il vous plaît retirer l'article `{0}` et sauver
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banque
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Ajouter des Feuilles de Temps
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Ajouter des Feuilles de Temps
 DocType: Vehicle Service,Service Item,Poste de Service
 DocType: Bank Guarantee,Bank Guarantee,Garantie Bancaire
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Veuillez cliquer sur ‘Générer Calendrier’ pour obtenir le calendrier
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Les Prix ne seront pas affichés si la Liste de Prix n'est pas définie
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Veuillez spécifier un pays pour cette Règle de Livraison ou cocher Livraison Internationale
 DocType: Stock Entry,Total Incoming Value,Valeur Entrante Totale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Compte de Débit Requis
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Compte de Débit Requis
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste des Prix d'Achat
 DocType: Offer Letter Term,Offer Term,Terme de la Proposition
 DocType: Quality Inspection,Quality Manager,Responsable Qualité
@@ -2151,7 +2150,7 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La Liste de Prix {0} est désactivée
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ligne {0} : Qté Complétée ne peut pas être supérieure à {1} pour l’opération {2}
 DocType: Manufacturing Settings,Allow Overtime,Autoriser les Heures Supplémentaires
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L&#39;élément sérialisé {0} ne peut pas être mis à jour en utilisant la réconciliation des stocks, utilisez l&#39;entrée de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L'Article Sérialisé {0} ne peut pas être mis à jour en utilisant la réconciliation des stocks, veuillez utiliser l'entrée de stock"
 DocType: Training Event Employee,Training Event Employee,Évènement de Formation – Employé
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous en avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taux de Valorisation Actuel
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,Raison de la Perte
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nouvelle Adresse
 DocType: Quality Inspection,Sample Size,Taille de l'Échantillon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Veuillez entrer le Document de Réception
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Tous les articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Veuillez entrer le Document de Réception
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Tous les articles ont déjà été facturés
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Veuillez spécifier un ‘Depuis le Cas N°.’ valide
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"D'autres centres de coûts peuvent être créés dans des Groupes, mais des écritures ne peuvent être faites que sur des centres de coûts individuels."
 DocType: Project,External,Externe
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilisateurs et Autorisations
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordres de Production Créés: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Ordres de Production Créés: {0}
 DocType: Branch,Branch,Branche
 DocType: Guardian,Mobile Number,Numéro de Mobile
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impression et Marque
@@ -2176,11 +2175,11 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,N° de Série {0} introuvable
 DocType: Scheduling Tool,Student Batch,Lot d'Étudiants
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vos clients
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Créer un Étudiant
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Créer un Étudiant
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Vous avez été invité à collaborer sur le projet : {0}
 DocType: Leave Block List Date,Block Date,Bloquer la Date
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Appliquer Maintenant
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qté réelle {0} / Quantité en attente {1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qté Réelle {0} / Quantité en Attente {1}
 DocType: Sales Order,Not Delivered,Non Livré
 ,Bank Clearance Summary,Bilan des Compensations Bancaires
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des résumés  d'E-mail quotidiens, hebdomadaires et mensuels ."
@@ -2199,8 +2198,9 @@
 DocType: SMS Log,Sent To,Envoyé À
 DocType: Payment Request,Make Sales Invoice,Faire des Factures de Vente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,La Date de Prochain Contact ne peut pas être dans le passé
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,La Date de Prochain Contact ne peut pas être dans le passé
 DocType: Company,For Reference Only.,Pour Référence Seulement.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Sélectionnez le N° de Lot
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalide {0} : {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Montant de l'Avance
@@ -2214,7 +2214,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas N° ne peut pas être 0
 DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Listes de Matériaux
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Magasins
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Magasins
 DocType: Serial No,Delivery Time,Heure de la Livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé Sur le Vieillissement
 DocType: Item,End of Life,Fin de Vie
@@ -2230,8 +2230,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfert de Matériel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spécifier les opérations, le coût d'exploitation et donner un N° d'Opération unique à vos opérations."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document excède la limite de {0} {1} pour l’article {4}. Faites-vous un autre {3} contre le même {2} ?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Sélectionner le compte de change
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Sélectionner le compte de change
 DocType: Purchase Invoice,Price List Currency,Devise de la Liste de Prix
 DocType: Naming Series,User must always select,L'utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un Stock Négatif
@@ -2242,7 +2242,7 @@
 DocType: Budget Account,Budget Account,Compte de Budget
 DocType: Quality Inspection,Verified By,Vérifié Par
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Impossible de changer la devise par défaut de la société, parce qu'il y a des opérations existantes. Les transactions doivent être annulées pour changer la devise par défaut."
-DocType: Grade Interval,Grade Description,Description de la Note
+DocType: Grading Scale Interval,Grade Description,Description de la Note
 DocType: Stock Entry,Purchase Receipt No,N° du Reçu d'Achat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Arrhes
 DocType: Process Payroll,Create Salary Slip,Créer une Fiche de Paie
@@ -2280,7 +2280,7 @@
 DocType: Upload Attendance,Attendance To Date,Présence Jusqu'à
 DocType: Warranty Claim,Raised By,Créé par
 DocType: Payment Gateway Account,Payment Account,Compte de Paiement
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Veuillez spécifier la Société pour continuer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Veuillez spécifier la Société pour continuer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Variation Nette des Comptes Débiteurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Congé Compensatoire
 DocType: Offer Letter,Accepted,Accepté
@@ -2293,7 +2293,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Étiquette de la Règle de Livraison
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l'Utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matières Premières ne peuvent pas être vides.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Écriture Rapide dans le Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si la LDM est mentionnée pour un article
 DocType: Employee,Previous Work Experience,Expérience de Travail Antérieure
@@ -2307,7 +2307,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termes et Conditions
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Le nom de l'institut pour lequel vous configurez ce système.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Les écritures comptables sont gelées jusqu'à cette date, personne ne peut ajouter / modifier les entrées sauf les rôles spécifiés ci-dessous."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Veuillez enregistrer le document avant de générer le calendrier d'entretien
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Veuillez enregistrer le document avant de générer le calendrier d'entretien
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statut du Projet
 DocType: UOM,Check this to disallow fractions. (for Nos),Cochez cette case pour interdire les fractions. (Pour les numéros)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Les Ordres de Production suivants ont été créés:
@@ -2330,6 +2330,7 @@
 DocType: Email Digest,How frequently?,A quelle fréquence ?
 DocType: Purchase Receipt,Get Current Stock,Obtenir le Stock Actuel
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre des Listes de Matériaux
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 DocType: Student,Joining Date,Date d'Inscription
 ,Employees working on a holiday,Employés qui travaillent un jour férié
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marquer Présent
@@ -2354,7 +2355,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Veuillez fournir les articles spécifiés aux meilleurs tarifs possibles
 DocType: Selling Settings,Auto close Opportunity after 15 days,Fermer automatiquement les Opportunités après 15 jours
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fin de l'Année
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Devis / Prospects %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Date de Fin de Contrat doit être supérieure à la Date d'Embauche
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un tiers distributeur / commerçant / commissionnaire / affilié / revendeur qui vend les produits de l'entreprise en échange d'une commission.
@@ -2430,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Date de Compensation non indiquée
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Production
 DocType: Guardian,Occupation,Occupation
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ligne {0} : La Date de Début doit être avant la Date de Fin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ligne {0} : La Date de Début doit être avant la Date de Fin
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qté)
 DocType: Sales Invoice,This Document,Ce Document
 DocType: Installation Note Item,Installed Qty,Qté Installée
@@ -2453,7 +2454,7 @@
 DocType: Notification Control,Sales Order Message,Message de la Commande Client
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Définir les Valeurs par Défaut comme : Societé, Devise, Exercice Actuel, etc..."
 DocType: Payment Entry,Payment Type,Type de Paiement
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sélectionnez un lot pour l&#39;élément {0}. Impossible de trouver un seul lot qui satisfait cette exigence
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Veuillez sélectionner un Lot pour l'Article {0}. Impossible de trouver un seul lot satisfaisant à cette exigence
 DocType: Process Payroll,Select Employees,Sélectionner les Employés
 DocType: Opportunity,Potential Sales Deal,Ventes Potentielles
 DocType: Payment Entry,Cheque/Reference Date,Chèque/Date de Référence
@@ -2470,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Profil PDV Global {0} déjà créé pour la société {1}
 DocType: Purchase Order,Ref SQ,Réf SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Remplacer l’Article / LDM dans toutes les LDMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Le reçu doit être soumis
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Le reçu doit être soumis
 DocType: Purchase Invoice Item,Received Qty,Qté Reçue
 DocType: Stock Entry Detail,Serial No / Batch,N° de Série / Lot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Non Payé et Non Livré
@@ -2483,7 +2484,7 @@
 ,To Produce,À Produire
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Paie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l'Article, les lignes {3} doivent également être incluses"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Créer un Utilisateur
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Créer un Utilisateur
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identification de l'emballage pour la livraison (pour l'impression)
 DocType: Bin,Reserved Quantity,Quantité Réservée
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Entrez une adresse email valide
@@ -2495,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Un Modèle Désactivé ne doit pas être un Modèle par Défaut
 DocType: Account,Income Account,Compte de Produits
 DocType: Payment Request,Amount in customer's currency,Montant dans la devise du client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Livraison
 DocType: Stock Reconciliation Item,Current Qty,Qté Actuelle
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Voir ""Taux des Matériaux Basé Sur"" dans la Section des Coûts"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Précédent
 DocType: Appraisal Goal,Key Responsibility Area,Domaine de Responsabilités Principal
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Les Lots d'Étudiants vous aide à suivre la présence, les évaluations et les frais pour les étudiants"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Les Lots d'Étudiants vous aide à suivre la présence, les évaluations et les frais pour les étudiants"
 DocType: Payment Entry,Total Allocated Amount,Montant Total Alloué
 DocType: Item Reorder,Material Request Type,Type de Demande de Matériel
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accumulation des Journaux d'Écritures pour les salaires de {0} à {1}
@@ -2522,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Suivre les Prospects par Type d'Industrie
 DocType: Item Supplier,Item Supplier,Fournisseur de l'Article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toutes les Adresses.
 DocType: Company,Stock Settings,Réglages de Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La combinaison est possible seulement si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, Type de Racine, Société"
@@ -2532,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Enverra un email au sujet de l'événement pour les employés ayant le statut 'Ouvert'
 DocType: Task,Depends on Tasks,Dépend des Tâches
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gérer l'Arborescence des Groupes de Clients.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Les pièces jointes peuvent être affichées sans autoriser le panier
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nom du Nouveau Centre de Coûts
 DocType: Leave Control Panel,Leave Control Panel,Quitter le Panneau de Configuration
@@ -2544,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,Débit Pour
 DocType: Delivery Note,Required only for sample item.,Requis uniquement pour les échantillons.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qté Réelle Après Transaction
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Aucune fiche de paie trouvée entre {0} et {1}
 ,Pending SO Items For Purchase Request,Articles de Commande Client en Attente Pour la Demande d'Achat
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissions des Étudiants
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} est désactivé
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} est désactivé
 DocType: Supplier,Billing Currency,Devise de Facturation
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2565,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Produit Présenté sur la Page d'Accueil
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tous les Groupes d'Évaluation
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nouveau Nom d'Entrepôt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Région
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Veuillez indiquer le nb de visites requises
 DocType: Stock Settings,Default Valuation Method,Méthode de Valorisation par Défaut
@@ -2583,7 +2585,7 @@
 DocType: Price List,Price List Master,Données de Base des Listes de Prix
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les Transactions de Vente peuvent être assignées à plusieurs **Commerciaux** pour configurer et surveiller les objectifs.
 ,S.O. No.,S.O. N°.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Veuillez créer un Client à partir du Prospect {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Veuillez créer un Client à partir du Prospect {0}
 DocType: Price List,Applicable for Countries,Applicable pour les Pays
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Seules les Demandes de Congés avec le statut 'Appouvée' ou 'Rejetée' peuvent être soumises
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Nom du Groupe d'Étudiant est obligatoire dans la ligne {0}
@@ -2623,7 +2625,7 @@
 DocType: Attendance,Leave Type,Type de Congé
 DocType: Purchase Invoice,Supplier Invoice Details,Détails de la Facture du Fournisseur
 apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»
-DocType: Project,Copied From,Copié à partir de
+DocType: Project,Copied From,Copié Depuis
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Erreur de Nom: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Pénurie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} n'est pas associé(e) à {2} {3}
@@ -2675,7 +2677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Écriture Comptable pour Stock
 DocType: Vehicle Service,Engine Oil,Huile Moteur
 DocType: Sales Invoice,Sales Team1,Équipe des Ventes 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Article {0} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Article {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du Client
 DocType: Employee Loan,Loan Details,Détails du Prêt
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Ligne {0} : Qté Complétée doit être supérieure à zéro.
@@ -2730,7 +2732,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Date de Début du Projet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +11,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Journal des Renommages
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Le groupe d&#39;étudiants ou le calendrier des cours est obligatoire
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Le Ggroupe d'Étudiants ou le Calendrier des Cours est obligatoire
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Maintenir les Heures Facturables et les Heures de Travail sur la même Feuille de Temps
 DocType: Maintenance Visit Purpose,Against Document No,Pour le Document N°
 DocType: BOM,Scrap,Mettre au Rebut
@@ -2739,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Les entrepôts avec des transactions existantes ne peuvent pas être convertis en groupe.
 DocType: Assessment Result Tool,Result HTML,Résultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expire Le
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Ajouter des Étudiants
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Ajouter des Étudiants
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Veuillez sélectionner {0}
 DocType: C-Form,C-Form No,Formulaire-C Nº
 DocType: BOM,Exploded_items,Articles-éclatés
@@ -2803,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limite Dépassée
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Risque
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Une période universitaire avec cette 'Année Universitaire' {0} et 'Nom de la Période' {1} existe déjà. Veuillez modifier ces entrées et essayer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Comme il existe des transactions avec l'article {0}, vous ne pouvez pas changer la valeur de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Comme il existe des transactions avec l'article {0}, vous ne pouvez pas changer la valeur de {1}"
 DocType: UOM,Must be Whole Number,Doit être un Nombre Entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nouvelle Allocation de Congés (en jours)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,N° de Série {0} n’existe pas
@@ -2833,7 +2835,7 @@
 DocType: Salary Component,Salary Component,Composante Salariale
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Écritures de Paiement {0} ne sont pas liées
 DocType: GL Entry,Voucher No,N° de Référence
-,Lead Owner Efficiency,Efficacité des propriétaires principaux
+,Lead Owner Efficiency,Efficacité des Responsables des Prospects
 DocType: Leave Allocation,Leave Allocation,Allocation de Congés
 DocType: Payment Request,Recipient Message And Payment Details,Message du Destinataire et Détails de Paiement
 DocType: Training Event,Trainer Email,Email du Formateur
@@ -2846,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,Dernier Jour du Mois Suivant
 DocType: Support Settings,Auto close Issue after 7 days,Fermer automatique les Questions après 7 jours
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être alloué avant le {0}, car le solde de congés a déjà été reporté dans la feuille d'allocation de congés futurs {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque : Date de Référence / d’Échéance dépasse le nombre de jours de crédit client autorisé de {0} jour(s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque : Date de Référence / d’Échéance dépasse le nombre de jours de crédit client autorisé de {0} jour(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Candidature Étudiante
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte d'Amortissement Cumulé
 DocType: Stock Settings,Freeze Stock Entries,Geler les Entrées de Stocks
@@ -2874,7 +2876,7 @@
 DocType: Asset,Item Code,Code de l'Article
 DocType: Production Planning Tool,Create Production Orders,Créer des Commandes de Production
 DocType: Serial No,Warranty / AMC Details,Garantie / Détails AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Sélectionnez les élèves manuellement pour le groupe basé sur l&#39;activité
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Sélectionner les élèves manuellement pour un Groupe basé sur l'Activité
 DocType: Journal Entry,User Remark,Remarque de l'Utilisateur
 DocType: Lead,Market Segment,Part de Marché
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}
@@ -2884,7 +2886,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,N° de Série {0} n'est pas en stock
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modèle de taxe pour les opérations de vente.
 DocType: Sales Invoice,Write Off Outstanding Amount,Encours de Reprise
-DocType: School Settings,Current Academic Year,Année académique actuelle
+DocType: School Settings,Current Academic Year,Année Académique Actuelle
 DocType: Stock Settings,Default Stock UOM,UDM par Défaut des Articles
 DocType: Asset,Number of Depreciations Booked,Nombre d’Amortissements Comptabilisés
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Pour le Prêt Employé : {0}
@@ -2892,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,Créer des Demandes de Matériel
 DocType: Employee Education,School/University,École/Université
 DocType: Payment Request,Reference Details,Détails de la Référence
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur Attendue Après Utilisation Complète doit être inférieure au Montant d'Achat Brut
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur Attendue Après Utilisation Complète doit être inférieure au Montant d'Achat Brut
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qté Disponible à l'Entrepôt
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Montant Facturé
 DocType: Asset,Double Declining Balance,Double Solde Dégressif
@@ -2913,19 +2915,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Le Compte d’Écart doit être un compte de type Actif / Passif, puisque cette Réconciliation de Stock est une écriture d'à-nouveau"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Le Montant Remboursé ne peut pas être supérieur au Montant du Prêt {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Numéro de Bon de Commande requis pour l'Article {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordre de Production non créé
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Ordre de Production non créé
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',La ‘Date de Début’ doit être antérieure à la ‘Date de Fin’
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Impossible de changer le statut car l'étudiant {0} est lié à la candidature de l'étudiant {1}
 DocType: Asset,Fully Depreciated,Complètement Déprécié
 ,Stock Projected Qty,Qté de Stock Projeté
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML des Présences Validées
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients"
 DocType: Sales Order,Customer's Purchase Order,N° de Bon de Commande du Client
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,N° de Série et lot
 DocType: Warranty Claim,From Company,De la Société
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Somme des Scores de Critères d'Évaluation doit être {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Veuillez définir le Nombre d’Amortissements Comptabilisés
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Veuillez définir le Nombre d’Amortissements Comptabilisés
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valeur ou Qté
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Les Ordres de Production ne peuvent pas être créés pour:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
@@ -2934,7 +2936,7 @@
 DocType: Leave Block List,Leave Block List Allowed,Liste de Blocage des Congés Autorisée
 DocType: Grading Scale Interval,Grading Scale Interval,Intervalle de l'Échelle de Notation
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Note de Frais pour Indémnité Kilométrique {0}
-DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Réduction (%) du tarif de la liste de prix avec la marge
+DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Remise (%) sur le Tarif de la Liste de Prix avec la Marge
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Tous les Entrepôts
 DocType: Sales Partner,Retailer,Détaillant
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Le compte À Créditer doit être un compte de Bilan
@@ -3033,7 +3035,7 @@
 DocType: Purchase Receipt Item,Rate and Amount,Prix et Montant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Le Type de Compte pour {0} doit être {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Congés et Vacances
-DocType: School Settings,Current Academic Term,Terme académique actuel
+DocType: School Settings,Current Academic Term,Terme Académique Actuel
 DocType: Sales Order,Not Billed,Non Facturé
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Les deux Entrepôt doivent appartenir à la même Société
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Aucun contact ajouté.
@@ -3053,7 +3055,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Groupe Étudiant
 DocType: Shopping Cart Settings,Quotation Series,Séries de Devis
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), veuillez changer le nom du groupe d'article ou renommer l'article"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Veuillez sélectionner un client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Veuillez sélectionner un client
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,Centre de Coûts de l'Amortissement d'Actifs
 DocType: Sales Order Item,Sales Order Date,Date de la Commande Client
@@ -3072,19 +3074,18 @@
 DocType: Vehicle,Insurance Details,Détails Assurance
 DocType: Account,Payable,Créditeur
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Veuillez entrer les Périodes de Remboursement
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Débiteurs ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Débiteurs ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nouveaux Clients
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bénéfice Brut %
 DocType: Appraisal Goal,Weightage (%),Poids (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Date de Compensation
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Montant d'Achat Brut est obligatoire
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Montant d'Achat Brut est obligatoire
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,La Partie est obligatoire
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nom du Sujet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Au moins Vente ou Achat doit être sélectionné
-DocType: Grading Structure,Grade Intervals,Intervalles de Notes
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Sélectionner la nature de votre entreprise.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Là où les opérations de fabrication sont réalisées.
 DocType: Asset Movement,Source Warehouse,Entrepôt Source
@@ -3113,6 +3114,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Pourcentage de Répartition Mensuelle
 DocType: Territory,Territory Targets,Objectifs Régionaux
 DocType: Delivery Note,Transporter Info,Infos Transporteur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Veuillez définir {0} par défaut dans la Société {1}
 DocType: Cheque Print Template,Starting position from top edge,Position initiale depuis bord haut
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Le même fournisseur a été saisi plusieurs fois
@@ -3164,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qté de Réapprovisionnement
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offres d'Emploi Actuelles
 DocType: Company,Stock Adjustment Account,Compte d'Ajustement du Stock
-DocType: Journal Entry,Write Off,Reprise
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Reprise
 DocType: Timesheet Detail,Operation ID,ID de l'Opération
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","L'ID (de connexion) de l'Utilisateur Système. S'il est défini, il deviendra la valeur par défaut pour tous les formulaires des RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
@@ -3175,8 +3177,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur livre au Client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Formulaire/Article/{0}) est en rupture de stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,La Date Suivante doit être supérieure à Date de Comptabilisation
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Afficher le détail des impôts
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Date d’échéance / de référence ne peut pas être après le {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Afficher le détail des impôts
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Date d’échéance / de référence ne peut pas être après le {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importer et Exporter des Données
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Des écritures de stock existent pour l'Entrepôt {0}, vous ne pouvez donc pas le réaffecter ou le modifier"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Aucun étudiant Trouvé
@@ -3188,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Veuillez sélectionner la Date de Comptabilisation avant de sélectionner la Partie
 DocType: Program Enrollment,School House,Maison de l'École
 DocType: Serial No,Out of AMC,Sur AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Sélectionnez Citations
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Effectuer une Visite d'Entretien
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Veuillez contactez l'utilisateur qui a le rôle de Directeur des Ventes {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Veuillez sélectionner des Devis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Effectuer une Visite d'Entretien
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Veuillez contactez l'utilisateur qui a le rôle de Directeur des Ventes {0}
 DocType: Company,Default Cash Account,Compte de Caisse par Défaut
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Données de base de la Société (ni les Clients ni les Fournisseurs)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basé sur la présence de cet Étudiant
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Aucun étudiant dans
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Ajouter plus d'articles ou ouvrir le formulaire complet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Veuillez entrer ‘Date de Livraison Prévue’
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Bons de Livraison {0} doivent être annulés avant d’annuler cette Commande Client
@@ -3228,7 +3231,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Détails de l'Article et de la Garantie
 DocType: Sales Team,Contribution (%),Contribution (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque : Écriture de Paiement ne sera pas créée car le compte 'Compte Bancaire ou de Caisse' n'a pas été spécifié
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Sélectionnez le programme pour obtenir des cours obligatoires.
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Sélectionner le Programme pour obtenir les cours obligatoires.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilités
 DocType: Expense Claim Account,Expense Claim Account,Compte de Note de Frais
 DocType: Sales Person,Sales Person Name,Nom du Vendeur
@@ -3240,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},À {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taxes et Frais Additionnels (Devise Société)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La Ligne de Taxe d'Article {0} doit indiquer un compte de type Taxes ou Produit ou Charge ou Facturable
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La Ligne de Taxe d'Article {0} doit indiquer un compte de type Taxes ou Produit ou Charge ou Facturable
 DocType: Sales Order,Partly Billed,Partiellement Facturé
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,L'article {0} doit être une Immobilisation
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,L'article {0} doit être une Immobilisation
 DocType: Item,Default BOM,LDM par Défaut
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Veuillez saisir à nouveau le nom de la société pour confirmer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Encours Total
@@ -3260,11 +3263,11 @@
 DocType: Notification Control,Custom Message,Message Personnalisé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banque d'Investissement
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,Espèces ou Compte Bancaire est obligatoire pour réaliser une écriture de paiement
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Adresse de l&#39;élève
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Adresse de l'Élève
 DocType: Purchase Invoice,Price List Exchange Rate,Taux de Change de la Liste de Prix
 DocType: Purchase Invoice Item,Rate,Taux
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nom de l'Adresse
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Nom de l'Adresse
 DocType: Stock Entry,From BOM,De LDM
 DocType: Assessment Code,Assessment Code,Code de l'Évaluation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,de Base
@@ -3289,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,Langue d’Impression
 DocType: Salary Slip,Total Working Hours,Total des Heures Travaillées
 DocType: Stock Entry,Including items for sub assemblies,Incluant les articles pour des sous-ensembles
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,La valeur entrée doit être positive
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,La valeur entrée doit être positive
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Tous les Territoires
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,L'étudiant est déjà inscrit.
@@ -3302,22 +3305,20 @@
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montant Maximal de la Facture
 DocType: Student Language,Student Language,Langue des Étudiants
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clients
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Commande / Quot%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Commande / Devis %
 DocType: Student Sibling,Institution,Institution
 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 +92,From and To dates required,Les date Du et Au sont requises
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Bourses de Valeurs Mobilières et de Marchandises
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction de
 DocType: Delivery Note Item,From Warehouse,De l'Entrepôt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
 DocType: Assessment Plan,Supervisor Name,Nom du Superviseur
-DocType: Program Enrollment Course,Program Enrollment Course,Cours d&#39;inscription au programme
-DocType: Grading Structure,Grading Structure,Structure de la Notation
+DocType: Program Enrollment Course,Program Enrollment Course,Cours d'Inscription au Programme
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
 DocType: Tax Rule,Shipping City,Ville de Livraison
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Cet Article est une Variante de {0} (Modèle). Les Attributs seront copiés à partir du modèle sauf si ‘Pas de Copie’ est coché
 DocType: Notification Control,Customize the Notification,Personnaliser la Notification
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flux de Trésorerie provenant des Opérations
 DocType: Sales Invoice,Shipping Rule,Règle de Livraison
@@ -3340,6 +3341,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Aucune LDM par défaut n’existe pour l'article {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Veuillez d’abord sélectionner la Date de Comptabilisation
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Date d'Ouverture devrait être antérieure à la Date de Clôture
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numérotation pour la présence via Configuration&gt; Série de numérotation
 DocType: Leave Control Panel,Carry Forward,Reporter
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Un Centre de Coûts avec des transactions existantes ne peut pas être converti en grand livre
 DocType: Department,Days for which Holidays are blocked for this department.,Jours pour lesquels les Vacances sont bloquées pour ce département.
@@ -3350,7 +3352,7 @@
 DocType: Training Event,Trainer Name,Nom du Formateur
 DocType: Mode of Payment,General,Général
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Joindre l'En-tête
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Dernière communication
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Dernière Communication
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Déduction impossible lorsque la catégorie est pour 'Évaluation' ou 'Vaulation et Total'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Inscrivez vos titres d'impôts (par exemple, TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standards. Cela va créer un modèle standard, que vous pouvez modifier et compléter plus tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},N° de Séries Requis pour Article Sérialisé {0}
@@ -3367,7 +3369,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Mnt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertissement et Loisir
 DocType: Quality Inspection,Item Serial No,No de Série de l'Article
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Créer les Dossiers des Employés
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Créer les Dossiers des Employés
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total des Présents
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Déclarations Comptables
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Heure
@@ -3382,7 +3384,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,La nouvelle LDM après remplacement
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point de Vente
 DocType: Payment Entry,Received Amount,Montant Reçu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,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: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Créer pour la quantité totale, en ignorant la quantité déjà commandée"
 DocType: Account,Tax,Taxe
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Non Marqué
@@ -3391,21 +3392,21 @@
 DocType: Quality Inspection,Report Date,Date du Rapport
 DocType: Student,Middle Name,Deuxième Nom
 DocType: C-Form,Invoices,Factures
-DocType: Batch,Source Document Name,Nom du document source
+DocType: Batch,Source Document Name,Nom du Document Source
 DocType: Job Opening,Job Title,Titre de l'Emploi
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Créer des Utilisateurs
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Créer des Utilisateurs
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramme
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantité à Fabriquer doit être supérieur à 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Rapport de visite pour appel de maintenance
 DocType: Stock Entry,Update Rate and Availability,Mettre à Jour le Prix et la Disponibilité
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou à livrer en plus de la quantité commandée. Par exemple : Si vous avez commandé 100 unités et que votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
 DocType: POS Customer Group,Customer Group,Groupe de clients
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nouveau numéro de lot (optionnel)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nouveau Numéro de Lot (Optionnel)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Compte de charge est obligatoire pour l'article {0}
 DocType: BOM,Website Description,Description du Site Web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variation Nette de Capitaux Propres
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
 DocType: Serial No,AMC Expiry Date,Date d'Expiration CMA
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Reçu
 ,Sales Register,Registre des Ventes
@@ -3416,16 +3417,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Il n'y a rien à modifier.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Résumé du mois et des activités en suspens
 DocType: Customer Group,Customer Group Name,Nom du Groupe Client
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Pas encore de Clients!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,États des Flux de Trésorerie
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Le Montant du prêt ne peut pas dépasser le Montant Maximal du Prêt de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Veuillez sélectionnez Report si vous souhaitez également inclure le solde des congés de l'exercice précédent à cet exercice
 DocType: GL Entry,Against Voucher Type,Pour le Type de Bon
 DocType: Item,Attributes,Attributs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Veuillez entrer un Compte de Reprise
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Date de la Dernière Commande
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Les numéros de série dans la ligne {0} ne correspondent pas à la note de livraison
 DocType: Student,Guardian Details,Détails du Tuteur
 DocType: C-Form,C-Form,Formulaire-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Valider la Présence de plusieurs employés
@@ -3450,14 +3453,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Ligne {0} # Le compte doit être de type ‘Actif Immobilisé'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qté Sortante
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Règles de calcul du montant des frais de port pour une vente
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série est obligatoire
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Services Financiers
 DocType: Student Sibling,Student ID,Carte d'Étudiant
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Types d'activités pour Journaux de Temps
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de Base
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
 DocType: Leave Allocation,Unused leaves,Congés non utilisés
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,État de la Facturation
@@ -3490,7 +3493,7 @@
 DocType: Payment Entry,Account Paid From,Compte Payé Du
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Code d’Article de Matière Première
 DocType: Journal Entry,Write Off Based On,Reprise Basée Sur
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Faire un Prospect
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Faire un Prospect
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impression et Papeterie
 DocType: Stock Settings,Show Barcode Field,Afficher Champ Code Barre
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Envoyer des Emails au Fournisseur
@@ -3499,12 +3502,13 @@
 DocType: Guardian Interest,Guardian Interest,Part du Tuteur
 apps/erpnext/erpnext/config/hr.py +177,Training,Formation
 DocType: Timesheet,Employee Detail,Détail Employé
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1 Email ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,ID Email du Tuteur1
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,Le jour de la Date Suivante et le Jour de Répétition du Mois doivent être égal
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Réglages pour la page d'accueil du site
 DocType: Offer Letter,Awaiting Response,Attente de Réponse
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Au-dessus
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Attribut invalide {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Veuillez mentionner s'il s'agit d'un compte créditeur non standard
 DocType: Salary Slip,Earning & Deduction,Revenus et Déduction
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes transactions.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Taux de Valorisation Négatif n'est pas autorisé
@@ -3526,26 +3530,26 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obtenir les Articles du Produit Groupé
 DocType: Asset,Straight Line,Ligne Droite
 DocType: Project User,Project User,Utilisateur du Projet
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Divisé
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Fractionner
 DocType: GL Entry,Is Advance,Est Accompte
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,La Date de Présence Depuis et la Date de Présence Jusqu'à sont obligatoires
 apps/erpnext/erpnext/controllers/buying_controller.py +146,Please enter 'Is Subcontracted' as Yes or No,Veuillez entrer Oui ou Non pour 'Est sous-traitée'
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Dernière date de communication
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Date de la Dernière Communication
 DocType: Sales Team,Contact No.,N° du Contact
 DocType: Bank Reconciliation,Payment Entries,Écritures de Paiement
 DocType: Production Order,Scrap Warehouse,Entrepôt de Rebut
-DocType: Production Order,Check if material transfer entry is not required,Vérifiez si l&#39;entrée du transfert de matériel n&#39;est pas requise
+DocType: Production Order,Check if material transfer entry is not required,Vérifiez si une un transfert de matériel n'est pas requis
 DocType: Program Enrollment Tool,Get Students From,Obtenir les Étudiants De
 DocType: Hub Settings,Seller Country,Pays du Vendeur
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publier les Articles sur le Site Web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Regrouper vos étudiants en lots
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Regrouper vos étudiants en lots
 DocType: Authorization Rule,Authorization Rule,Règle d'Autorisation
 DocType: Sales Invoice,Terms and Conditions Details,Détails des Termes et Conditions
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Caractéristiques
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modèle de Taxes et Frais de Vente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Crédit)
 DocType: Repayment Schedule,Payment Date,Date de Paiement
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nouvelle quantité de lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nouvelle Qté de Lot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Nombre de Commandes
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / bannière qui apparaîtra sur le haut de la liste des produits.
@@ -3583,7 +3587,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Dépenses Directes
 apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} est une adresse email invalide dans 'Notification \ Adresse Email'
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nouveau Revenu de Clientèle
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nouveaux Revenus de Clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Frais de Déplacement
 DocType: Maintenance Visit,Breakdown,Panne
 apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise : {1} ne peut pas être sélectionné
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Essai
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Composantes Salariales
 DocType: Program Enrollment Tool,New Academic Year,Nouvelle Année Académique
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retour / Note de Crédit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Retour / Note de Crédit
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique du taux de la Liste de Prix si manquante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Montant Total Payé
 DocType: Production Order Item,Transferred Qty,Quantité Transférée
@@ -3638,6 +3642,7 @@
 ,Sales Funnel,Entonnoir de Vente
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abréviation est obligatoire
 DocType: Project,Task Progress,Progression de la Tâche
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Panier
 ,Qty to Transfer,Qté à Transférer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Devis de Prospects ou Clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle Autorisé à modifier un stock gelé
@@ -3670,7 +3675,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},La quantité ({0}) ne peut pas être une fraction dans la ligne {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Collecter les Frais
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Le Code Barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Le Code Barre {0} est déjà utilisé dans l'article {1}
 DocType: Lead,Add to calendar on this date,Ajouter cette date au calendrier
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Règles pour l'ajout de frais de port.
 DocType: Item,Opening Stock,Stock d'Ouverture
@@ -3688,7 +3693,7 @@
 DocType: Customer,From Lead,Du Prospect
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Commandes validées pour la production.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Sélectionner Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
 DocType: Program Enrollment Tool,Enroll Students,Inscrire des Étudiants
 DocType: Hub Settings,Name Token,Nom du Jeton
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vente Standard
@@ -3699,7 +3704,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} pour la Facture de Vente {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nom du Projet
-DocType: Supplier,Mention if non-standard receivable account,Mentionner si le compte débiteur n'est pas standard
+DocType: Customer,Mention if non-standard receivable account,Mentionner si le compte débiteur n'est pas standard
 DocType: Journal Entry Account,If Income or Expense,Si Produits ou Charges
 DocType: Production Order,Required Items,Articles Requis
 DocType: Stock Ledger Entry,Stock Value Difference,Différence de Valeur du Sock
@@ -3725,10 +3730,11 @@
 DocType: Currency Exchange,To Currency,Devise Finale
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Autoriser les utilisateurs suivant à approuver les demandes de congés durant les jours bloqués.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Types de Notes de Frais.
-apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Le taux de vente pour l&#39;élément {0} est inférieur à son {1}. Le taux de vente devrait être au moins {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Le prix de vente pour l'élément {0} est inférieur à son {1}. Le prix de vente devrait être au moins {2}
 DocType: Item,Taxes,Taxes
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Payé et Non Livré
 DocType: Project,Default Cost Center,Centre de Coûts par Défaut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez configurer Naming Series pour {0} via Setup&gt; Paramètres&gt; Naming Series
 DocType: Bank Guarantee,End Date,Date de Fin
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions du Stock
 DocType: Budget,Budget Accounts,Comptes de Budgets
@@ -3793,7 +3799,7 @@
 DocType: Customer,Sales Partner and Commission,Partenaire Commercial et Commission
 DocType: Employee Loan,Rate of Interest (%) / Year,Taux d'Intérêt (%) / Année
 ,Project Quantity,Quantité de Projet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Le Total {0} pour tous les articles est nul, peut-être devriez-vous modifier ‘Distribuez les Frais sur la Base de’"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Le Total {0} pour tous les articles est nul, peut-être devriez-vous modifier ‘Distribuez les Frais sur la Base de’"
 DocType: Opportunity,To Discuss,À Discuter
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unités de {1} nécessaires dans {2} pour compléter cette transaction.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taux d'Intérêt (%) Annuel
@@ -3816,7 +3822,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marquer Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ligne {0} : La devise de la LDM #{1} doit être égale à la devise sélectionnée {2}
 DocType: Journal Entry Account,Exchange Rate,Taux de Change
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
 DocType: Homepage,Tag Line,Ligne de Tag
 DocType: Fee Component,Fee Component,Composant d'Honoraires
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestion de Flotte
@@ -3833,7 +3839,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,L'entrepôt {0} n'existe pas
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,S'inscrire au Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Pourcentages de Répartition Mensuelle
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,L’article sélectionné ne peut pas avoir de Lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,L’article sélectionné ne peut pas avoir de Lot
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Taux de valorisation non trouvé pour l’Article {0}, qui est nécessaire pour faire les écritures comptables pour {1} {2}. Si l’article est un l'échantillon dans {1}, veuillez le mentionner dans la table d’article de {1}. Dans le cas contraire, veuillez créer une écriture de stock pour l’article ou définir un taux de valorisation dans les données de base de l’article et essayez de soumettre / annuler cette écriture"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de matériaux livrés pour ce Bon de Livraison
 DocType: Project,Customer Details,Détails du client
@@ -3850,7 +3856,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Commandes Soumises ne peuvent pas être supprimés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà débiteur, vous n'êtes pas autorisé à définir 'Solde Doit Être' comme 'Créditeur'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestion de la Qualité
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,L'article {0} a été désactivé
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,L'article {0} a été désactivé
 DocType: Employee Loan,Repay Fixed Amount per Period,Rembourser un Montant Fixe par Période
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Veuillez entrer une quantité pour l'article {0}
 DocType: Employee External Work History,Employee External Work History,Antécédents Professionnels de l'Employé
@@ -3862,7 +3868,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +23,Cost Centers,Centres de Coûts
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taux auquel la devise du fournisseur est convertie en devise société de base
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ligne #{0}: Minutage en conflit avec la ligne {1}
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permettre le taux d&#39;évaluation zéro
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Autoriser un Taux de Valorisation Égal à Zéro
 DocType: Training Event Employee,Invited,Invité
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Plusieurs Grilles de Salaires Actives trouvées pour l'employé {0} pour les dates données
 DocType: Opportunity,Next Contact,Contact Suivant
@@ -3873,17 +3879,17 @@
 ,Cash Flow,Flux de Trésorerie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,La période de la demande ne peut pas être sur deux dossiers d'allocation
 DocType: Item Group,Default Expense Account,Compte de Charges par Défaut
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Étudiant Email ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ID Email de l'Étudiant
 DocType: Employee,Notice (days),Préavis (jours)
 DocType: Tax Rule,Sales Tax Template,Modèle de la Taxe de Vente
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Sélectionner les articles pour sauvegarder la facture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Sélectionner les articles pour sauvegarder la facture
 DocType: Employee,Encashment Date,Date de l'Encaissement
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajustement du Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Un Coût d’Activité par défault existe pour le Type d’Activité {0}
 DocType: Production Order,Planned Operating Cost,Coûts de Fonctionnement Prévus
 DocType: Academic Term,Term Start Date,Date de Début du Terme
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Compte d'Opportunités
 apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},Veuillez trouver ci-joint {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Solde du Relevé Bancaire d’après le Grand Livre
 DocType: Job Applicant,Applicant Name,Nom du Candidat
@@ -3910,6 +3916,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Notes de Débit Émises
 DocType: Production Order,Warehouses,Entrepôts
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actif ne peut pas être transféré
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Cet article est une Variante de {0} (Modèle).
 DocType: Workstation,per hour,par heure
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Achat
 DocType: Announcement,Announcement,Annonce
@@ -3925,7 +3932,7 @@
 DocType: Account,Receivable,Créance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ligne #{0} : Changement de Fournisseur non autorisé car un Bon de Commande existe déjà
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Données de base en cours de synchronisation, cela peut prendre un certain temps"
 DocType: Item,Material Issue,Problème Matériel
 DocType: Hub Settings,Seller Description,Description du Vendeur
@@ -3938,7 +3945,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Commandé
 DocType: Salary Detail,Component,Composant
 DocType: Assessment Criteria,Assessment Criteria Group,Groupe de Critère d'Évaluation
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
 DocType: Warehouse,Warehouse Name,Nom de l'Entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner la Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Veuillez entrer un Rôle Approbateur ou un Rôle Utilisateur
@@ -3962,7 +3969,7 @@
 DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,Voir Tâche
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Date de début de la période comptable
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Prospect %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Amortissements et Soldes d'Actif
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} à {3}
@@ -3972,7 +3979,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pour définir cet Exercice Fiscal par défaut, cliquez sur ""Définir par défaut"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Joindre
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Qté de Pénurie
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
 DocType: Employee Loan,Repay from Salary,Rembourser avec le Salaire
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Demande de Paiement pour {0} {1} pour le montant {2}
@@ -3990,7 +3997,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Détails des Résultats d'Évaluation
 DocType: Employee Education,Employee Education,Formation de l'Employé
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Groupe d’articles en double trouvé dans la table des groupes d'articles
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
 DocType: Salary Slip,Net Pay,Salaire Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,N° de Série {0} a déjà été reçu
@@ -3999,7 +4006,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","L'entrepôt {0} n'est liée à auncun compte, veuillez créer/lier le compte (Actif) correspondant pour l'entrepôt."
 DocType: Purchase Invoice,Recurring Id,Id Récurrent
 DocType: Customer,Sales Team Details,Détails de l'Équipe des Ventes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Supprimer définitivement ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Supprimer définitivement ?
 DocType: Expense Claim,Total Claimed Amount,Montant Total Réclamé
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Opportunités potentielles de vente.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalide {0}
@@ -4010,13 +4017,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Configurez votre École dans ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Montant de Base à Rendre (Devise de la Société)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Pas d’écritures comptables pour les entrepôts suivants
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Pas d’écritures comptables pour les entrepôts suivants
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Enregistrez le document d'abord.
 DocType: Account,Chargeable,Facturable
 DocType: Company,Change Abbreviation,Changer l'Abréviation
 DocType: Expense Claim Detail,Expense Date,Date de Frais
 DocType: Item,Max Discount (%),Réduction Max (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Montant de la Dernière Commande
+DocType: Task,Is Milestone,Milestone
 DocType: Daily Work Summary,Email Sent To,Email Envoyé À
 DocType: Budget,Warn,Avertir
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Toute autre remarque, effort remarquable qui devrait aller dans les dossiers."
@@ -4049,11 +4057,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Geler les stocks datant de plus` doit être inférieur à %d jours.
 DocType: Tax Rule,Purchase Tax Template,Modèle de Taxes pour les Achats
 ,Project wise Stock Tracking,Suivi des Stocks par Projet
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},L'Échéancier d'Entretien {0} existe pour {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qté Réelle (à la source/cible)
 DocType: Item Customer Detail,Ref Code,Code de Réf.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Dossiers de l'Employé.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Veuillez définir la Prochaine Date d’Amortissement
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Veuillez définir la Prochaine Date d’Amortissement
 DocType: HR Settings,Payroll Settings,Réglages de la Paie
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Rapprocher les Factures non liées avec les Paiements.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Passer la Commande
@@ -4076,7 +4083,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Chèques et Dépôts incorrectement compensés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
 DocType: Purchase Invoice Item,Price List Rate,Taux de la Liste des Prix
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Créer les devis client
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Créer les devis client
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Afficher ""En stock"" ou ""Pas en stock"" basé sur le stock disponible dans cet entrepôt."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Liste de Matériaux (LDM)
 DocType: Item,Average time taken by the supplier to deliver,Délai moyen de livraison par le fournisseur
@@ -4098,7 +4105,7 @@
 DocType: Asset,Disposal Date,Date d’Élimination
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Les Emails seront envoyés à tous les Employés Actifs de la société à l'heure donnée, s'ils ne sont pas en vacances. Le résumé des réponses sera envoyé à minuit."
 DocType: Employee Leave Approver,Employee Leave Approver,Approbateur des Congés de l'Employé
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ligne {0} : Une écriture de Réapprovisionnement existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ligne {0} : Une écriture de Réapprovisionnement existe déjà pour cet entrepôt {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Impossible de déclarer comme perdu, parce que le Devis a été fait."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Retour d'Expérience sur la Formation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,L'Ordre de Production {0} doit être soumis
@@ -4106,8 +4113,8 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Cours est obligatoire à la ligne {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La date de fin ne peut être antérieure à la date de début
 DocType: Supplier Quotation Item,Prevdoc DocType,DocPréc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Ajouter / Modifier Prix
-DocType: Batch,Parent Batch,Lot parental
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Ajouter / Modifier Prix
+DocType: Batch,Parent Batch,Lot Parent
 DocType: Cheque Print Template,Cheque Print Template,Modèles d'Impression de Chèques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Tableau des Centres de Coûts
 ,Requested Items To Be Ordered,Articles Demandés à Commander
@@ -4150,7 +4157,7 @@
 DocType: Item,Variant Based On,Variante Basée Sur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Le total des pondérations attribuées devrait être de 100 %. Il est {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vos Fournisseurs
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Impossible de définir comme perdu alors qu'un Bon de Commande a été créé.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossible de définir comme perdu alors qu'un Bon de Commande a été créé.
 DocType: Request for Quotation Item,Supplier Part No,N° de Pièce du Fournisseur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Vous ne pouvez pas déduire lorsqu'une catégorie est pour 'Évaluation' ou 'Évaluation et Total'
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Reçu De
@@ -4160,7 +4167,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0} : Du {0} pour {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ligne #{0} : Définir Fournisseur pour l’article {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Ligne {0} : La valeur des heures doit être supérieure à zéro.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Image pour le Site Web {0} attachée à l'Article {1} ne peut pas être trouvée
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Image pour le Site Web {0} attachée à l'Article {1} ne peut pas être trouvée
 DocType: Issue,Content Type,Type de Contenu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
@@ -4169,20 +4176,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à définir des valeurs gelées
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenir les Écritures non Réconcilliées
 DocType: Payment Reconciliation,From Invoice Date,De la Date de la Facture
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,La devise de facturation doit être égale à la devise par défaut de la société ou du compte de la partie
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,La devise de facturation doit être égale à la devise par défaut de la société ou du compte de la partie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Congés Accumulés à Encaisser
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Qu'est-ce que ça fait ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,À l'Entrepôt
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Toutes les Admissions des Étudiants
 ,Average Commission Rate,Taux Moyen de la Commission
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'A un Numéro de Série' ne peut pas être 'Oui' pour un article hors-stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'A un Numéro de Série' ne peut pas être 'Oui' pour un article hors-stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La présence ne peut pas être marquée pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Aide pour les Règles de Tarification
 DocType: School House,House Name,Nom de la Maison
 DocType: Purchase Taxes and Charges,Account Head,Compte Principal
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Mettre à jour les frais additionnels pour calculer le coût au débarquement des articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Électrique
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Ajouter le reste de votre organisation en tant qu'utilisateurs. Vous pouvez aussi inviter des Clients sur votre portail en les ajoutant depuis les Contacts
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Ajouter le reste de votre organisation en tant qu'utilisateurs. Vous pouvez aussi inviter des Clients sur votre portail en les ajoutant depuis les Contacts
 DocType: Stock Entry,Total Value Difference (Out - In),Différence Valeur Totale (Sor - En)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Ligne {0} : Le Taux de Change est obligatoire
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de l'Utilisateur non défini pour l'Employé {0}
@@ -4191,7 +4198,7 @@
 DocType: Item,Customer Code,Code Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rappel d'Anniversaire pour {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jours Depuis la Dernière Commande
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
 DocType: Buying Settings,Naming Series,Nom de la Série
 DocType: Leave Block List,Leave Block List Name,Nom de la Liste de Blocage des Congés
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Date de Début d'Assurance devrait être antérieure à la Date de Fin d'Assurance
@@ -4206,7 +4213,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Fiche de Paie de l'employé {0} déjà créée pour la feuille de temps {1}
 DocType: Vehicle Log,Odometer,Odomètre
 DocType: Sales Order Item,Ordered Qty,Qté Commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Article {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Article {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Gelé Jusqu'au
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,LDM ne contient aucun article en stock
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Les Dates de Période Initiale et de Période Finale sont obligatoires pour {0} récurrent(e)
@@ -4219,7 +4226,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montant de la Reprise (Devise Société)
 DocType: Sales Invoice Timesheet,Billing Hours,Heures Facturées
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,LDM par défaut {0} introuvable
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Ligne #{0} : Veuillez définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Ligne #{0} : Veuillez définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Choisissez des articles pour les ajouter ici
 DocType: Fees,Program Enrollment,Inscription au Programme
 DocType: Landed Cost Voucher,Landed Cost Voucher,Référence de Coût au Débarquement
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Veuillez définir {0}
@@ -4227,7 +4235,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} est un étudiant inactif
 DocType: Employee,Health Details,Détails de Santé
 DocType: Offer Letter,Offer Letter Terms,Termes de la Lettre de Proposition
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,Pour créer un document de référence de demande de paiement est requis
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,"Pour créer une Demande de Paiement, un document de référence est requis"
 DocType: Payment Entry,Allocate Payment Amount,Allouer le Montant du Paiement
 DocType: Employee External Work History,Salary,Salaire
 DocType: Serial No,Delivery Document Type,Type de Document de Livraison
@@ -4251,7 +4259,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM Remplacée
 ,Sales Analytics,Analyse des Ventes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponible {0}
-,Prospects Engaged But Not Converted,Perspectives engagées mais non converties
+,Prospects Engaged But Not Converted,Prospects Contactés mais non Convertis
 DocType: Manufacturing Settings,Manufacturing Settings,Paramètres de Fabrication
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurer l'Email
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,N° du Mobile du Tuteur 1
@@ -4276,7 +4284,7 @@
 apps/erpnext/erpnext/config/accounts.py +257,Default settings for accounting transactions.,Paramètres par défaut pour les opérations comptables .
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date Prévue ne peut pas être avant la Date de Demande de Matériel
-DocType: Purchase Invoice Item,Stock Qty,Stock Qté
+DocType: Purchase Invoice Item,Stock Qty,Qté en Stock
 DocType: Production Order,Source Warehouse (for reserving Items),Entrepôt Source (pour la réservation des Articles)
 DocType: Employee Loan,Repayment Period in Months,Période de Remboursement en Mois
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erreur : Pas un identifiant valide ?
@@ -4316,14 +4324,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vente de Détail & en Gros
 DocType: Issue,First Responded On,Première Réponse Le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Liste Croisée d'Articles dans plusieurs groupes
-DocType: Grade Interval,Grade Interval,Intervalle de Notes
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La Date de Début et la Date de Fin de l'Exercice Fiscal sont déjà définies dans l'Année Fiscale {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Date de Compensation mise à jour
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lot fractionné
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lot Fractionné
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Réconcilié avec Succès
 DocType: Request for Quotation Supplier,Download PDF,Télécharger au Format PDF
 DocType: Production Order,Planned End Date,Date de Fin Prévue
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Là où les articles sont stockés.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Request for Quotation,Supplier Detail,Détails du Fournisseur
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Erreur dans la formule ou dans la condition : {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Montant Facturé
@@ -4359,7 +4367,7 @@
 DocType: Packing Slip,Gross Weight UOM,UDM du Poids Brut
 DocType: Delivery Note Item,Against Sales Invoice,Pour la Facture de Vente
 DocType: Bin,Reserved Qty for Production,Qté Réservée pour la Production
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Laissez-vous désactiver si vous ne souhaitez pas considérer le lot tout en faisant des groupes basés sur les cours.
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Laisser désactivé si vous ne souhaitez pas considérer les lots en faisant des groupes basés sur les cours.
 DocType: Asset,Frequency of Depreciation (Months),Fréquence des Amortissements (Mois)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Compte Créditeur
 DocType: Landed Cost Item,Landed Cost Item,Coût de l'Article au Débarquement
@@ -4368,7 +4376,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Installation d&#39;un site web simple pour mon organisation
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte Débiteur / Créditeur
 DocType: Delivery Note Item,Against Sales Order Item,Pour l'Article de la Commande Client
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
 DocType: Item,Default Warehouse,Entrepôt par Défaut
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué pour le Compte de Groupe {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Veuillez entrer le centre de coût parent
@@ -4389,7 +4397,7 @@
 DocType: Stock Entry,As per Stock UOM,Selon UDM du Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Non Expiré
 DocType: Student Log,Achievement,Réalisation
-DocType: Batch,Source Document Type,Source Type de document
+DocType: Batch,Source Document Type,Type de Document Source
 DocType: Journal Entry,Total Debit,Total Débit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Entrepôt de Produits Finis par Défaut
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +78,Sales Person,Vendeur
@@ -4400,11 +4408,11 @@
 DocType: Guardian,Alternate Number,Autre Numéro
 DocType: Assessment Plan Criteria,Maximum Score,Score Maximum
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Créer des règles pour restreindre les transactions basées sur les valeurs .
-DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Laissez vide si vous faites des groupes d&#39;étudiants par année
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Laisser vide si vous faites des groupes d'étudiants par année
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si cochée, Le nombre total de Jours Ouvrés comprendra les vacances, ce qui réduira la valeur du Salaire Par Jour"
 DocType: Purchase Invoice,Total Advance,Total Avance
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être antérieure à la Date de Début de Terme. Veuillez corriger les dates et essayer à nouveau.
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Compte de Devis
 ,BOM Stock Report,Rapport de Stock de LDM
 DocType: Stock Reconciliation Item,Quantity Difference,Différence de Quantité
 apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Traitement de la Paie
@@ -4425,7 +4433,7 @@
 ,Items To Be Requested,Articles À Demander
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir le Dernier Tarif d'Achat
 DocType: Company,Company Info,Informations sur la Société
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Sélectionner ou ajoutez nouveau client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Sélectionner ou ajoutez nouveau client
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Un centre de coût est requis pour comptabiliser une note de frais
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Emplois des Ressources (Actifs)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Basé sur la présence de cet Employé
@@ -4438,13 +4446,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Empêcher les utilisateurs de faire des Demandes de Congé les jours suivants.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Montant de l'Achat
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Devis Fournisseur {0} créé
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Fin de l'Année ne peut pas être avant Début de l'Année
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Fin de l'Année ne peut pas être avant Début de l'Année
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Avantages de l'Employé
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},La quantité emballée doit être égale à la quantité pour l'Article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Qté Fabriquée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité Acceptée
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Veuillez définir une Liste de Vacances par défaut pour l'Employé {0} ou la Société {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} : {1} n’existe pas
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} : {1} n’existe pas
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures émises pour des Clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID du Projet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ligne N° {0}: Le montant ne peut être supérieur au Montant en Attente pour le Remboursement de Frais {1}. Le Montant en Attente est de {2}
@@ -4453,15 +4461,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Type de Référence
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Liste de Prix introuvable ou desactivée
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Liste de Prix introuvable ou desactivée
 DocType: Employee Loan Application,Approved,Approuvé
 DocType: Pricing Rule,Price,Prix
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Employé dégagé de {0} doit être défini comme 'Gauche'
 DocType: Guardian,Guardian,Tuteur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Évaluation {0} créée pour l'Employé {1} dans l'intervalle de dates donné
 DocType: Employee,Education,Education
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Supp
 DocType: Selling Settings,Campaign Naming By,Campagne Nommée Par
 DocType: Employee,Current Address Is,L'Adresse Actuelle est
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifié
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Optionnel. Défini la devise par défaut de l'entreprise, si non spécifié."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qté Disponible Depuis l'Entrepôt
@@ -4498,13 +4508,13 @@
 DocType: Hub Settings,Hub Settings,Paramètres du Hub
 DocType: Project,Gross Margin %,Marge Brute %
 DocType: BOM,With Operations,Avec des Opérations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Des écritures comptables ont déjà été réalisées en devise {0} pour la société {1}. Veuillez sélectionner un compte de crédit ou de débit  en devise {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Des écritures comptables ont déjà été réalisées en devise {0} pour la société {1}. Veuillez sélectionner un compte de crédit ou de débit  en devise {0}.
 DocType: Asset,Is Existing Asset,Est Actif Existant
-DocType: Salary Detail,Statistical Component,Composante statistique
+DocType: Salary Detail,Statistical Component,Composante Statistique
 ,Monthly Salary Register,Registre Mensuel des Salaires
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération LDM
-DocType: School Settings,Validate the Student Group from Program Enrollment,Valider le groupe étudiant de l&#39;inscription au programme
+DocType: School Settings,Validate the Student Group from Program Enrollment,Valider le Groupe d'Étudiant depuis l'Inscription au Programme
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Le Montant de la Rangée Précédente
 DocType: Student,Home Address,Adresse du Domicile
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfert d'Actifs
@@ -4552,7 +4562,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Joindre le Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveaux du Stocks
 DocType: Customer,Commission Rate,Taux de Commission
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Faire une Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Faire une Variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquer les demandes de congé par département
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Type de Paiement doit être Recevoir, Payer ou Transfert Interne"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytique
@@ -4565,6 +4575,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Autoriser la Fabrication pendant les Vacances
 DocType: Sales Order,Customer's Purchase Order Date,Date du Bon de Commande du Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
+DocType: Shopping Cart Settings,Show Public Attachments,Afficher les Pièces Jointes Publiques
 DocType: Packing Slip,Package Weight Details,Détails du Poids du Paquet
 DocType: Payment Gateway Account,Payment Gateway Account,Compte Passerelle de Paiement
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Le paiement terminé, rediriger l'utilisateur vers la page sélectionnée."
@@ -4589,7 +4600,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne plus afficher le symbole (tel que $, €...) à côté des montants."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Demi-Journée)
 DocType: Supplier,Credit Days,Jours de Crédit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Créer un Lot d'Étudiant
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Créer un Lot d'Étudiant
 DocType: Leave Type,Is Carry Forward,Est un Report
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtenir les Articles depuis LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Jours de Délai
@@ -4608,7 +4619,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Montant Approuvé
 DocType: GL Entry,Is Opening,Écriture d'Ouverture
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ligne {0} : L’Écriture de Débit ne peut pas être lié à un {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numérotation pour la présence via Configuration&gt; Série de numérotation
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Compte {0} n'existe pas
 DocType: Account,Cash,Espèces
 DocType: Employee,Short biography for website and other publications.,Courte biographie pour le site web et d'autres publications.
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index f9ea0e8..1f1650b 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,બેચ વસ્તુ સમાપ્તિ સ્થિતિ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,બેંક ડ્રાફ્ટ
 DocType: Mode of Payment Account,Mode of Payment Account,ચુકવણી એકાઉન્ટ પ્રકાર
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,બતાવો ચલો
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,બતાવો ચલો
 DocType: Academic Term,Academic Term,શૈક્ષણિક ટર્મ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,સામગ્રી
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,જથ્થો
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,સ્વાસ્થ્ય કાળજી
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ચુકવણી વિલંબ (દિવસ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,સેવા ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ભરતિયું
 DocType: Maintenance Schedule Item,Periodicity,સમયગાળાના
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ફિસ્કલ વર્ષ {0} જરૂરી છે
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,જાહેરાત
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,સેમ કંપની એક કરતા વધુ વખત દાખલ થયેલ
 DocType: Employee,Married,પરણિત
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},માટે પરવાનગી નથી {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},માટે પરવાનગી નથી {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,વસ્તુઓ મેળવો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સેટઅપ કર્મચારી માનવ સંસાધન માં નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ઉત્પાદન {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,કોઈ આઇટમ સૂચિબદ્ધ નથી
 DocType: Payment Reconciliation,Reconcile,સમાધાન
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,કરિયાણા
 DocType: Quality Inspection Reading,Reading 1,1 વાંચન
 DocType: Process Payroll,Make Bank Entry,બેન્ક પ્રવેશ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,પેન્શન ફંડ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
 DocType: SMS Center,All Sales Person,બધા વેચાણ વ્યક્તિ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** માસિક વિતરણ ** જો તમે તમારા બિઝનેસ મોસમ હોય તો તમે મહિના સમગ્ર બજેટ / લક્ષ્યાંક વિતરિત કરે છે.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,વસ્તુઓ મળી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,વસ્તુઓ મળી
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,પગાર માળખું ખૂટે
 DocType: Lead,Person Name,વ્યક્તિ નામ
 DocType: Sales Invoice Item,Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",દા.ત. &quot;પ્રાથમિક શાળા&quot; અથવા &quot;યુનિવર્સિટી&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,સ્ટોક અહેવાલ
 DocType: Warehouse,Warehouse Detail,વેરહાઉસ વિગતવાર
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ટર્મ સમાપ્તિ તારીખ કરતાં પાછળથી શૈક્ષણિક વર્ષ સમાપ્તિ તારીખ જે શબ્દ સાથે કડી થયેલ છે હોઈ શકે નહિં (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", અનચેક કરી શકાતી નથી કારણ કે એસેટ રેકોર્ડ વસ્તુ સામે અસ્તિત્વમાં &quot;સ્થિર એસેટ છે&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", અનચેક કરી શકાતી નથી કારણ કે એસેટ રેકોર્ડ વસ્તુ સામે અસ્તિત્વમાં &quot;સ્થિર એસેટ છે&quot;"
 DocType: Vehicle Service,Brake Oil,બ્રેક ઓઈલ
 DocType: Tax Rule,Tax Type,ટેક્સ પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
 DocType: BOM,Item Image (if not slideshow),આઇટમ છબી (જોક્સ ન હોય તો)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ગ્રાહક જ નામ સાથે હાજર
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(કલાક દર / 60) * વાસ્તવિક કામગીરી સમય
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOM પસંદ કરો
 DocType: SMS Log,SMS Log,એસએમએસ લોગ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,વિતરિત વસ્તુઓ કિંમત
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,પર {0} રજા વચ્ચે તારીખ થી અને તારીખ નથી
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,ગ્રેડ
 DocType: Sales Invoice Item,Delivered By Supplier,સપ્લાયર દ્વારા વિતરિત
 DocType: SMS Center,All Contact,તમામ સંપર્ક
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ઉત્પાદન ઓર્ડર પહેલેથી BOM સાથે તમામ વસ્તુઓ બનાવવામાં
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ઉત્પાદન ઓર્ડર પહેલેથી BOM સાથે તમામ વસ્તુઓ બનાવવામાં
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,વાર્ષિક પગાર
 DocType: Daily Work Summary,Daily Work Summary,દૈનિક કામ સારાંશ
 DocType: Period Closing Voucher,Closing Fiscal Year,ફિસ્કલ વર્ષ બંધ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} સ્થિર છે
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} સ્થિર છે
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,કૃપા કરીને એકાઉન્ટ્સ ઓફ ચાર્ટ બનાવવા માટે હાલના કંપની પસંદ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,સ્ટોક ખર્ચ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,પસંદ લક્ષ્યાંક વેરહાઉસ
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,ઊલટું એન્ટ્રી
 DocType: Journal Entry Account,Credit in Company Currency,કંપની કરન્સી ક્રેડિટ
 DocType: Delivery Note,Installation Status,સ્થાપન સ્થિતિ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",તમે હાજરી અપડેટ કરવા માંગો છો? <br> હાજર: {0} \ <br> ગેરહાજર: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty નકારેલું સ્વીકારાયું + વસ્તુ માટે પ્રાપ્ત જથ્થો માટે સમાન હોવો જોઈએ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,પુરવઠા કાચો માલ ખરીદી માટે
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ચુકવણી ઓછામાં ઓછો એક મોડ POS ભરતિયું માટે જરૂરી છે.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ચુકવણી ઓછામાં ઓછો એક મોડ POS ભરતિયું માટે જરૂરી છે.
 DocType: Products Settings,Show Products as a List,શો ઉત્પાદનો યાદી તરીકે
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", નમૂનો ડાઉનલોડ યોગ્ય માહિતી ભરો અને ફેરફાર ફાઇલ સાથે જોડે છે. પસંદ કરેલ સમયગાળામાં તમામ તારીખો અને કર્મચારી સંયોજન હાલની એટેન્ડન્સ રેકર્ડઝ સાથે, નમૂનો આવશે"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,અવમૂલ્યન પ્રવેશ કરો
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,વિનંતી પ્રકાર
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,કર્મચારીનું બનાવો
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,કર્મચારીનું બનાવો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,પ્રસારણ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,એક્ઝેક્યુશન
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,કામગીરી વિગતો બહાર કરવામાં આવે છે.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,જાળવણી મુલાકાત માટે યોજના.
 DocType: SMS Settings,Enter url parameter for message,સંદેશ માટે URL પેરામીટર દાખલ
 DocType: POS Profile,Customer Groups,ગ્રાહક જૂથો
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,નાણાકીય નિવેદનો
 DocType: Guardian,Students,વિદ્યાર્થી
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ભાવો અને ડિસ્કાઉન્ટ લાગુ પાડવા માટે નિયમો.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ભાવ યાદી ખરીદી અથવા વેચાણ માટે લાગુ હોવા જ જોઈએ
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
 DocType: Naming Series,Series List for this Transaction,આ સોદા માટે સિરીઝ યાદી
 DocType: Company,Default Payroll Payable Account,ડિફૉલ્ટ પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,સુધારા ઇમેઇલ ગ્રુપ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,સુધારા ઇમેઇલ ગ્રુપ
 DocType: Sales Invoice,Is Opening Entry,એન્ટ્રી ખુલી છે
 DocType: Customer Group,Mention if non-standard receivable account applicable,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ લાગુ પડતું હોય તો
 DocType: Course Schedule,Instructor Name,પ્રશિક્ષક નામ
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ સામે
 ,Production Orders in Progress,પ્રગતિ ઉત્પાદન ઓર્ડર્સ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,નાણાકીય થી ચોખ્ખી રોકડ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
 DocType: Lead,Address & Contact,સરનામું અને સંપર્ક
 DocType: Leave Allocation,Add unused leaves from previous allocations,અગાઉના ફાળવણી માંથી નહિં વપરાયેલ પાંદડા ઉમેરો
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},આગળ રીકરીંગ {0} પર બનાવવામાં આવશે {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),કુલ પડતર રકમ (સમયનો શીટ મારફતે)
 DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,બેન્ક પ્રવેશો
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,હબ પ્રકાશિત
 DocType: Student Admission,Student Admission,વિદ્યાર્થી પ્રવેશ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
 DocType: Item,Purchase Details,ખરીદી વિગતો
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,આપોઆપ સામગ્રી વિનંતી બનાવટ પર ઇમેઇલ દ્વારા સૂચિત
 DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
 DocType: Payment Reconciliation Invoice,Invoice Type,ભરતિયું પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ડિલીવરી નોંધ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,ડિલીવરી નોંધ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,કર સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,વેચાઈ એસેટ કિંમત
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,તમે તેને ખેંચી ચુકવણી પછી એન્ટ્રી સુધારાઈ ગયેલ છે. તેને ફરીથી ખેંચી કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
-DocType: Grade Interval,Min Score,મીન સ્કોર
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,આ અઠવાડિયે અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 DocType: Student Applicant,Admitted,પ્રવેશ
 DocType: Workstation,Rent Cost,ભાડું ખર્ચ
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ઓર્ડર કિંમત
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,બેન્ક / રોકડ પક્ષ સામે અથવા આંતરિક ટ્રાન્સફર માટે વ્યવહારો
 DocType: Shipping Rule,Valid for Countries,દેશો માટે માન્ય
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"આ આઇટમ એક નમૂનો છે અને વ્યવહારો ઉપયોગ કરી શકતા નથી. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી વસ્તુ લક્ષણો ચલો માં ઉપર નકલ થશે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"આ આઇટમ એક નમૂનો છે અને વ્યવહારો ઉપયોગ કરી શકતા નથી. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી વસ્તુ લક્ષણો ચલો માં ઉપર નકલ થશે"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ગણવામાં કુલ ઓર્ડર
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,દાખલ ક્ષેત્ર કિંમત &#39;ડે મહિનો પર પુનરાવર્તન&#39; કરો
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,ટેક્સ રેટ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} પહેલાથી જ કર્મચારી માટે ફાળવવામાં {1} માટે સમય {2} માટે {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,પસંદ કરો વસ્તુ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ROW # {0}: બેચ કોઈ તરીકે જ હોવી જોઈએ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,બિન-ગ્રુપ માટે કન્વર્ટ
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,આઇટમ બેચ (ઘણો).
 DocType: C-Form Invoice Detail,Invoice Date,ભરતિયું તારીખ
 DocType: GL Entry,Debit Amount,ડેબિટ રકમ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,જોડાણ જુઓ
 DocType: Purchase Order,% Received,% પ્રાપ્ત
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,વિદ્યાર્થી જૂથો બનાવો
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,અવતરણ માટે વિનંતી
 DocType: Salary Slip Timesheet,Working Hours,કામ નાં કલાકો
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,નવી ગ્રાહક બનાવવા
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,નવી ગ્રાહક બનાવવા
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ખરીદી ઓર્ડર બનાવો
 ,Purchase Register,ખરીદી રજીસ્ટર
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,લાગુ ખર્ચ
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,બધા ઉત્પાદન પ્રક્રિયા માટે વૈશ્વિક સુયોજનો.
 DocType: Accounts Settings,Accounts Frozen Upto,ફ્રોઝન સુધી એકાઉન્ટ્સ
 DocType: SMS Log,Sent On,પર મોકલવામાં
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
 DocType: HR Settings,Employee record is created using selected field. ,કર્મચારીનું રેકોર્ડ પસંદ ક્ષેત્ર ઉપયોગ કરીને બનાવવામાં આવે છે.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,હોલિડે માસ્ટર.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,પેકેજ નંબર પ્રતિ
 DocType: Item Attribute,To Range,શ્રેણી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,સિક્યોરિટીઝ અને થાપણો
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","મૂલ્યાંકન પદ્ધતિ બદલી શકતા નથી, કારણ કે ત્યાં અમુક વસ્તુઓ સામે વ્યવહારો કે જે તે નથી પોતાના મૂલ્યાંકન પદ્ધતિ છે"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ફાળવવામાં કુલ પાંદડા ફરજિયાત છે
 DocType: Job Opening,Description of a Job Opening,એક જોબ ખુલી વર્ણન
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,આજે બાકી પ્રવૃત્તિઓ
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
 DocType: Production Order,Additional Operating Cost,વધારાની ઓપરેટીંગ ખર્ચ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,કોસ્મેટિક્સ
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
 DocType: Shipping Rule,Net Weight,કુલ વજન
 DocType: Employee,Emergency Phone,સંકટકાલીન ફોન
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ખરીદો
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,કૃપા કરીને માટે થ્રેશોલ્ડ 0% ગ્રેડ વ્યાખ્યાયિત
 DocType: Sales Order,To Deliver,વિતરિત કરવા માટે
 DocType: Purchase Invoice Item,Item,વસ્તુ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
 DocType: Journal Entry,Difference (Dr - Cr),તફાવત (ડૉ - સીઆર)
 DocType: Account,Profit and Loss,નફો અને નુકસાનનું
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,મેનેજિંગ Subcontracting
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,સ્થાપન નોંધ વસ્તુ
 DocType: Production Plan Item,Pending Qty,બાકી Qty
 DocType: Budget,Ignore,અવગણો
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} સક્રિય નથી
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} સક્રિય નથી
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},એસએમએસ નીચેના નંબરો પર મોકલવામાં: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,સેટઅપ ચેક પ્રિન્ટીંગ માટે પરિમાણો
 DocType: Salary Slip,Salary Slip Timesheet,પગાર કાપલી Timesheet
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,કુલ કમિશન
 DocType: Pricing Rule,Sales Partner,વેચાણ ભાગીદાર
 DocType: Buying Settings,Purchase Receipt Required,ખરીદી રસીદ જરૂરી
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,જો ખુલે સ્ટોક દાખલ મૂલ્યાંકન દર ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,જો ખુલે સ્ટોક દાખલ મૂલ્યાંકન દર ફરજિયાત છે
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ભરતિયું ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,સંચિત મૂલ્યો
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","માફ કરશો, સીરીયલ અમે મર્જ કરી શકાતા નથી"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,વેચાણ ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,વેચાણ ઓર્ડર બનાવો
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 ,Lead Id,લીડ આઈડી
 DocType: C-Form Invoice Detail,Grand Total,કુલ સરવાળો
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,ફરી શરૂ કરો જોડાણ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,પુનરાવર્તન ગ્રાહકો
 DocType: Leave Control Panel,Allocate,ફાળવો
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,વેચાણ પરત
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,વેચાણ પરત
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,નોંધ: કુલ ફાળવેલ પાંદડા {0} પહેલાથી મંજૂર પાંદડા કરતાં ઓછી ન હોવી જોઈએ {1} સમયગાળા માટે
 DocType: Announcement,Posted By,દ્વારા પોસ્ટ કરવામાં આવ્યું
 DocType: Item,Delivered by Supplier (Drop Ship),સપ્લાયર દ્વારા વિતરિત (ડ્રૉપ જહાજ)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,કંપની સેટ કરો
 DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,વેચાણ ભરતિયું Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},સંદર્ભ કોઈ અને સંદર્ભ તારીખ માટે જરૂરી છે {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,પસંદ ચુકવણી એકાઉન્ટ બેન્ક એન્ટ્રી બનાવવા માટે
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","પાંદડા, ખર્ચ દાવાઓ અને પેરોલ વ્યવસ્થા કર્મચારી રેકોર્ડ બનાવવા"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","પાંદડા, ખર્ચ દાવાઓ અને પેરોલ વ્યવસ્થા કર્મચારી રેકોર્ડ બનાવવા"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,નોલેજ બેઝ ઉમેરો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,દરખાસ્ત લેખન
 DocType: Payment Entry Deduction,Payment Entry Deduction,ચુકવણી એન્ટ્રી કપાત
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 સાથે સંબંધ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,વ્યવસ્થાપક
 DocType: Payment Entry,Payment From / To,ચુકવણી / to
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,તારીખ રેંજ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,જ વસ્તુ ઘણી વખત દાખલ કરવામાં આવી છે.
 DocType: SMS Settings,Receiver Parameter,રીસીવર પરિમાણ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,અને &#39;ગ્રુપ દ્વારા&#39; &#39;પર આધારિત&#39; જ ન હોઈ શકે
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,ઠરાવ તારીખ
 DocType: Student Batch Name,Batch Name,બેચ નામ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,નોંધણી
 DocType: Selling Settings,Customer Naming By,કરીને ગ્રાહક નામકરણ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,તવદ્યાથી માસિક હાજરી રિપોર્ટ તરીકે પ્રસ્તુત બતાવશે
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,વિદ્યાર્થી એટેન્ડન્સ
 DocType: Sales Invoice Timesheet,Time Sheet,સમય પત્રક
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush કાચો માલ પર આધારિત
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,આઇટમ વિગતો દાખલ કરો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,આઇટમ વિગતો દાખલ કરો
 DocType: Interest,Interest,વ્યાજ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,પૂર્વ વેચાણ
 DocType: Purchase Receipt,Other Details,અન્ય વિગતો
@@ -726,7 +729,7 @@
 ,Absent Student Report,ગેરહાજર વિદ્યાર્થી રિપોર્ટ
 DocType: Email Digest,Next email will be sent on:,આગામી ઇમેઇલ પર મોકલવામાં આવશે:
 DocType: Offer Letter Term,Offer Letter Term,પત્ર ગાળાના ઓફર
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,વસ્તુ ચલો છે.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,વસ્તુ {0} મળી નથી
 DocType: Bin,Stock Value,સ્ટોક ભાવ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,કંપની {0} અસ્તિત્વમાં નથી
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,વોરંટી સમાપ્તિ તારીખ
 DocType: Material Request Item,Quantity and Warehouse,જથ્થો અને વેરહાઉસ
 DocType: Sales Invoice,Commission Rate (%),કમિશન દર (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ દ્વારા&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સેટ કરો
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,પસંદ કરો કાર્યક્રમ
 DocType: Project,Estimated Cost,અંદાજીત કિંમત
 DocType: Purchase Order,Link to material requests,સામગ્રી વિનંતીઓ લિંક
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} સ્ટોક વસ્તુ નથી
 DocType: Mode of Payment Account,Default Account,મૂળભૂત એકાઉન્ટ
 DocType: Payment Entry,Received Amount (Company Currency),મળેલી રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,સાપ્તાહિક બોલ દિવસ પસંદ કરો
 DocType: Production Order Operation,Planned End Time,આયોજિત સમાપ્તિ સમય
 ,Sales Person Target Variance Item Group-Wise,વેચાણ વ્યક્તિ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,ભાવ યાદી પસંદ નહી
 DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
 DocType: Request for Quotation Supplier,Send Email,ઇમેઇલ મોકલો
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,પરવાનગી નથી
 DocType: Company,Default Bank Account,મૂળભૂત બેન્ક એકાઉન્ટ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","પાર્ટી પર આધારિત ફિલ્ટર કરવા માટે, પસંદ પાર્ટી પ્રથમ પ્રકાર"
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,કોઈ કર્મચારી મળી
 DocType: Supplier Quotation,Stopped,બંધ
 DocType: Item,If subcontracted to a vendor,એક વિક્રેતા subcontracted તો
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,વિદ્યાર્થી જૂથ પહેલેથી અપડેટ થયેલ છે.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,વિદ્યાર્થી જૂથ પહેલેથી અપડેટ થયેલ છે.
 DocType: SMS Center,All Customer Contact,બધા ગ્રાહક સંપર્ક
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV મારફતે સ્ટોક બેલેન્સ અપલોડ કરો.
 DocType: Warehouse,Tree Details,વૃક્ષ વિગતો
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ન્યુનત્તમ ભરતિયું રકમ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: આ કિંમત કેન્દ્ર {2} કંપની ને અનુલક્ષતું નથી {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: એકાઉન્ટ {2} એક જૂથ હોઈ શકે છે
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,વસ્તુ રો {IDX}: {Doctype} {DOCNAME} ઉપર અસ્તિત્વમાં નથી &#39;{Doctype}&#39; ટેબલ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,વસ્તુ રો {IDX}: {Doctype} {DOCNAME} ઉપર અસ્તિત્વમાં નથી &#39;{Doctype}&#39; ટેબલ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,કોઈ કાર્યો
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ઓટો ભરતિયું 05, 28 વગેરે દા.ત. પેદા થશે કે જેના પર મહિનાનો દિવસ"
 DocType: Asset,Opening Accumulated Depreciation,ખુલવાનો સંચિત અવમૂલ્યન
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,સરેરાશ દર ખસેડવું
 DocType: Production Planning Tool,Select Items,આઇટમ્સ પસંદ કરો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} બિલ સામે {1} ના રોજ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,કોર્સ શેડ્યૂલ
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,કોર્સ શેડ્યૂલ
 DocType: Maintenance Visit,Completion Status,પૂર્ણ સ્થિતિ
 DocType: HR Settings,Enter retirement age in years,વર્ષમાં નિવૃત્તિ વય દાખલ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,આ ટકા સુધી ડિલિવરી અથવા રસીદ પર પરવાનગી આપે છે
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,બધા આઇટમ જૂથો
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,બધા આઇટમ જૂથો
 DocType: Process Payroll,Activity Log,પ્રવૃત્તિ લોગ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ચોખ્ખો નફો / નુકશાન
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,આપમેળે વ્યવહારો સબમિશન પર સંદેશ કંપોઝ.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ચુકવણી માટે ઓર્ડર ખરીદી
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,અંદાજિત Qty
 DocType: Sales Invoice,Payment Due Date,ચુકવણી કારણે તારીખ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;ખુલી&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,આવું કરવા માટે ઓપન
 DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,ફરીથી ઓર્ડર Qty
 DocType: Leave Block List Date,Leave Block List Date,બ્લોક યાદી તારીખ છોડી દો
 DocType: Pricing Rule,Price or Discount,ભાવ અથવા ડિસ્કાઉન્ટ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ખરીદી રસીદ વસ્તુઓ ટેબલ કુલ લાગુ ખર્ચ કુલ કર અને ખર્ચ તરીકે જ હોવી જોઈએ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ખરીદી રસીદ વસ્તુઓ ટેબલ કુલ લાગુ ખર્ચ કુલ કર અને ખર્ચ તરીકે જ હોવી જોઈએ
 DocType: Sales Team,Incentives,ઇનસેન્ટીવ્સ
 DocType: SMS Log,Requested Numbers,વિનંતી નંબર્સ
 DocType: Production Planning Tool,Only Obtain Raw Materials,માત્ર મેળવો કાચો માલ
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,મૂળભૂત ચૂકવવાપાત્ર હિસાબ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
 DocType: Fee Structure,Components,ઘટકો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ભરતિયું એડવાન્સ ખરીદી
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,રો {0}: / સેલ્સ ખરીદી ઓર્ડર સામે ચુકવણી હંમેશા અગાઉથી તરીકે ચિહ્નિત થયેલ હોવી જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,કેમિકલ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,મૂળભૂત બેન્ક / રોકડ એકાઉન્ટ આપમેળે જ્યારે આ સ્થિતિ પસંદ થયેલ પગાર જર્નલ પ્રવેશ અપડેટ કરવામાં આવશે.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ગ્રેડ કોડ માટે સમયાંતરે {0} અન્ય ગ્રેડ માટે એક ગ્રેડ અંતરાલો સાથે ઓવરલેપ થાય છે. કૃપા કરીને તપાસો સમયાંતરે {0} અને {1} અને ફરીથી પ્રયાસ કરો
 DocType: BOM,Raw Material Cost(Company Currency),કાચો સામગ્રી ખર્ચ (કંપની ચલણ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,બધી વસ્તુઓ પહેલેથી જ આ ઉત્પાદન ઓર્ડર માટે તબદીલ કરવામાં આવી છે.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},રો # {0}: દર ઉપયોગમાં દર કરતાં વધારે ન હોઈ શકે {1} {2}
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM વેબસાઇટ વસ્તુ
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો).
 DocType: Timesheet Detail,Bill,બિલ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,વ્હાઇટ
 DocType: SMS Center,All Lead (Open),બધા સીસું (ઓપન)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),રો {0}: Qty માટે ઉપલબ્ધ નથી {4} વેરહાઉસ {1} પ્રવેશ સમયે પોસ્ટ પર ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ઓર્ડર પ્રકાર એક હોવા જ જોઈએ {0}
 DocType: Lead,Next Contact Date,આગામી સંપર્ક તારીખ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty ખુલવાનો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
 DocType: Student Batch Name,Student Batch Name,વિદ્યાર્થી બેચ નામ
 DocType: Holiday List,Holiday List Name,રજા યાદી નામ
 DocType: Repayment Schedule,Balance Loan Amount,બેલેન્સ લોન રકમ
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ઉલ્લેખ કરો એક {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
 DocType: Delivery Note,Delivery To,ડ લવર
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
 DocType: Production Planning Tool,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ડિસ્કાઉન્ટ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ડિસ્કાઉન્ટ
 DocType: Asset,Total Number of Depreciations,કુલ Depreciations સંખ્યા
 DocType: Sales Invoice Item,Rate With Margin,માર્જિનથી દર
 DocType: Workstation,Wages,વેતન
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,સંસ્થા નામ
 DocType: Tax Rule,Shipping State,શીપીંગ રાજ્ય
 ,Projected Quantity as Source,સોર્સ તરીકે પ્રોજેક્ટ જથ્થો
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
 DocType: Employee,A-,એ
 DocType: Production Planning Tool,Include non-stock items,નોન-સ્ટોક વસ્તુઓ સમાવેશ થાય છે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,સેલ્સ ખર્ચ
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,સામે
 DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
 DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,પિન કોડ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,પિન કોડ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
 DocType: Opportunity,Contact Info,સંપર્ક માહિતી
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,ડિસ્ટ્રીબ્યુટર
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,શોપિંગ કાર્ટ શીપીંગ નિયમ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ઉત્પાદન ઓર્ડર {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
 ,Ordered Items To Be Billed,આદેશ આપ્યો વસ્તુઓ બિલ કરવા
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,રેન્જ ઓછી હોઈ શકે છે કરતાં શ્રેણી
 DocType: Global Defaults,Global Defaults,વૈશ્વિક ડિફૉલ્ટ્સ
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,બેચ નંબર મેળવવા માટે વસ્તુ કોડ દાખલ કરો
 DocType: Stock Settings,Default Item Group,મૂળભૂત વસ્તુ ગ્રુપ
 DocType: Employee Loan,Partially Disbursed,આંશિક વિતરિત
-DocType: Grading Structure,Grading System Name,ગ્રેડિંગ સિસ્ટમ નામ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,પુરવઠોકર્તા ડેટાબેઝ.
 DocType: Account,Balance Sheet,સરવૈયા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,તમારા વેચાણ વ્યક્તિ ગ્રાહક સંપર્ક કરવા માટે આ તારીખ પર એક રીમાઇન્ડર મળશે
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,એ જ વસ્તુ ઘણી વખત દાખલ કરી શકાતી નથી.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","વધુ એકાઉન્ટ્સ જૂથો હેઠળ કરી શકાય છે, પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,કામ કર્યું
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,લક્ષણો ટેબલ ઓછામાં ઓછા એક લક્ષણ સ્પષ્ટ કરો
 DocType: Announcement,All Students,બધા વિદ્યાર્થીઓ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,જુઓ ખાતાવહી
 DocType: Grading Scale,Intervals,અંતરાલો
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,જુનું
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,વિદ્યાર્થી મોબાઇલ નંબર
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,બાકીનું વિશ્વ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,આ આઇટમ {0} બેચ હોઈ શકે નહિં
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},સ્થિર એકાઉન્ટ સંપાદિત કરો કરવા માટે અધિકૃત ન {0}
 DocType: Journal Entry,Get Outstanding Invoices,બાકી ઇન્વૉઇસેસ મેળવો
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ખરીદી ઓર્ડર કરવાની યોજના ઘડી મદદ અને તમારી ખરીદી પર અનુસરો
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ખરીદી ઓર્ડર કરવાની યોજના ઘડી મદદ અને તમારી ખરીદી પર અનુસરો
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,નાના
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,સમન્વય માસ્ટર ડેટા
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
 DocType: Mode of Payment,Mode of Payment,ચૂકવણીની પદ્ધતિ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
 DocType: Student Applicant,AP,એપી
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,આ રુટ વસ્તુ જૂથ છે અને સંપાદિત કરી શકાતી નથી.
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,ગ્રુપ રોલ નંબર
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,બધા કાર્ય વજન કુલ પ્રયત્ન કરીશું 1. મુજબ બધા પ્રોજેક્ટ કાર્યો વજન સંતુલિત કૃપા કરીને
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,કેપિટલ સાધનો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","પ્રાઇસીંગ નિયમ પ્રથમ પર આધારિત પસંદ થયેલ વસ્તુ, આઇટમ ગ્રુપ અથવા બ્રાન્ડ બની શકે છે, જે ક્ષેત્ર &#39;પર લાગુ પડે છે."
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,જર્નલ પ્રવેશ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} પ્રગતિ વસ્તુઓ
 DocType: Workstation,Workstation Name,વર્કસ્ટેશન નામ
-DocType: Grade Interval,Grade Code,ગ્રેડ કોડ
+DocType: Grading Scale Interval,Grade Code,ગ્રેડ કોડ
 DocType: POS Item Group,POS Item Group,POS વસ્તુ ગ્રુપ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ડાયજેસ્ટ ઇમેઇલ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,હાર્ડવેર
 DocType: Sales Order,Recurring Upto,રીકરીંગ સુધી
 DocType: Attendance,HR Manager,એચઆર મેનેજર
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,કંપની પસંદ કરો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,પ્રિવિલેજ છોડો
 DocType: Purchase Invoice,Supplier Invoice Date,પુરવઠોકર્તા ભરતિયું તારીખ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,તમે શોપિંગ કાર્ટ સક્રિય કરવાની જરૂર છે
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ફૂડ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,એઇજીંગનો રેન્જ 3
 DocType: Maintenance Schedule Item,No of Visits,મુલાકાત કોઈ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,માર્ક Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,માર્ક Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},જાળવણી સુનિશ્ચિત {0} સામે અસ્તિત્વમાં {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,નોંધણી વિદ્યાર્થી
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},બંધ એકાઉન્ટ કરન્સી હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},બધા ગોલ માટે પોઈન્ટ રકમ તે 100 હોવું જોઈએ {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,એકાઉન્ટ્સ ઓફ ચાર્ટ
 DocType: Material Request,Terms and Conditions Content,નિયમો અને શરતો સામગ્રી
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Detail,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
 DocType: Pricing Rule,"Higher the number, higher the priority","ઉચ્ચ સંખ્યા, ઉચ્ચ અગ્રતા"
 ,Purchase Invoice Trends,ભરતિયું પ્રવાહો ખરીદી
 DocType: Employee,Better Prospects,સારી સંભાવના
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","રો # {0}: બેચ {1} માત્ર {2} Qty છે. કૃપા કરીને બીજી બેચ જે {3} Qty ઉપલબ્ધ છે પસંદ કરો અથવા બહુવિધ પંક્તિઓ માં પંક્તિ પડ્યા, બહુવિધ બૅચેસ થી પહોંચાડવા / મુદ્દાને"
 DocType: Vehicle,License Plate,લાઇસન્સ પ્લેટ
 DocType: Appraisal,Goals,લક્ષ્યાંક
 DocType: Warranty Claim,Warranty / AMC Status,વોરંટી / એએમસી સ્થિતિ
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,કર્મચારીનું પોતાની જાતને જાણ કરી શકો છો.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","એકાઉન્ટ સ્થિર છે, તો પ્રવેશો પ્રતિબંધિત વપરાશકર્તાઓ માટે માન્ય છે."
 DocType: Email Digest,Bank Balance,બેંક બેલેન્સ
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","જોબ પ્રોફાઇલ, યોગ્યતાઓ જરૂરી વગેરે"
 DocType: Journal Entry Account,Account Balance,એકાઉન્ટ બેલેન્સ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,વ્યવહારો માટે કરવેરા નિયમ.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,unclosed નાણાકીય વર્ષના પી એન્ડ એલ બેલેન્સ બતાવો
 DocType: Shipping Rule,Shipping Account,શીપીંગ એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: એકાઉન્ટ {2} નિષ્ક્રિય છે
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,વેચાણ ઓર્ડર તમે તમારા કામ કરવાની યોજના કરવામાં મદદ અને સમય પહોંચાડવા બનાવે
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,વેચાણ ઓર્ડર તમે તમારા કામ કરવાની યોજના કરવામાં મદદ અને સમય પહોંચાડવા બનાવે
 DocType: Quality Inspection,Readings,વાંચનો
 DocType: Stock Entry,Total Additional Costs,કુલ વધારાના ખર્ચ
 DocType: Course Schedule,SH,એસ.એચ
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,કિંમત
 DocType: Asset Movement,Stock Manager,સ્ટોક વ્યવસ્થાપક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},સોર્સ વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,પેકિંગ કાપલી
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,પેકિંગ કાપલી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ઓફિસ ભાડે
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,સેટઅપ એસએમએસ ગેટવે સેટિંગ્સ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,આયાત નિષ્ફળ!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,સોર્સ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,બતાવો બંધ
 DocType: Leave Type,Is Leave Without Pay,પગાર વિના છોડી દો
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,એસેટ વર્ગ સ્થિર એસેટ આઇટમ માટે ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,એસેટ વર્ગ સ્થિર એસેટ આઇટમ માટે ફરજિયાત છે
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,આ ચુકવણી ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},આ {0} સાથે તકરાર {1} માટે {2} {3}
 DocType: Student Attendance Tool,Students HTML,વિદ્યાર્થીઓ HTML
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,છોડીને તારીખ
 DocType: Pricing Rule,For Price List,ભાવ યાદી માટે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,એક્ઝિક્યુટિવ સર્ચ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,લીડ્સ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,લીડ્સ બનાવો
 DocType: Maintenance Schedule,Schedules,ફ્લાઈટ શેડ્યુલ
 DocType: Purchase Invoice Item,Net Amount,ચોખ્ખી રકમ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM વિગતવાર કોઈ
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,કાર્યક્રમ પ્રવેશ
 DocType: Sales Invoice Item,Brand Name,બ્રાન્ડ નામ
 DocType: Purchase Receipt,Transporter Details,ટ્રાન્સપોર્ટર વિગતો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,બોક્સ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,શક્ય પુરવઠોકર્તા
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,સંસ્થા
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 વાંચન
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},માટે {0} પ્રોજેક્ટ મળી નથી ડિફૉલ્ટ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,કંપની ખર્ચ માટે દાવા.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","વિદ્યાર્થી સિસ્ટમ હૃદય હોય છે, તમારા બધા વિદ્યાર્થીઓ ઉમેરી"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","વિદ્યાર્થી સિસ્ટમ હૃદય હોય છે, તમારા બધા વિદ્યાર્થીઓ ઉમેરી"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},રો # {0}: ક્લિયરન્સ તારીખ {1} પહેલાં ચેક તારીખ ન હોઈ શકે {2}
 DocType: Company,Default Holiday List,રજા યાદી મૂળભૂત
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},રો {0}: પ્રતિ સમય અને સમય {1} સાથે ઓવરલેપિંગ છે {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ચુકવણી ઇમેઇલ ફરી મોકલો
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,નવી કાર્ય
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,અવતરણ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,અવતરણ બનાવો
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,અન્ય અહેવાલો
 DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,અગાઉથી X દિવસ માટે કામગીરી આયોજન કરવાનો પ્રયાસ કરો.
 DocType: HR Settings,Stop Birthday Reminders,સ્ટોપ જન્મદિવસ રિમાઇન્ડર્સ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
 DocType: SMS Center,Receiver List,રીસીવર યાદી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,શોધ વસ્તુ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,શોધ વસ્તુ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,કમ્પોનન્ટ રકમ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,કેશ કુલ ફેરફાર
 DocType: Assessment Plan,Grading Scale,ગ્રેડીંગ સ્કેલ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,પહેલેથી જ પૂર્ણ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ચુકવણી વિનંતી પહેલેથી હાજર જ છે {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,બહાર પાડેલી વસ્તુઓ કિંમત
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,એકત્રિત
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
 DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,તમે કાઢી શકતા નથી ફિસ્કલ વર્ષ {0}. ફિસ્કલ વર્ષ {0} વૈશ્વિક સેટિંગ્સ મૂળભૂત તરીકે સુયોજિત છે
 DocType: Journal Entry,Entry Type,એન્ટ્રી પ્રકાર
 ,Customer Credit Balance,ગ્રાહક ક્રેડિટ બેલેન્સ
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,આ જ સંસ્થાના અભ્યાસ
 DocType: Territory,Territory Manager,પ્રદેશ વ્યવસ્થાપક
 DocType: Packed Item,To Warehouse (Optional),વેરહાઉસ (વૈકલ્પિક)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,આઇટમ code&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Payment Entry,Paid Amount (Company Currency),ચૂકવેલ રકમ (કંપની ચલણ)
 DocType: Purchase Invoice,Additional Discount,વધારાના ડિસ્કાઉન્ટ
 DocType: Selling Settings,Selling Settings,સેટિંગ્સ વેચાણ
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,કાર્ટ માં જુઓ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,માર્કેટિંગ ખર્ચ
 ,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,સામગ્રી વિનંતી આ સ્ટોક એન્ટ્રી બનાવવા માટે વપરાય
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,આગળ અવમૂલ્યન તારીખ નવા એસેટ માટે ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,આગળ અવમૂલ્યન તારીખ નવા એસેટ માટે ફરજિયાત છે
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,દરેક બેચ માટે અલગ અભ્યાસક્રમ આધારિત ગ્રુપ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,આઇટમ એક એકમ.
 DocType: Fee Category,Fee Category,ફી વર્ગ
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,ભારાંકન
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: આ કિંમત કેન્દ્ર &#39;નફો અને નુકસાનનું&#39; એકાઉન્ટ માટે જરૂરી છે {2}. કૃપા કરીને કંપની માટે મૂળભૂત કિંમત કેન્દ્ર સુયોજિત કરો.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ટેરિટરી
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ન્યૂ સંપર્ક
 DocType: Territory,Parent Territory,પિતૃ પ્રદેશ
 DocType: Quality Inspection Reading,Reading 2,2 વાંચન
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,રિકંસીલેશન JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ઘણા બધા કૉલમ. અહેવાલમાં નિકાસ અને એક સ્પ્રેડશીટ એપ્લિકેશન ઉપયોગ છાપો.
 DocType: Purchase Invoice Item,Batch No,બેચ કોઈ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},માટે વિનિમય દર શોધવામાં અસમર્થ {0} માટે {1} કી તારીખ માટે {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,એક ગ્રાહક ખરીદી ઓર્ડર સામે બહુવિધ વેચાણ ઓર્ડર માટે પરવાનગી આપે છે
 DocType: Student Group Instructor,Student Group Instructor,વિદ્યાર્થીઓની જૂથ પ્રશિક્ષક
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 મોબાઇલ કોઈ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,મુખ્ય
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,વેરિએન્ટ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,મુખ્ય
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,વેરિએન્ટ
 DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
 DocType: Employee Attendance Tool,Employees HTML,કર્મચારીઓ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
 DocType: Employee,Leave Encashed?,વટાવી છોડી?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ક્ષેત્રમાં પ્રતિ તક ફરજિયાત છે
 DocType: Email Digest,Annual Expenses,વાર્ષિક ખર્ચ
 DocType: Item,Variants,ચલો
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
 DocType: SMS Center,Send To,ને મોકલવું
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ફાળવેલ રકમ
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,appraisals
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},સીરીયલ કોઈ વસ્તુ માટે દાખલ ડુપ્લિકેટ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,એક શિપિંગ નિયમ માટે એક શરત
-DocType: Grading Structure,Grading Intervals,ગ્રેડીંગ અંતરાલો
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,દાખલ કરો
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","સળંગ આઇટમ {0} માટે overbill શકાતું નથી {1} કરતાં વધુ {2}. ઓવર બિલિંગ પરવાનગી આપવા માટે, સેટિંગ્સ ખરીદવી સેટ કૃપા કરીને"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,આઇટમ અથવા વેરહાઉસ પર આધારિત ફિલ્ટર સેટ
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,અધિકૃતિ નિયંત્રણ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ચુકવણી
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,તમારા ઓર્ડર મેનેજ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,તમારા ઓર્ડર મેનેજ
 DocType: Production Order Operation,Actual Time and Cost,વાસ્તવિક સમય અને ખર્ચ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},મહત્તમ {0} ના સામગ્રી વિનંતી {1} વેચાણ ઓર્ડર સામે વસ્તુ માટે કરી શકાય છે {2}
 DocType: Employee,Salutation,નમસ્કાર
 DocType: Course,Course Abbreviation,કોર્સ સંક્ષેપનો
 DocType: Student Leave Application,Student Leave Application,વિદ્યાર્થી છોડો અરજી
 DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},કર્મચારીનું {0} પર અડધા દિવસ પર {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},કુલ કામના કલાકો મેક્સ કામના કલાકો કરતાં વધારે ન હોવી જોઈએ {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,પર
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,વેચાણ સમયે બંડલ વસ્તુઓ.
 DocType: Quotation Item,Actual Qty,વાસ્તવિક Qty
 DocType: Sales Invoice Item,References,સંદર્ભો
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,તમે નકલી વસ્તુઓ દાખલ કર્યો છે. સુધારવું અને ફરીથી પ્રયાસ કરો.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,એસોસિયેટ
 DocType: Asset Movement,Asset Movement,એસેટ ચળવળ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ન્યૂ કાર્ટ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,ન્યૂ કાર્ટ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} વસ્તુ એક શ્રેણીબદ્ધ વસ્તુ નથી
 DocType: SMS Center,Create Receiver List,રીસીવર યાદી બનાવો
 DocType: Vehicle,Wheels,વ્હિલ્સ
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ઉત્પાદન ઓર્ડર સામે સમય લોગ બનાવટને નિષ્ક્રિય કરે. ઓપરેશન્સ ઉત્પાદન ઓર્ડર સામે ટ્રેક કરી નહિ
 DocType: Student,Student Mobile Number,વિદ્યાર્થી મોબાઇલ નંબર
 DocType: Item,Has Variants,ચલો છે
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,બૅચ ID ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,બૅચ ID ફરજિયાત છે
 DocType: Sales Person,Parent Sales Person,પિતૃ વેચાણ વ્યક્તિ
 DocType: Purchase Invoice,Recurring Invoice,રીકરીંગ ભરતિયું
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,પ્રોજેક્ટ વ્યવસ્થા
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,નાણાકીય વર્ષ
 DocType: Vehicle Log,Fuel Price,ફ્યુઅલ પ્રાઈસ
 DocType: Budget,Budget,બજેટ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",તે આવક અથવા ખર્ચ એકાઉન્ટ નથી તરીકે બજેટ સામે {0} અસાઇન કરી શકાતી નથી
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,પ્રાપ્ત
 DocType: Student Admission,Application Form Route,અરજી ફોર્મ રૂટ
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},રકમ {0} {1} સામે બાદ {2}
 DocType: Employee,Salary Information,પગાર માહિતી
 DocType: Sales Person,Name and Employee ID,નામ અને કર્મચારી ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
 DocType: Website Item Group,Website Item Group,વેબસાઇટ વસ્તુ ગ્રુપ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,કર અને વેરામાંથી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,પુનરાવર્તન ગ્રાહક આવક
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ભૂમિકા &#39;ખર્ચ તાજનો&#39; હોવી જ જોઈએ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,જોડી
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
 DocType: Asset,Depreciation Schedule,અવમૂલ્યન સૂચિ
 DocType: Bank Reconciliation Detail,Against Account,એકાઉન્ટ સામે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,અડધા દિવસ તારીખ તારીખ થી અને તારીખ વચ્ચે પ્રયત્ન કરીશું
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
 ,Quotation Trends,અવતરણ પ્રવાહો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
 DocType: Shipping Rule Condition,Shipping Amount,શીપીંગ રકમ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,બાકી રકમ
 DocType: Purchase Invoice Item,Conversion Factor,રૂપાંતર ફેક્ટર
 DocType: Purchase Order,Delivered,વિતરિત
 ,Vehicle Expenses,વાહન ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
+DocType: Serial No,Invoice Details,ઇન્વૉઇસ વિગતો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
 DocType: Purchase Receipt,Vehicle Number,વાહન સંખ્યા
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,રિકરિંગ ભરતિયું સ્ટોપ હશે કે જેના પર તારીખ
 DocType: Employee Loan,Loan Amount,લોન રકમ
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,વધારાના ડિસ્કાઉન્ટ રકમ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
 DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,બિન-ગ્રુપ ગ્રુપ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,રમતો
 DocType: Loan Type,Loan Name,લોન નામ
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,ગ્રાહક સંપાદન અને વફાદારી
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,તમે નકારી વસ્તુઓ સ્ટોક જાળવણી કરવામાં આવે છે જ્યાં વેરહાઉસ
 DocType: Production Order,Skip Material Transfer,જાઓ સામગ્રી ટ્રાન્સફર
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,માટે વિનિમય દર શોધવામાં અસમર્થ {0} પર {1} કી તારીખ માટે {2}. ચલણ વિનિમય રેકોર્ડ મેન્યુઅલી બનાવવા કૃપા કરીને
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,તમારી નાણાકીય વર્ષ પર સમાપ્ત થાય છે
 DocType: POS Profile,Price List,ભાવ યાદી
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} મૂળભૂત ફિસ્કલ વર્ષ હવે છે. ફેરફાર અસર લેવા માટે કે તમારા બ્રાઉઝરને તાજું કરો.
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,વસ્તુ {0} પહેલાથી જ પરત કરવામાં આવી છે
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ફિસ્કલ વર્ષ ** એક નાણાકીય વર્ષ રજૂ કરે છે. બધા હિસાબી પ્રવેશો અને અન્ય મોટા પાયાના વ્યવહારો ** ** ફિસ્કલ યર સામે ટ્રેક છે.
 DocType: Opportunity,Customer / Lead Address,ગ્રાહક / લીડ સરનામું
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
 DocType: Student Admission,Eligibility,લાયકાત
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","તરફ દોરી જાય છે, તમે વ્યવસાય, તમારા પગલે તરીકે તમારા બધા સંપર્કો અને વધુ ઉમેરો વિચાર મદદ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","તરફ દોરી જાય છે, તમે વ્યવસાય, તમારા પગલે તરીકે તમારા બધા સંપર્કો અને વધુ ઉમેરો વિચાર મદદ"
 DocType: Production Order Operation,Actual Operation Time,વાસ્તવિક કામગીરી સમય
 DocType: Authorization Rule,Applicable To (User),લાગુ કરો (વપરાશકર્તા)
 DocType: Purchase Taxes and Charges,Deduct,કપાત
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,કંપની પસંદ કરો ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,તમામ વિભાગો માટે ગણવામાં તો ખાલી છોડી દો
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
 DocType: Process Payroll,Fortnightly,પાક્ષિક
 DocType: Currency Exchange,From Currency,ચલણ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ઓછામાં ઓછા એક પંક્તિ ફાળવવામાં રકમ, ભરતિયું પ્રકાર અને ભરતિયું નંબર પસંદ કરો"
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,પ્રથમ પંક્તિ માટે &#39;અગાઉના પંક્તિ કુલ પર&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; તરીકે ચાર્જ પ્રકાર પસંદ કરો અથવા નથી કરી શકો છો
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,બાળ વસ્તુ એક ઉત્પાદન બંડલ ન હોવી જોઈએ. આઇટમ દૂર `{0} &#39;અને સેવ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,બેન્કિંગ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ઉમેરો
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ઉમેરો
 DocType: Vehicle Service,Service Item,સેવા વસ્તુ
 DocType: Bank Guarantee,Bank Guarantee,બેંક ગેરંટી
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,શેડ્યૂલ મેળવવા માટે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,કિંમતો બતાવવામાં આવશે નહીં તો ભાવ સૂચિ સેટ નથી
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,આ શીપીંગ નિયમ માટે એક દેશ ઉલ્લેખ કરો અથવા વિશ્વભરમાં શીપીંગ તપાસો
 DocType: Stock Entry,Total Incoming Value,કુલ ઇનકમિંગ ભાવ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ખરીદી ભાવ યાદી
 DocType: Offer Letter Term,Offer Term,ઓફર ગાળાના
 DocType: Quality Inspection,Quality Manager,ગુણવત્તા મેનેજર
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,લોસ્ટ કારણ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,નવું સરનામું
 DocType: Quality Inspection,Sample Size,સેમ્પલ કદ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,રસીદ દસ્તાવેજ દાખલ કરો
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,બધી વસ્તુઓ પહેલેથી જ તેનું ભરતિયું કરાય છે
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,રસીદ દસ્તાવેજ દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,બધી વસ્તુઓ પહેલેથી જ તેનું ભરતિયું કરાય છે
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;કેસ નંબર પ્રતિ&#39; માન્ય સ્પષ્ટ કરો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,વધુ ખર્ચ કેન્દ્રો જૂથો હેઠળ કરી શકાય છે પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે
 DocType: Project,External,બાહ્ય
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,વપરાશકર્તાઓ અને પરવાનગીઓ
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ઉત્પાદન ઓર્ડર્સ બનાવ્યું: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},ઉત્પાદન ઓર્ડર્સ બનાવ્યું: {0}
 DocType: Branch,Branch,શાખા
 DocType: Guardian,Mobile Number,મોબાઇલ નંબર
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,પ્રિન્ટર અને બ્રાંડિંગ
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
 DocType: Scheduling Tool,Student Batch,વિદ્યાર્થી બેચ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,તમારા ગ્રાહકો
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,વિદ્યાર્થી બનાવો
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,વિદ્યાર્થી બનાવો
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},તમે આ પ્રોજેક્ટ પર સહયોગ કરવા માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
 DocType: Leave Block List Date,Block Date,બ્લોક તારીખ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,હવે લાગુ
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,મોકલવામાં
 DocType: Payment Request,Make Sales Invoice,સેલ્સ ભરતિયું બનાવો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,સોફ્ટવેર્સ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,આગામી સંપર્ક તારીખ ભૂતકાળમાં ન હોઈ શકે
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,આગામી સંપર્ક તારીખ ભૂતકાળમાં ન હોઈ શકે
 DocType: Company,For Reference Only.,સંદર્ભ માટે માત્ર.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,બેચ પસંદ કોઈ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},અમાન્ય {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,એડવાન્સ રકમ
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,કેસ નંબર 0 ન હોઈ શકે
 DocType: Item,Show a slideshow at the top of the page,પાનાંની ટોચ પર એક સ્લાઇડ શો બતાવવા
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,સ્ટોર્સ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,સ્ટોર્સ
 DocType: Serial No,Delivery Time,ડ લવર સમય
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,પર આધારિત એઇજીંગનો
 DocType: Item,End of Life,જીવનનો અંત
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ટ્રાન્સફર સામગ્રી
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","કામગીરી, સંચાલન ખર્ચ સ્પષ્ટ અને તમારી કામગીરી કરવા માટે કોઈ એક અનન્ય ઓપરેશન આપે છે."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,આ દસ્તાવેજ દ્વારા મર્યાદા વધારે છે {0} {1} આઇટમ માટે {4}. તમે બનાવે છે અન્ય {3} જ સામે {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
 DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
 DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
 DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,બજેટ એકાઉન્ટ
 DocType: Quality Inspection,Verified By,દ્વારા ચકાસવામાં
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","હાલની વ્યવહારો છે, કારણ કે કંપની મૂળભૂત ચલણ બદલી શકાતું નથી. વ્યવહારો મૂળભૂત ચલણ બદલવાની રદ હોવું જ જોઈએ."
-DocType: Grade Interval,Grade Description,ગ્રેડ વર્ણન
+DocType: Grading Scale Interval,Grade Description,ગ્રેડ વર્ણન
 DocType: Stock Entry,Purchase Receipt No,ખરીદી રસીદ કોઈ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,બાનું
 DocType: Process Payroll,Create Salary Slip,પગાર કાપલી બનાવો
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,તારીખ હાજરી
 DocType: Warranty Claim,Raised By,દ્વારા ઊભા
 DocType: Payment Gateway Account,Payment Account,ચુકવણી એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,એકાઉન્ટ્સ પ્રાપ્ત નેટ બદલો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,વળતર બંધ
 DocType: Offer Letter,Accepted,સ્વીકારાયું
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,શીપીંગ નિયમ લેબલ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,વપરાશકર્તા ફોરમ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
 DocType: Employee,Previous Work Experience,પહેલાંના કામ અનુભવ
@@ -2285,7 +2285,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,નિયમો અને Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,સંસ્થા નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","આ તારીખ સુધી સ્થિર હિસાબી પ્રવેશ, કોઈએ / કરવા નીચે સ્પષ્ટ ભૂમિકા સિવાય પ્રવેશ સુધારી શકો છો."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,જાળવણી સૂચિ પેદા પહેલાં દસ્તાવેજ સેવ કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,જાળવણી સૂચિ પેદા પહેલાં દસ્તાવેજ સેવ કરો
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,પ્રોજેક્ટ સ્થિતિ
 DocType: UOM,Check this to disallow fractions. (for Nos),અપૂર્ણાંક નામંજૂર કરવા માટે આ તપાસો. (સંખ્યા માટે)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,નીચેના ઉત્પાદન ઓર્ડર્સ બનાવવામાં આવી હતી:
@@ -2308,6 +2308,7 @@
 DocType: Email Digest,How frequently?,કેવી રીતે વારંવાર?
 DocType: Purchase Receipt,Get Current Stock,વર્તમાન સ્ટોક મેળવો
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,સામગ્રી બિલ વૃક્ષ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,આઇટમ code&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Student,Joining Date,જોડાયા તારીખ
 ,Employees working on a holiday,રજા પર કામ કરતા કર્મચારીઓ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,માર્ક હાજર
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ક્લિયરન્સ તારીખ ઉલ્લેખ નથી
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ઉત્પાદન
 DocType: Guardian,Occupation,વ્યવસાય
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),કુલ (Qty)
 DocType: Sales Invoice,This Document,આ દસ્તાવેજ
 DocType: Installation Note Item,Installed Qty,ઇન્સ્ટોલ Qty
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,વેચાણ ઓર્ડર સંદેશ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","વગેરે કંપની, કરન્સી, ચાલુ નાણાકીય વર્ષના, જેવા સેટ મૂળભૂત મૂલ્યો"
 DocType: Payment Entry,Payment Type,ચુકવણી પ્રકાર
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,કૃપા કરીને આઇટમ માટે બેચ પસંદ {0}. એક બેચ કે આ જરૂરિયાત પૂર્ણ શોધવામાં અસમર્થ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,કૃપા કરીને આઇટમ માટે બેચ પસંદ {0}. એક બેચ કે આ જરૂરિયાત પૂર્ણ શોધવામાં અસમર્થ
 DocType: Process Payroll,Select Employees,પસંદગીના કર્મચારીઓને
 DocType: Opportunity,Potential Sales Deal,સંભવિત વેચાણની ડીલ
 DocType: Payment Entry,Cheque/Reference Date,ચેક / સંદર્ભ તારીખ
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},પહેલેથી જ કંપની માટે બનાવવામાં વૈશ્વિક POS પ્રોફાઇલ {0} {1}
 DocType: Purchase Order,Ref SQ,સંદર્ભ SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,બધા BOMs વસ્તુ / BOM બદલો
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,રસીદ દસ્તાવેજ સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,રસીદ દસ્તાવેજ સબમિટ હોવું જ જોઈએ
 DocType: Purchase Invoice Item,Received Qty,પ્રાપ્ત Qty
 DocType: Stock Entry Detail,Serial No / Batch,સીરીયલ કોઈ / બેચ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,નથી ચૂકવણી અને બચાવી શક્યા
@@ -2441,7 +2442,7 @@
 ,To Produce,પેદા કરવા માટે
 apps/erpnext/erpnext/config/hr.py +93,Payroll,પગારપત્રક
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","પંક્તિ માટે {0} માં {1}. આઇટમ રેટ માં {2} સમાવેશ કરવા માટે, પંક્તિઓ {3} પણ સમાવેશ કરવો જ જોઈએ"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,બનાવો વપરાશકર્તા
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,બનાવો વપરાશકર્તા
 DocType: Packing Slip,Identification of the package for the delivery (for print),વિતરણ માટે પેકેજ ઓળખ (પ્રિન્ટ માટે)
 DocType: Bin,Reserved Quantity,અનામત જથ્થો
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,કૃપા કરીને માન્ય ઇમેઇલ સરનામું દાખલ
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,અપંગ નમૂનો ડિફૉલ્ટ નમૂનો ન હોવું જોઈએ
 DocType: Account,Income Account,આવક એકાઉન્ટ
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ડ લવર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,ડ લવર
 DocType: Stock Reconciliation Item,Current Qty,વર્તમાન Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",જુઓ પડતર વિભાગ &quot;સામગ્રી પર આધારિત દર&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,પાછલું
 DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","વિદ્યાર્થી બૅચેસ તમે હાજરી, આકારણીઓ અને વિદ્યાર્થીઓ માટે ફી ટ્રૅક મદદ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","વિદ્યાર્થી બૅચેસ તમે હાજરી, આકારણીઓ અને વિદ્યાર્થીઓ માટે ફી ટ્રૅક મદદ"
 DocType: Payment Entry,Total Allocated Amount,કુલ ફાળવેલ રકમ
 DocType: Item Reorder,Material Request Type,સામગ્રી વિનંતી પ્રકાર
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},થી {0} પગાર માટે Accural જર્નલ પ્રવેશ {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
 DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,બધા સંબોધે છે.
 DocType: Company,Stock Settings,સ્ટોક સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',સ્થિતિ સાથે કર્મચારીઓને ઘટના વિશે એક ઇમેઇલ મોકલશે &#39;ઓપન&#39;
 DocType: Task,Depends on Tasks,કાર્યો પર આધાર રાખે છે
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ગ્રાહક જૂથ વૃક્ષ મેનેજ કરો.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,જોડાણો શોપિંગ કાર્ટ સક્ષમ કર્યા વિના જ દર્શાવી શકાય
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ન્યૂ ખર્ચ કેન્દ્રને નામ
 DocType: Leave Control Panel,Leave Control Panel,નિયંત્રણ પેનલ છોડો
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,ડેબિટ
 DocType: Delivery Note,Required only for sample item.,માત્ર નમૂના આઇટમ માટે જરૂરી છે.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,સોદા બાદ વાસ્તવિક Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},કોઈ પગાર સ્લિપ વચ્ચે મળી {0} અને {1}
 ,Pending SO Items For Purchase Request,ખરીદી વિનંતી તેથી વસ્તુઓ બાકી
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,વિદ્યાર્થી પ્રવેશ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} અક્ષમ છે
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} અક્ષમ છે
 DocType: Supplier,Billing Currency,બિલિંગ કરન્સી
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,બહુ્ મોટુ
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,મુખપૃષ્ઠ ફીચર્ડ ઉત્પાદન
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,બધા આકારણી જૂથો
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,નવી વેરહાઉસ નામ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),કુલ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),કુલ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,પ્રદેશ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
 DocType: Stock Settings,Default Valuation Method,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,ભાવ યાદી માસ્ટર
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,તમે સુયોજિત અને લક્ષ્યો મોનીટર કરી શકે છે કે જેથી બધા સેલ્સ વ્યવહારો બહુવિધ ** વેચાણ વ્યક્તિઓ ** સામે ટૅગ કરી શકો છો.
 ,S.O. No.,તેથી નંબર
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
 DocType: Price List,Applicable for Countries,દેશો માટે લાગુ પડે છે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,માત્ર છોડો સ્થિતિ સાથે કાર્યક્રમો &#39;માન્ય&#39; અને &#39;નકારી કાઢ્યો સબમિટ કરી શકો છો
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},વિદ્યાર્થી જૂથ નામ પંક્તિ માં ફરજિયાત છે {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
 DocType: Vehicle Service,Engine Oil,એન્જિન તેલ
 DocType: Sales Invoice,Sales Team1,સેલ્સ team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
 DocType: Sales Invoice,Customer Address,ગ્રાહક સરનામું
 DocType: Employee Loan,Loan Details,લોન વિગતો
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,રો {0}: પૂર્ણ Qty શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે વખારો જૂથ રૂપાંતરિત કરી શકાય છે.
 DocType: Assessment Result Tool,Result HTML,પરિણામ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ના રોજ સમાપ્ત થાય
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,વિદ્યાર્થીઓ ઉમેરી
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,વિદ્યાર્થીઓ ઉમેરી
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},પસંદ કરો {0}
 DocType: C-Form,C-Form No,સી-ફોર્મ નં
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,મર્યાદા ઓળંગી
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,વેન્ચર કેપિટલ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,આ શૈક્ષણિક વર્ષ &#39;સાથે એક શૈક્ષણિક શબ્દ {0} અને&#39; શબ્દ નામ &#39;{1} પહેલેથી હાજર છે. આ પ્રવેશો સુધારવા માટે અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","વસ્તુ {0} વિરુદ્ધનાં પ્રવર્તમાન વ્યવહારો છે કે, તમે કિંમત બદલી શકતા નથી {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","વસ્તુ {0} વિરુદ્ધનાં પ્રવર્તમાન વ્યવહારો છે કે, તમે કિંમત બદલી શકતા નથી {1}"
 DocType: UOM,Must be Whole Number,સમગ્ર નંબર હોવો જોઈએ
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(દિવસોમાં) સોંપાયેલ નવા પાંદડા
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,સીરીયલ કોઈ {0} અસ્તિત્વમાં નથી
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,આગામી મહિને છેલ્લો દિવસ
 DocType: Support Settings,Auto close Issue after 7 days,7 દિવસ પછી ઓટો બંધ અંક
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","પહેલાં ફાળવવામાં કરી શકાતી નથી મૂકો {0}, રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,વિદ્યાર્થી અરજદાર
 DocType: Asset Category Account,Accumulated Depreciation Account,સંચિત અવમૂલ્યન એકાઉન્ટ
 DocType: Stock Settings,Freeze Stock Entries,ફ્રીઝ સ્ટોક પ્રવેશો
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,વસ્તુ કોડ
 DocType: Production Planning Tool,Create Production Orders,ઉત્પાદન ઓર્ડર્સ બનાવો
 DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
 DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
 DocType: Lead,Market Segment,માર્કેટ સેગમેન્ટ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,સામગ્રી અરજીઓ બનાવો
 DocType: Employee Education,School/University,શાળા / યુનિવર્સિટી
 DocType: Payment Request,Reference Details,સંદર્ભ વિગતો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
 DocType: Sales Invoice Item,Available Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ગણાવી રકમ
 DocType: Asset,Double Declining Balance,ડબલ કથળતું જતું બેલેન્સ
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","આ સ્ટોક રિકંસીલેશન એક ખુલી પ્રવેશ છે, કારણ કે તફાવત એકાઉન્ટ, એક એસેટ / જવાબદારી પ્રકાર એકાઉન્ટ હોવું જ જોઈએ"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},વિતરિત રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},વસ્તુ માટે જરૂરી ઓર્ડર નંબર ખરીદી {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ઉત્પાદન ઓર્ડર બનાવવામાં આવી ન
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,ઉત્પાદન ઓર્ડર બનાવવામાં આવી ન
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;તારીખ પ્રતિ&#39; પછી &#39;તારીખ&#39; હોવા જ જોઈએ
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},વિદ્યાર્થી તરીકે સ્થિતિ બદલી શકાતું નથી {0} વિદ્યાર્થી અરજી સાથે કડી થયેલ છે {1}
 DocType: Asset,Fully Depreciated,સંપૂર્ણપણે અવમૂલ્યન
 ,Stock Projected Qty,સ્ટોક Qty અંદાજિત
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,નોંધપાત્ર હાજરી HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",સુવાકયો દરખાસ્તો બિડ તમે તમારા ગ્રાહકો માટે મોકલી છે
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",સુવાકયો દરખાસ્તો બિડ તમે તમારા ગ્રાહકો માટે મોકલી છે
 DocType: Sales Order,Customer's Purchase Order,ગ્રાહક ખરીદી ઓર્ડર
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,સીરીયલ કોઈ અને બેચ
 DocType: Warranty Claim,From Company,કંપનીથી
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,આકારણી માપદંડ સ્કોર્સ ની રકમ {0} હોઈ જરૂર છે.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations સંખ્યા નક્કી સુયોજિત કરો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations સંખ્યા નક્કી સુયોજિત કરો
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ભાવ અથવા Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,મિનિટ
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,વિદ્યાર્થી જૂથ
 DocType: Shopping Cart Settings,Quotation Series,અવતરણ સિરીઝ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","એક વસ્તુ જ નામ સાથે હાજર ({0}), આઇટમ જૂથ નામ બદલવા અથવા વસ્તુ નામ બદલી કૃપા કરીને"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
 DocType: C-Form,I,હું
 DocType: Company,Asset Depreciation Cost Center,એસેટ અવમૂલ્યન કિંમત કેન્દ્ર
 DocType: Sales Order Item,Sales Order Date,સેલ્સ ઓર્ડર તારીખ
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,વીમા વિગતો
 DocType: Account,Payable,ચૂકવવાપાત્ર
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ચુકવણી કાળ દાખલ કરો
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ડેટર્સ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ડેટર્સ ({0})
 DocType: Pricing Rule,Margin,માર્જિન
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,નવા ગ્રાહકો
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,કુલ નફો %
 DocType: Appraisal Goal,Weightage (%),ભારાંકન (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ક્લિયરન્સ તારીખ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,કુલ ખરીદી જથ્થો ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,કુલ ખરીદી જથ્થો ફરજિયાત છે
 DocType: Lead,Address Desc,DESC સરનામું
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,પાર્ટી ફરજિયાત છે
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,વિષય નામ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,વેચાણ અથવા ખરીદી ઓછામાં ઓછા એક પસંદ કરેલ હોવું જ જોઈએ
-DocType: Grading Structure,Grade Intervals,ગ્રેડ અંતરાલો
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,તમારા વેપાર સ્વભાવ પસંદ કરો.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ઉત્પાદન કામગીરી જ્યાં ધરવામાં આવે છે.
 DocType: Asset Movement,Source Warehouse,સોર્સ વેરહાઉસ
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,માસિક વિતરણ ટકાવારી
 DocType: Territory,Territory Targets,પ્રદેશ લક્ષ્યાંક
 DocType: Delivery Note,Transporter Info,ટ્રાન્સપોર્ટર માહિતી
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ટેરિટરી
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},મૂળભૂત {0} કંપની સુયોજિત કરો {1}
 DocType: Cheque Print Template,Starting position from top edge,ટોચ ધાર પરથી શરૂ સ્થિતિમાં
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,જ સપ્લાયર ઘણી વખત દાખલ કરવામાં આવી છે
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,પુનઃક્રમાંકિત કરો Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,વર્તમાન જોબ શરૂઆતનો
 DocType: Company,Stock Adjustment Account,સ્ટોક એડજસ્ટમેન્ટ એકાઉન્ટ
-DocType: Journal Entry,Write Off,માંડવાળ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,માંડવાળ
 DocType: Timesheet Detail,Operation ID,ઓપરેશન ID ને
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","સિસ્ટમ વપરાશકર્તા (લોગઇન) એજન્સી આઈડી. સુયોજિત કરો, તો તે બધા એચઆર ફોર્મ માટે મૂળભૂત બની જાય છે."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: પ્રતિ {1}
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,પુરવઠોકર્તા ગ્રાહક માટે પહોંચાડે છે
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ફોર્મ / વસ્તુ / {0}) સ્ટોક બહાર છે
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,આગામી તારીખ પોસ્ટ તારીખ કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,બતાવો કર બ્રેક અપ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,બતાવો કર બ્રેક અપ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,માહિતી આયાત અને નિકાસ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","સ્ટોક પ્રવેશો, {0} વેરહાઉસ સામે અસ્તિત્વમાં તેથી તમે ફરીથી સોંપવા અથવા સંશોધિત કરી શકો છો"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,કોઈ વિદ્યાર્થીઓ મળ્યો
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
 DocType: Program Enrollment,School House,શાળા હાઉસ
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,સુવાકયો પસંદ કરો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,જાળવણી મુલાકાત કરી
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,સુવાકયો પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,જાળવણી મુલાકાત કરી
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
 DocType: Company,Default Cash Account,ડિફૉલ્ટ કેશ એકાઉન્ટ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,કંપની (નથી ગ્રાહક અથવા સપ્લાયર) માસ્ટર.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,આ વિદ્યાર્થી હાજરી પર આધારિત છે
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,કોઈ વિદ્યાર્થી
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,વધુ વસ્તુઓ અથવા ઓપન સંપૂર્ણ ફોર્મ ઉમેરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;અપેક્ષા બોલ તારીખ&#39; દાખલ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ડ લવર નોંધો {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,સમાધાન પહેલાં
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},માટે {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),કર અને ખર્ચ ઉમેરાયેલ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,વસ્તુ ટેક્સ રો {0} પ્રકાર વેરો કે આવક અથવા ખર્ચ અથવા લેવાપાત્ર કારણે હોવી જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,વસ્તુ ટેક્સ રો {0} પ્રકાર વેરો કે આવક અથવા ખર્ચ અથવા લેવાપાત્ર કારણે હોવી જ જોઈએ
 DocType: Sales Order,Partly Billed,આંશિક ગણાવી
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,વસ્તુ {0} એક નિશ્ચિત એસેટ વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,વસ્તુ {0} એક નિશ્ચિત એસેટ વસ્તુ જ હોવી જોઈએ
 DocType: Item,Default BOM,મૂળભૂત BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ફરીથી લખો કંપની નામ ખાતરી કરવા માટે કરો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,કુલ બાકી એએમટી
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ભાવ યાદી એક્સચેન્જ રેટ
 DocType: Purchase Invoice Item,Rate,દર
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ઇન્ટર્ન
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,એડ્રેસ નામ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,એડ્રેસ નામ
 DocType: Stock Entry,From BOM,BOM થી
 DocType: Assessment Code,Assessment Code,આકારણી કોડ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,મૂળભૂત
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,પ્રિંટ ભાષા
 DocType: Salary Slip,Total Working Hours,કુલ કામ કલાક
 DocType: Stock Entry,Including items for sub assemblies,પેટા વિધાનસભાઓ માટે વસ્તુઓ સહિત
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,બધા પ્રદેશો
 DocType: Purchase Invoice,Items,વસ્તુઓ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,વિદ્યાર્થી પહેલેથી પ્રવેશ છે.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,ઉદઘાટન સમય
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,પ્રતિ અને જરૂરી તારીખો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,સિક્યોરિટીઝ એન્ડ કોમોડિટી એક્સચેન્જો
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
 DocType: Assessment Plan,Supervisor Name,સુપરવાઇઝર નામ
 DocType: Program Enrollment Course,Program Enrollment Course,કાર્યક્રમ નોંધણી કોર્સ
-DocType: Grading Structure,Grading Structure,ગ્રેડીંગ માળખું
 DocType: Purchase Taxes and Charges,Valuation and Total,મૂલ્યાંકન અને કુલ
 DocType: Tax Rule,Shipping City,શીપીંગ સિટી
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"આ વસ્તુ {0} (ટેમ્પલેટ) એક પ્રકાર છે. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી લક્ષણો નમૂનો પર નકલ થશે"
 DocType: Notification Control,Customize the Notification,સૂચન કસ્ટમાઇઝ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,કામગીરી માંથી રોકડ પ્રવાહ
 DocType: Sales Invoice,Shipping Rule,શીપીંગ નિયમ
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,તારીખ ઓપનિંગ તારીખ બંધ કરતા પહેલા પ્રયત્ન કરીશું
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી શ્રેણી સંખ્યા&gt; નંબરિંગ સિરીઝ
 DocType: Leave Control Panel,Carry Forward,આગળ લઈ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને ખાતાવહી રૂપાંતરિત કરી શકતા નથી
 DocType: Department,Days for which Holidays are blocked for this department.,દિવસો કે જેના માટે રજાઓ આ વિભાગ માટે બ્લોક કરી દેવામાં આવે છે.
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),કુલ (એએમટી)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,મનોરંજન &amp; ફુરસદની પ્રવૃત્તિઓ
 DocType: Quality Inspection,Item Serial No,વસ્તુ સીરીયલ કોઈ
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,કર્મચારીનું રેકોર્ડ બનાવવા
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,કર્મચારીનું રેકોર્ડ બનાવવા
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,કુલ પ્રેઝન્ટ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,હિસાબી નિવેદનો
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,કલાક
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,રિપ્લેસમેન્ટ પછી નવા BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,વેચાણ પોઇન્ટ
 DocType: Payment Entry,Received Amount,મળેલી રકમ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સેટઅપ કર્મચારી માનવ સંસાધન માં નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","સંપૂર્ણ જથ્થો માટે બનાવવા માટે, ઓર્ડર પર પહેલેથી જ જથ્થો અવગણીને"
 DocType: Account,Tax,ટેક્સ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,માર્ક ન
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,ઇનવૉઇસેસ
 DocType: Batch,Source Document Name,સોર્સ દસ્તાવેજનું નામ
 DocType: Job Opening,Job Title,જોબ શીર્ષક
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,બનાવવા વપરાશકર્તાઓ
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,બનાવવા વપરાશકર્તાઓ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ગ્રામ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,જાળવણી કોલ માટે અહેવાલ મુલાકાત લો.
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
 DocType: BOM,Website Description,વેબસાઇટ વર્ણન
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,રસીદ
 ,Sales Register,સેલ્સ રજિસ્ટર
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ફેરફાર કરવા માટે કંઈ નથી.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 DocType: Customer Group,Customer Group Name,ગ્રાહક જૂથ નામ
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,હજુ સુધી કોઈ ગ્રાહકો!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,લાઈસન્સ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"તમે પણ અગાઉના નાણાકીય વર્ષમાં બેલેન્સ ચાલુ નાણાકીય વર્ષના નહીં સામેલ કરવા માંગો છો, તો આગળ લઈ પસંદ કરો"
 DocType: GL Entry,Against Voucher Type,વાઉચર પ્રકાર સામે
 DocType: Item,Attributes,લક્ષણો
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,છેલ્લે ઓર્ડર તારીખ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
 DocType: Student,Guardian Details,ગાર્ડિયન વિગતો
 DocType: C-Form,C-Form,સી-ફોર્મ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,બહુવિધ કર્મચારીઓ માટે માર્ક એટેન્ડન્સ
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',રો {0} # એકાઉન્ટ પ્રકાર હોવા જ જોઈએ &#39;સ્થિર એસેટ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty આઉટ
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,નિયમો વેચાણ માટે શીપીંગ જથ્થો ગણતરી માટે
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,સિરીઝ ફરજિયાત છે
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,સિરીઝ ફરજિયાત છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ફાઈનાન્સિયલ સર્વિસીસ
 DocType: Student Sibling,Student ID,વિદ્યાર્થી ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,સમય લોગ માટે પ્રવૃત્તિઓ પ્રકાર
 DocType: Tax Rule,Sales,સેલ્સ
 DocType: Stock Entry Detail,Basic Amount,મૂળભૂત રકમ
 DocType: Training Event,Exam,પરીક્ષા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
 DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,લાખોમાં
 DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,એકાઉન્ટ ચૂકવણી
 DocType: Purchase Order Item Supplied,Raw Material Item Code,કાચો સામગ્રી વસ્તુ કોડ
 DocType: Journal Entry,Write Off Based On,પર આધારિત માંડવાળ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,લીડ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,લીડ બનાવો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,પ્રિન્ટ અને સ્ટેશનરી
 DocType: Stock Settings,Show Barcode Field,બતાવો બારકોડ ક્ષેત્ર
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,પ્રતિભાવ પ્રતીક્ષામાં
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ઉપર
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ઉલ્લેખ જો નોન-સ્ટાન્ડર્ડ ચૂકવવાપાત્ર એકાઉન્ટ
 DocType: Salary Slip,Earning & Deduction,અર્નિંગ અને કપાત
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,વૈકલ્પિક. આ ગોઠવણી વિવિધ વ્યવહારો ફિલ્ટર કરવા માટે ઉપયોગ કરવામાં આવશે.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,વિદ્યાર્થીઓ મેળવો
 DocType: Hub Settings,Seller Country,વિક્રેતા દેશ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,વેબસાઇટ પર આઇટમ્સ પ્રકાશિત
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,બૅચેસ માં ગ્રુપ તમારા વિદ્યાર્થીઓ
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,બૅચેસ માં ગ્રુપ તમારા વિદ્યાર્થીઓ
 DocType: Authorization Rule,Authorization Rule,અધિકૃતિ નિયમ
 DocType: Sales Invoice,Terms and Conditions Details,નિયમો અને શરતો વિગતો
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,તરફથી
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,પ્રોબેશન
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,પગાર ઘટકો
 DocType: Program Enrollment Tool,New Academic Year,નવા શૈક્ષણિક વર્ષ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,રીટર્ન / ક્રેડિટ નોટ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,રીટર્ન / ક્રેડિટ નોટ
 DocType: Stock Settings,Auto insert Price List rate if missing,ઓટો સામેલ ભાવ યાદી દર ગુમ તો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,કુલ ભરપાઈ રકમ
 DocType: Production Order Item,Transferred Qty,પરિવહન Qty
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,વેચાણ નાળચું
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
 DocType: Project,Task Progress,ટાસ્ક પ્રગતિ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,કાર્ટ
 ,Qty to Transfer,પરિવહન માટે Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,દોરી જાય છે અથવા ગ્રાહકો માટે ખર્ચ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},જથ્થા ({0}) પંક્તિમાં અપૂર્ણાંક ન હોઈ શકે {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ફી એકઠી
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
 DocType: Lead,Add to calendar on this date,આ તારીખ પર કૅલેન્ડર ઉમેરો
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,શિપિંગ ખર્ચ ઉમેરવા માટે નિયમો.
 DocType: Item,Opening Stock,ખુલવાનો સ્ટોક
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,લીડ પ્રતિ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ઓર્ડર્સ ઉત્પાદન માટે પ્રકાશિત થાય છે.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
 DocType: Program Enrollment Tool,Enroll Students,વિદ્યાર્થી નોંધણી
 DocType: Hub Settings,Name Token,નામ ટોકન
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ધોરણ વેચાણ
@@ -3645,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} સેલ્સ ભરતિયું સામે {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,પ્રોજેક્ટ નામ
-DocType: Supplier,Mention if non-standard receivable account,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ તો
+DocType: Customer,Mention if non-standard receivable account,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ તો
 DocType: Journal Entry Account,If Income or Expense,આવક અથવા ખર્ચ તો
 DocType: Production Order,Required Items,જરૂરી વસ્તુઓ
 DocType: Stock Ledger Entry,Stock Value Difference,સ્ટોક વેલ્યુ તફાવત
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,કર
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,ચૂકવેલ અને વિતરિત નથી
 DocType: Project,Default Cost Center,મૂળભૂત ખર્ચ કેન્દ્રને
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ દ્વારા&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સેટ કરો
 DocType: Bank Guarantee,End Date,સમાપ્તિ તારીખ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,સ્ટોક વ્યવહારો
 DocType: Budget,Budget Accounts,બજેટ એકાઉન્ટ્સ
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,વેચાણ ભાગીદાર અને કમિશન
 DocType: Employee Loan,Rate of Interest (%) / Year,વ્યાજ (%) / વર્ષ દર
 ,Project Quantity,પ્રોજેક્ટ જથ્થો
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","કુલ {0} બધી વસ્તુઓ માટે શૂન્ય છે, તો તમે &#39;પર આધારિત ચાર્જિસ વિતરિત&#39; બદલવા જોઈએ કરી શકે"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","કુલ {0} બધી વસ્તુઓ માટે શૂન્ય છે, તો તમે &#39;પર આધારિત ચાર્જિસ વિતરિત&#39; બદલવા જોઈએ કરી શકે"
 DocType: Opportunity,To Discuss,ચર્ચા કરવા માટે
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} એકમો {1} {2} આ વ્યવહાર પૂર્ણ કરવા માટે જરૂર છે.
 DocType: Loan Type,Rate of Interest (%) Yearly,વ્યાજ દર (%) વાર્ષિક
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,માર્ક ગેરહાજર
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},રો {0}: બોમ # ચલણ {1} પસંદ ચલણ સમાન હોવું જોઈએ {2}
 DocType: Journal Entry Account,Exchange Rate,વિનિમય દર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
 DocType: Homepage,Tag Line,ટેગ લાઇન
 DocType: Fee Component,Fee Component,ફી પુન
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ફ્લીટ મેનેજમેન્ટ
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,વેરહાઉસ {0} અસ્તિત્વમાં નથી
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext હબ માટે નોંધણી
 DocType: Monthly Distribution,Monthly Distribution Percentages,માસિક વિતરણ ટકાવારી
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","મૂલ્યાંકન દર વસ્તુ {0}, જેના માટે એકાઉન્ટિંગ પ્રવેશો કરવા માટે જરૂરી છે માટે નથી મળી {1} {2}. આઇટમ એક નમૂના વસ્તુ તરીકે ટ્રાન્ઝેક્શન્સ છે, તો {1}, કે {1} વસ્તુ ટેબલ ઉલ્લેખ કરો. નહિંતર, આઇટમ રેકોર્ડ વસ્તુ અથવા ઉલ્લેખ મૂલ્યાંકન દર માટે ઇનકમિંગ સ્ટોક ટ્રાન્ઝેક્શન બનાવો, અને પછી / submiting પ્રયાસ આ પ્રવેશ રદ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,સામગ્રી% આ બોલ પર કોઈ નોંધ સામે વિતરિત
 DocType: Project,Customer Details,ગ્રાહક વિગતો
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,સબમિટ ઓર્ડર કાઢી શકાતી નથી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","પહેલેથી જ ડેબિટ એકાઉન્ટ બેલેન્સ, તમે ક્રેડિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,ક્વોલિટી મેનેજમેન્ટ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,વસ્તુ {0} અક્ષમ કરવામાં આવ્યું છે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,વસ્તુ {0} અક્ષમ કરવામાં આવ્યું છે
 DocType: Employee Loan,Repay Fixed Amount per Period,ચુકવણી સમય દીઠ નિશ્ચિત રકમ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},વસ્તુ માટે જથ્થો દાખલ કરો {0}
 DocType: Employee External Work History,Employee External Work History,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,વિદ્યાર્થી ઇમેઇલ ને
 DocType: Employee,Notice (days),સૂચના (દિવસ)
 DocType: Tax Rule,Sales Tax Template,સેલ્સ ટેક્સ ઢાંચો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
 DocType: Employee,Encashment Date,એન્કેશમેન્ટ તારીખ
 DocType: Training Event,Internet,ઈન્ટરનેટ
 DocType: Account,Stock Adjustment,સ્ટોક એડજસ્ટમેન્ટ
@@ -3855,6 +3861,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ડેબિટ નોટ જારી
 DocType: Production Order,Warehouses,વખારો
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} એસેટ ટ્રાન્સફર કરી શકતા નથી
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,આ આઇટમની {0} (ટેમ્પલેટ) ના એક પ્રકાર છે.
 DocType: Workstation,per hour,કલાક દીઠ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ખરીદી
 DocType: Announcement,Announcement,જાહેરાત
@@ -3870,7 +3877,7 @@
 DocType: Account,Receivable,પ્રાપ્ત
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ROW # {0}: ખરીદી ઓર્ડર પહેલેથી જ અસ્તિત્વમાં છે સપ્લાયર બદલવાની મંજૂરી નથી
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,સેટ ક્રેડિટ મર્યાદા કરતાં વધી કે વ્યવહારો સબમિટ કરવા માટે માન્ય છે તે ભૂમિકા.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
 DocType: Item,Material Issue,મહત્વનો મુદ્દો
 DocType: Hub Settings,Seller Description,વિક્રેતા વર્ણન
@@ -3883,7 +3890,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,આદેશ આપ્યો
 DocType: Salary Detail,Component,પુન
 DocType: Assessment Criteria,Assessment Criteria Group,આકારણી માપદંડ ગ્રુપ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ખુલવાનો સંચિત અવમૂલ્યન બરાબર કરતાં ઓછી હોવી જોઈએ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ખુલવાનો સંચિત અવમૂલ્યન બરાબર કરતાં ઓછી હોવી જોઈએ {0}
 DocType: Warehouse,Warehouse Name,વેરહાઉસ નામ
 DocType: Naming Series,Select Transaction,પસંદ ટ્રાન્ઝેક્શન
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ભૂમિકા એપ્રૂવિંગ અથવા વપરાશકર્તા એપ્રૂવિંગ દાખલ કરો
@@ -3917,7 +3924,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",મૂળભૂત તરીકે ચાલુ નાણાકીય વર્ષના સુયોજિત કરવા માટે &#39;મૂળભૂત તરીકે સેટ કરો&#39; પર ક્લિક કરો
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,જોડાઓ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,અછત Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
 DocType: Employee Loan,Repay from Salary,પગારની ચુકવણી
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},સામે ચુકવણી વિનંતી {0} {1} રકમ માટે {2}
@@ -3935,7 +3942,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,આકારણી પરિણામ વિગતવાર
 DocType: Employee Education,Employee Education,કર્મચારીનું શિક્ષણ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,નકલી વસ્તુ જૂથ આઇટમ જૂથ ટેબલ મળી
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
 DocType: Salary Slip,Net Pay,નેટ પે
 DocType: Account,Account,એકાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,સીરીયલ કોઈ {0} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
@@ -3944,7 +3951,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","વેરહાઉસ {0} કોઈપણ એકાઉન્ટ સાથે સંકળાયેલ નથી, કૃપા કરીને / વેરહાઉસ માટે અનુરૂપ (અસ્ક્યામત) એકાઉન્ટ લિંક બનાવો."
 DocType: Purchase Invoice,Recurring Id,રીકરીંગ આઈડી
 DocType: Customer,Sales Team Details,સેલ્સ ટીમ વિગતો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,કાયમી કાઢી નાખો?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,કાયમી કાઢી નાખો?
 DocType: Expense Claim,Total Claimed Amount,કુલ દાવો રકમ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,વેચાણ માટે સંભવિત તકો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},અમાન્ય {0}
@@ -3955,13 +3962,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,સેટઅપ ERPNext તમારા શાળા
 DocType: Sales Invoice,Base Change Amount (Company Currency),આધાર બદલી રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,પ્રથમ દસ્તાવેજ સાચવો.
 DocType: Account,Chargeable,લેવાપાત્ર
 DocType: Company,Change Abbreviation,બદલો સંક્ષેપનો
 DocType: Expense Claim Detail,Expense Date,ખર્ચ તારીખ
 DocType: Item,Max Discount (%),મેક્સ ડિસ્કાઉન્ટ (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,છેલ્લે ઓર્ડર રકમ
+DocType: Task,Is Milestone,સિમાચિહ્ન છે
 DocType: Daily Work Summary,Email Sent To,ઇમેઇલ મોકલવામાં
 DocType: Budget,Warn,ચેતવો
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ."
@@ -3994,11 +4002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ફ્રીઝ સ્ટોક્સ જૂની Than`% d દિવસ કરતાં ઓછું હોવું જોઈએ.
 DocType: Tax Rule,Purchase Tax Template,ટેક્સ ઢાંચો ખરીદી
 ,Project wise Stock Tracking,પ્રોજેક્ટ મુજબની સ્ટોક ટ્રેકિંગ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},જાળવણી સુનિશ્ચિત {0} સામે અસ્તિત્વમાં {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(સ્રોત / લક્ષ્ય પર) વાસ્તવિક Qty
 DocType: Item Customer Detail,Ref Code,સંદર્ભ કોડ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,કર્મચારીનું રેકોર્ડ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
 DocType: HR Settings,Payroll Settings,પગારપત્રક સેટિંગ્સ
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,બિન-કડી ઇનવૉઇસેસ અને ચૂકવણી મેળ ખાય છે.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ઓર્ડર કરો
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques અને થાપણો ખોટી રીતે સાફ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,એકાઉન્ટ {0}: તમે પિતૃ એકાઉન્ટ તરીકે પોતાને સોંપી શકો છો
 DocType: Purchase Invoice Item,Price List Rate,ભાવ યાદી દર
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ગ્રાહક અવતરણ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ગ્રાહક અવતરણ બનાવો
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;સ્ટોક&quot; અથવા આ વેરહાઉસ ઉપલબ્ધ સ્ટોક પર આધારિત &quot;નથી સ્ટોક&quot; શો.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),સામગ્રી બિલ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,સપ્લાયર દ્વારા લેવામાં સરેરાશ સમય પહોંચાડવા માટે
@@ -4043,7 +4050,7 @@
 DocType: Asset,Disposal Date,નિકાલ તારીખ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ઇમેઇલ્સ આપવામાં કલાક કંપની બધી સક્રિય કર્મચારીઓની મોકલવામાં આવશે, જો તેઓ રજા નથી. પ્રતિસાદ સારાંશ મધ્યરાત્રિએ મોકલવામાં આવશે."
 DocType: Employee Leave Approver,Employee Leave Approver,કર્મચારી રજા તાજનો
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,તાલીમ પ્રતિસાદ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ઓર્ડર {0} સબમિટ હોવું જ જોઈએ ઉત્પાદન
@@ -4051,7 +4058,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},કોર્સ પંક્તિ માં ફરજિયાત છે {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
 DocType: Batch,Parent Batch,પિતૃ બેચ
 DocType: Cheque Print Template,Cheque Print Template,ચેક પ્રિન્ટ ઢાંચો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,કિંમત કેન્દ્રો ચાર્ટ
@@ -4095,7 +4102,7 @@
 DocType: Item,Variant Based On,વેરિએન્ટ પર આધારિત
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% પ્રયત્ન કરીશું સોંપાયેલ કુલ વેઇટેજ. તે {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,તમારા સપ્લાયર્સ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
 DocType: Request for Quotation Item,Supplier Part No,પુરવઠોકર્તા ભાગ કોઈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',કપાત કરી શકો છો જ્યારે શ્રેણી &#39;વેલ્યુએશન&#39; અથવા &#39;Vaulation અને કુલ&#39; માટે છે
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,પ્રતિ પ્રાપ્ત
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: પ્રતિ {0} માટે {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,રો {0}: કલાક કિંમત શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
 DocType: Issue,Content Type,સામગ્રી પ્રકાર
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,કમ્પ્યુટર
 DocType: Item,List this Item in multiple groups on the website.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
@@ -4114,20 +4121,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,તમે ફ્રોઝન કિંમત સુયોજિત કરવા માટે અધિકૃત નથી
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled પ્રવેશો મળી
 DocType: Payment Reconciliation,From Invoice Date,ભરતિયું તારીખથી
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પક્ષ એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પક્ષ એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,એન્કેશમેન્ટ છોડો
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,તે શું કરે છે?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,વેરહાઉસ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,બધા વિદ્યાર્થી પ્રવેશ
 ,Average Commission Rate,સરેરાશ કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે સીરીયલ નંબર 'હા' કરી શકશો નહિ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે સીરીયલ નંબર 'હા' કરી શકશો નહિ.
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,એટેન્ડન્સ ભવિષ્યમાં તારીખો માટે ચિહ્નિત કરી શકાતી નથી
 DocType: Pricing Rule,Pricing Rule Help,પ્રાઇસીંગ નિયમ મદદ
 DocType: School House,House Name,હાઉસ નામ
 DocType: Purchase Taxes and Charges,Account Head,એકાઉન્ટ હેડ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,વસ્તુઓ ઉતરાણ ખર્ચ ગણતરી માટે વધારાના ખર્ચ અપડેટ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ઇલેક્ટ્રિકલ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,તમારી સંસ્થા બાકીના તમારા વપરાશકર્તાઓ તરીકે ઉમેરો. તમે પણ તેમને સંપર્કો માંથી ઉમેરીને તમારી પોર્ટલ ગ્રાહકો આમંત્રિત ઉમેરી શકો છો
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,તમારી સંસ્થા બાકીના તમારા વપરાશકર્તાઓ તરીકે ઉમેરો. તમે પણ તેમને સંપર્કો માંથી ઉમેરીને તમારી પોર્ટલ ગ્રાહકો આમંત્રિત ઉમેરી શકો છો
 DocType: Stock Entry,Total Value Difference (Out - In),કુલ મૂલ્ય તફાવત (બહાર - માં)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,રો {0}: વિનિમય દર ફરજિયાત છે
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},વપરાશકર્તા ID કર્મચારી માટે સેટ નથી {0}
@@ -4136,7 +4143,7 @@
 DocType: Item,Customer Code,ગ્રાહક કોડ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 DocType: Buying Settings,Naming Series,નામકરણ સિરીઝ
 DocType: Leave Block List,Leave Block List Name,બ્લોક યાદી મૂકો નામ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,વીમા પ્રારંભ તારીખ કરતાં વીમા અંતિમ તારીખ ઓછી હોવી જોઈએ
@@ -4151,7 +4158,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
 DocType: Vehicle Log,Odometer,ઑડોમીટર
 DocType: Sales Order Item,Ordered Qty,આદેશ આપ્યો Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},પ્રતિ અને સમય રિકરિંગ માટે ફરજિયાત તારીખો પીરિયડ {0}
@@ -4164,7 +4171,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),રકમ માંડવાળ (કંપની ચલણ)
 DocType: Sales Invoice Timesheet,Billing Hours,બિલિંગ કલાક
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,માટે {0} મળી નથી ડિફૉલ્ટ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,તેમને અહીં ઉમેરવા માટે વસ્તુઓ ટેપ
 DocType: Fees,Program Enrollment,કાર્યક્રમ પ્રવેશ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ઉતારેલ માલની કિંમત વાઉચર
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},સેટ કરો {0}
@@ -4261,7 +4269,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,રિટેલ અને હોલસેલ
 DocType: Issue,First Responded On,પ્રથમ જવાબ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,બહુવિધ જૂથો માં આઇટમ ક્રોસ લિસ્ટિંગ
-DocType: Grade Interval,Grade Interval,ગ્રેડ અંતરાલ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ પહેલેથી નાણાકીય વર્ષમાં સુયોજિત છે {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ક્લિયરન્સ તારીખ સુધારાશે
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,સ્પ્લિટ બેચ
@@ -4269,6 +4276,7 @@
 DocType: Request for Quotation Supplier,Download PDF,પીડીએફ ડાઉનલોડ કરો
 DocType: Production Order,Planned End Date,આયોજિત સમાપ્તિ તારીખ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,વસ્તુઓ જ્યાં સંગ્રહાય છે.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 DocType: Request for Quotation,Supplier Detail,પુરવઠોકર્તા વિગતવાર
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},સૂત્ર અથવા શરત ભૂલ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,ભરતિયું રકમ
@@ -4313,7 +4321,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,સેટઅપ મારા સંસ્થા માટે એક સરળ વેબસાઇટ
 DocType: Payment Reconciliation,Receivable / Payable Account,પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ
 DocType: Delivery Note Item,Against Sales Order Item,વેચાણ ઓર્ડર વસ્તુ સામે
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
 DocType: Item,Default Warehouse,મૂળભૂત વેરહાઉસ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},બજેટ ગ્રુપ એકાઉન્ટ સામે અસાઇન કરી શકાતી નથી {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,પિતૃ ખર્ચ કેન્દ્રને દાખલ કરો
@@ -4370,7 +4378,7 @@
 ,Items To Be Requested,વસ્તુઓ વિનંતી કરવામાં
 DocType: Purchase Order,Get Last Purchase Rate,છેલ્લા ખરીદી દર વિચાર
 DocType: Company,Company Info,કંપની માહિતી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ખર્ચ કેન્દ્રને ખર્ચ દાવો બુક કરવા માટે જરૂરી છે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ફંડ (અસ્ક્યામત) અરજી
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,આ કર્મચારીનું હાજરી પર આધારિત છે
@@ -4383,13 +4391,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,પછીના દિવસોમાં રજા કાર્યક્રમો બનાવવા વપરાશકર્તાઓ રોકો.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ખરીદી જથ્થો
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},ભરેલા જથ્થો પંક્તિ માં વસ્તુ {0} માટે જથ્થો બરાબર હોવું જોઈએ {1}
 DocType: Production Order,Manufactured Qty,ઉત્પાદન Qty
 DocType: Purchase Receipt Item,Accepted Quantity,સ્વીકારાયું જથ્થો
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} નથી અસ્તિત્વમાં
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} નથી અસ્તિત્વમાં
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ગ્રાહકો માટે ઊભા બીલો.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,પ્રોજેક્ટ ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
@@ -4398,15 +4406,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 વાંચન
 ,Hub,હબ
 DocType: GL Entry,Voucher Type,વાઉચર પ્રકાર
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
 DocType: Employee Loan Application,Approved,મંજૂર
 DocType: Pricing Rule,Price,ભાવ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
 DocType: Guardian,Guardian,ગાર્ડિયન
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,મૂલ્યાંકન {0} {1} આપેલ તારીખ શ્રેણી માં કર્મચારી માટે બનાવવામાં
 DocType: Employee,Education,શિક્ષણ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ડેલ
 DocType: Selling Settings,Campaign Naming By,દ્વારા ઝુંબેશ નામકરણ
 DocType: Employee,Current Address Is,વર્તમાન સરનામું
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,સંશોધિત
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","વૈકલ્પિક. સ્પષ્ટ થયેલ નહિં હોય, તો કંપની મૂળભૂત ચલણ સુયોજિત કરે છે."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,હિસાબી જર્નલ પ્રવેશો.
 DocType: Delivery Note Item,Available Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ Qty
@@ -4443,7 +4453,7 @@
 DocType: Hub Settings,Hub Settings,હબ સેટિંગ્સ
 DocType: Project,Gross Margin %,એકંદર માર્જીન%
 DocType: BOM,With Operations,કામગીરી સાથે
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,હિસાબી પ્રવેશો પહેલાથી જ ચલણ માં કરવામાં આવેલ છે {0} કંપની માટે {1}. ચલણ સાથે મળવાપાત્ર અથવા ચૂકવવાપાત્ર એકાઉન્ટ પસંદ કરો {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,હિસાબી પ્રવેશો પહેલાથી જ ચલણ માં કરવામાં આવેલ છે {0} કંપની માટે {1}. ચલણ સાથે મળવાપાત્ર અથવા ચૂકવવાપાત્ર એકાઉન્ટ પસંદ કરો {0}.
 DocType: Asset,Is Existing Asset,હાલની એસેટ છે
 DocType: Salary Detail,Statistical Component,સ્ટેટિસ્ટિકલ કમ્પોનન્ટ
 ,Monthly Salary Register,માસિક પગાર રજિસ્ટર
@@ -4497,7 +4507,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,લોગો જોડો
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,સ્ટોક સ્તર
 DocType: Customer,Commission Rate,કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,વેરિએન્ટ બનાવો
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,વેરિએન્ટ બનાવો
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,વિભાગ દ્વારા બ્લોક છોડી કાર્યક્રમો.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ચુકવણી પ્રકાર, પ્રાપ્ત એક હોવું જોઈએ પે અને આંતરિક ટ્રાન્સફર"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ઍનલિટિક્સ
@@ -4510,6 +4520,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,રજાઓ પર ઉત્પાદન માટે પરવાનગી આપે છે
 DocType: Sales Order,Customer's Purchase Order Date,ગ્રાહક ખરીદી ઓર્ડર તારીખ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,કેપિટલ સ્ટોક
+DocType: Shopping Cart Settings,Show Public Attachments,જાહેર જોડાણો બતાવો
 DocType: Packing Slip,Package Weight Details,પેકેજ વજન વિગતો
 DocType: Payment Gateway Account,Payment Gateway Account,પેમેન્ટ ગેટવે એકાઉન્ટ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"ચુકવણી પૂર્ણ કર્યા પછી, પસંદ કરેલ પાનું વપરાશકર્તા પુનઃદિશામાન."
@@ -4534,7 +4545,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,કરન્સી વગેરે $ જેવી કોઇ પ્રતીક આગામી બતાવશો નહીં.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(અડધા દિવસ)
 DocType: Supplier,Credit Days,ક્રેડિટ દિવસો
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,વિદ્યાર્થી બેચ બનાવવા
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,વિદ્યાર્થી બેચ બનાવવા
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,સમય દિવસમાં લીડ
@@ -4553,7 +4564,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,મંજુર રકમ
 DocType: GL Entry,Is Opening,ખોલ્યા છે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},રો {0}: ડેબિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી શ્રેણી સંખ્યા&gt; નંબરિંગ સિરીઝ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,એકાઉન્ટ {0} અસ્તિત્વમાં નથી
 DocType: Account,Cash,કેશ
 DocType: Employee,Short biography for website and other publications.,વેબસાઇટ અને અન્ય પ્રકાશનો માટે લઘુ જીવનચરિત્ર.
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 11f815d..d18d38c 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -51,7 +51,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,החדש Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,המחאה בנקאית
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,גרסאות הצג
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,גרסאות הצג
 DocType: Academic Term,Academic Term,מונח אקדמי
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,חוֹמֶר
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,כמות
@@ -99,9 +99,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,פרסום
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,אותו החברה נכנסה יותר מפעם אחת
 DocType: Employee,Married,נשוי
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},חל איסור על {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},חל איסור על {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,קבל פריטים מ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},מוצרים {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
@@ -118,8 +118,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",למשל &quot;בית הספר היסודי&quot; או &quot;האוניברסיטה&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,דוחות במלאי
 DocType: Warehouse,Warehouse Detail,פרט מחסן
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;האם רכוש קבוע&quot; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;האם רכוש קבוע&quot; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
 DocType: Tax Rule,Tax Type,סוג המס
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
 DocType: BOM,Item Image (if not slideshow),תמונת פריט (אם לא מצגת)
@@ -163,7 +163,7 @@
 DocType: SMS Center,All Contact,כל הקשר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,משכורת שנתית
 DocType: Period Closing Voucher,Closing Fiscal Year,סגירת שנת כספים
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} הוא קפוא
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} הוא קפוא
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,הוצאות המניה
 DocType: Journal Entry,Contra Entry,קונטרה כניסה
 DocType: Journal Entry Account,Credit in Company Currency,אשראי במטבע החברה
@@ -184,7 +184,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,הפוך כניסת פחת
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,סוג הבקשה
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,הפוך שכיר
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,הפוך שכיר
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,שידור
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ביצוע
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,פרטים של הפעולות שביצעו.
@@ -229,7 +229,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,נגד פריט מכירות חשבונית
 ,Production Orders in Progress,הזמנות ייצור בהתקדמות
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,מזומנים נטו ממימון
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
 DocType: Lead,Address & Contact,כתובת ולתקשר
 DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
@@ -250,7 +250,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),סה&quot;כ תמחיר הסכום (באמצעות גיליון זמן)
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,פוסט בנק
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
@@ -265,7 +265,7 @@
 DocType: Course Scheduling Tool,Course Start Date,תאריך פתיחת הקורס
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,פריט {0} יבוטל
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
@@ -312,11 +312,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,להודיע באמצעות דואר אלקטרוני על יצירת בקשת חומר אוטומטית
 DocType: Journal Entry,Multi Currency,מטבע רב
 DocType: Payment Reconciliation Invoice,Invoice Type,סוג חשבונית
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,תעודת משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,תעודת משלוח
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,עלות נמכר נכס
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
 DocType: Student Applicant,Admitted,רישיון
 DocType: Workstation,Rent Cost,עלות השכרה
@@ -326,7 +326,7 @@
 DocType: GL Entry,Debit Amount in Account Currency,סכום חיוב במטבע חשבון
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,עסקות בנק / מזומנים נגד מפלגה או עבור העברה פנימית
 DocType: Shipping Rule,Valid for Countries,תקף למדינות
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,"להזמין סה""כ נחשב"
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,נא להזין את 'חזור על פעולה ביום בחודש' ערך שדה
@@ -335,13 +335,13 @@
 DocType: Item Tax,Tax Rate,שיעור מס
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} כבר הוקצה לעובדי {1} לתקופה {2} {3} ל
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,פריט בחר
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,המרת שאינה קבוצה
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,אצווה (הרבה) של פריט.
 DocType: C-Form Invoice Detail,Invoice Date,תאריך חשבונית
 DocType: GL Entry,Debit Amount,סכום חיוב
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,אנא ראה קובץ מצורף
 DocType: Purchase Order,% Received,% התקבל
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,יצירת קבוצות סטודנטים
@@ -405,7 +405,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,אב חג.
@@ -444,7 +444,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
 DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,קוסמטיקה
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,לִקְנוֹת
@@ -452,7 +452,7 @@
 DocType: Sales Invoice,Offline POS Name,שם קופה מנותקת
 DocType: Sales Order,To Deliver,כדי לספק
 DocType: Purchase Invoice Item,Item,פריט
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
 DocType: Journal Entry,Difference (Dr - Cr),"הבדל (ד""ר - Cr)"
 DocType: Account,Profit and Loss,רווח והפסד
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,קבלנות משנה ניהול
@@ -486,13 +486,13 @@
 DocType: Sales Invoice,Total Commission,"הוועדה סה""כ"
 DocType: Pricing Rule,Sales Partner,פרטנר מכירות
 DocType: Buying Settings,Purchase Receipt Required,קבלת רכישת חובה
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,דרג ההערכה היא חובה אם Stock פתיחה נכנס
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,דרג ההערכה היא חובה אם Stock פתיחה נכנס
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ערכים מצטברים
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,הפוך להזמין מכירות
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,הפוך להזמין מכירות
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי ליד
 DocType: C-Form Invoice Detail,Grand Total,סך כולל
@@ -508,7 +508,7 @@
 DocType: Job Applicant,Resume Attachment,מצורף קורות חיים
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
 DocType: Leave Control Panel,Allocate,להקצות
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,חזור מכירות
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,חזור מכירות
 DocType: Announcement,Posted By,פורסם על ידי
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
@@ -517,7 +517,7 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
@@ -557,7 +557,7 @@
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,גיליון נוצר:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,לְהִרָשֵׁם
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 DocType: Depreciation Schedule,Depreciation Amount,סכום הפחת
@@ -591,7 +591,7 @@
 DocType: Student Attendance,Student Attendance,נוכחות תלמידים
 DocType: Sales Invoice Timesheet,Time Sheet,לוח זמנים
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush חומרי גלם המבוסס על
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,נא להזין את פרטי פריט
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,נא להזין את פרטי פריט
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,קדם מכירות
 DocType: Purchase Receipt,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
@@ -604,7 +604,7 @@
 DocType: Hub Settings,Seller City,מוכר עיר
 DocType: Email Digest,Next email will be sent on:,"הדוא""ל הבא יישלח על:"
 DocType: Offer Letter Term,Offer Letter Term,להציע מכתב לטווח
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,החברה {0} לא קיים
@@ -627,7 +627,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} הוא לא פריט מלאי
 DocType: Mode of Payment Account,Default Account,חשבון ברירת מחדל
 DocType: Payment Entry,Received Amount (Company Currency),הסכום שהתקבל (חברת מטבע)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,אנא בחר יום מנוחה שבועי
 DocType: Production Order Operation,Planned End Time,שעת סיום מתוכננת
 ,Sales Person Target Variance Item Group-Wise,פריט יעד שונות איש מכירות קבוצה-Wise
@@ -688,7 +688,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Request for Quotation Supplier,Send Email,שלח אי-מייל
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
@@ -706,8 +706,8 @@
 ,Support Analytics,Analytics תמיכה
 DocType: Item,Website Warehouse,מחסן אתר
 DocType: Payment Reconciliation,Minimum Invoice Amount,סכום חשבונית מינימום
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,פריט שורה {idx}: {DOCTYPE} {DOCNAME} אינה קיימת מעל &#39;{DOCTYPE} שולחן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,פריט שורה {idx}: {DOCTYPE} {DOCNAME} אינה קיימת מעל &#39;{DOCTYPE} שולחן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","היום בחודש שבו חשבונית אוטומטית תיווצר למשל 05, 28 וכו '"
 DocType: Asset,Opening Accumulated Depreciation,פתיחת פחת שנצבר
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5
@@ -720,7 +720,7 @@
 DocType: Bin,Moving Average Rate,נע תעריף ממוצע
 DocType: Production Planning Tool,Select Items,פריטים בחרו
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,לוח זמנים מסלול
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,לוח זמנים מסלול
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
 DocType: HR Settings,Enter retirement age in years,זן גיל פרישה בשנים
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,יעד מחסן
@@ -728,7 +728,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,בכל קבוצות הפריט
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,בכל קבוצות הפריט
 DocType: Process Payroll,Activity Log,יומן פעילות
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,רווח נקי / הפסד
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
@@ -738,7 +738,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,הזמנת רכש לתשלום
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
@@ -802,8 +802,7 @@
 DocType: Purchase Receipt,Range,טווח
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
@@ -885,10 +884,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,מזומנים / חשבון בנק
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} אינו יכול להיות שלילי
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,דיסקונט
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,דיסקונט
 DocType: Asset,Total Number of Depreciations,מספר כולל של פחת
 DocType: Workstation,Wages,שכר
 DocType: Project,Internal,פנימי
@@ -913,7 +912,7 @@
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,גיוס
 DocType: Lead,Organization Name,שם ארגון
 DocType: Tax Rule,Shipping State,מדינת משלוח
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
 DocType: Employee,A-,א-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,הוצאות מכירה
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,קנייה סטנדרטית
@@ -956,7 +955,7 @@
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
 ,Ordered Items To Be Billed,פריטים שהוזמנו להיות מחויב
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,מהטווח צריך להיות פחות מטווח
 DocType: Global Defaults,Global Defaults,ברירות מחדל גלובליות
@@ -987,8 +986,8 @@
 DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,מסד נתוני ספק.
 DocType: Account,Balance Sheet,מאזן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,איש המכירות שלך יקבל תזכורת על מועד זה ליצור קשר עם הלקוח
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 DocType: Lead,Lead,לידים
@@ -1019,10 +1018,10 @@
 DocType: Maintenance Visit Purpose,Work Done,מה נעשה
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ציין מאפיין אחד לפחות בטבלת התכונות
 DocType: Announcement,All Students,כל הסטודנטים
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
@@ -1054,7 +1053,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,קטן
@@ -1077,7 +1076,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
@@ -1089,7 +1088,7 @@
 DocType: Serial No,Serial No Details,Serial No פרטים
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ציוד הון
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
@@ -1128,7 +1127,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,חומרה
 DocType: Sales Order,Recurring Upto,Upto חוזר
 DocType: Attendance,HR Manager,מנהל משאבי אנוש
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,אנא בחר חברה
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,אנא בחר חברה
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,זכות Leave
 DocType: Purchase Invoice,Supplier Invoice Date,תאריך חשבונית ספק
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
@@ -1144,7 +1143,7 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,מזון
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,טווח הזדקנות 3
 DocType: Maintenance Schedule Item,No of Visits,אין ביקורים
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,מארק Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,מארק Attendence
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},מטבע של חשבון הסגירה חייב להיות {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},הסכום של נקודות לכל המטרות צריך להיות 100. זה {0}
 DocType: Project,Start and End Dates,תאריכי התחלה וסיום
@@ -1189,7 +1188,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,תרשים של חשבונות
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Detail,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1211,7 +1210,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,עובד לא יכול לדווח לעצמו.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","אם החשבון הוא קפוא, ערכים מותרים למשתמשים מוגבלים."
 DocType: Email Digest,Bank Balance,עובר ושב
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","פרופיל תפקיד, כישורים נדרשים וכו '"
 DocType: Journal Entry Account,Account Balance,יתרת חשבון
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,כלל מס לעסקות.
@@ -1226,7 +1225,7 @@
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Asset Movement,Stock Manager,ניהול מלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Slip אריזה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Slip אריזה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,השכרת משרד
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,יבוא נכשל!
@@ -1249,7 +1248,7 @@
 DocType: Sales Invoice,Source,מקור
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,הצג סגור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,קטגורית נכסים היא חובה עבור פריט רכוש קבוע
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,קטגורית נכסים היא חובה עבור פריט רכוש קבוע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},{0} זו מתנגשת עם {1} עבור {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML סטודנטים
@@ -1325,17 +1324,17 @@
 DocType: Student Group,Set 0 for no limit,גדר 0 עבור שום מגבלה
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,שלח שוב דוא&quot;ל תשלום
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,הפוך הצעת מחיר
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,הפוך הצעת מחיר
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,דוחות נוספים
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,כמות הנצרכת
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,שינוי נטו במזומנים
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,הושלם כבר
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},בקשת תשלום כבר קיימת {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,עלות פריטים הונפק
@@ -1371,7 +1370,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,לאסוף
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,אתה לא יכול למחוק את שנת הכספים {0}. שנת הכספים {0} מוגדרת כברירת מחדל ב הגדרות גלובליות
 DocType: Journal Entry,Entry Type,סוג הכניסה
 ,Customer Credit Balance,יתרת אשראי ללקוחות
@@ -1412,9 +1411,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +17,Fulfillment,הַגשָׁמָה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,בקשת חומר המשמשת לייצור Stock רשומת זו
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,תאריך הפחת הבא הוא חובה של נכסים חדשים
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,תאריך הפחת הבא הוא חובה של נכסים חדשים
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,יחידה אחת של פריט.
 DocType: Fee Category,Fee Category,קטגורית דמים
 ,Student Fee Collection,אוסף דמי סטודנטים
@@ -1427,7 +1426,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,איש קשר חדש
 DocType: Territory,Parent Territory,טריטורית הורה
 DocType: Quality Inspection Reading,Reading 2,קריאת 2
@@ -1454,15 +1453,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 DocType: Purchase Invoice Item,Batch No,אצווה לא
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,לאפשר הזמנות ומכירות מרובות נגד הלקוח הזמנת הרכש
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ראשי
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ראשי
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
 DocType: Employee Attendance Tool,Employees HTML,עובד HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
@@ -1491,7 +1490,8 @@
 DocType: Employee,Salutation,שְׁאֵילָה
 DocType: Course,Course Abbreviation,קיצור קורס
 DocType: Item,Will also apply for variants,תחול גם לגרסות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ב
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
 DocType: Quotation Item,Actual Qty,כמות בפועל
 DocType: Sales Invoice Item,References,אזכור
@@ -1537,7 +1537,7 @@
 DocType: Supplier,Supplier of Goods or Services.,ספק של מוצרים או שירותים.
 DocType: Budget,Fiscal Year,שנת כספים
 DocType: Budget,Budget,תקציב
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","תקציב לא ניתן להקצות כנגד {0}, כמו שזה לא חשבון הכנסה או הוצאה"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,הושג
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,שטח / לקוחות
@@ -1564,7 +1564,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},סכום {0} {1} לנכות כנגד {2}
 DocType: Employee,Salary Information,מידע משכורת
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
 DocType: Website Item Group,Website Item Group,קבוצת פריט באתר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,חובות ומסים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,נא להזין את תאריך הפניה
@@ -1627,12 +1627,12 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
 DocType: Purchase Order,Delivered,נמסר
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,עלים כולל שהוקצו {0} לא יכולים להיות פחות מעלים שכבר אושרו {1} לתקופה
@@ -1649,7 +1649,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,קבוצה לקבוצה ללא
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,"סה""כ בפועל"
@@ -1690,7 +1690,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,פריט {0} הוחזר כבר
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** שנת כספים ** מייצגת שנת כספים. כל הרישומים החשבונאיים ועסקות גדולות אחרות מתבצעים מעקב נגד שנת כספים ** **.
 DocType: Opportunity,Customer / Lead Address,לקוחות / כתובת לידים
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
 DocType: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
@@ -1722,7 +1722,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,בחר חברה ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,עלות רכישה חדשה
@@ -1771,7 +1771,7 @@
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,נא לציין מדינה לכלל משלוח זה או לבדוק משלוח ברחבי העולם
 DocType: Stock Entry,Total Incoming Value,"ערך הנכנס סה""כ"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,חיוב נדרש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,חיוב נדרש
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,מחיר מחירון רכישה
 DocType: Offer Letter Term,Offer Term,טווח הצעה
 DocType: Quality Inspection,Quality Manager,מנהל איכות
@@ -1797,8 +1797,8 @@
 DocType: Opportunity,Lost Reason,סיבה לאיבוד
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,כתובת חדשה
 DocType: Quality Inspection,Sample Size,גודל מדגם
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,נא להזין את מסמך הקבלה
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,כל הפריטים כבר בחשבונית
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,נא להזין את מסמך הקבלה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,כל הפריטים כבר בחשבונית
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',נא לציין חוקי 'מתיק מס' '
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
 DocType: Project,External,חיצוני
@@ -1842,7 +1842,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},אין פריט ברקוד {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,מקרה מס 'לא יכול להיות 0
 DocType: Item,Show a slideshow at the top of the page,הצג מצגת בחלק העליון של הדף
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,חנויות
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,חנויות
 DocType: Serial No,Delivery Time,זמן אספקה
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,הזדקנות המבוסס על
 DocType: Item,End of Life,סוף החיים
@@ -1857,7 +1857,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,העברת חומר
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,מסמך זה חורג מהמגבלה על ידי {0} {1} עבור פריט {4}. האם אתה גורם אחר {3} נגד אותו {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,אפשר מלאי שלילי
@@ -1903,7 +1903,7 @@
 DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Gateway Account,Payment Account,חשבון תשלומים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,שינוי נטו בחשבונות חייבים
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Off המפצה
 DocType: Offer Letter,Accepted,קיבלתי
@@ -1914,7 +1914,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) לא יכול להיות גדול יותר מquanitity המתוכנן ({2}) בהפקה להזמין {3}
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
@@ -1927,7 +1927,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,שמו של המכון אשר אתה מגדיר מערכת זו.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","כניסת חשבונאות קפואה עד למועד זה, אף אחד לא יכול לעשות / לשנות כניסה מלבד התפקיד שיפורט להלן."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,אנא שמור את המסמך לפני יצירת לוח זמנים תחזוקה
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,אנא שמור את המסמך לפני יצירת לוח זמנים תחזוקה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,סטטוס פרויקט
 DocType: UOM,Check this to disallow fractions. (for Nos),לבדוק את זה כדי לאסור שברים. (למס)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,הזמנות הייצור הבאות נוצרו:
@@ -2016,7 +2016,7 @@
 DocType: Opportunity,Customer / Lead Name,לקוחות / שם ליד
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,תאריך חיסול לא הוזכר
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,הפקה
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),"סה""כ (כמות)"
 DocType: Sales Invoice,This Document,מסמך זה
 DocType: Installation Note Item,Installed Qty,כמות מותקנת
@@ -2054,7 +2054,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},פרופיל גלובלי קופה {0} כבר יצר לחברת {1}
 DocType: Purchase Order,Ref SQ,"נ""צ SQ"
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,להחליף פריט / BOM בכל עצי המוצר
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,מסמך הקבלה יוגש
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,מסמך הקבלה יוגש
 DocType: Purchase Invoice Item,Received Qty,כמות התקבלה
 DocType: Stock Entry Detail,Serial No / Batch,לא / אצווה סידוריים
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,לא שילם ולא נמסר
@@ -2074,7 +2074,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,תבנית לנכים אסור להיות תבנית ברירת המחדל
 DocType: Account,Income Account,חשבון הכנסות
 DocType: Payment Request,Amount in customer's currency,הסכום במטבע של הלקוח
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,משלוח
 DocType: Stock Reconciliation Item,Current Qty,כמות נוכחית
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ראה ""שיעור חומרים הבוסס על"" בסעיף תמחיר"
 DocType: Appraisal Goal,Key Responsibility Area,פינת אחריות מפתח
@@ -2097,7 +2097,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,צפייה בלידים לפי סוג התעשייה.
 DocType: Item Supplier,Item Supplier,ספק פריט
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,כל הכתובות.
 DocType: Company,Stock Settings,הגדרות מניות
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
@@ -2115,7 +2115,7 @@
 DocType: Delivery Note,Required only for sample item.,נדרש רק עבור פריט מדגם.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,כמות בפועל לאחר עסקה
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} מושבתת
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} מושבתת
 DocType: Supplier,Billing Currency,מטבע חיוב
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,גדול במיוחד
@@ -2130,7 +2130,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,גדול
 DocType: Homepage Featured Product,Homepage Featured Product,מוצרי דף בית מומלצים
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,שם מחסן חדש
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),סה&quot;כ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),סה&quot;כ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,שטח
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
 DocType: Stock Settings,Default Valuation Method,שיטת הערכת ברירת מחדל
@@ -2146,7 +2146,7 @@
 DocType: Price List,Price List Master,מחיר מחירון Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"יכולות להיות מתויגות כל עסקות המכירה מול אנשי מכירות ** ** מרובים, כך שאתה יכול להגדיר ולעקוב אחר מטרות."
 ,S.O. No.,SO מס '
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
 DocType: Price List,Applicable for Countries,ישים עבור מדינות
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},סטודנט הקבוצה שם הוא חובה בשורת {0}
 DocType: Homepage,Products to be shown on website homepage,מוצרים שיוצגו על בית של אתר
@@ -2216,7 +2216,7 @@
 DocType: Purchase Invoice,Half-yearly,חצי שנתי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,שורת {0}: הושלמה הכמות חייבת להיות גדולה מאפס.
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
@@ -2353,7 +2353,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},מניות יכולות להיות לא מעודכנות נגד קבלת רכישת {0}
 DocType: Supplier,Last Day of the Next Month,היום האחרון של החודש הבא
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","לעזוב לא יכול להיות מוקצה לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,סטודנט המבקש
 DocType: Asset Category Account,Accumulated Depreciation Account,חשבון פחת נצבר
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
@@ -2395,7 +2395,7 @@
 DocType: Production Planning Tool,Create Material Requests,צור בקשות חומר
 DocType: Employee Education,School/University,בית ספר / אוניברסיטה
 DocType: Payment Request,Reference Details,התייחסות פרטים
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
 DocType: Sales Invoice Item,Available Qty at Warehouse,כמות זמינה במחסן
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,סכום חיוב
 DocType: Asset,Double Declining Balance,יתרה זוגית ירידה
@@ -2416,12 +2416,12 @@
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
 DocType: Asset,Fully Depreciated,לגמרי מופחת
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML נוכחות ניכרת
 DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,אין ו אצווה סידורי
 DocType: Warranty Claim,From Company,מחברה
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,אנא להגדיר מספר הפחת הוזמן
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,אנא להגדיר מספר הפחת הוזמן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ערך או כמות
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,דקות
@@ -2532,7 +2532,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,סטודנט קבוצה
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,אנא בחר לקוח
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,אנא בחר לקוח
 DocType: C-Form,I,אני
 DocType: Company,Asset Depreciation Cost Center,מרכז עלות פחת נכסים
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
@@ -2545,13 +2545,13 @@
 DocType: Payment Entry,Payment References,הפניות תשלום
 DocType: C-Form,C-FORM-,C-טפסים רשמיים
 DocType: Account,Payable,משתלם
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),חייבים ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),חייבים ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,לקוחות חדשים
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,% רווח גולמי
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,תאריך אישור
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
 DocType: Lead,Address Desc,כתובת יורד
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,המפלגה היא חובה
 DocType: Journal Entry,JV-,JV-
@@ -2628,7 +2628,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,סדר מחדש כמות
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,משרות נוכחיות
 DocType: Company,Stock Adjustment Account,חשבון התאמת מלאי
-DocType: Journal Entry,Write Off,לכתוב את
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,לכתוב את
 DocType: Timesheet Detail,Operation ID,מבצע זיהוי
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","משתמש מערכת מזהה (התחברות). אם נקבע, הוא יהפוך לברירת מחדל עבור כל צורות HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: החל מ- {1}
@@ -2639,8 +2639,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ספק מספק ללקוח
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (טופס # / כתבה / {0}) אזל מהמלאי
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,התאריך הבא חייב להיות גדול מ תאריך פרסום
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,התפרקות מס הצג
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,נתוני יבוא ויצוא
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות אותה"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,אין תלמידים נמצאו
@@ -2650,9 +2650,9 @@
 DocType: Product Bundle,List items that form the package.,פריטי רשימה היוצרים את החבילה.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,אחוז ההקצאה צריכה להיות שווה ל- 100%
 DocType: Serial No,Out of AMC,מתוך AMC
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,מספר הפחת הוזמן לא יכול להיות גדול ממספרם הכולל של פחת
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,הפוך תחזוקה בקר
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,מספר הפחת הוזמן לא יכול להיות גדול ממספרם הכולל של פחת
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,הפוך תחזוקה בקר
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
 DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,זה מבוסס על הנוכחות של תלמיד זה
@@ -2693,9 +2693,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},כדי {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
 DocType: Sales Order,Partly Billed,בחלק שחויב
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,פריט {0} חייב להיות פריט רכוש קבוע
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,פריט {0} חייב להיות פריט רכוש קבוע
 DocType: Item,Default BOM,BOM ברירת המחדל
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"סה""כ מצטיין Amt"
@@ -2733,7 +2733,7 @@
 DocType: Purchase Invoice,Print Language,שפת דפס
 DocType: Salary Slip,Total Working Hours,שעות עבודה הכוללות
 DocType: Stock Entry,Including items for sub assemblies,כולל פריטים למכלולים תת
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,זן הערך חייב להיות חיובי
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,זן הערך חייב להיות חיובי
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,כל השטחים
 DocType: Purchase Invoice,Items,פריטים
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,סטודנטים כבר נרשמו.
@@ -2749,13 +2749,12 @@
 DocType: Issue,Opening Time,מועד פתיחה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ומכדי התאריכים מבוקשים ל
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
 DocType: Assessment Plan,Supervisor Name,המפקח שם
 DocType: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
 DocType: Tax Rule,Shipping City,משלוח עיר
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"פריט זה הנו נגזר של {0} (תבנית). תכונות תועתק על מהתבנית אלא אם כן ""לא העתק 'מוגדרת"
 DocType: Notification Control,Customize the Notification,התאמה אישית של ההודעה
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,תזרים מזומנים מפעילות שוטף
 DocType: Sales Invoice,Shipping Rule,כלל משלוח
@@ -2825,7 +2824,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
 DocType: BOM,Website Description,תיאור אתר
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,שינוי נטו בהון עצמי
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
 DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
 ,Sales Register,מכירות הרשמה
 DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
@@ -2835,7 +2834,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
 DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,דוח על תזרימי המזומנים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,אנא בחר לשאת קדימה אם אתה גם רוצה לכלול האיזון של שנת כספים הקודמת משאיר לשנה הפיסקלית
 DocType: GL Entry,Against Voucher Type,נגד סוג השובר
 DocType: Item,Attributes,תכונות
@@ -2862,12 +2861,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',שורה {0} החשבון # צריך להיות מסוג &#39;קבוע נכסים&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,מתוך כמות
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,כללים לחישוב סכום משלוח למכירה
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,סדרה היא חובה
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,סדרה היא חובה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,שירותים פיננסיים
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,סוגי פעילויות יומני זמן
 DocType: Tax Rule,Sales,מכירות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,מדינת חיוב
@@ -3020,6 +3019,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,מסים והיטלים נוסף
 ,Sales Funnel,משפך מכירות
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,הקיצור הוא חובה
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,סל
 ,Qty to Transfer,כמות להעביר
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
@@ -3050,7 +3050,7 @@
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,לגבות דמי
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
 DocType: Lead,Add to calendar on this date,הוסף ללוח שנה בתאריך זה
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
 DocType: Item,Opening Stock,מאגר פתיחה
@@ -3067,7 +3067,7 @@
 DocType: Customer,From Lead,מליד
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,הזמנות שוחררו לייצור.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Program Enrollment Tool,Enroll Students,רשם תלמידים
 DocType: Hub Settings,Name Token,שם אסימון
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,מכירה סטנדרטית
@@ -3077,7 +3077,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,שם פרויקט
-DocType: Supplier,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
+DocType: Customer,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
 DocType: Journal Entry Account,If Income or Expense,אם הכנסה או הוצאה
 DocType: Production Order,Required Items,פריטים דרושים
 DocType: Stock Ledger Entry,Stock Value Difference,הבדל ערך המניה
@@ -3176,7 +3176,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,זהות לקוח
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,מארק בהעדר
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 DocType: Homepage,Tag Line,קו תג
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,הוספת פריטים מ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},מחסן {0}: הורה חשבון {1} לא Bolong לחברת {2}
@@ -3189,7 +3189,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,מחסן {0} אינו קיים
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,הירשם לHub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,אחוזים בחתך חודשיים
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% מחומרים מועברים נגד תעודת משלוח זו
 DocType: Project,Customer Details,פרטי לקוחות
 DocType: Employee,Reports to,דיווחים ל
@@ -3200,7 +3200,7 @@
 DocType: Item Variant,Item Variant,פריט Variant
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","יתרת חשבון כבר בחיוב, שאינך מורשים להגדרה 'יתרה חייבים להיות' כמו 'אשראי'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,ניהול איכות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,פריט {0} הושבה
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,פריט {0} הושבה
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},נא להזין את הכמות לפריט {0}
 DocType: Employee External Work History,Employee External Work History,העובד חיצוני היסטוריה עבודה
 DocType: Tax Rule,Purchase,רכישה
@@ -3221,7 +3221,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,מזהה אימייל סטודנטים
 DocType: Employee,Notice (days),הודעה (ימים)
 DocType: Tax Rule,Sales Tax Template,תבנית מס מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
 DocType: Employee,Encashment Date,תאריך encashment
 DocType: Account,Stock Adjustment,התאמת מלאי
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},עלות פעילות ברירת המחדל קיימת לסוג פעילות - {0}
@@ -3271,7 +3271,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,סבון וחומרי ניקוי
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture ווידאו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,הורה
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},פתיחת פחת שנצבר חייבת להיות פחות מ שווה ל {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},פתיחת פחת שנצבר חייבת להיות פחות מ שווה ל {0}
 DocType: Warehouse,Warehouse Name,שם מחסן
 DocType: Naming Series,Select Transaction,עסקה בחר
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,נא להזין את אישור תפקיד או אישור משתמש
@@ -3301,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","כדי להגדיר שנת כספים זו כברירת מחדל, לחץ על 'קבע כברירת מחדל'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,לְהִצְטַרֵף
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
 DocType: Pricing Rule,Margin Rate or Amount,שיעור או סכום שולי
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'עד תאריך' נדרש
@@ -3313,14 +3313,14 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
 DocType: Employee Education,Employee Education,חינוך לעובדים
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
 DocType: Salary Slip,Net Pay,חבילת נקי
 DocType: Account,Account,חשבון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
 ,Requested Items To Be Transferred,פריטים מבוקשים שיועברו
 DocType: Purchase Invoice,Recurring Id,זיהוי חוזר
 DocType: Customer,Sales Team Details,פרטי צוות מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,למחוק לצמיתות?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,למחוק לצמיתות?
 DocType: Expense Claim,Total Claimed Amount,"סכום הנתבע סה""כ"
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,הזדמנויות פוטנציאליות למכירה.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},לא חוקי {0}
@@ -3330,7 +3330,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,חנויות כלבו
 DocType: Warehouse,PIN,פִּין
 DocType: Sales Invoice,Base Change Amount (Company Currency),שנת סכום בסיס (מטבע חברה)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,שמור את המסמך ראשון.
 DocType: Account,Chargeable,נִטעָן
 DocType: Company,Change Abbreviation,קיצור שינוי
@@ -3367,11 +3367,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`מניות הקפאה ישן יותר Than` צריך להיות קטן יותר מאשר% d ימים.
 DocType: Tax Rule,Purchase Tax Template,מס רכישת תבנית
 ,Project wise Stock Tracking,מעקב מלאי חכם פרויקט
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},לוח זמנים תחזוקה {0} קיים נגד {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),כמות בפועל (במקור / יעד)
 DocType: Item Customer Detail,Ref Code,"נ""צ קוד"
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,רשומות עובדים.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
 DocType: HR Settings,Payroll Settings,הגדרות שכר
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,להזמין מקום
@@ -3412,14 +3411,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},מטבע עבור {0} חייב להיות {1}
 DocType: Asset,Disposal Date,תאריך סילוק
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},הקורס הוא חובה בשורת {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,עד כה לא יכול להיות לפני מהמועד
 DocType: Supplier Quotation Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,להוסיף מחירים / עריכה
 DocType: Cheque Print Template,Cheque Print Template,תבנית הדפסת המחאה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,תרשים של מרכזי עלות
 ,Requested Items To Be Ordered,פריטים מבוקשים כדי להיות הורה
@@ -3455,7 +3454,7 @@
 DocType: Student Group Creation Tool,Student Group Creation Tool,כלי יצירת סטודנט קבוצה
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 100%. זה {0}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,הספקים שלך
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
 DocType: Request for Quotation Item,Supplier Part No,אין ספק חלק
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,התקבל מ
 DocType: Lead,Converted,המרה
@@ -3464,7 +3463,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: החל מ- {0} עבור {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,שורה {0}: שעות הערך חייב להיות גדול מאפס.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
 DocType: Issue,Content Type,סוג תוכן
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,מחשב
 DocType: Item,List this Item in multiple groups on the website.,רשימת פריט זה במספר קבוצות באתר.
@@ -3473,11 +3472,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
 DocType: Payment Reconciliation,From Invoice Date,מתאריך החשבונית
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,מטבע חיוב חייב להיות שווה מטבע של או מטבע או צד חשבון comapany מחדל
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,מטבע חיוב חייב להיות שווה מטבע של או מטבע או צד חשבון comapany מחדל
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,מה זה עושה?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,למחסן
 ,Average Commission Rate,שערי העמלה הממוצעת
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
@@ -3490,7 +3489,7 @@
 DocType: Item,Customer Code,קוד לקוח
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ימים מאז הזמנה אחרונה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
 DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,נכסים במלאי
@@ -3503,7 +3502,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,סגירת חשבון {0} חייבת להיות אחריות / הון עצמי סוג
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
@@ -3513,7 +3512,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,שער הרכישה האחרונה לא נמצא
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
 DocType: Fees,Program Enrollment,הרשמה לתכנית
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},אנא הגדר {0}
@@ -3644,7 +3643,7 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,נא להזין מרכז עלות הורה
@@ -3688,7 +3687,7 @@
 ,Items To Be Requested,פריטים להידרש
 DocType: Purchase Order,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Company,Company Info,מידע על חברה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,בחר או הוסף לקוח חדש
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,בחר או הוסף לקוח חדש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,זה מבוסס על הנוכחות של העובד
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,חשבון חיוב
@@ -3705,7 +3704,7 @@
 DocType: Production Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},אנא להגדיר ברירת מחדל Holiday רשימה עבור שכיר {0} או החברה {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} לא קיים
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} לא קיים
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,פרויקט זיהוי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
@@ -3714,7 +3713,7 @@
 DocType: Quality Inspection Reading,Reading 3,רידינג 3
 ,Hub,רכזת
 DocType: GL Entry,Voucher Type,סוג שובר
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Employee Loan Application,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
@@ -3753,7 +3752,7 @@
 DocType: Hub Settings,Hub Settings,הגדרות Hub
 DocType: Project,Gross Margin %,% שיעור רווח גולמי
 DocType: BOM,With Operations,עם מבצעים
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
 DocType: Asset,Is Existing Asset,האם קיימים נכסים
 ,Monthly Salary Register,חודשי שכר הרשמה
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
@@ -3797,7 +3796,7 @@
 DocType: Item Attribute,Numeric Values,ערכים מספריים
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,הפוך Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",סוג התשלום חייב להיות אחד וקבל שכר וטובות העברה פנימית
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 1070da4..26470a4 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,बैच मद समाप्ति की स्थिति
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,बैंक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,दिखाएँ वेरिएंट
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,दिखाएँ वेरिएंट
 DocType: Academic Term,Academic Term,शैक्षणिक अवधि
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,सामग्री
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,मात्रा
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भुगतान में देरी (दिन)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा व्यय
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,वित्त वर्ष {0} की आवश्यकता है
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,विज्ञापन
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,एक ही कंपनी के एक से अधिक बार दर्ज किया जाता है
 DocType: Employee,Married,विवाहित
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},अनुमति नहीं {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},अनुमति नहीं {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,से आइटम प्राप्त
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली&gt; एचआर सेटिंग्स सेट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पाद {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोई आइटम सूचीबद्ध नहीं
 DocType: Payment Reconciliation,Reconcile,समाधान करना
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराना
 DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
 DocType: Process Payroll,Make Bank Entry,बैंक एंट्री बनाओ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेंशन फंड
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** अगर आप अपने व्यवसाय में मौसमी है आप महीने भर का बजट / लक्ष्य वितरित मदद करता है।
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,नहीं आइटम नहीं मिला
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,नहीं आइटम नहीं मिला
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,वेतन ढांचे गुम
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Sales Invoice Item,Sales Invoice Item,बिक्री चालान आइटम
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",उदाहरण के लिए &quot;प्राइमरी स्कूल&quot; या &quot;विश्वविद्यालय&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,स्टॉक रिपोर्ट
 DocType: Warehouse,Warehouse Detail,वेअरहाउस विस्तार
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,सत्रांत तिथि से बाद में शैक्षणिक वर्ष की वर्ष समाप्ति तिथि है जो करने के लिए शब्द जुड़ा हुआ है नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है &quot;निश्चित परिसंपत्ति है&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है &quot;निश्चित परिसंपत्ति है&quot;
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
 DocType: Tax Rule,Tax Type,टैक्स प्रकार
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
 DocType: BOM,Item Image (if not slideshow),छवि (यदि नहीं स्लाइड शो)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक एक ही नाम के साथ मौजूद है
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(घंटा दर / 60) * वास्तविक ऑपरेशन टाइम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,बीओएम का चयन
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,बीओएम का चयन
 DocType: SMS Log,SMS Log,एसएमएस प्रवेश
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित मदों की लागत
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,पर {0} छुट्टी के बीच की तिथि से और आज तक नहीं है
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,ग्रेड
 DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: SMS Center,All Contact,सभी संपर्क
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,उत्पादन आदेश पहले से ही बीओएम के साथ सभी मदों के लिए बनाया
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,उत्पादन आदेश पहले से ही बीओएम के साथ सभी मदों के लिए बनाया
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,वार्षिक वेतन
 DocType: Daily Work Summary,Daily Work Summary,दैनिक काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,वित्तीय वर्ष और समापन
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} स्थायी है
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} स्थायी है
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,कृपया खातों का चार्ट बनाने के लिए मौजूदा कंपनी का चयन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,शेयर व्यय
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,लक्ष्य वेअरहाउस चुनें
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,कॉन्ट्रा एंट्री
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी मुद्रा में ऋण
 DocType: Delivery Note,Installation Status,स्थापना स्थिति
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",आप उपस्थिति को अद्यतन करना चाहते हैं? <br> वर्तमान: {0} \ <br> अनुपस्थित: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},स्वीकृत + अस्वीकृत मात्रा मद के लिए प्राप्त मात्रा के बराबर होना चाहिए {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,आपूर्ति कच्चे माल की खरीद के लिए
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,भुगतान के कम से कम एक मोड पीओएस चालान के लिए आवश्यक है।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,भुगतान के कम से कम एक मोड पीओएस चालान के लिए आवश्यक है।
 DocType: Products Settings,Show Products as a List,दिखाने के उत्पादों एक सूची के रूप में
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", टेम्पलेट डाउनलोड उपयुक्त डेटा को भरने और संशोधित फ़ाइल देते हैं।
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,मूल्यह्रास प्रवेश कर
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,अनुरोध प्रकार
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,कर्मचारी
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,कर्मचारी
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,निष्पादन
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,आपरेशन के विवरण से बाहर किया।
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,रखरखाव के दौरे के लिए योजना.
 DocType: SMS Settings,Enter url parameter for message,संदेश के लिए url पैरामीटर दर्ज करें
 DocType: POS Profile,Customer Groups,ग्राहक समूहों
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,वित्तीय विवरण
 DocType: Guardian,Students,छात्र
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,मूल्य निर्धारण और छूट लागू करने के लिए नियम.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,मूल्य सूची खरीदने या बेचने के लिए लागू किया जाना चाहिए
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
 DocType: Naming Series,Series List for this Transaction,इस लेन - देन के लिए सीरीज सूची
 DocType: Company,Default Payroll Payable Account,डिफ़ॉल्ट पेरोल देय खाता
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,अपडेट ईमेल समूह
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,अपडेट ईमेल समूह
 DocType: Sales Invoice,Is Opening Entry,एंट्री खोल रहा है
 DocType: Customer Group,Mention if non-standard receivable account applicable,मेंशन गैर मानक प्राप्य खाते यदि लागू हो
 DocType: Course Schedule,Instructor Name,प्रशिक्षक नाम
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,बिक्री चालान आइटम के खिलाफ
 ,Production Orders in Progress,प्रगति में उत्पादन के आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,फाइनेंसिंग से नेट नकद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
 DocType: Lead,Address & Contact,पता और संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),कुल लागत राशि (समय पत्रक के माध्यम से)
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,बैंक प्रविष्टियां
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,हब में प्रकाशित
 DocType: Student Admission,Student Admission,छात्र प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 DocType: Item,Purchase Details,खरीद विवरण
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वचालित सामग्री अनुरोध के निर्माण पर ईमेल द्वारा सूचित करें
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
 DocType: Payment Reconciliation Invoice,Invoice Type,चालान का प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,बिलटी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,बिलटी
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,बिक संपत्ति की लागत
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
-DocType: Grade Interval,Min Score,न्यूनतम स्कोर
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
 DocType: Student Applicant,Admitted,भर्ती किया
 DocType: Workstation,Rent Cost,बाइक किराए मूल्य
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ऑर्डर का मूल्य
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,बैंक / नकद पार्टी के खिलाफ या आंतरिक स्थानांतरण के लिए लेनदेन
 DocType: Shipping Rule,Valid for Countries,देशों के लिए मान्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"इस मद के लिए एक खाका है और लेनदेन में इस्तेमाल नहीं किया जा सकता है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक आइटम विशेषताओं वेरिएंट में खत्म नकल की जाएगी"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"इस मद के लिए एक खाका है और लेनदेन में इस्तेमाल नहीं किया जा सकता है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक आइटम विशेषताओं वेरिएंट में खत्म नकल की जाएगी"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,माना कुल ऑर्डर
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,क्षेत्र मूल्य 'माह के दिवस पर दोहराएँ ' दर्ज करें
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,कर की दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} पहले से ही कर्मचारी के लिए आवंटित {1} तक की अवधि के {2} के लिए {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,वस्तु चुनें
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,गैर-समूह कन्वर्ट करने के लिए
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,एक आइटम के बैच (बहुत).
 DocType: C-Form Invoice Detail,Invoice Date,चालान तिथि
 DocType: GL Entry,Debit Amount,निकाली गई राशि
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,छात्र गुटों बनाएं
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,उद्धरण के लिए अनुरोध
 DocType: Salary Slip Timesheet,Working Hours,कार्य के घंटे
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,एक मौजूदा श्रृंखला के शुरू / वर्तमान अनुक्रम संख्या बदलें.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,एक नए ग्राहक बनाने
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,एक नए ग्राहक बनाने
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","कई डालती प्रबल करने के लिए जारी रखते हैं, उपयोगकर्ताओं संघर्ष को हल करने के लिए मैन्युअल रूप से प्राथमिकता सेट करने के लिए कहा जाता है."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,खरीद आदेश बनाएं
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,खरीद आदेश बनाएं
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सभी विनिर्माण प्रक्रियाओं के लिए वैश्विक सेटिंग्स।
 DocType: Accounts Settings,Accounts Frozen Upto,लेखा तक जमे हुए
 DocType: SMS Log,Sent On,पर भेजा
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,अवकाश मास्टर .
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,पैकेज सं से
 DocType: Item Attribute,To Range,सीमा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,प्रतिभूति और जमाओं
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","वैल्यूएशन पद्धति को बदल नहीं सकते हैं, क्योंकि कुछ वस्तुओं के लेनदेन के साथ ही इसमें अपनी वैल्यूएशन विधि नहीं होती है"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,आवंटित कुल पत्तियों अनिवार्य है
 DocType: Job Opening,Description of a Job Opening,एक नौकरी खोलने का विवरण
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज के लिए लंबित गतिविधियों
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
 DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,खरीदें
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,थ्रेशोल्ड 0% के लिए ग्रेड को परिभाषित करें
 DocType: Sales Order,To Deliver,पहुँचाना
 DocType: Purchase Invoice Item,Item,मद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
 DocType: Account,Profit and Loss,लाभ और हानि
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,प्रबंध उप
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 DocType: Production Plan Item,Pending Qty,विचाराधीन मात्रा
 DocType: Budget,Ignore,उपेक्षा
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} सक्रिय नहीं है
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} सक्रिय नहीं है
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},एसएमएस निम्नलिखित संख्या के लिए भेजा: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,सेटअप जांच मुद्रण के लिए आयाम
 DocType: Salary Slip,Salary Slip Timesheet,वेतन पर्ची Timesheet
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,कुल आयोग
 DocType: Pricing Rule,Sales Partner,बिक्री साथी
 DocType: Buying Settings,Purchase Receipt Required,खरीद रसीद आवश्यक
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,अगर खोलने स्टॉक में प्रवेश किया मूल्यांकन दर अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,अगर खोलने स्टॉक में प्रवेश किया मूल्यांकन दर अनिवार्य है
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,संचित मान
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,बनाओ बिक्री आदेश
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,बनाओ बिक्री आदेश
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,जीवनवृत्त संलग्नक
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहकों को दोहराने
 DocType: Leave Control Panel,Allocate,आवंटित
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,बिक्री लौटें
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,नोट: कुल आवंटित पत्ते {0} पहले ही मंजूरी दे दी पत्तियों से कम नहीं होना चाहिए {1} अवधि के लिए
 DocType: Announcement,Posted By,द्वारा प्रकाशित किया गया था
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,कृपया कंपनी सेट करें
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,बिक्री चालान Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,चयन भुगतान खाता बैंक एंट्री बनाने के लिए
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","पत्ते, व्यय का दावा है और पेरोल प्रबंधन करने के लिए कर्मचारी रिकॉर्ड बनाएं"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","पत्ते, व्यय का दावा है और पेरोल प्रबंधन करने के लिए कर्मचारी रिकॉर्ड बनाएं"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ज्ञानकोष में जोड़े
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भुगतान एंट्री कटौती
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 के साथ संबंध
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,मैनेजर
 DocType: Payment Entry,Payment From / To,भुगतान से / करने के लिए
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,तिथि सीमा
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नई क्रेडिट सीमा ग्राहक के लिए वर्तमान बकाया राशि की तुलना में कम है। क्रेडिट सीमा कम से कम हो गया है {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नई क्रेडिट सीमा ग्राहक के लिए वर्तमान बकाया राशि की तुलना में कम है। क्रेडिट सीमा कम से कम हो गया है {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
 DocType: SMS Settings,Receiver Parameter,रिसीवर पैरामीटर
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'पर आधारित' और 'समूह  द्वारा' दोनों समान नहीं हो सकते हैं
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,संकल्प तिथि
 DocType: Student Batch Name,Batch Name,बैच का नाम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet बनाया:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,भर्ती
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,छात्र छात्र मासिक उपस्थिति रिपोर्ट में के रूप में उपस्थित दिखाई देंगे
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,छात्र उपस्थिति
 DocType: Sales Invoice Timesheet,Time Sheet,समय पत्र
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush आधारित कच्चे माल पर
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,आइटम विवरण दर्ज करें
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आइटम विवरण दर्ज करें
 DocType: Interest,Interest,ब्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,बेचने से पहले
 DocType: Purchase Receipt,Other Details,अन्य विवरण
@@ -727,7 +730,7 @@
 ,Absent Student Report,अनुपस्थित छात्र की रिपोर्ट
 DocType: Email Digest,Next email will be sent on:,अगले ईमेल पर भेजा जाएगा:
 DocType: Offer Letter Term,Offer Letter Term,पत्र टर्म प्रस्ताव
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,कंपनी {0} मौजूद नहीं है
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,वारंटी समाप्ति तिथि
 DocType: Material Request Item,Quantity and Warehouse,मात्रा और वेयरहाउस
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें&gt; सेटिंग&gt; नामकरण श्रृंखला
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया कार्यक्रम चुनें
 DocType: Project,Estimated Cost,अनुमानित लागत
 DocType: Purchase Order,Link to material requests,सामग्री अनुरोध करने के लिए लिंक
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} भंडार वस्तु नहीं है
 DocType: Mode of Payment Account,Default Account,डिफ़ॉल्ट खाता
 DocType: Payment Entry,Received Amount (Company Currency),प्राप्त राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,साप्ताहिक छुट्टी के दिन का चयन करें
 DocType: Production Order Operation,Planned End Time,नियोजित समाप्ति समय
 ,Sales Person Target Variance Item Group-Wise,बिक्री व्यक्ति लक्ष्य विचरण मद समूहवार
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Request for Quotation Supplier,Send Email,ईमेल भेजें
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,अनुमति नहीं है
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,नहीं मिला कर्मचारी
 DocType: Supplier Quotation,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,छात्र समूह पहले से ही अपडेट किया गया है।
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,छात्र समूह पहले से ही अपडेट किया गया है।
 DocType: SMS Center,All Customer Contact,सभी ग्राहक संपर्क
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv के माध्यम से शेयर संतुलन अपलोड करें.
 DocType: Warehouse,Tree Details,ट्री विवरण
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,न्यूनतम चालान राशि
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: लागत केंद्र {2} कंपनी से संबंधित नहीं है {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाता {2} एक समूह नहीं हो सकता है
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आइटम पंक्ति {IDX}: {doctype} {} DOCNAME ऊपर में मौजूद नहीं है &#39;{} doctype&#39; तालिका
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आइटम पंक्ति {IDX}: {doctype} {} DOCNAME ऊपर में मौजूद नहीं है &#39;{} doctype&#39; तालिका
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोई कार्य
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो चालान 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 DocType: Asset,Opening Accumulated Depreciation,खुलने संचित मूल्यह्रास
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,मूविंग औसत दर
 DocType: Production Planning Tool,Select Items,आइटम का चयन करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,पाठ्यक्रम अनुसूची
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,पाठ्यक्रम अनुसूची
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
 DocType: HR Settings,Enter retirement age in years,साल में सेवानिवृत्ति की आयु दर्ज
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,लक्ष्य वेअरहाउस
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,सभी आइटम समूहों
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,सभी आइटम समूहों
 DocType: Process Payroll,Activity Log,गतिविधि लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,शुद्ध लाभ / हानि
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;उद्घाटन&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,क्या करने के लिए ओपन
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,पुन: आदेश मात्रा
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक सूची तिथि छोड़ दो
 DocType: Pricing Rule,Price or Discount,मूल्य या डिस्काउंट
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरीद रसीद आइटम तालिका में कुल लागू शुल्कों के कुल करों और शुल्कों के रूप में ही होना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरीद रसीद आइटम तालिका में कुल लागू शुल्कों के कुल करों और शुल्कों के रूप में ही होना चाहिए
 DocType: Sales Team,Incentives,प्रोत्साहन
 DocType: SMS Log,Requested Numbers,अनुरोधित नंबर
 DocType: Production Planning Tool,Only Obtain Raw Materials,केवल प्राप्त कच्चे माल
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Fee Structure,Components,अवयव
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,डिफ़ॉल्ट बैंक / नकद खाते स्वचालित रूप से जब इस मोड का चयन वेतन जर्नल प्रविष्टि में अद्यतन किया जाएगा।
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ग्रेड कोड के लिए अंतराल {0} अन्य ग्रेड के लिए ग्रेड के अंतराल के साथ overlaps। कृपया चेक अंतराल {0} और {1} और फिर कोशिश करें
 DocType: BOM,Raw Material Cost(Company Currency),कच्चे माल की लागत (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},पंक्ति # {0}: दर {1} {2} में प्रयुक्त दर से अधिक नहीं हो सकती
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,बीओएम वेबसाइट मद
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
 DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,सफेद
 DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),पंक्ति {0}: मात्रा के लिए उपलब्ध नहीं {4} गोदाम में {1} प्रवेश के समय पोस्टिंग पर ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},आदेश प्रकार का होना चाहिए {0}
 DocType: Lead,Next Contact Date,अगले संपर्क तिथि
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,खुलने मात्रा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
 DocType: Student Batch Name,Student Batch Name,छात्र बैच नाम
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
 DocType: Repayment Schedule,Balance Loan Amount,शेष ऋण की राशि
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},कृपया बताएं कि एक {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,छूट
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,छूट
 DocType: Asset,Total Number of Depreciations,कुल depreciations की संख्या
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन के साथ दर
 DocType: Workstation,Wages,वेतन
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,संगठन का नाम
 DocType: Tax Rule,Shipping State,जहाजरानी राज्य
 ,Projected Quantity as Source,स्रोत के रूप में पेश मात्रा
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
 DocType: Employee,A-,ए-
 DocType: Production Planning Tool,Include non-stock items,गैर-शेयर मदों को शामिल करें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,बिक्री व्यय
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,पिन कोड
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,पिन कोड
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
 ,Ordered Items To Be Billed,हिसाब से बिलिंग किए आइटम
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,सीमा कम हो गया है से की तुलना में श्रृंखला के लिए
 DocType: Global Defaults,Global Defaults,वैश्विक मूलभूत
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,बैच नंबर पाने के लिए मद कोड दर्ज करें
 DocType: Stock Settings,Default Item Group,डिफ़ॉल्ट आइटम समूह
 DocType: Employee Loan,Partially Disbursed,आंशिक रूप से वितरित
-DocType: Grading Structure,Grading System Name,ग्रेडिंग प्रणाली का नाम
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,प्रदायक डेटाबेस.
 DocType: Account,Balance Sheet,बैलेंस शीट
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","भुगतान मोड कॉन्फ़िगर नहीं है। कृपया चेक, चाहे खाता भुगतान के मोड पर या पीओएस प्रोफाइल पर स्थापित किया गया है।"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","भुगतान मोड कॉन्फ़िगर नहीं है। कृपया चेक, चाहे खाता भुगतान के मोड पर या पीओएस प्रोफाइल पर स्थापित किया गया है।"
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,अपनी बिक्री व्यक्ति इस तिथि पर एक चेतावनी प्राप्त करने के लिए ग्राहकों से संपर्क करेंगे
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,एक ही मद कई बार दर्ज नहीं किया जा सकता है।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,करेंकिया गया काम
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,गुण तालिका में कम से कम एक विशेषता निर्दिष्ट करें
 DocType: Announcement,All Students,सभी छात्र
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,देखें खाता बही
 DocType: Grading Scale,Intervals,अंतराल
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,छात्र मोबाइल नंबर
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,खरीद आदेश आप की योजना में मदद मिलेगी और अपनी खरीद पर का पालन करें
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,खरीद आदेश आप की योजना में मदद मिलेगी और अपनी खरीद पर का पालन करें
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,छोटा
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,सिंक मास्टर डाटा
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
 DocType: Student Applicant,AP,एपी
 DocType: Purchase Invoice Item,BOM,बीओएम
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,समूह रोल संख्या
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सभी कार्य भार की कुल होना चाहिए 1. तदनुसार सभी परियोजना कार्यों के भार को समायोजित करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,राजधानी उपकरणों
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} प्रगति में आइटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाम
-DocType: Grade Interval,Grade Code,ग्रेड कोड
+DocType: Grading Scale Interval,Grade Code,ग्रेड कोड
 DocType: POS Item Group,POS Item Group,पीओएस मद समूह
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,डाइजेस्ट ईमेल:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,हार्डवेयर
 DocType: Sales Order,Recurring Upto,आवर्ती तक
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,एक कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,एक कंपनी का चयन करें
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,विशेषाधिकार छुट्टी
 DocType: Purchase Invoice,Supplier Invoice Date,प्रदायक चालान तिथि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,आप खरीदारी की टोकरी में सक्रिय करने की जरूरत
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,भोजन
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,बूढ़े रेंज 3
 DocType: Maintenance Schedule Item,No of Visits,यात्राओं की संख्या
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,मार्क उपस्थिति
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,मार्क उपस्थिति
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},रखरखाव अनुसूची {0} के खिलाफ मौजूद है {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,नामांकन छात्र
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},समापन खाते की मुद्रा होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सभी लक्ष्यों के लिए अंक का योग यह है 100. होना चाहिए {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,खातों का चार्ट
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Detail,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
 DocType: Pricing Rule,"Higher the number, higher the priority","उच्च संख्या, उच्च प्राथमिकता"
 ,Purchase Invoice Trends,चालान रुझान खरीद
 DocType: Employee,Better Prospects,बेहतर संभावनाओं
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ति # {0}: बैच {1} में केवल {2} मात्रा है कृपया एक और बैच का चयन करें जिसमें {3} मात्रा उपलब्ध है या कई पंक्तियों में पंक्ति को विभाजित करने के लिए, कई बैचों से वितरित / जारी करने के लिए"
 DocType: Vehicle,License Plate,लाइसेंस प्लेट
 DocType: Appraisal,Goals,लक्ष्य
 DocType: Warranty Claim,Warranty / AMC Status,वारंटी / एएमसी स्थिति
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी खुद को रिपोर्ट नहीं कर सकते हैं।
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाता जमे हुए है , तो प्रविष्टियों प्रतिबंधित उपयोगकर्ताओं की अनुमति है."
 DocType: Email Digest,Bank Balance,बैंक में जमा राशि
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","आवश्यक काम प्रोफ़ाइल , योग्यता आदि"
 DocType: Journal Entry Account,Account Balance,खाते की शेष राशि
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,खुला हुआ वित्त वर्ष के पी एंड एल शेष राशि दिखाएँ
 DocType: Shipping Rule,Shipping Account,नौवहन खाता
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: खाता {2} निष्क्रिय है
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,विक्रय आदेश आप अपने काम की योजना में मदद और समय पर वितरित करने के लिए सुनिश्चित करें
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,विक्रय आदेश आप अपने काम की योजना में मदद और समय पर वितरित करने के लिए सुनिश्चित करें
 DocType: Quality Inspection,Readings,रीडिंग
 DocType: Stock Entry,Total Additional Costs,कुल अतिरिक्त लागत
 DocType: Course Schedule,SH,एसएच
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,मूल्य के लिए
 DocType: Asset Movement,Stock Manager,शेयर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,पर्ची पैकिंग
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,पर्ची पैकिंग
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,कार्यालय का किराया
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात विफल!
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,स्रोत
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,दिखाएँ बंद
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,परिसंपत्ति वर्ग फिक्स्ड एसेट आइटम के लिए अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,परिसंपत्ति वर्ग फिक्स्ड एसेट आइटम के लिए अनिवार्य है
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},यह {0} {1} के साथ संघर्ष के लिए {2} {3}
 DocType: Student Attendance Tool,Students HTML,छात्र HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,छोड़ने का दिनांक
 DocType: Pricing Rule,For Price List,मूल्य सूची के लिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी खोज
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,सुराग बनाने
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,सुराग बनाने
 DocType: Maintenance Schedule,Schedules,अनुसूचियों
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,कार्यक्रम नामांकन
 DocType: Sales Invoice Item,Brand Name,ब्रांड नाम
 DocType: Purchase Receipt,Transporter Details,ट्रांसपोर्टर विवरण
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,डिब्बा
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,संभव प्रदायक
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,संगठन
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} के प्रोजेक्ट के लिए नहीं मिला डिफ़ॉल्ट बीओएम {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,कंपनी के खर्च के लिए दावा.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","छात्र प्रणाली के दिल में हैं, अपने सभी छात्रों को जोड़ने"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","छात्र प्रणाली के दिल में हैं, अपने सभी छात्रों को जोड़ने"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},पंक्ति # {0}: क्लीयरेंस तारीख {1} से पहले चैक दिनांक नहीं किया जा सकता {2}
 DocType: Company,Default Holiday List,छुट्टियों की सूची चूक
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},पंक्ति {0}: से समय और के समय {1} के साथ अतिव्यापी है {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भुगतान ईमेल पुन: भेजें
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,नया कार्य
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,कोटेशन बनाओ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,कोटेशन बनाओ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,अन्य रिपोर्टें
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,अग्रिम में एक्स दिनों के लिए आपरेशन की योजना बना प्रयास करें।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
 DocType: SMS Center,Receiver List,रिसीवर सूची
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,खोजें मद
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,खोजें मद
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,खपत राशि
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,नकद में शुद्ध परिवर्तन
 DocType: Assessment Plan,Grading Scale,ग्रेडिंग पैमाने
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,पहले से पूरा है
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},भुगतान का अनुरोध पहले से मौजूद है {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,लीजिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आप नहीं हटा सकते वित्त वर्ष {0}। वित्त वर्ष {0} वैश्विक सेटिंग्स में डिफ़ॉल्ट के रूप में सेट किया गया है
 DocType: Journal Entry,Entry Type,प्रविष्टि प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट बैलेंस
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,एक ही संस्थान में अध्ययन
 DocType: Territory,Territory Manager,क्षेत्र प्रबंधक
 DocType: Packed Item,To Warehouse (Optional),गोदाम के लिए (वैकल्पिक)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Payment Entry,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,कार्ट में देखें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,इस स्टॉक एंट्री बनाने के लिए इस्तेमाल सामग्री अनुरोध
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,अगली मूल्यह्रास दिनांक नई संपत्ति के लिए अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,अगली मूल्यह्रास दिनांक नई संपत्ति के लिए अनिवार्य है
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बैच के लिए अलग पाठ्यक्रम आधारित समूह
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,एक आइटम के एकल इकाई.
 DocType: Fee Category,Fee Category,शुल्क श्रेणी
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,महत्व
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: लागत केंद्र &#39;लाभ और हानि के खाते के लिए आवश्यक है {2}। कृपया कंपनी के लिए एक डिफ़ॉल्ट लागत केंद्र की स्थापना की।
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,नया संपर्क
 DocType: Territory,Parent Territory,माता - पिता टेरिटरी
 DocType: Quality Inspection Reading,Reading 2,2 पढ़ना
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,सुलह JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 DocType: Purchase Invoice Item,Batch No,कोई बैच
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},एक्सचेंज के लिए दर मिल करने में असमर्थ {0} को {1} कुंजी की तारीख के लिए {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक की खरीद के आदेश के खिलाफ कई विक्रय आदेश की अनुमति दें
 DocType: Student Group Instructor,Student Group Instructor,छात्र समूह के प्रशिक्षक
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,मुख्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,प्रकार
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,मुख्य
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,प्रकार
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारियों एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
 DocType: Employee,Leave Encashed?,भुनाया छोड़ दो?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,क्षेत्र से मौके अनिवार्य है
 DocType: Email Digest,Annual Expenses,सालाना खर्च
 DocType: Item,Variants,वेरिएंट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
@@ -1764,7 +1761,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,मूल्यांकन
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक नौवहन नियम के लिए एक शर्त
-DocType: Grading Structure,Grading Intervals,ग्रेडिंग अंतराल
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,कृपया दर्ज करें
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते {1} की तुलना में अधिक {2}। ओवर-बिलिंग की अनुमति के लिए, सेटिंग ख़रीदना में सेट करें"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,कृपया मद या गोदाम के आधार पर फ़िल्टर सेट
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,भुगतान
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,अपने आदेश की व्यवस्था करें
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,अपने आदेश की व्यवस्था करें
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक समय और लागत
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},अधिकतम की सामग्री अनुरोध {0} मद के लिए {1} के खिलाफ किया जा सकता है बिक्री आदेश {2}
 DocType: Employee,Salutation,अभिवादन
 DocType: Course,Course Abbreviation,कोर्स संक्षिप्त
 DocType: Student Leave Application,Student Leave Application,छात्र लीव आवेदन
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},कर्मचारी {0} को आधा दिन पर {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},कुल काम के घंटे अधिकतम काम के घंटे से अधिक नहीं होना चाहिए {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,पर
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,बिक्री के समय में आइटम बंडल.
 DocType: Quotation Item,Actual Qty,वास्तविक मात्रा
 DocType: Sales Invoice Item,References,संदर्भ
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आप डुप्लिकेट आइटम दर्ज किया है . सुधारने और पुन: प्रयास करें .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,सहयोगी
 DocType: Asset Movement,Asset Movement,एसेट आंदोलन
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,नई गाड़ी
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,नई गाड़ी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,आइटम {0} एक धारावाहिक आइटम नहीं है
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
 DocType: Vehicle,Wheels,पहियों
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,उत्पादन के आदेश के खिलाफ समय लॉग का सृजन अक्षम करता है। संचालन उत्पादन आदेश के खिलाफ लगाया जा नहीं करेगा
 DocType: Student,Student Mobile Number,छात्र मोबाइल नंबर
 DocType: Item,Has Variants,वेरिएंट है
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,बैच आईडी अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बैच आईडी अनिवार्य है
 DocType: Sales Person,Parent Sales Person,माता - पिता बिक्री व्यक्ति
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चालान
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,परियोजनाओं के प्रबंधन
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,वित्तीय वर्ष
 DocType: Vehicle Log,Fuel Price,ईंधन मूल्य
 DocType: Budget,Budget,बजट
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",यह एक आय या खर्च खाता नहीं है के रूप में बजट के खिलाफ {0} नहीं सौंपा जा सकता
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,हासिल
 DocType: Student Admission,Application Form Route,आवेदन पत्र रूट
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},राशि {0} {1} {2} के खिलाफ की कटौती
 DocType: Employee,Salary Information,वेतन की जानकारी
 DocType: Sales Person,Name and Employee ID,नाम और कर्मचारी ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
 DocType: Website Item Group,Website Item Group,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,शुल्कों और करों
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तिथि दर्ज करें
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,दोहराने ग्राहक राजस्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका की कीमत अनुमोदनकर्ता 'होना चाहिए
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,जोड़ा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
 DocType: Asset,Depreciation Schedule,मूल्यह्रास अनुसूची
 DocType: Bank Reconciliation Detail,Against Account,खाते के खिलाफ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,आधा दिन की तारीख की तिथि से और आज तक के बीच होना चाहिए
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
 DocType: Purchase Order,Delivered,दिया गया
 ,Vehicle Expenses,वाहन खर्च
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
+DocType: Serial No,Invoice Details,चालान विवरण
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"तारीख, जिस पर आवर्ती चालान रोकने के लिए किया जाएगा"
 DocType: Employee Loan,Loan Amount,उधार की राशि
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,गैर-समूह के लिए समूह
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,खेल
 DocType: Loan Type,Loan Name,ऋण नाम
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,ग्राहक अधिग्रहण और वफादारी
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,वेअरहाउस जहाँ आप को अस्वीकार कर दिया आइटम के शेयर को बनाए रखने रहे हैं
 DocType: Production Order,Skip Material Transfer,सामग्री स्थानांतरण छोड़ें
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,कुंजी दिनांक {2} के लिए {0} से {0} के लिए विनिमय दर खोजने में असमर्थ कृपया मैन्युअल रूप से एक मुद्रा विनिमय रिकॉर्ड बनाएं
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,आपकी वित्तीय वर्ष को समाप्त होता है
 DocType: POS Profile,Price List,कीमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} अब मूलभूत वित्त वर्ष है . परिवर्तन को प्रभावी बनाने के लिए अपने ब्राउज़र को ताज़ा करें.
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** वित्त वर्ष ** एक वित्तीय वर्ष का प्रतिनिधित्व करता है। सभी लेखा प्रविष्टियों और अन्य प्रमुख लेनदेन ** ** वित्त वर्ष के खिलाफ ट्रैक किए गए हैं।
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पता
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 DocType: Student Admission,Eligibility,पात्रता
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","सुराग आप व्यापार, अपने नेतृत्व के रूप में अपने सभी संपर्कों को और अधिक जोड़ने पाने में मदद"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","सुराग आप व्यापार, अपने नेतृत्व के रूप में अपने सभी संपर्कों को और अधिक जोड़ने पाने में मदद"
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,कंपनी का चयन करें ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,मुद्रा से
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"पहली पंक्ति के लिए ' पिछली पंक्ति कुल पर ', ' पिछली पंक्ति पर राशि ' या के रूप में कार्यभार प्रकार का चयन नहीं कर सकते"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,बाल मद एक उत्पाद बंडल नहीं होना चाहिए। आइटम को हटा दें `` {0} और बचाने के लिए कृपया
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बैंकिंग
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets जोड़े
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets जोड़े
 DocType: Vehicle Service,Service Item,सेवा आइटम
 DocType: Bank Guarantee,Bank Guarantee,बैंक गारंटी
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दाम नहीं दिखाया जाएगा अगर कीमत सूची सेट नहीं है
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,इस नौवहन नियम के लिए एक देश निर्दिष्ट या दुनिया भर में शिपिंग कृपया जांच करें
 DocType: Stock Entry,Total Incoming Value,कुल आवक मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,डेबिट करने के लिए आवश्यक है
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,डेबिट करने के लिए आवश्यक है
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरीद मूल्य सूची
 DocType: Offer Letter Term,Offer Term,ऑफर टर्म
 DocType: Quality Inspection,Quality Manager,गुणवत्ता प्रबंधक
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,खोया कारण
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नया पता
 DocType: Quality Inspection,Sample Size,नमूने का आकार
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,रसीद दस्तावेज़ दर्ज करें
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,रसीद दस्तावेज़ दर्ज करें
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;केस नंबर से&#39; एक वैध निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
 DocType: Project,External,बाहरी
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,उपयोगकर्ता और अनुमतियाँ
 DocType: Vehicle Log,VLOG.,Vlog।
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},उत्पादन के आदेश निर्मित: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},उत्पादन के आदेश निर्मित: {0}
 DocType: Branch,Branch,शाखा
 DocType: Guardian,Mobile Number,मोबाइल नंबर
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण और ब्रांडिंग
@@ -2176,7 +2175,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
 DocType: Scheduling Tool,Student Batch,छात्र बैच
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,अपने ग्राहकों
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,छात्र
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,छात्र
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},आप इस परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
 DocType: Leave Block List Date,Block Date,तिथि ब्लॉक
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,अभी अप्लाई करें
@@ -2199,8 +2198,9 @@
 DocType: SMS Log,Sent To,भेजा
 DocType: Payment Request,Make Sales Invoice,बिक्री चालान बनाएं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,सॉफ्टवेयर
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,अगले संपर्क दिनांक अतीत में नहीं किया जा सकता
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,अगले संपर्क दिनांक अतीत में नहीं किया जा सकता
 DocType: Company,For Reference Only.,केवल संदर्भ के लिए।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,बैच नंबर का चयन करें
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,अग्रिम राशि
@@ -2214,7 +2214,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,मुकदमा संख्या 0 नहीं हो सकता
 DocType: Item,Show a slideshow at the top of the page,पृष्ठ के शीर्ष पर एक स्लाइड शो दिखाएँ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,भंडार
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,भंडार
 DocType: Serial No,Delivery Time,सुपुर्दगी समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,के आधार पर बूढ़े
 DocType: Item,End of Life,जीवन का अंत
@@ -2230,8 +2230,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,हस्तांतरण सामग्री
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,इस दस्तावेज़ से सीमा से अधिक है {0} {1} आइटम के लिए {4}। आप कर रहे हैं एक और {3} उसी के खिलाफ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,बदलें चुनें राशि खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,बदलें चुनें राशि खाते
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
@@ -2242,7 +2242,7 @@
 DocType: Budget Account,Budget Account,बजट खाता
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","मौजूदा लेनदेन कर रहे हैं , क्योंकि कंपनी के डिफ़ॉल्ट मुद्रा में परिवर्तन नहीं कर सकते हैं . लेनदेन डिफ़ॉल्ट मुद्रा बदलने के लिए रद्द कर दिया जाना चाहिए ."
-DocType: Grade Interval,Grade Description,ग्रेड विवरण
+DocType: Grading Scale Interval,Grade Description,ग्रेड विवरण
 DocType: Stock Entry,Purchase Receipt No,रसीद खरीद नहीं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,बयाना राशि
 DocType: Process Payroll,Create Salary Slip,वेतनपर्ची बनाएँ
@@ -2280,7 +2280,7 @@
 DocType: Upload Attendance,Attendance To Date,तिथि उपस्थिति
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Gateway Account,Payment Account,भुगतान खाता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,लेखा प्राप्य में शुद्ध परिवर्तन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,प्रतिपूरक बंद
 DocType: Offer Letter,Accepted,स्वीकार किया
@@ -2293,7 +2293,7 @@
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,उपयोगकर्ता मंच
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
@@ -2307,7 +2307,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,संस्थान का नाम है जिसके लिए आप इस प्रणाली स्थापित कर रहे हैं।
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","इस तारीख तक कर जम लेखा प्रविष्टि, कोई नहीं / नीचे निर्दिष्ट भूमिका छोड़कर प्रविष्टि को संशोधित कर सकते हैं."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,कृपया रखरखाव शेड्यूल जनरेट करने से पहले दस्तावेज़ सहेजना
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,कृपया रखरखाव शेड्यूल जनरेट करने से पहले दस्तावेज़ सहेजना
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,परियोजना की स्थिति
 DocType: UOM,Check this to disallow fractions. (for Nos),नामंज़ूर भिन्न करने के लिए इसे चेक करें. (ओपन स्कूल के लिए)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,निम्न उत्पादन के आदेश बनाया गया:
@@ -2330,6 +2330,7 @@
 DocType: Email Digest,How frequently?,कितनी बार?
 DocType: Purchase Receipt,Get Current Stock,मौजूदा स्टॉक
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,सामग्री के बिल का पेड़
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Student,Joining Date,कार्यग्रहण तिथि
 ,Employees working on a holiday,एक छुट्टी पर काम कर रहे कर्मचारियों को
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,मार्क का तोहफा
@@ -2430,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,उत्पादन
 DocType: Guardian,Occupation,बायो
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),कुल मात्रा)
 DocType: Sales Invoice,This Document,इस दस्तावेज़
 DocType: Installation Note Item,Installed Qty,स्थापित मात्रा
@@ -2453,7 +2454,7 @@
 DocType: Notification Control,Sales Order Message,बिक्री आदेश संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","आदि कंपनी , मुद्रा , चालू वित्त वर्ष , की तरह सेट डिफ़ॉल्ट मान"
 DocType: Payment Entry,Payment Type,भुगतान के प्रकार
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,आइटम {0} के लिए बैच का चयन करें। इस आवश्यकता को पूरा करने वाले एकल बैच को खोजने में असमर्थ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,आइटम {0} के लिए बैच का चयन करें। इस आवश्यकता को पूरा करने वाले एकल बैच को खोजने में असमर्थ
 DocType: Process Payroll,Select Employees,चयन करें कर्मचारी
 DocType: Opportunity,Potential Sales Deal,संभावित बिक्री डील
 DocType: Payment Entry,Cheque/Reference Date,चैक / संदर्भ तिथि
@@ -2470,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},पहले से ही कंपनी के लिए बनाया वैश्विक स्थिति प्रोफ़ाइल {0} {1}
 DocType: Purchase Order,Ref SQ,रेफरी वर्ग
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,सभी BOMs आइटम / BOM बदलें
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,रसीद दस्तावेज प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,रसीद दस्तावेज प्रस्तुत किया जाना चाहिए
 DocType: Purchase Invoice Item,Received Qty,प्राप्त मात्रा
 DocType: Stock Entry Detail,Serial No / Batch,धारावाहिक नहीं / बैच
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,भुगतान नहीं किया और वितरित नहीं
@@ -2483,7 +2484,7 @@
 ,To Produce,निर्माण करने के लिए
 apps/erpnext/erpnext/config/hr.py +93,Payroll,पेरोल
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","पंक्ति के लिए {0} में {1}। आइटम दर में {2} में शामिल करने के लिए, पंक्तियों {3} भी शामिल किया जाना चाहिए"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,बनाओ उपयोगकर्ता
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,बनाओ उपयोगकर्ता
 DocType: Packing Slip,Identification of the package for the delivery (for print),प्रसव के लिए पैकेज की पहचान (प्रिंट के लिए)
 DocType: Bin,Reserved Quantity,आरक्षित मात्रा
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,कृपया मान्य ईमेल पता दर्ज करें
@@ -2495,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,विकलांगों के लिए टेम्पलेट डिफ़ॉल्ट टेम्पलेट नहीं होना चाहिए
 DocType: Account,Income Account,आय खाता
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,वितरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,वितरण
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",धारा लागत में &quot;सामग्री के आधार पर दर&quot; देखें
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,पिछला
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","छात्र बैचों आप उपस्थिति, आकलन और छात्रों के लिए फीस ट्रैक करने में मदद"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","छात्र बैचों आप उपस्थिति, आकलन और छात्रों के लिए फीस ट्रैक करने में मदद"
 DocType: Payment Entry,Total Allocated Amount,कुल आवंटित राशि
 DocType: Item Reorder,Material Request Type,सामग्री अनुरोध प्रकार
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},से {0} को वेतन के लिए Accural जर्नल प्रविष्टि {1}
@@ -2522,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रैक उद्योग प्रकार के द्वारा होता है .
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
@@ -2532,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',स्थिति के साथ कर्मचारियों को घटना के बारे में एक ईमेल भेज देंगे &#39;ओपन&#39;
 DocType: Task,Depends on Tasks,कार्य पर निर्भर करता है
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ग्राहक समूह ट्री प्रबंधन .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,शॉपिंग कार्ट को सक्षम किए बिना संलग्नक दिखाए जा सकते हैं
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,नए लागत केन्द्र का नाम
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण कक्ष छोड़ दो
@@ -2544,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,करने के लिए डेबिट
 DocType: Delivery Note,Required only for sample item.,केवल नमूना आइटम के लिए आवश्यक है.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,लेन - देन के बाद वास्तविक मात्रा
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; प्रदायक प्रकार
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},कोई वेतन पर्ची के बीच पाया {0} और {1}
 ,Pending SO Items For Purchase Request,खरीद के अनुरोध के लिए लंबित है तो आइटम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} अक्षम है
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} अक्षम है
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,एक्स्ट्रा लार्ज
@@ -2565,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,मुखपृष्ठ रुप से प्रदर्शित उत्पाद
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,सभी मूल्यांकन समूह
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,नए गोदाम नाम
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),कुल {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),कुल {0} ({1})
 DocType: C-Form Invoice Detail,Territory,क्षेत्र
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
@@ -2583,7 +2585,7 @@
 DocType: Price List,Price List Master,मूल्य सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
 ,S.O. No.,बिक्री आदेश संख्या
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
 DocType: Price List,Applicable for Countries,देशों के लिए लागू
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,केवल छोड़ दो की स्थिति के साथ अनुप्रयोग &#39;स्वीकृत&#39; और &#39;अस्वीकृत&#39; प्रस्तुत किया जा सकता
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},छात्र समूह का नाम पंक्ति में अनिवार्य है {0}
@@ -2675,7 +2677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 DocType: Vehicle Service,Engine Oil,इंजन तेल
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
 DocType: Employee Loan,Loan Details,ऋण विवरण
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,पंक्ति {0}: पूर्ण मात्रा शून्य से अधिक होना चाहिए।
@@ -2739,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,मौजूदा लेनदेन के साथ गोदामों समूह में परिवर्तित नहीं किया जा सकता है।
 DocType: Assessment Result Tool,Result HTML,परिणाम HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,पर समय सीमा समाप्त
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,छात्रों को जोड़ें
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,छात्रों को जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},कृपया चुनें {0}
 DocType: C-Form,C-Form No,कोई सी - फार्म
 DocType: BOM,Exploded_items,Exploded_items
@@ -2803,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,सीमा पार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,वेंचर कैपिटल
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,इस &#39;शैक्षिक वर्ष&#39; के साथ एक शैक्षणिक अवधि {0} और &#39;शब्द का नाम&#39; {1} पहले से ही मौजूद है। इन प्रविष्टियों को संशोधित करने और फिर कोशिश करें।
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","आइटम {0} के खिलाफ मौजूदा लेनदेन देखते हैं के रूप में, आप के मूल्य में परिवर्तन नहीं कर सकते {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","आइटम {0} के खिलाफ मौजूदा लेनदेन देखते हैं के रूप में, आप के मूल्य में परिवर्तन नहीं कर सकते {1}"
 DocType: UOM,Must be Whole Number,पूर्ण संख्या होनी चाहिए
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नई पत्तियों आवंटित (दिनों में)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,धारावाहिक नहीं {0} मौजूद नहीं है
@@ -2846,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,अगले महीने के आखिरी दिन
 DocType: Support Settings,Auto close Issue after 7 days,7 दिनों के बाद ऑटो बंद जारी
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","पहले आवंटित नहीं किया जा सकता छोड़ दो {0}, छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है के रूप में {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,छात्र आवेदक
 DocType: Asset Category Account,Accumulated Depreciation Account,संचित मूल्यह्रास अकाउंट
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
@@ -2874,7 +2876,7 @@
 DocType: Asset,Item Code,आइटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन के आदेश बनाएँ
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
 DocType: Lead,Market Segment,बाजार खंड
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
@@ -2892,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,सामग्री अनुरोध बनाएँ
 DocType: Employee Education,School/University,स्कूल / विश्वविद्यालय
 DocType: Payment Request,Reference Details,संदर्भ विवरण
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
 DocType: Sales Invoice Item,Available Qty at Warehouse,गोदाम में उपलब्ध मात्रा
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,बिल की राशि
 DocType: Asset,Double Declining Balance,डबल गिरावट का संतुलन
@@ -2913,19 +2915,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित राशि ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,उत्पादन आदेश नहीं बनाया
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,उत्पादन आदेश नहीं बनाया
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},छात्र के रूप में स्थिति को बदल नहीं सकते {0} छात्र आवेदन के साथ जुड़ा हुआ है {1}
 DocType: Asset,Fully Depreciated,पूरी तरह से घिस
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,उल्लेखनीय उपस्थिति एचटीएमएल
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","कोटेशन प्रस्तावों, बोलियों आप अपने ग्राहकों के लिए भेजा है रहे हैं"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","कोटेशन प्रस्तावों, बोलियों आप अपने ग्राहकों के लिए भेजा है रहे हैं"
 DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,सीरियल नहीं और बैच
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,मूल्यांकन मापदंड के अंकों के योग {0} की जरूरत है।
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations की संख्या बुक सेट करें
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations की संख्या बुक सेट करें
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,मूल्य या मात्रा
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,मिनट
@@ -3053,7 +3055,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,छात्र समूह
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन सीरीज
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,कृपया ग्राहक का चयन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,कृपया ग्राहक का चयन
 DocType: C-Form,I,मैं
 DocType: Company,Asset Depreciation Cost Center,संपत्ति मूल्यह्रास लागत केंद्र
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
@@ -3072,19 +3074,18 @@
 DocType: Vehicle,Insurance Details,बीमा विवरण
 DocType: Account,Payable,देय
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,चुकौती अवधि दर्ज करें
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),देनदार ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),देनदार ({0})
 DocType: Pricing Rule,Margin,हाशिया
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नए ग्राहकों
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,सकल लाभ%
 DocType: Appraisal Goal,Weightage (%),वेटेज (%)
 DocType: Bank Reconciliation Detail,Clearance Date,क्लीयरेंस तिथि
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,सकल खरीद राशि अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,सकल खरीद राशि अनिवार्य है
 DocType: Lead,Address Desc,जानकारी पता करने के लिए
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,पार्टी अनिवार्य है
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,विषय नाम
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,बेचने या खरीदने का कम से कम एक का चयन किया जाना चाहिए
-DocType: Grading Structure,Grade Intervals,ग्रेड अंतराल
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,आपके व्यवसाय की प्रकृति का चयन करें।
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,निर्माण कार्यों कहां किया जाता है।
 DocType: Asset Movement,Source Warehouse,स्रोत वेअरहाउस
@@ -3113,6 +3114,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण का प्रतिशत
 DocType: Territory,Territory Targets,टेरिटरी लक्ष्य
 DocType: Delivery Note,Transporter Info,ट्रांसपोर्टर जानकारी
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},डिफ़ॉल्ट {0} कंपनी में सेट करें {1}
 DocType: Cheque Print Template,Starting position from top edge,ऊपरी किनारे से स्थिति शुरू
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,एक ही सप्लायर कई बार दर्ज किया गया है
@@ -3164,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder मात्रा
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,वर्तमान नौकरी के उद्घाटन
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
-DocType: Journal Entry,Write Off,ख़ारिज करना
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ख़ारिज करना
 DocType: Timesheet Detail,Operation ID,ऑपरेशन आईडी
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","सिस्टम प्रयोक्ता आईडी (प्रवेश). अगर सेट किया जाता है, यह सभी मानव संसाधन रूपों के लिए डिफ़ॉल्ट बन जाएगा."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} से: {1}
@@ -3175,8 +3177,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,आपूर्तिकर्ता ग्राहक को बचाता है
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# प्रपत्र / मद / {0}) स्टॉक से बाहर है
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,अगली तारीख पोस्ट दिनांक से अधिक होना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,शो कर तोड़-अप
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डाटा आयात और निर्यात
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","स्टॉक प्रविष्टियों, {0} गोदाम के खिलाफ मौजूद इसलिए आप नहीं फिर से आवंटित या इसे संशोधित कर सकते हैं"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,कोई छात्र नहीं मिले
@@ -3188,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
 DocType: Program Enrollment,School House,स्कूल हाउस
 DocType: Serial No,Out of AMC,एएमसी के बाहर
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,कृपया उद्धरण का चयन करें
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,रखरखाव भेंट बनाओ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,कृपया उद्धरण का चयन करें
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,रखरखाव भेंट बनाओ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
 DocType: Company,Default Cash Account,डिफ़ॉल्ट नकद खाता
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,यह इस छात्र की उपस्थिति पर आधारित है
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,में कोई छात्र नहीं
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,अधिक आइटम या खुले पूर्ण रूप में जोड़ें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
@@ -3240,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,सुलह से पहले
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),करों और शुल्कों जोड़ा (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
 DocType: Sales Order,Partly Billed,आंशिक रूप से बिल
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,मद {0} एक निश्चित परिसंपत्ति मद में होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,मद {0} एक निश्चित परिसंपत्ति मद में होना चाहिए
 DocType: Item,Default BOM,Default बीओएम
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,कुल बकाया राशि
@@ -3264,7 +3267,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,प्रशिक्षु
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,पता नाम
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,पता नाम
 DocType: Stock Entry,From BOM,बीओएम से
 DocType: Assessment Code,Assessment Code,आकलन संहिता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,बुनियादी
@@ -3289,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,प्रिंट भाषा
 DocType: Salary Slip,Total Working Hours,कुल काम के घंटे
 DocType: Stock Entry,Including items for sub assemblies,उप असेंबलियों के लिए आइटम सहित
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,सभी प्रदेशों
 DocType: Purchase Invoice,Items,आइटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,छात्र पहले से ही दाखिला लिया है।
@@ -3308,16 +3311,14 @@
 DocType: Issue,Opening Time,समय खुलने की
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,दिनांक से और
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक का नाम
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नामांकन पाठ्यक्रम
-DocType: Grading Structure,Grading Structure,ग्रेडिंग संरचना
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
 DocType: Tax Rule,Shipping City,शिपिंग शहर
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"इस मद {0} (खाका) का एक संस्करण है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक गुण टेम्पलेट से अधिक नकल की जाएगी"
 DocType: Notification Control,Customize the Notification,अधिसूचना को मनपसंद
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,आपरेशन से नकद प्रवाह
 DocType: Sales Invoice,Shipping Rule,नौवहन नियम
@@ -3340,6 +3341,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
 DocType: Leave Control Panel,Carry Forward,आगे ले जाना
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,मौजूदा लेनदेन के साथ लागत केंद्र लेज़र परिवर्तित नहीं किया जा सकता है
 DocType: Department,Days for which Holidays are blocked for this department.,दिन छुट्टियाँ जिसके लिए इस विभाग के लिए अवरुद्ध कर रहे हैं.
@@ -3367,7 +3369,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),कुल (राशि)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 DocType: Quality Inspection,Item Serial No,आइटम कोई धारावाहिक
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,कर्मचारी रिकॉर्ड बनाएं
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,कर्मचारी रिकॉर्ड बनाएं
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,कुल वर्तमान
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,लेखांकन बयान
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,घंटा
@@ -3382,7 +3384,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,बदलने के बाद नए बीओएम
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,बिक्री के प्वाइंट
 DocType: Payment Entry,Received Amount,प्राप्त राशि
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली&gt; एचआर सेटिंग्स सेट करें
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","पूर्ण मात्रा के लिए बनाएँ, आदेश पर पहले से ही मात्रा की अनदेखी"
 DocType: Account,Tax,कर
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,चिह्नित नहीं
@@ -3393,7 +3394,7 @@
 DocType: C-Form,Invoices,चालान
 DocType: Batch,Source Document Name,स्रोत दस्तावेज़ का नाम
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,बनाएं उपयोगकर्ता
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,बनाएं उपयोगकर्ता
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ग्राम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,रखरखाव कॉल के लिए रिपोर्ट पर जाएँ.
@@ -3404,8 +3405,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: BOM,Website Description,वेबसाइट विवरण
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,रसीद
 ,Sales Register,बिक्री रजिस्टर
@@ -3416,16 +3417,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करने के लिए कुछ भी नहीं है .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,अभी तक कोई ग्राहक नहीं!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,नकदी प्रवाह विवरण
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,लाइसेंस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,का चयन करें कृपया आगे ले जाना है अगर तुम भी शामिल करना चाहते हैं पिछले राजकोषीय वर्ष की शेष राशि इस वित्त वर्ष के लिए छोड़ देता है
 DocType: GL Entry,Against Voucher Type,वाउचर प्रकार के खिलाफ
 DocType: Item,Attributes,गुण
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,पिछले आदेश की तिथि
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
 DocType: Student,Guardian Details,गार्जियन विवरण
 DocType: C-Form,C-Form,सी - फार्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,कई कर्मचारियों के लिए मार्क उपस्थिति
@@ -3450,14 +3453,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',पंक्ति {0} # खाता प्रकार का होना चाहिए &#39;फिक्स्ड एसेट&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,मात्रा बाहर
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,एक बिक्री के लिए शिपिंग राशि की गणना करने के नियम
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,सीरीज अनिवार्य है
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,सीरीज अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
 DocType: Student Sibling,Student ID,छात्र आईडी
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,समय लॉग के लिए गतिविधियों के प्रकार
 DocType: Tax Rule,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
 DocType: Training Event,Exam,परीक्षा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,सीआर
 DocType: Tax Rule,Billing State,बिलिंग राज्य
@@ -3490,7 +3493,7 @@
 DocType: Payment Entry,Account Paid From,खाते से भुगतान
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चे माल के मद कोड
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,लीड बनाओ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,लीड बनाओ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,प्रिंट और स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,शो बारकोड फील्ड
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,प्रदायक ईमेल भेजें
@@ -3505,6 +3508,7 @@
 DocType: Offer Letter,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ऊपर
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
+DocType: Supplier,Mention if non-standard payable account,यदि मानक मानक देय खाता है तो उल्लेख करें
 DocType: Salary Slip,Earning & Deduction,अर्जन कटौती
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
@@ -3538,7 +3542,7 @@
 DocType: Program Enrollment Tool,Get Students From,से छात्रों जाओ
 DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,वेबसाइट पर आइटम प्रकाशित करें
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,बैचों में समूह अपने छात्रों
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,बैचों में समूह अपने छात्रों
 DocType: Authorization Rule,Authorization Rule,प्राधिकरण नियम
 DocType: Sales Invoice,Terms and Conditions Details,नियमों और शर्तों के विवरण
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,निर्दिष्टीकरण
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,परिवीक्षा
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,वेतन अवयव
 DocType: Program Enrollment Tool,New Academic Year,नए शैक्षणिक वर्ष
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,वापसी / क्रेडिट नोट
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,वापसी / क्रेडिट नोट
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,कुल भुगतान की गई राशि
 DocType: Production Order Item,Transferred Qty,मात्रा तबादला
@@ -3638,6 +3642,7 @@
 ,Sales Funnel,बिक्री कीप
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
 DocType: Project,Task Progress,कार्य प्रगति
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,गाड़ी
 ,Qty to Transfer,स्थानांतरण करने के लिए मात्रा
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
@@ -3670,7 +3675,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},मात्रा ({0}) पंक्ति {1} में अंश नहीं हो सकता
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,फीस जमा
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
 DocType: Lead,Add to calendar on this date,इस तिथि पर कैलेंडर में जोड़ें
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
 DocType: Item,Opening Stock,आरंभिक स्टॉक
@@ -3689,7 +3694,7 @@
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,उत्पादन के लिए आदेश जारी किया.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,छात्रों को भर्ती
 DocType: Hub Settings,Name Token,नाम टोकन
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक बेच
@@ -3700,7 +3705,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,इस परियोजना का नाम
-DocType: Supplier,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
+DocType: Customer,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
 DocType: Production Order,Required Items,आवश्यक आइटम
 DocType: Stock Ledger Entry,Stock Value Difference,स्टॉक मूल्य अंतर
@@ -3729,6 +3734,7 @@
 DocType: Item,Taxes,कर
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,भुगतान किया है और वितरित नहीं
 DocType: Project,Default Cost Center,डिफ़ॉल्ट लागत केंद्र
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें&gt; सेटिंग&gt; नामकरण श्रृंखला
 DocType: Bank Guarantee,End Date,समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,शेयर लेनदेन
 DocType: Budget,Budget Accounts,बजट लेखा
@@ -3793,7 +3799,7 @@
 DocType: Customer,Sales Partner and Commission,बिक्री साथी और आयोग
 DocType: Employee Loan,Rate of Interest (%) / Year,ब्याज (%) / वर्ष की दर
 ,Project Quantity,परियोजना मात्रा
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए शून्य है, तो आप &#39;के आधार पर शुल्क वितरित&#39; परिवर्तन होना चाहिए हो सकता है"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए शून्य है, तो आप &#39;के आधार पर शुल्क वितरित&#39; परिवर्तन होना चाहिए हो सकता है"
 DocType: Opportunity,To Discuss,चर्चा करने के लिए
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} की इकाइयों {1} {2} इस सौदे को पूरा करने के लिए की जरूरत है।
 DocType: Loan Type,Rate of Interest (%) Yearly,ब्याज दर (%) वार्षिक
@@ -3816,7 +3822,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपस्थित
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},पंक्ति {0}: बीओएम # की मुद्रा {1} चयनित मुद्रा के बराबर होना चाहिए {2}
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 DocType: Homepage,Tag Line,टैग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,बेड़े प्रबंधन
@@ -3833,7 +3839,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,वेयरहाउस {0} मौजूद नहीं है
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext हब के लिए रजिस्टर
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण प्रतिशत
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","मूल्यांकन दर मद {0}, जिसके लिए लेखांकन प्रविष्टियों करने के लिए आवश्यक है के लिए नहीं मिला {1} {2}। मद में एक नमूना आइटम के रूप में लेनदेन किया जाता है तो {1}, कि {1} मद तालिका में उल्लेख करें। अन्यथा, कृपया मद रिकॉर्ड में आइटम या उल्लेख मूल्यांकन दर के लिए एक इनकमिंग शेयर लेनदेन बनाने के लिए, और फिर / submiting कोशिश इस प्रविष्टि को रद्द"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% सामग्री को इस डिलिवरी नोट के सहारे सुपुर्द किया गया है
 DocType: Project,Customer Details,ग्राहक विवरण
@@ -3850,7 +3856,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,प्रस्तुत किए गए आदेशों हटाया नहीं जा सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,गुणवत्ता प्रबंधन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,मद {0} अक्षम किया गया है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,मद {0} अक्षम किया गया है
 DocType: Employee Loan,Repay Fixed Amount per Period,चुकाने अवधि के प्रति निश्चित राशि
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
@@ -3876,7 +3882,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,छात्र ईमेल आईडी
 DocType: Employee,Notice (days),सूचना (दिन)
 DocType: Tax Rule,Sales Tax Template,सेल्स टैक्स खाका
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
 DocType: Employee,Encashment Date,नकदीकरण तिथि
 DocType: Training Event,Internet,इंटरनेट
 DocType: Account,Stock Adjustment,शेयर समायोजन
@@ -3909,6 +3915,7 @@
 DocType: Purchase Invoice,Debit Note Issued,डेबिट नोट जारी
 DocType: Production Order,Warehouses,गोदामों
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} संपत्ति हस्तांतरित नहीं किया जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,यह आइटम {0} (टेम्पलेट) का एक प्रकार है।
 DocType: Workstation,per hour,प्रति घंटा
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,क्रय
 DocType: Announcement,Announcement,घोषणा
@@ -3924,7 +3931,7 @@
 DocType: Account,Receivable,प्राप्य
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,पंक्ति # {0}: खरीद आदेश पहले से मौजूद है के रूप में आपूर्तिकर्ता बदलने की अनुमति नहीं
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,निर्धारित ऋण सीमा से अधिक लेनदेन है कि प्रस्तुत करने की अनुमति दी है कि भूमिका.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
 DocType: Item,Material Issue,महत्त्वपूर्ण विषय
 DocType: Hub Settings,Seller Description,विक्रेता विवरण
@@ -3937,7 +3944,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेशित
 DocType: Salary Detail,Component,अंग
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन मापदंड समूह
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},खुलने संचित मूल्यह्रास के बराबर की तुलना में कम होना चाहिए {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},खुलने संचित मूल्यह्रास के बराबर की तुलना में कम होना चाहिए {0}
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,रोल अनुमोदन या उपयोगकर्ता स्वीकृति दर्ज करें
@@ -3971,7 +3978,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डिफ़ॉल्ट रूप में इस वित्तीय वर्ष में सेट करने के लिए , 'मूलभूत रूप में सेट करें ' पर क्लिक करें"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,जुडें
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Employee Loan,Repay from Salary,वेतन से बदला
 DocType: Leave Application,LAP/,गोद /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},के खिलाफ भुगतान का अनुरोध {0} {1} राशि के लिए {2}
@@ -3989,7 +3996,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,आकलन के परिणाम विस्तार
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,डुप्लिकेट आइटम समूह मद समूह तालिका में पाया
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
 DocType: Salary Slip,Net Pay,शुद्ध वेतन
 DocType: Account,Account,खाता
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,धारावाहिक नहीं {0} पहले से ही प्राप्त हो गया है
@@ -3998,7 +4005,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","गोदाम {0} किसी भी खाते से जुड़ा हुआ नहीं है, कृपया / गोदाम के लिए इसी (एसेट) खाते लिंक बनाएँ।"
 DocType: Purchase Invoice,Recurring Id,आवर्ती आईडी
 DocType: Customer,Sales Team Details,बिक्री टीम विवरण
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,स्थायी रूप से हटाना चाहते हैं?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,स्थायी रूप से हटाना चाहते हैं?
 DocType: Expense Claim,Total Claimed Amount,कुल दावा किया राशि
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,बेचने के लिए संभावित अवसरों.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},अमान्य {0}
@@ -4009,13 +4016,14 @@
 DocType: Warehouse,PIN,पिन
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,सेटअप ERPNext में अपने स्कूल
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस परिवर्तन राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,पहले दस्तावेज़ को सहेजें।
 DocType: Account,Chargeable,प्रभार्य
 DocType: Company,Change Abbreviation,बदले संक्षिप्त
 DocType: Expense Claim Detail,Expense Date,व्यय तिथि
 DocType: Item,Max Discount (%),अधिकतम डिस्काउंट (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,अंतिम आदेश राशि
+DocType: Task,Is Milestone,क्या मील का पत्थर है
 DocType: Daily Work Summary,Email Sent To,इलेक्ट्रॉनिक पत्राचार भेजा गया
 DocType: Budget,Warn,चेतावनी देना
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
@@ -4048,11 +4056,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक उम्र रुक स्टॉक `% d दिनों से कम होना चाहिए .
 DocType: Tax Rule,Purchase Tax Template,टैक्स टेम्पलेट खरीद
 ,Project wise Stock Tracking,परियोजना वार शेयर ट्रैकिंग
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},रखरखाव अनुसूची {0} के खिलाफ मौजूद {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),वास्तविक मात्रा (स्रोत / लक्ष्य पर)
 DocType: Item Customer Detail,Ref Code,रेफरी कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रिकॉर्ड.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
 DocType: HR Settings,Payroll Settings,पेरोल सेटिंग्स
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,न-जुड़े चालान और भुगतान का मिलान.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,आदेश देना
@@ -4075,7 +4082,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,चेक्स और जमाओं को गलत तरीके से मंजूरी दे दी है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
 DocType: Purchase Invoice Item,Price List Rate,मूल्य सूची दर
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ग्राहक उद्धरण बनाएं
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ग्राहक उद्धरण बनाएं
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",स्टॉक में दिखाएँ &quot;&quot; या &quot;नहीं&quot; स्टॉक में इस गोदाम में उपलब्ध स्टॉक के आधार पर.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),सामग्री के बिल (बीओएम)
 DocType: Item,Average time taken by the supplier to deliver,सप्लायर द्वारा लिया गया औसत समय देने के लिए
@@ -4097,7 +4104,7 @@
 DocType: Asset,Disposal Date,निपटान की तिथि
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ईमेल दी घंटे में कंपनी के सभी सक्रिय कर्मचारियों के लिए भेजा जाएगा, अगर वे छुट्टी की जरूरत नहीं है। प्रतिक्रियाओं का सारांश आधी रात को भेजा जाएगा।"
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी छुट्टी अनुमोदक
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण प्रतिक्रिया
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},कोर्स पंक्ति में अनिवार्य है {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
 DocType: Batch,Parent Batch,अभिभावक बैच
 DocType: Cheque Print Template,Cheque Print Template,चैक प्रिंट खाका
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,लागत केंद्र के चार्ट
@@ -4149,7 +4156,7 @@
 DocType: Item,Variant Based On,प्रकार पर आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,अपने आपूर्तिकर्ताओं
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
 DocType: Request for Quotation Item,Supplier Part No,प्रदायक भाग नहीं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',घटा नहीं सकते जब श्रेणी &#39;मूल्यांकन&#39; या &#39;Vaulation और कुल&#39; के लिए है
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,से प्राप्त
@@ -4159,7 +4166,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} के लिए {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,पंक्ति {0}: घंटे मूल्य शून्य से अधिक होना चाहिए।
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
@@ -4168,20 +4175,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
 DocType: Payment Reconciliation,From Invoice Date,चालान तिथि से
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी के खाते की मुद्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी के खाते की मुद्रा के बराबर होना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,नकदीकरण छोड़े
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,यह क्या करता है?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,गोदाम के लिए
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,सभी छात्र प्रवेश
 ,Average Commission Rate,औसत कमीशन दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
 DocType: School House,House Name,घरेलु नाम
 DocType: Purchase Taxes and Charges,Account Head,लेखाशीर्ष
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,मदों की उतरा लागत की गणना करने के लिए अतिरिक्त लागत अद्यतन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,विद्युत
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,अपने संगठन के बाकी अपने उपयोगकर्ताओं के रूप में जोड़े। तुम भी उन्हें संपर्क से जोड़कर अपने पोर्टल के लिए ग्राहकों को आमंत्रित जोड़ सकते हैं
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,अपने संगठन के बाकी अपने उपयोगकर्ताओं के रूप में जोड़े। तुम भी उन्हें संपर्क से जोड़कर अपने पोर्टल के लिए ग्राहकों को आमंत्रित जोड़ सकते हैं
 DocType: Stock Entry,Total Value Difference (Out - In),कुल मूल्य का अंतर (आउट - में)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},यूजर आईडी कर्मचारी के लिए सेट नहीं {0}
@@ -4190,7 +4197,7 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,दिनों से पिछले आदेश
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
 DocType: Buying Settings,Naming Series,श्रृंखला का नामकरण
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,बीमा प्रारंभ दिनांक से बीमा समाप्ति की तारीख कम होना चाहिए
@@ -4205,7 +4212,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
@@ -4218,7 +4225,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग घंटे
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} नहीं मिला डिफ़ॉल्ट बीओएम
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,उन्हें यहां जोड़ने के लिए आइटम टैप करें
 DocType: Fees,Program Enrollment,कार्यक्रम नामांकन
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},सेट करें {0}
@@ -4316,7 +4324,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
 DocType: Issue,First Responded On,पर पहले जवाब
 DocType: Website Item Group,Cross Listing of Item in multiple groups,कई समूहों में आइटम के क्रॉस लिस्टिंग
-DocType: Grade Interval,Grade Interval,ग्रेड अंतराल
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष के अंत तिथि पहले से ही वित्त वर्ष में स्थापित कर रहे हैं {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,क्लीयरेंस दिनांक अद्यतन
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,स्प्लिट बैच
@@ -4324,6 +4331,7 @@
 DocType: Request for Quotation Supplier,Download PDF,पीडीएफ़ डाउनलोड करें
 DocType: Production Order,Planned End Date,नियोजित समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,आइटम कहाँ संग्रहीत हैं.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; प्रदायक प्रकार
 DocType: Request for Quotation,Supplier Detail,प्रदायक विस्तार
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},सूत्र या हालत में त्रुटि: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,चालान राशि
@@ -4368,7 +4376,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,सेटअप अपने संगठन के लिए एक साधारण वेबसाइट
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,माता - पिता लागत केंद्र दर्ज करें
@@ -4425,7 +4433,7 @@
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
 DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Company,Company Info,कंपनी की जानकारी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,लागत केंद्र एक व्यय का दावा बुक करने के लिए आवश्यक है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,यह इस कर्मचारी की उपस्थिति पर आधारित है
@@ -4438,13 +4446,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,निम्नलिखित दिन पर छुट्टी अनुप्रयोग बनाने से उपयोगकर्ताओं को बंद करो.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,खरीद ने का मूलय
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,कर्मचारी लाभ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Production Order,Manufactured Qty,निर्मित मात्रा
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,परियोजना ईद
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
@@ -4453,15 +4461,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 पढ़ना
 ,Hub,हब
 DocType: GL Entry,Voucher Type,वाउचर प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Employee Loan Application,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
 DocType: Guardian,Guardian,अभिभावक
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यांकन {0} {1} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
 DocType: Employee,Education,शिक्षा
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,डेल
 DocType: Selling Settings,Campaign Naming By,अभियान नामकरण से
 DocType: Employee,Current Address Is,वर्तमान पता है
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,संशोधित
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
@@ -4498,7 +4508,7 @@
 DocType: Hub Settings,Hub Settings,हब सेटिंग्स
 DocType: Project,Gross Margin %,सकल मार्जिन%
 DocType: BOM,With Operations,आपरेशनों के साथ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
 DocType: Asset,Is Existing Asset,मौजूदा परिसंपत्ति है
 DocType: Salary Detail,Statistical Component,सांख्यिकीय घटक
 ,Monthly Salary Register,मासिक वेतन रेजिस्टर
@@ -4552,7 +4562,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,लोगो अटैच
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,भंडारण स्तर
 DocType: Customer,Commission Rate,आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,संस्करण बनाओ
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","भुगतान प्रकार, प्राप्त की एक होना चाहिए वेतन और आंतरिक स्थानांतरण"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,एनालिटिक्स
@@ -4565,6 +4575,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,छुट्टियों पर उत्पादन की अनुमति
 DocType: Sales Order,Customer's Purchase Order Date,ग्राहक की खरीद आदेश दिनांक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,शेयर पूंजी
+DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक अनुलग्नक दिखाएं
 DocType: Packing Slip,Package Weight Details,पैकेज वजन विवरण
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,भुगतान पूरा होने के बाद चयनित पृष्ठ के लिए उपयोगकर्ता अनुप्रेषित।
@@ -4589,7 +4600,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,$ मुद्राओं की बगल आदि की तरह किसी भी प्रतीक नहीं दिखा.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,छात्र बैच बनाने
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,छात्र बैच बनाने
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,बीओएम से आइटम प्राप्त
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,लीड समय दिन
@@ -4608,7 +4619,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: GL Entry,Is Opening,है खोलने
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: {1} डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,खाते {0} मौजूद नहीं है
 DocType: Account,Cash,नकद
 DocType: Employee,Short biography for website and other publications.,वेबसाइट और अन्य प्रकाशनों के लिए लघु जीवनी.
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index b424a52..740eda0 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Hrpa Stavka isteka Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Pokaži varijante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Pokaži varijante
 DocType: Academic Term,Academic Term,Akademski pojam
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materijal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Količina
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (dani)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,usluga Rashodi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista tvrtka je ušao više od jednom
 DocType: Employee,Married,Oženjen
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dopušteno {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nije dopušteno {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Nabavite stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nema navedenih stavki
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 DocType: Process Payroll,Make Bank Entry,Provjerite banke unos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Mirovinski fondovi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija Datum ne može biti prije Datum kupnje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija Datum ne može biti prije Datum kupnje
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mjesečna distribucija ** pomaže vam rasporediti proračun / Target preko mjeseca, ako imate sezonalnost u Vašem poslovanju."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nije pronađen stavke
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nije pronađen stavke
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktura plaća Nedostaje
 DocType: Lead,Person Name,Osoba ime
 DocType: Sales Invoice Item,Sales Invoice Item,Prodajni proizvodi
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Sveučilište&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,dionica izvješća
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam završetka ne može biti kasnije od godine datum završetka školske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je nepokretne imovine&quot; ne može biti potvrđen, što postoji imovinom rekord protiv stavku"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je nepokretne imovine&quot; ne može biti potvrđen, što postoji imovinom rekord protiv stavku"
 DocType: Vehicle Service,Brake Oil,ulje za kočnice
 DocType: Tax Rule,Tax Type,Porezna Tip
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Broj sati / 60) * Stvarno trajanje operacije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Odaberi BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Odaberi BOM
 DocType: SMS Log,SMS Log,SMS Prijava
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih stavki
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Odmor na {0} nije između Od Datum i do sada
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Razred
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučio dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Proizvodnja Red je već stvorio za sve stavke s sastavnice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Proizvodnja Red je već stvorio za sve stavke s sastavnice
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Godišnja plaća
 DocType: Daily Work Summary,Daily Work Summary,Dnevni rad Sažetak
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zamrznuta
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zamrznuta
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Odaberite postojeće tvrtke za izradu grafikona o računima
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Troškovi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Odaberite Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra Stupanje
 DocType: Journal Entry Account,Credit in Company Currency,Kredit u trgovačkim društvima valuti
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Želite li ažurirati dolazak? <br> Prisutni: {0} \ <br> Odsutni: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Nabava sirovine za kupnju
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,potreban je najmanje jedan način plaćanja za POS računa.
 DocType: Products Settings,Show Products as a List,Prikaži proizvode kao popis
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite predložak, ispunite odgovarajuće podatke i priložiti izmijenjene datoteke.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Provjerite Amortizacija unos
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Provjerite zaposlenik
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Provjerite zaposlenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifuzija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Pojedinosti o operacijama koje se provode.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan održavanja posjeta.
 DocType: SMS Settings,Enter url parameter for message,Unesite URL parametar za poruke
 DocType: POS Profile,Customer Groups,kupaca Grupe
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Financijska izvješća
 DocType: Guardian,Students,Studenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravila za primjenu cijena i popusta.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Company,Default Payroll Payable Account,Zadana plaće Plaća račun
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Grupa
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Grupa
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenuti ako nestandardni potraživanja računa primjenjivo
 DocType: Course Schedule,Instructor Name,Instruktor Ime
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje dostavnice točke
 ,Production Orders in Progress,Radni nalozi u tijeku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto novčani tijek iz financijskih
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorištenih lišće iz prethodnih dodjela
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno troška Iznos (preko vremenska tablica)
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bankovni tekstova
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Objavi na Hub
 DocType: Student Admission,Student Admission,Studentski Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Proizvod {0} je otkazan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Detalji nabave
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijest putem maila prilikom stvaranja automatskog Zahtjeva za robom
 DocType: Journal Entry,Multi Currency,Više valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Troškovi prodane imovinom
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Ulazak Plaćanje je izmijenjen nakon što ga je izvukao. Ponovno izvucite ga.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
-DocType: Grade Interval,Min Score,min rezultat
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
 DocType: Student Applicant,Admitted,priznao
 DocType: Workstation,Rent Cost,Rent cost
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Vrijednost narudžbe
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Banka / Novac transakcije protiv stranke ili za internog transfera
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ova točka je predložak i ne može se koristiti u prometu. Atributi artikl će biti kopirana u varijanti osim 'Ne Copy ""je postavljena"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ova točka je predložak i ne može se koristiti u prometu. Atributi artikl će biti kopirana u varijanti osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Naručite Smatra
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Odaberite stavku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvori u ne-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Duguje iznos
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Stvaranje grupe učenika
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Salary Slip Timesheet,Working Hours,Radnih sati
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Stvaranje novog kupca
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Stvaranje novog kupca
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Izrada narudžbenice
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Izrada narudžbenice
 ,Purchase Register,Popis nabave
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Troškove u
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Iz paketa broj
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Nije moguće promijeniti način vrednovanja jer postoje transakcije protiv nekih stavki koje nemaju vlastitu metodu vrednovanja
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće izdvojena obvezna
 DocType: Job Opening,Description of a Job Opening,Opis je otvaranju novih radnih mjesta
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Čekanju aktivnosti za danas
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni trošak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Telefon hitne službe
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupiti
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definirajte ocjenu za Prag 0%
 DocType: Sales Order,To Deliver,Za isporuku
 DocType: Purchase Invoice Item,Item,Proizvod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje podugovaranje
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U tijeku Kom
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nije aktivan
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslan na sljedećim brojevima: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Provjera postavljanje dimenzije za ispis
 DocType: Salary Slip,Salary Slip Timesheet,Plaća proklizavanja timesheet
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 DocType: Buying Settings,Purchase Receipt Required,Primka je obvezna
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje stopa je obavezno ako Otvaranje Stock ušao
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje stopa je obavezno ako Otvaranje Stock ušao
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Akumulirani Vrijednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Napravi prodajnu narudžbu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Napravi prodajnu narudžbu
 DocType: Project Task,Project Task,Zadatak projekta
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Nastavi Prilog
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponoviti kupaca
 DocType: Leave Control Panel,Allocate,Dodijeliti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Povrat robe
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Povrat robe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Napomena: Ukupno dodijeljeni lišće {0} ne bi trebala biti manja od već odobrenih lišća {1} za razdoblje
 DocType: Announcement,Posted By,Objavio
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavlja Dobavljač (Drop Ship)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Postavite tvrtku
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Odaberite Račun za plaćanje kako bi Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Stvaranje zaposlenika evidencije za upravljanje lišće, trošak tvrdnje i obračun plaća"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Stvaranje zaposlenika evidencije za upravljanje lišće, trošak tvrdnje i obračun plaća"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj u bazi znanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Ulaz Odbitak
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Odnos s Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Upravitelj
 DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Raspon datuma
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manja od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manja od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Isti predmet je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Temelji se na' i 'Grupiranje po' ne mogu biti isti
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Rezolucija Datum
 DocType: Student Batch Name,Batch Name,Batch Name
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet stvorio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Upisati
 DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Pokazat će student prisutan u Studentskom Mjesečni Attendance Report
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Studentski Gledatelja
 DocType: Sales Invoice Timesheet,Time Sheet,Vrijeme list
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Jedinice za pranje sirovine na temelju
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Unesite Detalji
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pretprodaja
 DocType: Purchase Receipt,Other Details,Ostali detalji
@@ -727,7 +730,7 @@
 ,Absent Student Report,Odsutni Student Report
 DocType: Email Digest,Next email will be sent on:,Sljedeći email će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda pismo Pojam
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Tvrtka {0} ne postoji
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,Datum isteka jamstva
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem Postava&gt; Postavke&gt; Serija za imenovanje
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Odaberite Program
 DocType: Project,Estimated Cost,Procjena cijene
 DocType: Purchase Order,Link to material requests,Link na materijalnim zahtjevima
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nije skladišni proizvod
 DocType: Mode of Payment Account,Default Account,Zadani račun
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni Iznos (Društvo valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Pregled prometa po prodavaču i grupi proizvoda
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-poštu
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nemate dopuštenje
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nisu pronađeni zaposlenici
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentska grupa je već ažurirana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentska grupa je već ažurirana.
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 DocType: Warehouse,Tree Details,stablo Detalji
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Centar Cijena {2} ne pripada Društvu {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Račun {2} ne može biti grupa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka retka {idx}: {DOCTYPE} {DOCNAME} ne postoji u gore &#39;{DOCTYPE}&#39; stol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka retka {idx}: {DOCTYPE} {DOCNAME} ne postoji u gore &#39;{DOCTYPE}&#39; stol
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nema zadataka
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto faktura će biti generiran npr 05, 28 itd"
 DocType: Asset,Opening Accumulated Depreciation,Otvaranje Akumulirana amortizacija
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,Stopa prosječne ponderirane cijene
 DocType: Production Planning Tool,Select Items,Odaberite proizvode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Raspored predmeta
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Raspored predmeta
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za umirovljenje u godinama
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljana galerija
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Sve skupine proizvoda
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Sve skupine proizvoda
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Narudžbenice za plaćanje
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Predviđena količina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Otvaranje &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otvoreni učiniti
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Kom
 DocType: Leave Block List Date,Leave Block List Date,Datum popisa neodobrenih odsustava
 DocType: Pricing Rule,Price or Discount,Cijena i popust
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno odgovarajuće naknade u potvrdi o kupnji stavke stolu mora biti ista kao i Total poreza i naknada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno odgovarajuće naknade u potvrdi o kupnji stavke stolu mora biti ista kao i Total poreza i naknada
 DocType: Sales Team,Incentives,Poticaji
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Dobiti Samo sirovine
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,Komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ulazni račun - predujam
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemijski
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Zadana Banka / Novčani račun će biti automatski ažurira plaće Temeljnica kad je odabran ovaj način rada.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervali za Grade Kodeksa {0} preklapa s intervalima razreda za druge razrede. Provjerite intervali {0} i {1} i pokušajte ponovno
 DocType: BOM,Raw Material Cost(Company Currency),Troškova sirovine (Društvo valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Red # {0}: Stopa ne može biti veća od stope korištene u {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM web stranica predmeta
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati kasnije).
 DocType: Timesheet Detail,Bill,Račun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Sljedeća Amortizacija Datum upisuje kao prošlih dana
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sljedeća Amortizacija Datum upisuje kao prošlih dana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bijela
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Kol nisu dostupni za {4} u skladištu {1} na objavljivanje vrijeme upisa ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Sljedeći datum kontakta
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Unesite račun za promjene visine
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Unesite račun za promjene visine
 DocType: Student Batch Name,Student Batch Name,Studentski Batch Name
 DocType: Holiday List,Holiday List Name,Turistička Popis Ime
 DocType: Repayment Schedule,Balance Loan Amount,Stanje Iznos kredita
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Navedite a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj deprecijaciju
 DocType: Sales Invoice Item,Rate With Margin,Ocijenite s marginom
 DocType: Workstation,Wages,Plaće
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,Naziv organizacije
 DocType: Tax Rule,Shipping State,Državna dostava
 ,Projected Quantity as Source,Planirana količina kao izvor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Uključuje ne-stock predmeta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodajni troškovi
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poštanski broj
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Prodaja Naručite {0} {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Izrada Stock unose
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Unesite Šifra dobiti broj serije
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
 DocType: Employee Loan,Partially Disbursed,djelomično Isplaćeno
-DocType: Grading Structure,Grading System Name,Naziv sustav ocjenjivanja
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavljač baza podataka.
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Troška za stavku s šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plaćanja nije konfiguriran. Provjerite, da li je račun postavljen na način rada platnu ili na POS profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Troška za stavku s šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plaćanja nije konfiguriran. Provjerite, da li je račun postavljen na način rada platnu ili na POS profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti predmet ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daljnje računi mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Navedite barem jedan atribut u tablici Svojstva
 DocType: Announcement,All Students,Svi studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock točka a
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock točka a
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Pogledaj Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Studentski Mobile Ne
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na Vašoj kupnji
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na Vašoj kupnji
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupna količina Pitanje / Prijenos {0} u materijalnim Zahtjevu {1} \ ne može biti veća od tražene količine {2} za točki {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mali
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Broj grupe grupa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupan svih radnih težina bi trebala biti 1. Podesite vage svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
-DocType: Grade Interval,Grade Code,Grade Šifra
+DocType: Grading Scale Interval,Grade Code,Grade Šifra
 DocType: POS Item Group,POS Item Group,POS Točka Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ponavljajući Upto
 DocType: Attendance,HR Manager,HR menadžer
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Odaberite tvrtku
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Odaberite tvrtku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Morate omogućiti košaricu
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Raspon 3
 DocType: Maintenance Schedule Item,No of Visits,Broj pregleda
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark dolazaka
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark dolazaka
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Raspored održavanja {0} postoji protiv {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,upisa studenata
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbroj bodova svih ciljeva trebao biti 100. To je {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontni plan
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
 DocType: Pricing Rule,"Higher the number, higher the priority","Veći broj, veći prioritet"
 ,Purchase Invoice Trends,Trendovi nabavnih računa
 DocType: Employee,Better Prospects,Bolji izgledi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Red # {0}: Šarža {1} ima samo {2} qty. Odaberite drugu seriju koja ima {3} količinu dostupnu ili razdijelite red u više redaka, kako biste ih isporučili / izdali iz više šarži"
 DocType: Vehicle,License Plate,registarska tablica
 DocType: Appraisal,Goals,Golovi
 DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Bankovni saldo
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, tražene kvalifikacije i sl."
 DocType: Journal Entry Account,Account Balance,Bilanca računa
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Porezni Pravilo za transakcije.
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezatvorena fiskalne godine u P &amp; L stanja
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} nije aktivan
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Provjerite Prodaja Narudžbe će vam pomoći planirati svoj rad i isporučiti na vrijeme
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Provjerite Prodaja Narudžbe će vam pomoći planirati svoj rad i isporučiti na vrijeme
 DocType: Quality Inspection,Readings,Očitanja
 DocType: Stock Entry,Total Additional Costs,Ukupno Dodatni troškovi
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Odreskom
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Najam ureda
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke SMS pristupnika
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio !
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,Izvor
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},To {0} sukobi s {1} od {2} {3}
 DocType: Student Attendance Tool,Students HTML,Studenti HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,Datum Napuštanje
 DocType: Pricing Rule,For Price List,Za cjenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Stvaranje vodi
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Stvaranje vodi
 DocType: Maintenance Schedule,Schedules,Raspored
 DocType: Purchase Invoice Item,Net Amount,Neto Iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Programska upisanih
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,kutija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Mogući Dobavljač
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Zadana BOM {0} nije pronađen Projekta {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti se u središtu sustava, dodati sve svoje studente"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti se u središtu sustava, dodati sve svoje studente"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Red # {0}: Datum Razmak {1} ne može biti prije Ček Datum {2}
 DocType: Company,Default Holiday List,Default odmor List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Red {0}: S vremena i na vrijeme od {1} je preklapanje s {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljuje za odmor su praznici. Ne morate se prijaviti za dopust.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno slanje plaćanja Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Novi zadatak
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Napravite citat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Napravite citat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostala izvješća
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Molimo postavite zadanog Platne naplativo račun u Društvu {0}
 DocType: SMS Center,Receiver List,Prijemnik Popis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Traži Stavka
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Konzumira Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,ljestvici
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Prikupiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati Fiskalna godina {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
 DocType: Journal Entry,Entry Type,Ulaz Tip
 ,Customer Credit Balance,Kupac saldo
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studiranje u istom institutu
 DocType: Territory,Territory Manager,Upravitelj teritorija
 DocType: Packed Item,To Warehouse (Optional),Za Warehouse (po izboru)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Plaćeni iznos (Društvo valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Postavke prodaje
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Pogledaj u košaricu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zahtjev za robom korišten za izradu ovog ulaza robe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum obvezna je za novu imovinu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum obvezna je za novu imovinu
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Odvojena grupa za tečajeve za svaku seriju
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Jedna jedinica stavku.
 DocType: Fee Category,Fee Category,Naknada Kategorija
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,P.S-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Centar Cijena je potreban za &quot;dobiti i gubitka računa {2}. Molimo postaviti zadani troška Društva.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Skupina kupaca&gt; Teritorij
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novi Kontakt
 DocType: Territory,Parent Territory,Nadređena teritorija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nije moguće pronaći tečaj za {0} do {1} za ključni datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopusti višestruke prodajne naloge protiv kupca narudžbenice
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupe studenata
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Ne
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Glavni
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varijanta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Glavni
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposlenici HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
 DocType: Employee,Leave Encashed?,Odsustvo naplaćeno?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika Od polje je obavezno
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodijeljeni iznos
@@ -1764,7 +1761,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,procjene
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za proizvod {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uvjet za Pravilo isporuke
-DocType: Grading Structure,Grading Intervals,Ocjenjivanje Intervali
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molim uđite
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Ne mogu overbill za točku {0} u nizu {1} više {2}. Da bi se omogućilo pretjerano naplatu, postavite na kupnju Postavke"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Molimo postavite filter na temelju stavka ili skladište
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijen Skladište je obvezna protiv odbijena točka {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Uplata
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Upravljanje narudžbe
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Upravljanje narudžbe
 DocType: Production Order Operation,Actual Time and Cost,Stvarnog vremena i troškova
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Zahtjev za robom od maksimalnih {0} može biti napravljen za proizvod {1} od narudžbe kupca {2}
 DocType: Employee,Salutation,Pozdrav
 DocType: Course,Course Abbreviation,naziv predmeta
 DocType: Student Leave Application,Student Leave Application,Studentski Ostavite aplikacija
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na pola dana na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Ukupno radno vrijeme ne smije biti veći od max radnog vremena {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Hrpa proizvoda u vrijeme prodaje.
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli ste dupli proizvod. Ispravite i pokušajte ponovno.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,pomoćnik
 DocType: Asset Movement,Asset Movement,imovina pokret
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Novi Košarica
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Novi Košarica
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Proizvod {0} nije serijalizirani proizvod
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 DocType: Vehicle,Wheels,kotači
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Onemogućuje stvaranje vremenskih trupaca protiv radne naloge. Operacije neće biti praćeni protiv proizvodnje Reda
 DocType: Student,Student Mobile Number,Studentski broj mobitela
 DocType: Item,Has Variants,Je Varijante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID serije obvezan je
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID serije obvezan je
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Vehicle Log,Fuel Price,Cijena goriva
 DocType: Budget,Budget,Budžet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun se ne može dodijeliti protiv {0}, kao što je nije prihod ili rashod račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareno
 DocType: Student Admission,Application Form Route,Obrazac za prijavu Route
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Iznos {0} {1} oduzimaju od {2}
 DocType: Employee,Salary Information,Informacije o plaći
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Grupa proizvoda web stranice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite kupaca prihoda
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Poludnevni Datum treba biti između od datuma i datuma
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 ,Vehicle Expenses,Troškovi vozila
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
+DocType: Serial No,Invoice Details,Pojedinosti fakture
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
 DocType: Employee Loan,Loan Amount,Iznos pozajmice
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupa ne-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 DocType: Loan Type,Loan Name,Naziv kredita
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Skladište na kojem držite zalihe odbijenih proizvoda
 DocType: Production Order,Skip Material Transfer,Preskoči prijenos materijala
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}. Ručno stvorite zapis za mjenjačnicu
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sada zadana fiskalna godina. Osvježi preglednik kako bi se promjene aktualizirale.
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Proizvod {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Fiskalna godina** predstavlja poslovnu godinu. Svi računovodstvene stavke i druge glavne transakcije su praćene od **Fiskalne godine**.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 DocType: Student Admission,Eligibility,kvalificiranost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Potencijalni kupci će vam pomoći u posao, dodati sve svoje kontakte, a više kao svoje potencijalne klijente"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Potencijalni kupci će vam pomoći u posao, dodati sve svoje kontakte, a više kao svoje potencijalne klijente"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Odaberite tvrtku ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako se odnosi na sve odjele
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Process Payroll,Fortnightly,četrnaestodnevni
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Uklonite stavku &#39;{0}&#39; i spremanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj timesheets
 DocType: Vehicle Service,Service Item,usluga predmeta
 DocType: Bank Guarantee,Bank Guarantee,Jamstvo banke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazana ako Cjenik nije postavljena
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Navedite zemlju za ovaj Dostava pravilom ili provjeriti Dostava u svijetu
 DocType: Stock Entry,Total Incoming Value,Ukupno Dolazni vrijednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Zaduženja je potrebno
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Zaduženja je potrebno
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik
 DocType: Offer Letter Term,Offer Term,Ponuda Pojam
 DocType: Quality Inspection,Quality Manager,Upravitelj kvalitete
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Unesite primitka dokumenta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Svi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Unesite primitka dokumenta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Svi proizvodi su već fakturirani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 DocType: Project,External,Vanjski
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Radni nalozi Created: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Radni nalozi Created: {0}
 DocType: Branch,Branch,Grana
 DocType: Guardian,Mobile Number,Broj mobitela
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje
@@ -2176,7 +2175,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijski broj {0} nije pronađen
 DocType: Scheduling Tool,Student Batch,Student serije
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Provjerite Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Provjerite Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Pozvani ste da surađuju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Datum bloka
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Primijeni sada
@@ -2198,8 +2197,9 @@
 DocType: SMS Log,Sent To,Poslano Da
 DocType: Payment Request,Make Sales Invoice,Napravi prodajni račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Sljedeća Kontakt Datum ne može biti u prošlosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sljedeća Kontakt Datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za samo kao referenca.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Odaberite šifra serije
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Pogrešna {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Iznos predujma
@@ -2213,7 +2213,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Sastavnice
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,prodavaonice
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,prodavaonice
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
@@ -2229,8 +2229,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Prijenos materijala
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Jeste li što drugo {3} protiv iste {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Iznos računa Odaberi promjene
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Iznos računa Odaberi promjene
 DocType: Purchase Invoice,Price List Currency,Valuta cjenika
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2241,7 +2241,7 @@
 DocType: Budget Account,Budget Account,proračun računa
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
-DocType: Grade Interval,Grade Description,Razred Opis
+DocType: Grading Scale Interval,Grade Description,Razred Opis
 DocType: Stock Entry,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
@@ -2279,7 +2279,7 @@
 DocType: Upload Attendance,Attendance To Date,Gledanost do danas
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Račun za plaćanje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto promjena u potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,kompenzacijski Off
 DocType: Offer Letter,Accepted,Prihvaćeno
@@ -2292,7 +2292,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum za korisnike
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
 DocType: Employee,Previous Work Experience,Radnog iskustva
@@ -2306,7 +2306,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Ime instituta za koju postavljate ovaj sustav.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Sljedeći Radni nalozi stvorili su:
@@ -2329,6 +2329,7 @@
 DocType: Email Digest,How frequently?,Kako često?
 DocType: Purchase Receipt,Get Current Stock,Kreiraj trenutne zalihe
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drvo Bill materijala
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 DocType: Student,Joining Date,Ulazak Datum
 ,Employees working on a holiday,Radnici koji rade na odmor
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Sadašnje
@@ -2429,7 +2430,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Razmak Datum nije spomenuo
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Proizvodnja
 DocType: Guardian,Occupation,Okupacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
 DocType: Sales Invoice,This Document,Ovaj dokument
 DocType: Installation Note Item,Installed Qty,Instalirana kol
@@ -2452,7 +2453,7 @@
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Postavi zadane vrijednosti kao što su tvrtka, valuta, tekuća fiskalna godina, itd."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći jednu seriju koja ispunjava taj uvjet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći jednu seriju koja ispunjava taj uvjet
 DocType: Process Payroll,Select Employees,Odaberite Zaposlenici
 DocType: Opportunity,Potential Sales Deal,Potencijalni Prodaja Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
@@ -2469,7 +2470,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalna POS Profil {0} je već stvoren za tvrtku {1}
 DocType: Purchase Order,Ref SQ,Ref. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zamijenite predmet / BOM u svim sastavnicama
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Prijem dokumenata moraju biti dostavljeni
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Prijem dokumenata moraju biti dostavljeni
 DocType: Purchase Invoice Item,Received Qty,Pozicija Kol
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ne plaća i ne Isporučeno
@@ -2482,7 +2483,7 @@
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Platni spisak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} {1}. Da su {2} u stopu točke, redovi {3} također moraju biti uključeni"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Provjerite korisnika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Provjerite korisnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Unesite valjanu e-adresu
@@ -2494,11 +2495,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Onemogućeno predložak ne smije biti zadani predložak
 DocType: Account,Income Account,Račun prihoda
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Kom
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Prethodna
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studentski Serije vam pomoći pratiti posjećenost, procjene i naknade za učenike"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studentski Serije vam pomoći pratiti posjećenost, procjene i naknade za učenike"
 DocType: Payment Entry,Total Allocated Amount,Ukupni raspoređeni iznos
 DocType: Item Reorder,Material Request Type,Tip zahtjeva za robom
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Temeljnica za plaće iz {0} do {1}
@@ -2521,7 +2523,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
@@ -2531,6 +2533,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Hoće li poslati e-mail o događaju na zaposlenike sa statusom &quot;Otvoreni&quot;
 DocType: Task,Depends on Tasks,Ovisi o poslovima
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Uredi hijerarhiju grupe kupaca.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Prilozi se mogu prikazati bez omogućavanja košarice za kupnju
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novi naziv troškovnog centra
 DocType: Leave Control Panel,Leave Control Panel,Upravljačka ploča odsustava
@@ -2543,11 +2546,10 @@
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nema klizanja plaća je između {0} i {1}
 ,Pending SO Items For Purchase Request,Otvorene stavke narudžbe za zahtjev za kupnju
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Studentski Upisi
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je onemogućen
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je onemogućen
 DocType: Supplier,Billing Currency,Naplata valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra large
@@ -2564,7 +2566,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Početna Istaknuti Proizvodi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Sve grupe za procjenu
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo ime skladišta
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Ukupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritorij
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
@@ -2582,7 +2584,7 @@
 DocType: Price List,Price List Master,Cjenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve prodajnih transakcija može biti označene protiv više osoba ** prodaje **, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,N.K.br.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ostavite samo one prijave sa statusom &quot;Odobreno&quot; i &quot;Odbijeno&quot; može se podnijeti
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Grupa Ime obvezna je u redu {0}
@@ -2674,7 +2676,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Knjiženje na skladištu
 DocType: Vehicle Service,Engine Oil,Motorno ulje
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Employee Loan,Loan Details,zajam Detalji
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završen količina mora biti veća od nule.
@@ -2738,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Skladišta s postojećim transakcije se ne može pretvoriti u skupinu.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,istječe
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj studente
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj studente
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-obrazac br
 DocType: BOM,Exploded_items,Exploded_items
@@ -2802,7 +2804,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Ograničenje Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademska termina s ovim &#39;akademske godine&#39; {0} i &quot;Pojam Ime &#39;{1} već postoji. Molimo izmijeniti ove stavke i pokušati ponovno.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što postoje neki poslovi protiv točki {0}, ne možete promijeniti vrijednost {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što postoje neki poslovi protiv točki {0}, ne možete promijeniti vrijednost {1}"
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijski Ne {0} ne postoji
@@ -2845,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Posljednji dan sljedećeg mjeseca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu Izdavanje nakon 7 dana
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studentski Podnositelj zahtjeva
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumulirana amortizacija računa
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
@@ -2873,7 +2875,7 @@
 DocType: Asset,Item Code,Šifra proizvoda
 DocType: Production Planning Tool,Create Production Orders,Napravi proizvodni nalog
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog negativnog preostali iznos {0}
@@ -2891,7 +2893,7 @@
 DocType: Production Planning Tool,Create Material Requests,Zahtjevnica za nabavu
 DocType: Employee Education,School/University,Škola / Sveučilište
 DocType: Payment Request,Reference Details,Referentni Detalji
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost nakon korisnog vijeka trajanja mora biti manja od bruto iznosa kupnje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost nakon korisnog vijeka trajanja mora biti manja od bruto iznosa kupnje
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Naplaćeni iznos
 DocType: Asset,Double Declining Balance,Dvaput padu Stanje
@@ -2912,19 +2914,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni Iznos ne može biti veća od iznos kredita {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Proizvodnja Narudžba nije stvorio
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Proizvodnja Narudžba nije stvorio
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ne može se promijeniti status studenta {0} je povezan sa studentskom primjene {1}
 DocType: Asset,Fully Depreciated,potpuno amortizirana
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Gledatelja HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali na svoje klijente"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali na svoje klijente"
 DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijski broj i serije
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Zbroj ocjene kriterija za ocjenjivanje treba biti {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Molimo postavite Broj deprecijaciju Rezervirano
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Molimo postavite Broj deprecijaciju Rezervirano
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,"Vrijednost, ili Kol"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
@@ -3052,7 +3054,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentski Grupa
 DocType: Shopping Cart Settings,Quotation Series,Ponuda serija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Molimo izaberite kupca
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Molimo izaberite kupca
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Imovina Centar Amortizacija troškova
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe (kupca)
@@ -3071,19 +3073,18 @@
 DocType: Vehicle,Insurance Details,Detalji osiguranje
 DocType: Account,Payable,Plativ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Unesite razdoblja otplate
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dužnici ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi kupci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto dobit%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto Iznos narudžbe je obavezno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Iznos narudžbe je obavezno
 DocType: Lead,Address Desc,Adresa silazno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Stranka je obvezna
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,tema Naziv
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
-DocType: Grading Structure,Grade Intervals,grade Intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Odaberite prirodu Vašeg poslovanja.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Gdje se odvija proizvodni postupci.
 DocType: Asset Movement,Source Warehouse,Izvor galerija
@@ -3112,6 +3113,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Skupina kupaca&gt; Teritorij
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Molimo postavite zadani {0} u Društvu {1}
 DocType: Cheque Print Template,Starting position from top edge,Početni položaj od gornjeg ruba
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Isti dobavljač je unesen više puta
@@ -3163,7 +3165,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Poredaj Kom
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Trenutni radnih mjesta
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
-DocType: Journal Entry,Write Off,Otpisati
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
 DocType: Timesheet Detail,Operation ID,Operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ID korisnika sustava. Ako je postavljen, postat će zadani za sve HR oblike."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: od {1}
@@ -3174,8 +3176,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja Kupcu
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Obrazac / Artikl / {0}) je out of stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od datum knjiženja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Pokaži porez raspada
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock unosi postoje protiv Skladište {0}, stoga se ne može ponovno dodijeliti ili mijenjati"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nema učenika Pronađeno
@@ -3187,13 +3189,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
 DocType: Program Enrollment,School House,Škola Kuća
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Odaberite Ponude
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Odaberite Ponude
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nema studenata u Zagrebu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodaj još stavki ili otvoriti puni oblik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
@@ -3239,9 +3242,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prije pomirenja
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično naplaćeno
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti Fixed Asset predmeta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti Fixed Asset predmeta
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupni Amt
@@ -3263,7 +3266,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Tečaj cjenika
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,stažista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresa Ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,adresa Ime
 DocType: Stock Entry,From BOM,Od sastavnice
 DocType: Assessment Code,Assessment Code,kod procjena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Osnovni
@@ -3288,7 +3291,7 @@
 DocType: Purchase Invoice,Print Language,Ispis Language
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Stock Entry,Including items for sub assemblies,Uključujući predmeta za sub sklopova
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Proizvodi
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je već upisan.
@@ -3307,16 +3310,14 @@
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
 DocType: Assessment Plan,Supervisor Name,Naziv Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Tečaj za upis na program
-DocType: Grading Structure,Grading Structure,Ocjenjivanje struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava Grad
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ova točka je varijanta {0} (predložak). Značajke će biti kopirana iz predloška, osim ako je postavljen 'Ne Kopiraj'"
 DocType: Notification Control,Customize the Notification,Prilagodi obavijest
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Novčani tijek iz redovnog poslovanja
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
@@ -3339,6 +3340,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije datuma zatvaranja
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molim postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
 DocType: Department,Days for which Holidays are blocked for this department.,Dani za koje su praznici blokirani za ovaj odjel.
@@ -3366,7 +3368,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Quality Inspection,Item Serial No,Serijski broj proizvoda
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Stvaranje zaposlenika Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Stvaranje zaposlenika Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Ukupno Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Računovodstveni izvještaji
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Sat
@@ -3381,7 +3383,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,primljeni iznos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Stvaranje za punu količinu, ignorirajući količine već naručene"
 DocType: Account,Tax,Porez
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neobilježen
@@ -3392,7 +3393,7 @@
 DocType: C-Form,Invoices,Računi
 DocType: Batch,Source Document Name,Izvorni naziv dokumenta
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Stvaranje korisnika
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Stvaranje korisnika
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Pogledajte izvješće razgovora vezanih uz održavanje.
@@ -3403,8 +3404,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Opis web stranice
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Priznanica
 ,Sales Register,Prodaja Registracija
@@ -3415,16 +3416,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
 DocType: Customer Group,Customer Group Name,Naziv grupe kupaca
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Još nema kupaca!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanom tijeku
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Značajke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnje narudžbe Datum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
 DocType: Student,Guardian Details,Guardian Detalji
 DocType: C-Form,C-Form,C-obrazac
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Gledatelja za više radnika
@@ -3449,14 +3452,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;Dugotrajne imovine&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financijske usluge
 DocType: Student Sibling,Student ID,studentska iskaznica
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Evidencije
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
 DocType: Training Event,Exam,Ispit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Državna naplate
@@ -3489,7 +3492,7 @@
 DocType: Payment Entry,Account Paid From,Račun se plaća iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Napravite Olovo
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Napravite Olovo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Ispis i konfekcija
 DocType: Stock Settings,Show Barcode Field,Prikaži Barkod Polje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Pošalji Supplier e-pošte
@@ -3504,6 +3507,7 @@
 DocType: Offer Letter,Awaiting Response,Očekujem odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Iznad
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neispravan atribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Navedite ako je nestandardni račun koji se plaća
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
@@ -3537,7 +3541,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dobiti studenti iz
 DocType: Hub Settings,Seller Country,Prodavač Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavi stavke na web stranici
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa vaši učenici u serijama
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa vaši učenici u serijama
 DocType: Authorization Rule,Authorization Rule,Pravilo autorizacije
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,tehnički podaci
@@ -3596,7 +3600,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Povrat / odobrenje kupcu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Povrat / odobrenje kupcu
 DocType: Stock Settings,Auto insert Price List rate if missing,"Ako ne postoji, automatski ubaciti cjenik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: Production Order Item,Transferred Qty,prebačen Kol
@@ -3637,6 +3641,7 @@
 ,Sales Funnel,prodaja dimnjak
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Naziv je obavezan
 DocType: Project,Task Progress,Zadatak Napredak
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kolica
 ,Qty to Transfer,Količina za prijenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
@@ -3669,7 +3674,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u retku {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,prikupiti naknade
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravila za dodavanje troškova prijevoza.
 DocType: Item,Opening Stock,Otvaranje Stock
@@ -3688,7 +3693,7 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
 DocType: Hub Settings,Name Token,Naziv tokena
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
@@ -3699,7 +3704,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Naziv projekta
-DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
+DocType: Customer,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Production Order,Required Items,potrebne stavke
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
@@ -3729,6 +3734,7 @@
 DocType: Item,Taxes,Porezi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Plaćeni i nije isporučena
 DocType: Project,Default Cost Center,Zadana troškovnih centara
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem Postava&gt; Postavke&gt; Serija za imenovanje
 DocType: Bank Guarantee,End Date,Datum završetka
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock transakcije
 DocType: Budget,Budget Accounts,Proračun računa
@@ -3793,7 +3799,7 @@
 DocType: Customer,Sales Partner and Commission,Prodaja partner i komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatna stopa (%) / godina
 ,Project Quantity,Projekt Količina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &#39;Podijeliti optužbi na temelju&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &#39;Podijeliti optužbi na temelju&#39;"
 DocType: Opportunity,To Discuss,Za Raspravljajte
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinica {1} potrebna u {2} za dovršetak ovu transakciju.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatna stopa (%) godišnje
@@ -3816,7 +3822,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnice # {1} bi trebao biti jednak odabranoj valuti {2}
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag linija
 DocType: Fee Component,Fee Component,Naknada Komponenta
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Mornarički menađer
@@ -3833,7 +3839,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Skladište {0} ne postoji
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrirajte se za ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni postotci distribucije
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa Vrednovanje nije pronađen u točki {0}, koji je potreban za napraviti računovodstvene stavke za {1} {2}. Ako je stavka prijenosom kao stavka uzorka u {1}, molimo napomenuti da u {1} tačka stola. Inače, stvoriti dolazni transakciju dionica za brzinu vrednovanja stavki ili spomenuti u stavku zapis, a zatim pokušajte priloženog / otkazivanja ovaj unos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% robe od ove otpremnice je isporučeno
 DocType: Project,Customer Details,Korisnički podaci
@@ -3850,7 +3856,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Upravljanje kvalitetom
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućen
 DocType: Employee Loan,Repay Fixed Amount per Period,Vratiti fiksni iznos po razdoblju
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
@@ -3876,7 +3882,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student ID e-pošte
 DocType: Employee,Notice (days),Obavijest (dani)
 DocType: Tax Rule,Sales Tax Template,Porez Predložak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Odaberite stavke za spremanje račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Odaberite stavke za spremanje račun
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Podešavanje
@@ -3909,6 +3915,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Terećenju Izdano
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} imovine ne može se prenijeti
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ova stavka je varijanta od {0} (Predložak).
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 DocType: Announcement,Announcement,Obavijest
@@ -3924,7 +3931,7 @@
 DocType: Account,Receivable,potraživanja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Odaberite stavke za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Odaberite stavke za proizvodnju
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
 DocType: Item,Material Issue,Materijal Issue
 DocType: Hub Settings,Seller Description,Prodavač Opis
@@ -3937,7 +3944,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Salary Detail,Component,sastavni dio
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji za ocjenu Grupa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje za akumuliranu amortizaciju mora biti manja od jednaka {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje za akumuliranu amortizaciju mora biti manja od jednaka {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
@@ -3971,7 +3978,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Pridružiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Employee Loan,Repay from Salary,Vrati iz plaće
 DocType: Leave Application,LAP/,KRUG/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Zahtjev za isplatu od {0} {1} za iznos {2}
@@ -3989,7 +3996,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Procjena Detalj Rezultat
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenika
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dvostruki stavke skupina nalaze se u tablici stavke grupe
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3998,7 +4005,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Skladište {0} nije povezan s bilo kojim računom, stvoriti / povezati odgovarajući (imovina) račun za skladište."
 DocType: Purchase Invoice,Recurring Id,Ponavljajući Id
 DocType: Customer,Sales Team Details,Detalji prodnog tima
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Brisanje trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Brisanje trajno?
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Pogrešna {0}
@@ -4009,13 +4016,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Postavite svoj škola u ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baza Promjena Iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni naziv
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Maksimalni popust (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Iznos zadnje narudžbe
+DocType: Task,Is Milestone,Je li Milestone
 DocType: Daily Work Summary,Email Sent To,Mail poslan
 DocType: Budget,Warn,Upozoriti
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
@@ -4048,11 +4056,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` Freeze Dionice starije od ` bi trebao biti manji od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Predložak poreza pri nabavi
 ,Project wise Stock Tracking,Projekt mudar Stock Praćenje
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Stvarni Kol (na izvoru / ciljne)
 DocType: Item Customer Detail,Ref Code,Ref. Šifra
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidencija zaposlenih.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
 DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Naručiti
@@ -4075,7 +4082,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekovi i depozita pogrešno izbrisani
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
 DocType: Purchase Invoice Item,Price List Rate,Stopa cjenika
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Stvaranje kupaca citati
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Stvaranje kupaca citati
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokaži ""raspoloživo"" ili ""nije raspoloživo"" na temelju trentnog stanja na skladištu."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Sastavnice (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme potrebno od strane dobavljača za isporuku
@@ -4097,7 +4104,7 @@
 DocType: Asset,Disposal Date,Datum Odlaganje
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mail će biti poslan svim aktivnim zaposlenicima Društva u određeni sat, ako oni nemaju odmora. Sažetak odgovora će biti poslan u ponoć."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Povratne informacije trening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tečaj je obavezan u redu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Uredi cijene
 DocType: Batch,Parent Batch,Roditeljska šarža
 DocType: Cheque Print Template,Cheque Print Template,Ček Predložak Ispis
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
@@ -4149,7 +4156,7 @@
 DocType: Item,Variant Based On,Varijanta na temelju
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši dobavljači
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač Dio Ne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada je kategorija za &quot;vrednovanje&quot; ili &quot;Vaulation i ukupni &#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Primljeno od
@@ -4159,7 +4166,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} od {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Red {0}: Sati vrijednost mora biti veća od nule.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
@@ -4168,20 +4175,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Payment Reconciliation,From Invoice Date,Iz dostavnice Datum
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Valuta naplate mora biti jednaka Zadano comapany je valuta ili stranke valutu
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Valuta naplate mora biti jednaka Zadano comapany je valuta ili stranke valutu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Ostavi naplate
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Što učiniti ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladište
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Svi Studentski Upisi
 ,Average Commission Rate,Prosječna provizija
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
 DocType: School House,House Name,Ime kuća
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Ažuriranje dodatne troškove za izračun sletio trošak stavke
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Električna
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak svoje organizacije kao svoje korisnike. Također možete dodati pozvati kupce da svoj portal dodajući ih iz Kontakata
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak svoje organizacije kao svoje korisnike. Također možete dodati pozvati kupce da svoj portal dodajući ih iz Kontakata
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
@@ -4190,7 +4197,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Osiguranje Datum početka mora biti manja od osiguranja datum završetka
@@ -4205,7 +4212,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Plaća proklizavanja zaposlenika {0} već stvoren za vremensko listu {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Razdoblje od razdoblja do datuma obvezna za ponavljajućih {0}
@@ -4218,7 +4225,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Radno vrijeme naplate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Zadana BOM za {0} nije pronađena
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Dodirnite stavke da biste ih dodali ovdje
 DocType: Fees,Program Enrollment,Program za upis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
@@ -4316,7 +4324,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Križ Oglas pošiljke u više grupa
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Razmak Datum ažurirana
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4324,6 +4331,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Preuzmite PDF
 DocType: Production Order,Planned End Date,Planirani datum završetka
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Gdje predmeti su pohranjeni.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 DocType: Request for Quotation,Supplier Detail,Dobavljač Detalj
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Dostavljeni iznos
@@ -4368,7 +4376,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Postavljanje jednostavan website za moju organizaciju
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Plaća račun
 DocType: Delivery Note Item,Against Sales Order Item,Protiv prodaje reda točkom
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Unesite roditelj troška
@@ -4425,7 +4433,7 @@
 ,Items To Be Requested,Potraživani proizvodi
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o tvrtki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Odaberite ili dodajte novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Odaberite ili dodajte novi kupac
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Troška potrebno je rezervirati trošak zahtjev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo tog zaposlenog
@@ -4438,13 +4446,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Iznos narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Godina završetka ne može biti prije Početak godine
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Godina završetka ne može biti prije Početak godine
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Production Order,Manufactured Qty,Proizvedena količina
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Postavite zadani popis za odmor za zaposlenika {0} ili poduzeću {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} Ne radi postoji
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} Ne radi postoji
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
@@ -4453,15 +4461,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Središte
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cjenik nije pronađen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Cjenik nije pronađen
 DocType: Employee Loan Application,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Guardian,Guardian,Čuvar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,promijenjen
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Izborni. Postavlja tvrtke zadanu valutu, ako nije navedeno."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Knjigovodstvene temeljnice
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
@@ -4498,7 +4508,7 @@
 DocType: Hub Settings,Hub Settings,Hub Postavke
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
 DocType: Asset,Is Existing Asset,Je Postojeći Imovina
 DocType: Salary Detail,Statistical Component,Statistička komponenta
 ,Monthly Salary Register,Mjesečna plaća Registracija
@@ -4552,7 +4562,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pričvrstite Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Razine
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Napravite varijanta
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Vrsta plaćanja mora biti jedan od primati, platiti i unutarnje prijenos"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analitika
@@ -4565,6 +4575,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite proizvodnje na odmor
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapital
+DocType: Shopping Cart Settings,Show Public Attachments,Prikaži javne privitke
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka plaćanja preusmjeriti korisnika na odabranu stranicu.
@@ -4589,7 +4600,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Provjerite Student Hrpa
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Provjerite Student Hrpa
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
@@ -4608,7 +4619,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molim postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Račun {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i drugih publikacija.
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 995239f..2b6f5c1 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Kötegelt tétel Lejárat állapota
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank tervezet
 DocType: Mode of Payment Account,Mode of Payment Account,Fizetési számla módja
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mutassa a változatokat
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mutassa a változatokat
 DocType: Academic Term,Academic Term,Akadémia szemeszter
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Anyag
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Mennyiség
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Egészségügyi ellátás
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Fizetési késedelem (napok)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Szolgáltatás költsége
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorszám: {0} már hivatkozott Értékesítési számlák: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Pénzügyi év {0} szükséges
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Hírdet
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ugyanez a vállalat szerepel többször
 DocType: Employee,Married,Házas
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nem engedélyezett erre {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nem engedélyezett erre {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Tételeket kér le innen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Kérjük beállítási Alkalmazott névadási rendszerben Emberi Erőforrás&gt; HR beállítások
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Gyártmány {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nincsenek listázott elemek
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Olvasás 1
 DocType: Process Payroll,Make Bank Entry,Banki bejegyzés generálás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Következő értékcsökkenés dátuma nem lehet korábbi a vásárlás dátumánál
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Következő értékcsökkenés dátuma nem lehet korábbi a vásárlás dátumánál
 DocType: SMS Center,All Sales Person,Összes értékesítő
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"* Havi Felbontás** segít felbontani a Költségvetést / Célt a hónapok között, ha vállalkozásod szezonális."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nem talált tételeket
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nem talált tételeket
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Bérrendszer Hiányzó
 DocType: Lead,Person Name,Személy neve
 DocType: Sales Invoice Item,Sales Invoice Item,Kimenő értékesítési számla tételei
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","pl. ""általános iskola"" vagy ""egyetem"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Készlet jelentések
 DocType: Warehouse,Warehouse Detail,Raktár részletek
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeretet már átlépte az ügyfél {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeretet már átlépte az ügyfél {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A feltétel végső dátuma nem lehet későbbi, mint a tanév év végi időpontja, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
 DocType: Vehicle Service,Brake Oil,Fékolaj
 DocType: Tax Rule,Tax Type,Adónem
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nincs engedélye bejegyzés hozzáadására és frissítésére előbb mint: {0}
 DocType: BOM,Item Image (if not slideshow),Tétel Kép (ha nem slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Az Ügyfél már létezik ezen a néven
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Óra érték / 60) * aktuális üzemidő
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Válasszon Anyagj
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Válasszon Anyagj
 DocType: SMS Log,SMS Log,SMS napló
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Költségét a szállított tételeken
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ez az ünnep: {0} nincs az induló és a végső dátum közt
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Osztály
 DocType: Sales Invoice Item,Delivered By Supplier,Beszállító által szállított
 DocType: SMS Center,All Contact,Összes Kapcsolattartó
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Gyártási rendelés már létrehozott valamennyi tételre egy Anyagjegyzékkel
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Gyártási rendelés már létrehozott valamennyi tételre egy Anyagjegyzékkel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Éves Munkabér
 DocType: Daily Work Summary,Daily Work Summary,Napi munka összefoglalása
 DocType: Period Closing Voucher,Closing Fiscal Year,Pénzügyi év záró
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} fagyasztott
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} fagyasztott
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Kérjük, válassza ki, meglévő vállakozást a számlatükör létrehozásához"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Készlet költségek
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Cél Raktár kiválasztása
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Ellen jegyzés
 DocType: Journal Entry Account,Credit in Company Currency,Követelés a vállalkozás pénznemében
 DocType: Delivery Note,Installation Status,Telepítés állapota
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Szeretné frissíteni részvétel? <br> Jelen: {0} \ <br> Hiányzik: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiségnek meg kell egyeznie a {0} tétel beérkezett mennyiségével
 DocType: Request for Quotation,RFQ-,AJK-
 DocType: Item,Supply Raw Materials for Purchase,Nyersanyagok beszállítása beszerzéshez
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,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.
 DocType: Products Settings,Show Products as a List,Megmutatása a tételeket listában
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Töltse le a sablont, töltse ki a megfelelő adatokat és csatolja a módosított fájlt. Minden időpont és alkalmazott kombináció a kiválasztott időszakban bekerül a sablonba, a meglévő jelenléti ívekkel együtt"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ÉCS bejegyzés generálás
 DocType: Appraisal Template Goal,KRA,TÉSABL
 DocType: Lead,Request Type,Kérés típusa
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Alkalmazot létrehozás
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Alkalmazot létrehozás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Hírállomás
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Végrehajtás
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Részletek az elvégzett műveletekethez.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Tervet karbantartási ellenőrzés.
 DocType: SMS Settings,Enter url parameter for message,Adjon url paramétert üzenethez
 DocType: POS Profile,Customer Groups,Vevőcsoportok
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Pénzügyi kimutatások
 DocType: Guardian,Students,Tanulók
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Alkalmazási szabályainak árképzés és kedvezmény.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Árlistát alkalmazni kell vagy beszerzésre vagy eladásra
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},"Előleg összege nem lehet nagyobb, mint {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
 DocType: Company,Default Payroll Payable Account,Alapértelmezett Bér fizetendő számla
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Email csoport frissítés
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Email csoport frissítés
 DocType: Sales Invoice,Is Opening Entry,Ez kezdő könyvelési tétel
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Megemlít, ha nem szabványos bevételi számla  alkalmazandó"
 DocType: Course Schedule,Instructor Name,Oktató neve
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési tétel számlák
 ,Production Orders in Progress,Folyamatban lévő gyártási rendelések
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettó pénzeszközök a pénzügyről
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Helyi-tároló megtelt, nem menti"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Helyi-tároló megtelt, nem menti"
 DocType: Lead,Address & Contact,Cím & Kapcsolattartó
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adja hozzá a fel nem használt távoléteket a korábbi elhelyezkedésből
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Következő ismétlődő: {0} ekkor jön létre {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Összes költség összeg ((Idő nyilvántartó szerint)
 DocType: Item Website Specification,Item Website Specification,Tétel weboldal adatai
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Távollét blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank bejegyzések
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Készlet egyeztetés tétele
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,Közzéteszi a Hubon
 DocType: Student Admission,Student Admission,Tanuló Felvételi
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} tétel törölve
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} tétel törölve
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Végső dátum frissítése
 DocType: Item,Purchase Details,Beszerzés adatai
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Email értesítő létrehozása automatikus Anyag igény létrehozásához
 DocType: Journal Entry,Multi Currency,Több pénznem
 DocType: Payment Reconciliation Invoice,Invoice Type,Számla típusa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Szállítólevél
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Szállítólevél
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Adók beállítása
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Eladott eszközök költsége
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetés megadása módosításra került, miután lehívta. Kérjük, hívja le újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
-DocType: Grade Interval,Min Score,min. pontszám
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
 DocType: Student Applicant,Admitted,Belépést nyer
 DocType: Workstation,Rent Cost,Bérleti díj
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Megrendelési érték
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank/készpénz tranzakciókat ügyfélfél vagy belső átutalás szerint
 DocType: Shipping Rule,Valid for Countries,Érvényes ezekre az országokra
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ez a tétel egy sablon, és nem lehet használni a tranzakciókhoz. Elem Jellemzők át lesznek másolva a különböző variációkra, kivéve, ha be van állítva a 'Ne másolja'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ez a tétel egy sablon, és nem lehet használni a tranzakciókhoz. Elem Jellemzők át lesznek másolva a különböző variációkra, kivéve, ha be van állítva a 'Ne másolja'"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Összes Megrendelés ami annak Tekinthető
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Alkalmazott Titulus (pl vezérigazgató, igazgató stb)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Kérjük, írja be a 'Ismételje a hónap ezen napján' mező értékét"
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,Adókulcs
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített a  {1} Alkalmazotthoz a {2} -től {3} -ig időszakra
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Tétel kiválasztása
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Beszállítói számla: {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Beszállítói számla: {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Köteg számnak egyeznie kell ezzel {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Átalakítás nem-csoporttá
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,A Köteg több Tétel összessége.
 DocType: C-Form Invoice Detail,Invoice Date,Számla dátuma
 DocType: GL Entry,Debit Amount,Tartozás összeg
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nem lehet csak 1 fiók vállalatonként ebben {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nem lehet csak 1 fiók vállalatonként ebben {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Kérjük, nézze meg a mellékletet"
 DocType: Purchase Order,% Received,% fogadva
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Készítsen Diákcsoportokat
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Ajánlatkérés
 DocType: Salary Slip Timesheet,Working Hours,Munkaidő
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszámot egy meglévő sorozatban.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Hozzon létre egy új Vevőt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Hozzon létre egy új Vevőt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ha több árképzési szabály továbbra is fennáll, a felhasználók fel lesznek kérve, hogy a kézi prioritás beállítással orvosolják a konfliktusokat."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Beszerzési megrendelés létrehozása
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Beszerzési megrendelés létrehozása
 ,Purchase Register,Beszerzési Regisztráció
 DocType: Course Scheduling Tool,Rechedule,Újraidőzítés
 DocType: Landed Cost Item,Applicable Charges,Alkalmazandó díjak
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamatra.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
 DocType: HR Settings,Employee record is created using selected field. ,Alkalmazott rekord jön létre a kiválasztott mezővel.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Távollét törzsadat.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,Csomag számból
 DocType: Item Attribute,To Range,Tartományhoz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nem lehet megváltoztatni értékelési módszert, mivel vannak tranzakciókat olyan tételek, amelyek nem hogy a saját értékelési módszer"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Összes kötelezően kiosztott távollétek
 DocType: Job Opening,Description of a Job Opening,Leírás egy Állásajánlathoz
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Függő tevékenységek mára
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja meg a Raktárat, amelyekre anyag igénylés keletkezett"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Egyesítéshez, a következő tulajdonságoknak meg kell egyeznie mindkét tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Egyesítéshez, a következő tulajdonságoknak meg kell egyeznie mindkét tételnél"
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Vásárol
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Kérjük adja meg a küszöb fokozatát 0%
 DocType: Sales Order,To Deliver,Szállít
 DocType: Purchase Invoice Item,Item,Tétel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Széria sz. tétel nem lehet egy törtrész
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Széria sz. tétel nem lehet egy törtrész
 DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
 DocType: Account,Profit and Loss,Eredménykimutatás
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Alvállalkozói munkák kezelése
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
 DocType: Production Plan Item,Pending Qty,Folyamatban db
 DocType: Budget,Ignore,Mellőz
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nem aktív
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nem aktív
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},Küldött SMS alábbi telefonszámokon: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Csekk méretek telepítése a nyomtatáshoz
 DocType: Salary Slip,Salary Slip Timesheet,Bérpapirok munkaidő jelenléti ívei
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,Teljes Jutalék
 DocType: Pricing Rule,Sales Partner,Értékesítő partner
 DocType: Buying Settings,Purchase Receipt Required,Beszerzési megrendelés nyugta kötelező
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Készletérték ár kötelező, ha nyitási készletet felvitt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Készletérték ár kötelező, ha nyitási készletet felvitt"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nem talált bejegyzést a számlatáblázat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Kérjük, válasszon Vállalkozást és Ügyfél típust először"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Halmozott értékek
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Széria sz. nem lehet összevonni,"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Vevői rendelés létrehozás
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Vevői rendelés létrehozás
 DocType: Project Task,Project Task,Projekt téma feladat
 ,Lead Id,Érdeklődés ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,Folytatás Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlók
 DocType: Leave Control Panel,Allocate,Feloszott
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Eladás visszaküldése
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Eladás visszaküldése
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Megjegyzés: Az összes kijelölt távollét: {0} nem lehet kevesebb, mint a már jóváhagyott távollétek: {1} erre az időszakra"
 DocType: Announcement,Posted By,Általa rögzítve
 DocType: Item,Delivered by Supplier (Drop Ship),Beszállító által közvetlenül vevőnek szállított (Drop Ship)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Nyitó (Követ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Kérjük, állítsa be a Vállalkozást"
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Kimenő értékesítési számlák Munkaidő jelenléti ív nyilvántartója
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Válasszon Fizetési számlát, banki tétel bejegyzéshez"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Készítsen Munkavállaló nyilvántartásokat a távollétek, költségtérítési igények és a bér kezeléséhez"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Készítsen Munkavállaló nyilvántartásokat a távollétek, költségtérítési igények és a bér kezeléséhez"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Hozzáadás a tudásbázishoz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pályázatírás
 DocType: Payment Entry Deduction,Payment Entry Deduction,Fizetés megadásának levonása
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Összefüggés Helyettesítő2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menedzser
 DocType: Payment Entry,Payment From / To,Fizetési Honnan / Hova
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Időintervallum
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},"Új hitelkeret kevesebb, mint a jelenlegi fennálló összeget a vevő számára. Hitelkeretnek minimum ennyinek kell lennie {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},"Új hitelkeret kevesebb, mint a jelenlegi fennálló összeget a vevő számára. Hitelkeretnek minimum ennyinek kell lennie {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Ugyanaz a tételt már többször megjelenik.
 DocType: SMS Settings,Receiver Parameter,Vevő Paraméter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Az 'Ez alapján' 'és a 'Csoport szerint' nem lehet azonos
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,Megoldás dátuma
 DocType: Student Batch Name,Batch Name,Köteg neve
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Beiratkozás
 DocType: Selling Settings,Customer Naming By,Vevő elnevezés típusa
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Megmutatja a hallgatót mint jelenlévőt a  Hallgató havi résztvételi jelentésben
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,Tanuló Nézőszám
 DocType: Sales Invoice Timesheet,Time Sheet,Jelenléti ív
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Visszatartandó nyersanyagok ez alapján
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Kérjük, adja meg a tétel részleteit"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Kérjük, adja meg a tétel részleteit"
 DocType: Interest,Interest,Érdek
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Értékesítés előtt
 DocType: Purchase Receipt,Other Details,Egyéb részletek
@@ -726,7 +729,7 @@
 ,Absent Student Report,Jelentés a hiányzó tanulókról
 DocType: Email Digest,Next email will be sent on:,A következő emailt ekkor küldjük:
 DocType: Offer Letter Term,Offer Letter Term,Ajánlati levél feltétele
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Tétel {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Vállalkozás {0} nem létezik
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,Garancia lejárati dátuma
 DocType: Material Request Item,Quantity and Warehouse,Mennyiség és raktár
 DocType: Sales Invoice,Commission Rate (%),Jutalék mértéke (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa be az elnevezés sorozatot ehhez {0} a Telepítés &gt; Beállítások&gt; elnevezés sorozatok alatt"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Kérjük, válassza ki a Program"
 DocType: Project,Estimated Cost,Becsült költség
 DocType: Purchase Order,Link to material requests,Hivatkozás az anyagra kérésekre
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nem Készletezhető tétel
 DocType: Mode of Payment Account,Default Account,Alapértelmezett számla
 DocType: Payment Entry,Received Amount (Company Currency),Beérkezett összeg (Vállalkozás pénzneme)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Érdeklődést kell beállítani, ha a Lehetőséget az Érdeklődésből hozta létre"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Érdeklődést kell beállítani, ha a Lehetőséget az Érdeklődésből hozta létre"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Kérjük, válassza ki a heti munkaszüneti napot"
 DocType: Production Order Operation,Planned End Time,Tervezett befejezési idő
 ,Sales Person Target Variance Item Group-Wise,Értékesítői Cél Variance tétel Group-Wise
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Árlista nincs kiválasztva
 DocType: Employee,Family Background,Családi háttér
 DocType: Request for Quotation Supplier,Send Email,E-mail küldése
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nincs jogosultság
 DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Az Ügyfél alapján kiszűrni, válasszuk ki az Ügyfél típpust először"
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Egyetlen Alkalmazottat sem talált
 DocType: Supplier Quotation,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba kiadva egy beszállítóhoz
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Diák csoport már frissítve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Diák csoport már frissítve.
 DocType: SMS Center,All Customer Contact,Összes vevői Kapcsolattartó
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Készlet egyenlege feltöltése csv fájlon keresztül.
 DocType: Warehouse,Tree Details,fa Részletek
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimális Számla összege
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Költséghely {2} nem tartozik ehhez a vállalkozáshoz {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: fiók {2} nem lehet csoport
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Tétel sor {idx}: {doctype} {docname} nem létezik a fenti '{doctype}' táblában
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Jelenléti ív {0} már befejezett vagy törölt
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Tétel sor {idx}: {doctype} {docname} nem létezik a fenti '{doctype}' táblában
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Jelenléti ív {0} már befejezett vagy törölt
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nincsenek feladatok
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","A hónap napja, amelyen a számla automatikusan jön létre pl 05, 28 stb"
 DocType: Asset,Opening Accumulated Depreciation,Nyitva halmozott ÉCS
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,Mozgóátlag ár
 DocType: Production Planning Tool,Select Items,Válassza ki a tételeket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} a  {2} dátumú  {1} Ellenszámla
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Tanfolyam menetrend
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Tanfolyam menetrend
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
 DocType: HR Settings,Enter retirement age in years,Adja meg a nyugdíjkorhatárt (év)
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Cél raktár
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Szállítás címzettnek vagy átvétel nyugtázás engedélyezése eddig a százalékig
 DocType: Stock Entry,STE-,KÉSZLBEJ-
 DocType: Upload Attendance,Import Attendance,Jelenlét Import
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Összes tétel csoport
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Összes tétel csoport
 DocType: Process Payroll,Activity Log,Tevékenység napló
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Nettó nyereség / veszteség
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikusan ír üzenetet a benyújtott  tranzakciókra.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Beszerzési Megrendelést Kifizetésre
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Tervezett mennyiség
 DocType: Sales Invoice,Payment Due Date,Fizetési határidő
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Nyitás"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Nyitott teendő
 DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,Újra-rendelési szint  mennyiség
 DocType: Leave Block List Date,Leave Block List Date,Távollét blokk lista dátuma
 DocType: Pricing Rule,Price or Discount,Árazás vagy engedmény
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Összesen alkalmazandó díjak a vásárlási nyugta tételek táblázatban egyeznie kell az Összes adókkal és illetékekkel
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Összesen alkalmazandó díjak a vásárlási nyugta tételek táblázatban egyeznie kell az Összes adókkal és illetékekkel
 DocType: Sales Team,Incentives,Ösztönzők
 DocType: SMS Log,Requested Numbers,Kért számok
 DocType: Production Planning Tool,Only Obtain Raw Materials,Csak nyersanyagokat szerezhet be
@@ -915,7 +917,7 @@
 DocType: Serial No,Incoming Rate,Bejövő ár
 DocType: Packing Slip,Gross Weight,Bruttó súly
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,"A vállalkozásának a neve, amelyre ezt a rendszert beállítja."
-DocType: HR Settings,Include holidays in Total no. of Working Days,Tartalmazza az ünnepnapokat a munkanapok számának összege
+DocType: HR Settings,Include holidays in Total no. of Working Days,A munkanapok számának összege tartalmazza az ünnepnapokat
 DocType: Job Applicant,Hold,Tart
 DocType: Employee,Date of Joining,Csatlakozás dátuma
 DocType: Naming Series,Update Series,Sorszámozás frissítése
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,Alapértelmezett kifizetendő számlák
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"Alkalmazott {0} nem aktív, vagy nem létezik"
 DocType: Fee Structure,Components,Alkatrészek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Tétel változatok {0} frissített
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Beszállítói előleg számla
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Sor {0}: Fizetés az Vavői/Beszerzési megrendelés ellenében mindig előrefizetéssel kell feltüntetni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Vegyi
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Alapértelmezett Bank / készpénz fiók automatikusan frissül a fizetés naplóbejegyzésben, ha ez a mód a kiválasztott."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Az intervallumok évfolyam kódja: {0} átfedi az évfolyam időközöket más évfolyamon. Kérjük, ellenőrizze időközöket: {0} és {1}, és próbálja újra"
 DocType: BOM,Raw Material Cost(Company Currency),Nyersanyagköltség (Vállakozás pénzneme)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,"Összes tétel már átadott, erre a gyártási rendelésre."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Sor # {0}: Érték nem lehet nagyobb, mint az érték amit ebben használt {1} {2}"
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,Anyagjegyzék honlap tétel
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Kérjük töltse fel levele fejlécét és logo-ját. (Ezeket később szerkesztheti).
 DocType: Timesheet Detail,Bill,Számla
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Következő értékcsökkenés dátumaként múltbeli dátumot tüntettek fel
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Következő értékcsökkenés dátumaként múltbeli dátumot tüntettek fel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Fehér
 DocType: SMS Center,All Lead (Open),Összes Érdeklődés (Nyitott)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Sor {0}: Mennyiség nem áll rendelkezésre {4} raktárban {1} a kiküldetés idején a bejegyzést ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Megrendelni típusa ezek közül kell legyen: {0}
 DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Nyitó Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz mennyiséghez"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz mennyiséghez"
 DocType: Student Batch Name,Student Batch Name,Tanuló kötegnév
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
 DocType: Repayment Schedule,Balance Loan Amount,Hitel összeg mérlege
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Kérjük adjon meg egy {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
 DocType: Delivery Note,Delivery To,Szállítás címzett
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Jellemzők tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Jellemzők tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Vevő rendelések lekérése
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nem lehet negatív
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Kedvezmény
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Kedvezmény
 DocType: Asset,Total Number of Depreciations,Összes amortizációk száma
 DocType: Sales Invoice Item,Rate With Margin,Érték árkülöbözettel
 DocType: Workstation,Wages,Munkabér
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,Vállalkozás neve
 DocType: Tax Rule,Shipping State,Szállítási állam
 ,Projected Quantity as Source,"Tervezett mennyiségét , mint forrás"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Tételt kell hozzá adni a 'Tételek beszerzése a Beszerzési bevételezések' gomb használatával
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Tételt kell hozzá adni a 'Tételek beszerzése a Beszerzési bevételezések' gomb használatával
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Tartalmazza a nem-készletezett tételeket
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Értékesítési költségek
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Értékesítési költséghely
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Irányítószám
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Irányítószám
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Vevői rendelés {0} az ez {1}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Készlet bejegyzés létrehozás
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,Forgalmazó
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Bevásárló kosár Szállítási szabály
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelést: {0} törölni kell ennek a  Vevői rendelésnek a törléséhez
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az 'Alkalmazzon további kedvezmény ezen'"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az 'Alkalmazzon további kedvezmény ezen'"
 ,Ordered Items To Be Billed,Számlázandó Rendelt mennyiség
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Tartományból távolságnak kisebbnek kell lennie mint a Tartományba
 DocType: Global Defaults,Global Defaults,Általános beállítások
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Kérjük, adja meg a tételkódot, hogy megkapja a köteg számot"
 DocType: Stock Settings,Default Item Group,Alapértelmezett tételcsoport
 DocType: Employee Loan,Partially Disbursed,Részben folyosított
-DocType: Grading Structure,Grading System Name,Osztályozási rendszer neve
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Beszállítói adatbázis.
 DocType: Account,Balance Sheet,Mérleg
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Költséghely tételhez ezzel a tétel kóddal '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Fizetési mód nincs beállítva. Kérjük, ellenőrizze, hogy a fiók be lett állítva a fizetési módon, vagy POS profilon."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Költséghely tételhez ezzel a tétel kóddal '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Fizetési mód nincs beállítva. Kérjük, ellenőrizze, hogy a fiók be lett állítva a fizetési módon, vagy POS profilon."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Az értékesítési személy kap egy emlékeztetőt ezen a napon, az ügyféllel történő kapcsolatfelvételhez,"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Ugyanazt a tételt nem lehet beírni többször.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","További számlákat a Csoportok alatt hozhat létre, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Kész a munka
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Kérjük adjon meg legalább egy Jellemzőt a Jellemzők táblázatban
 DocType: Announcement,All Students,Összes diák
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Tétel: {0} -  Nem készletezhető tételnek kell lennie
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Tétel: {0} -  Nem készletezhető tételnek kell lennie
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Főkönyvi kivonat megtekintése
 DocType: Grading Scale,Intervals,Periódusai
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel csoport létezik azonos névvel, kérjük, változtassa meg az tétel nevét, vagy nevezze át a tétel-csoportot"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel csoport létezik azonos névvel, kérjük, változtassa meg az tétel nevét, vagy nevezze át a tétel-csoportot"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Tanuló Mobil sz.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Köteg
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlát {0}
 DocType: Journal Entry,Get Outstanding Invoices,Fennálló negatív kintlévő számlák lekérdezése
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Vevői rendelés {0} nem érvényes
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Beszerzési megrendelések segítenek megtervezni és követni a beszerzéseket
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Beszerzési megrendelések segítenek megtervezni és követni a beszerzéseket
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","A teljes Probléma / Átvitt mennyiség {0} ebben az Anyaga igénylésben: {1} \ nem lehet nagyobb, mint az igényelt mennyiség: {2} erre a tételre: {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kis
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Törzsadatok szinkronizálása
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,A termékei vagy szolgáltatásai
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,ANYGJZ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoport, és nem lehet szerkeszteni."
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,Csoport regisztrációs száma
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0} -hoz, csak jóváírási számlákat lehet kapcsolni a másik ellen terheléshez"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Összesen feladat súlyozása legyen 1. Kérjük, állítsa a súlyozást minden projekt feladataira ennek megfelelően"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Tétel {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Alap Felszereltség
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabályt először 'Alkalmazza ezen' mező alapján kiválasztott, ami lehet tétel, pont-csoport vagy a márka."
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,Könyvelési tétel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} tétel(ek) folyamatban
 DocType: Workstation,Workstation Name,Munkaállomás neve
-DocType: Grade Interval,Grade Code,Osztály kód
+DocType: Grading Scale Interval,Grade Code,Osztály kód
 DocType: POS Item Group,POS Item Group,POS tétel csoport
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ismétlődő Upto
 DocType: Attendance,HR Manager,HR menedzser
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Kérjük, válasszon egy vállalkozást"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Kérjük, válasszon egy vállalkozást"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Kiváltságos távollét
 DocType: Purchase Invoice,Supplier Invoice Date,Beszállítói számla dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Engedélyeznie kell a bevásárló kosárat
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Élelmiszer
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Öregedés tartomány 3
 DocType: Maintenance Schedule Item,No of Visits,Látogatások száma
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Jelenlét jelölése
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Jelenlét jelölése
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Karbantartási ütemterv {0} létezik erre {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Tanuló regisztráló
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},A záró számla Pénznemének ennek kell lennie: {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Az összes cél pontjainak összege 100 kell legyen. Ez most: {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Számlatükör
 DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulajdon
 DocType: Salary Detail,Depends on Leave Without Pay,Fizetés nélküli távolléttől függ
 DocType: Pricing Rule,"Higher the number, higher the priority","Minél nagyobb a szám, annál nagyobb a prioritás"
 ,Purchase Invoice Trends,Beszerzési számlák alakulása
 DocType: Employee,Better Prospects,Jobb kilátások
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Sor # {0}: A köteg: {1} csak {2} Menny. Kérjük, válasszon egy másik tétel köteget, amelyben {3} Mennyiség elérhető vagy válassza szée a sort több sorrá, szállít / ügy kötegekből"
 DocType: Vehicle,License Plate,Rendszámtábla
 DocType: Appraisal,Goals,Célok
 DocType: Warranty Claim,Warranty / AMC Status,Garancia és éves karbantartási szerződés állapota
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Alkalmazott nem jelent magának.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ha a számla zárolásra került, a bejegyzések engedélyezettek korlátozott felhasználóknak."
 DocType: Email Digest,Bank Balance,Bank mérleg
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},"Könyvelési tétel ehhez {0}: {1}, csak ebben a pénznem végezhető: {2}"
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},"Könyvelési tétel ehhez {0}: {1}, csak ebben a pénznem végezhető: {2}"
 DocType: Job Opening,"Job profile, qualifications required etc.","Munkakör, szükséges képesítések stb"
 DocType: Journal Entry Account,Account Balance,Számla egyenleg
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Adó szabály a tranzakciókra.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mutassa a lezáratlan pénzügyi évben a P&L mérlegeket
 DocType: Shipping Rule,Shipping Account,Szállítási számla
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: fiók {2} inaktív
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Hozzon létre vevői rendeléseket a munkái megtervezéséhez és a pontos, időbeni kiszállításokhoz"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Hozzon létre vevői rendeléseket a munkái megtervezéséhez és a pontos, időbeni kiszállításokhoz"
 DocType: Quality Inspection,Readings,Olvasások
 DocType: Stock Entry,Total Additional Costs,Összes További költségek
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,Értékeléshez
 DocType: Asset Movement,Stock Manager,Készlet menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Forrás raktára kötelező ebben a sorban {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Csomagjegy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Csomagjegy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Iroda bérlés
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMS átjáró telepítése
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importálás nem sikerült!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,Forrás
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mutassa zárva
 DocType: Leave Type,Is Leave Without Pay,Ez fizetés nélküli szabadság
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Vagyoneszköz Kategória kötelező befektetett eszközök tételeire
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Vagyoneszköz Kategória kötelező befektetett eszközök tételeire
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nem talált bejegyzést a fizetési táblázatban
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ez {0} ütközik ezzel {1} ehhez {2} {3}
 DocType: Student Attendance Tool,Students HTML,Tanulók HTML
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,Eltávozás dátuma
 DocType: Pricing Rule,For Price List,Árlistához
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Adminisztratív keresés
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Készítsen érdeklődéseket
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Készítsen érdeklődéseket
 DocType: Maintenance Schedule,Schedules,Ütemezések
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program beiratkozások
 DocType: Sales Invoice Item,Brand Name,Márkanév
 DocType: Purchase Receipt,Transporter Details,Fuvarozó Részletek
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Alapértelmezett raktár szükséges a kiválasztott elemhez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Alapértelmezett raktár szükséges a kiválasztott elemhez
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Doboz
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Lehetséges Beszállító
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,A Szervezet
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,Olvasás 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Alapértelmezett ANYAGJ {0} nem található ehhez a projekt témához {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Garanciális igény a vállalkozás költségén.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","A diákok a rendszer lelkei, összes tanuló hozzáadása"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","A diákok a rendszer lelkei, összes tanuló hozzáadása"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"Sor # {0}: Végső dátuma: {1} nem lehet, a csekk dátuma: {2} előtti"
 DocType: Company,Default Holiday List,Alapértelmezett távolléti lista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Sor {0}: Időtől és időre {1} átfedésben van {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok), amelyre benyújtotta a távollétét azok ünnepnapok. Nem kell igényelni a távollétet."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Küldje el újra a Fizetési E-mailt
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Új feladat
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Árajánlat létrehozás
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Árajánlat létrehozás
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Más jelentések
 DocType: Dependent Task,Dependent Task,Függő feladat
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 ebben a sorban: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 ebben a sorban: {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Távollét típusa {0}, nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbáljon tervezni tevékenységet  X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Születésnapi emlékeztetők kikapcsolása
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Bérszámfejtés fizetendő számlát a cégben: {0}"
 DocType: SMS Center,Receiver List,Vevő lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Tétel keresése
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Tétel keresése
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott mennyiség
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettó készpénz változás
 DocType: Assessment Plan,Grading Scale,Osztályozás időszak
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} amit egynél többször adott meg a konverziós tényező táblázatban
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} amit egynél többször adott meg a konverziós tényező táblázatban
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Már elkészült
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Kifizetési kérelem már létezik: {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Problémás tételek költsége
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Gyűjt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Beszállító Ellenszámla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árlista
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Nem törölheti ezt a Pénzügyi évet: {0}. Pénzügyi év: {0} az alapértelmezett beállítás, a Globális beállításokban"
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
 ,Customer Credit Balance,Vevőkövetelés egyenleg
@@ -1643,7 +1643,7 @@
 DocType: Shipping Rule Country,Shipping Rule Country,Szállítási szabály Ország
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Távollét és jelenlét
 DocType: Maintenance Visit,Partially Completed,Részben befejezett
-DocType: Leave Type,Include holidays within leaves as leaves,Tartalmazzák a távolléteken belül az ünnepnapokat mint távollétek
+DocType: Leave Type,Include holidays within leaves as leaves,Tartalmazzák a távolléteken belül az ünnepnapokat mint távolléteket
 DocType: Sales Invoice,Packed Items,Csomag tételei
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garancia igény ehhez a Széria számhoz
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Cserélje egy adott darabjegyzékre minden más Darabjegyzékeket, ahol alkalmazzák. Ez váltja fel a régi Anyagjegyzék linket, frissíti a költséget és regenerálja  ""Anyagjegyzék robbantott tételek"" tábláját, egy új Anyagjegyzékké"
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,Ugyanabban az intézetben tanul
 DocType: Territory,Territory Manager,Területi igazgató
 DocType: Packed Item,To Warehouse (Optional),Raktárba (választható)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Tétel kód&gt; Tétel Csoport&gt; Márka
 DocType: Payment Entry,Paid Amount (Company Currency),Fizetett összeg (Vállalkozás pénzneme)
 DocType: Purchase Invoice,Additional Discount,További kedvezmény
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Megtekintés a kosárban
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Tétel Hiány jelentés
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súlyt említik, \ nKérlek említsd meg a ""Súly mértékegység"" is"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súlyt említik, \ nKérlek említsd meg a ""Súly mértékegység"" is"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyag igénylést használják ennek a Készlet bejegyzésnek a létrehozásához
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Következő értékcsökkenés dátuma kötelező az új tárgyi eszközhöz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Következő értékcsökkenés dátuma kötelező az új tárgyi eszközhöz
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Külön tanfolyam mindegyik köteg csoportja alapján
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Egy darab a tételből.
 DocType: Fee Category,Fee Category,Díj kategória
@@ -1684,9 +1683,8 @@
 DocType: Course Assessment Criteria,Weightage,Súlyozás
 DocType: Packing Slip,PS-,CSOMJ-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Költséghely szükséges az 'Eredménykimutatás' számlához {2}. Kérjük, állítsa be az alapértelmezett Költséghelyet a Vállalkozáshoz."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Egy vevő csoport létezik azonos névvel, kérjük változtassa meg a Vevő nevét vagy nevezze át a 
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Egy vevő csoport létezik azonos névvel, kérjük változtassa meg a Vevő nevét vagy nevezze át a 
 Vevői csoportot"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Vevő &gt; Vevő csoport&gt; Terület
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Új Kapcsolat
 DocType: Territory,Parent Territory,Szülő Terület
 DocType: Quality Inspection Reading,Reading 2,Olvasás 2
@@ -1713,20 +1711,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Összeegyeztetni JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Túl sok oszlop. Exportálja a jelentést, és nyomtassa ki táblázatkezelő program segítségével."
 DocType: Purchase Invoice Item,Batch No,Kötegszám
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nem található árfolyam: {0} - {1} a legfontosabb dátum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Többszöri Vevő rendelések engedélyezése egy Beszerzési megrendelés ellen
 DocType: Student Group Instructor,Student Group Instructor,Diák csoport oktató
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Helyettesítő2 Mobil szám
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Legfontosabb
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Változat
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Legfontosabb
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Változat
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sorozat számozás előtag beállítása a  tranzakciókhoz
 DocType: Employee Attendance Tool,Employees HTML,Alkalmazottak HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett anyagjegyzék BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablonjához"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett anyagjegyzék BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablonjához"
 DocType: Employee,Leave Encashed?,Távollét beváltása?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség tőle mező kitöltése kötelező
 DocType: Email Digest,Annual Expenses,Éves költségek
 DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Beszerzési rendelés létrehozás
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Beszerzési rendelés létrehozás
 DocType: SMS Center,Send To,Küldés Címzettnek
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nincs elég távollét egyenlege ehhez a távollét típushoz {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Lekötött összeg
@@ -1744,7 +1741,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Értékeléséből
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Ismétlődő sorozatszám lett beírva ehhez a tételhez: {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Egy Szállítási szabály feltételei
-DocType: Grading Structure,Grading Intervals,Osztályozás periódusai
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kérlek lépj be
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nem lehet túlszámlázni a tételt: {0} ebben a sorban: {1} több mint {2}. Ahhoz, hogy a túlszámlázhassa, állítsa be a vásárlás beállításoknál"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Kérjük, adja meg a szűrési feltételt a tétel vagy  Raktár alapján"
@@ -1757,16 +1753,17 @@
 DocType: Authorization Control,Authorization Control,Jóváhagyás vezérlés
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasított Raktár kötelező az elutasított elemhez: {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Fizetés
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Megrendelései kezelése
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Megrendelései kezelése
 DocType: Production Order Operation,Actual Time and Cost,Tényleges idő és költség
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Anyag kérésére legfeljebb {0} tehető erre a tételre {1} erre a Vevői rendelésre {2}
 DocType: Employee,Salutation,Megszólítás
 DocType: Course,Course Abbreviation,Tanfolyam rövidítés
 DocType: Student Leave Application,Student Leave Application,Diák távollét alkalmazás
 DocType: Item,Will also apply for variants,Változatokra is alkalmazni fogja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Vagyoneszköz nem törölhető, mivel ez már {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Vagyoneszköz nem törölhető, mivel ez már {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Alkalmazott {0} félműszakos ekkor {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Teljes munkaidő nem lehet nagyobb, mint a max munkaidő {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Tovább
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Csomag tételek az eladás idején.
 DocType: Quotation Item,Actual Qty,Aktuális menny.
 DocType: Sales Invoice Item,References,Referenciák
@@ -1776,7 +1773,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ismétlődő tételeket adott meg. Kérjük orvosolja, és próbálja újra."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Társult
 DocType: Asset Movement,Asset Movement,Vagyoneszköz mozgás
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,új Kosár
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,új Kosár
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Tétel: {0} nem sorbarendezett tétel
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
 DocType: Vehicle,Wheels,Kerekek
@@ -1808,9 +1805,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Kikapcsolja az idő napló létrehozását a gyártási utasításokon. Műveleteket nem lehet nyomon követni a Gyártási rendeléseken
 DocType: Student,Student Mobile Number,Tanuló mobil szám
 DocType: Item,Has Variants,Vannak változatai
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Már választott ki elemeket innen {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Már választott ki elemeket innen {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Havi Felbontás neve
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Kötegazonosító kötelező
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Kötegazonosító kötelező
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítő
 DocType: Purchase Invoice,Recurring Invoice,Ismétlődő számla
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektek irányítása
@@ -1818,7 +1815,7 @@
 DocType: Budget,Fiscal Year,Pénzügyi év
 DocType: Vehicle Log,Fuel Price,Üzemanyag ár
 DocType: Budget,Budget,Költségkeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,"Befektetett fix eszközöknek, nem készletezhető elemeknek kell lennie."
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,"Befektetett fix eszközöknek, nem készletezhető elemeknek kell lennie."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Költségvetést nem lehet ehhez rendelni: {0}, mivel ez nem egy bevétel vagy kiadás főkönyvi számla"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Elért
 DocType: Student Admission,Application Form Route,Jelentkezési mód
@@ -1849,7 +1846,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Összeg: {0} {1} levonásra ellenéből {2}
 DocType: Employee,Salary Information,Bérinformáció
 DocType: Sales Person,Name and Employee ID,Név és Alkalmazotti azonosító ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal tétel Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Vámok és adók
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot"
@@ -1906,7 +1903,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Törzsvásárlói árbevétele
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'Kiadás jóváhagyó' beosztással kell rendelkeznie
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
 DocType: Asset,Depreciation Schedule,Értékcsökkentési leírás ütemezése
 DocType: Bank Reconciliation Detail,Against Account,Ellen számla
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Félnapos időpontja között kell lennie Dátum és a mai napig
@@ -1923,13 +1920,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellenéből {2} {3}
 ,Quotation Trends,Árajánlatok alakulása
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Tétel Csoport nem említett a tétel törzsadatban erre a tételre: {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
 DocType: Purchase Order,Delivered,Kiszállítva
 ,Vehicle Expenses,Jármű költségek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Várható érték a hasznos élettartam után nagyobbnak kell lennie, vagy egyenlő, mint {0}"
+DocType: Serial No,Invoice Details,Számla részletek
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Várható érték a hasznos élettartam után nagyobbnak kell lennie, vagy egyenlő, mint {0}"
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Az időpont, amikor az ismétlődő számlát meg fogják állítani"
 DocType: Employee Loan,Loan Amount,Hitelösszeg
@@ -1952,7 +1950,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,További kedvezmény összege
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, a tétel egy tárgyi eszköz. Használjon külön sort több menny."
 DocType: Leave Block List Allow,Leave Block List Allow,Távollét blokk lista engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Csoport Csoporton kívülire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportok
 DocType: Loan Type,Loan Name,Hitel neve
@@ -1963,6 +1961,7 @@
 ,Customer Acquisition and Loyalty,Vevőszerzés és hűség
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Raktár, ahol a visszautasított tételek készletezését kezeli"
 DocType: Production Order,Skip Material Transfer,Anyagátadás átugrása
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Nem található árfolyam {0} {1} a legfontosabb dátum {2}. Kérjük, hozzon létre egy pénzváltó rekordot manuálisan"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,A pénzügyi év vége
 DocType: POS Profile,Price List,Árlista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ez most az alapértelmezett Költségvetési Év. Kérjük, frissítse böngészőjét a változtatások életbeléptetéséhez."
@@ -2000,9 +1999,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,"Tétel: {0}, már visszahozták"
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** jelképezi a Költségvetési évet. Minden könyvelési tétel, és más jelentős tranzakciók rögzítése ebben ** Pénzügyi Év **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Érdeklődő címe
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány a  {0} mellékleteten
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány a  {0} mellékleteten
 DocType: Student Admission,Eligibility,Jogosultság
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Vezetékek segít abban, hogy az üzleti, add a kapcsolatokat, és több mint a vezet"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Vezetékek segít abban, hogy az üzleti, add a kapcsolatokat, és több mint a vezet"
 DocType: Production Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
@@ -2041,7 +2040,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Válasszon Vállalkozást...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Hagyja üresen, ha figyelembe veszi az összes szervezeti egységen"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Alkalmazott foglalkoztatás típusa (munkaidős, szerződéses, gyakornok stb)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
 DocType: Process Payroll,Fortnightly,Kéthetenkénti
 DocType: Currency Exchange,From Currency,Pénznemből
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típust és számlaszámot legalább egy sorban"
@@ -2057,7 +2056,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nem lehet kiválasztani az első sorra az 'Előző sor összegére' vagy 'Előző sor Összesen' terhelés típust
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Al tétel nem lehet egy termék csomag. Kérjük, távolítsa el tételt: `{0}' és mentse"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banki ügyletek
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Munkaidő nyilvántartó jelenléti ív hozzáadása
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Munkaidő nyilvántartó jelenléti ív hozzáadása
 DocType: Vehicle Service,Service Item,Szolgáltatás tétel
 DocType: Bank Guarantee,Bank Guarantee,Bankgarancia
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a 'Ütemterv létrehozás', hogy ütemezzen"
@@ -2105,8 +2104,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Az árak nem jelennek meg, ha Árlista nincs megadva"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Kérjük adjon meg egy országot a házhozszállítás szabályhoz vagy ellenőrizze az Egész világra kiterjedő szállítást
 DocType: Stock Entry,Total Incoming Value,Beérkező össz Érték
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Tartozás megterhelése szükséges
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csapatának."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Tartozás megterhelése szükséges
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csapatának."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Beszerzési árlista
 DocType: Offer Letter Term,Offer Term,Ajánlat feltételei
 DocType: Quality Inspection,Quality Manager,Minőségbiztosítási vezető
@@ -2139,14 +2138,14 @@
 DocType: Opportunity,Lost Reason,Elvesztés oka
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Új cím
 DocType: Quality Inspection,Sample Size,Minta mérete
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Kérjük, adjon meg dokumentum átvételt"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Összes tétel már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Kérjük, adjon meg dokumentum átvételt"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Összes tétel már kiszámlázott
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Kérem adjon meg egy érvényes 'Eset számig'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"További költséghelyek hozhatók létre a csoportok alatt, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
 DocType: Project,External,Külső
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Felhasználók és engedélyek
 DocType: Vehicle Log,VLOG.,VIDEÓBLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Gyártási rendelések létrehozva: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Gyártási rendelések létrehozva: {0}
 DocType: Branch,Branch,Ágazat
 DocType: Guardian,Mobile Number,Mobil szám
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Nyomtatás és Márkaépítés
@@ -2155,7 +2154,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Széria sz. {0} nem található
 DocType: Scheduling Tool,Student Batch,Tanuló köteg
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vevői
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Tanuló létrehozás
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Tanuló létrehozás
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ön meghívást kapott ennek a projeknek a közreműködéséhez: {0}
 DocType: Leave Block List Date,Block Date,Zárolás dátuma
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Jelentkezzen most
@@ -2178,8 +2177,9 @@
 DocType: SMS Log,Sent To,Elküldve
 DocType: Payment Request,Make Sales Invoice,Vevői megrendelésre számla létrehozás
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Szoftverek
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Következő megbeszélés dátuma nem lehet a múltban
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Következő megbeszélés dátuma nem lehet a múltban
 DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Válasszon köteg sz.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Érvénytelen {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,BESZSZ-ELLEN-
 DocType: Sales Invoice Advance,Advance Amount,Előleg
@@ -2193,7 +2193,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Eset sz. nem lehet 0
 DocType: Item,Show a slideshow at the top of the page,Mutass egy diavetítést  a lap tetején
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Anyagjegyzékek
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Üzletek
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Üzletek
 DocType: Serial No,Delivery Time,Szállítási idő
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Öregedés ezen alapszik
 DocType: Item,End of Life,Felhasználhatósági idő
@@ -2209,8 +2209,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Anyag Átvitel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a műveletet, a működési költségeket, és adjon meg egy egyedi műveletet a műveletekhez."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ez a dokumentum túlcsordult ennyivel {0} {1} erre a tételre {4}. Létrehoz egy másik {3}  ugyanazon {2} helyett?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Válasszon váltópénz összeg számlát
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Válasszon váltópénz összeg számlát
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználónak mindig választani kell
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
@@ -2221,7 +2221,7 @@
 DocType: Budget Account,Budget Account,Költségvetési elszámolási számla
 DocType: Quality Inspection,Verified By,Ellenőrizte
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nem lehet megváltoztatni a vállalkozás alapértelmezett pénznemét, mert már léteznek tranzakciók. Tranzakciókat törölni kell az alapértelmezett pénznem megváltoztatásához."
-DocType: Grade Interval,Grade Description,Osztály Leírás
+DocType: Grading Scale Interval,Grade Description,Osztály Leírás
 DocType: Stock Entry,Purchase Receipt No,Beszerzési megrendelés nyugta sz.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Foglaló pénz
 DocType: Process Payroll,Create Salary Slip,Bérpapír létrehozása
@@ -2259,7 +2259,7 @@
 DocType: Upload Attendance,Attendance To Date,Részvétel befejezés dátuma
 DocType: Warranty Claim,Raised By,Felvetette
 DocType: Payment Gateway Account,Payment Account,Fizetési számla
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Kérjük, adja meg a vállalkozást a folytatáshoz"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Kérjük, adja meg a vállalkozást a folytatáshoz"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettó Vevői számla tartozások változása
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenzációs Ki
 DocType: Offer Letter,Accepted,Elfogadva
@@ -2272,7 +2272,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Szállítási szabály címkéi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Felhasználói fórum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni az árat, ha az említett ANYGJZ összefügg már egy tétellel"
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
@@ -2286,7 +2286,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Az intézmény neve amelyre ezt a rendszert beállítja.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt zárolt eddig a dátumig, senkinek nincs joga végrehajtani / módosítani a bejegyzést kivéve az alább meghatározott beosztásokkal rendelkezőket."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, a  karbantartási ütemterv létrehozása előtt"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, a  karbantartási ütemterv létrehozása előtt"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt téma állapota
 DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze a törtrészt. (a darab számokhoz)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,A következő gyártási megrendelések jöttek létre:
@@ -2309,6 +2309,7 @@
 DocType: Email Digest,How frequently?,Milyen gyakran?
 DocType: Purchase Receipt,Get Current Stock,Aktuális raktárkészlet lekérés
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Fa az Anyagjegyzékekhez
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Termék kód&gt; Elem Csoport&gt; Márka
 DocType: Student,Joining Date,Csatlakozási dátum
 ,Employees working on a holiday,Alkalmazott ünnepen is dolgozik
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Jelenlévőnek jelöl
@@ -2389,7 +2390,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Végső dátum nem szerepel
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Gyártás
 DocType: Guardian,Occupation,Foglalkozása
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Összesen(db)
 DocType: Sales Invoice,This Document,Ez a dokumentum
 DocType: Installation Note Item,Installed Qty,Telepített Mennyiség
@@ -2412,7 +2413,7 @@
 DocType: Notification Control,Sales Order Message,Vevői rendelés üzenet
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a vállalkozás, pénznem, folyó pénzügyi év, stb. beállítása."
 DocType: Payment Entry,Payment Type,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Kérjük, válasszon egy Köteget ehhez a tételhez {0}. Nem található egyedülállü köteg, amely megfelel ennek a követelménynek"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Kérjük, válasszon egy Köteget ehhez a tételhez {0}. Nem található egyedülállü köteg, amely megfelel ennek a követelménynek"
 DocType: Process Payroll,Select Employees,Válassza ki az Alkalmazottakat
 DocType: Opportunity,Potential Sales Deal,Potenciális értékesítési üzlet
 DocType: Payment Entry,Cheque/Reference Date,Csekk/Hivatkozási dátum
@@ -2429,7 +2430,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS profil {0} már létrehozott ennek a vállalkozásnak {1}
 DocType: Purchase Order,Ref SQ,Hiv. BR
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Cserélje Elem / BOM minden Darabjegyzékeket
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Nyugta dokumentumot be kell nyújtani
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Nyugta dokumentumot be kell nyújtani
 DocType: Purchase Invoice Item,Received Qty,Beérkezett Mennyiség
 DocType: Stock Entry Detail,Serial No / Batch,Széria sz. / Köteg
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nem fizetett és le nem szállított
@@ -2442,7 +2443,7 @@
 ,To Produce,Termelni
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bérszámfejtés
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",A {1} -nek a {0} sorbában. A Tétel értékébe a {2} beillesztéséhez a {3} sorokat is hozzá kell adni
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Felhasználó létrehozás
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Felhasználó létrehozás
 DocType: Packing Slip,Identification of the package for the delivery (for print),Csomag azonosítása a szállításhoz (nyomtatáshoz)
 DocType: Bin,Reserved Quantity,Mennyiség fenntartva
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Kérem adjon meg egy érvényes e-mail címet
@@ -2454,11 +2455,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Letiltott sablon nem lehet alapértelmezett sablon
 DocType: Account,Income Account,Jövedelem számla
 DocType: Payment Request,Amount in customer's currency,Összeg ügyfél valutájában
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Szállítás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Szállítás
 DocType: Stock Reconciliation Item,Current Qty,Jelenlegi Mennyiség
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lásd az 'Anyagköltség számítás módja' a Költség részben
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Előző
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Tanulók kötegei, segítenek nyomon követni a részvételt, értékeléseket és díjakat a hallgatókhoz"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Tanulók kötegei, segítenek nyomon követni a részvételt, értékeléseket és díjakat a hallgatókhoz"
 DocType: Payment Entry,Total Allocated Amount,Lefoglalt teljes összeg
 DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Naplókönyvelés fizetések származó {0} {1}
@@ -2481,7 +2483,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Ipari típusonkénti Érdeklődés nyomonkövetése.
 DocType: Item Supplier,Item Supplier,Tétel Beszállító
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Összes cím.
 DocType: Company,Stock Settings,Készlet beállítások
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
@@ -2491,6 +2493,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',E-mailt küld az eseményről a 'Nyitott' státuszú alkalmazottaknak
 DocType: Task,Depends on Tasks,Függ a Feladatoktól
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Vevői csoport fa. kezelése.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Mellékletek megjelenítésénak lehetővé tétele kosár bekapcsolása nélkül
 DocType: Supplier Quotation,SQTN-,BESZÁRAJ-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Új költséghely neve
 DocType: Leave Control Panel,Leave Control Panel,Távollét vezérlőpult
@@ -2503,11 +2506,10 @@
 DocType: Sales Invoice,Debit To,Tartozás megterhelése
 DocType: Delivery Note,Required only for sample item.,Szükséges csak a minta elemet.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség a tranzakció után
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Beszállító &gt; Beszállító típus
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nem található bérpapít {0} és {1} közt
 ,Pending SO Items For Purchase Request,Függőben lévő VR tételek erre a vásárolható rendelésre
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Tanuló Felvételi
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} le van tiltva
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} le van tiltva
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
 DocType: Sales Invoice,SINV-RET-,ÉSZLA-ELLEN-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Nagy
@@ -2524,7 +2526,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Kezdőlap Ajánlott termék
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Az Értékelési Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Új raktár neve
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Összesen {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Összesen {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Terület
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Kérjük említse meg a szükséges résztvevők számát
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
@@ -2542,7 +2544,7 @@
 DocType: Price List,Price List Master,Árlista törzsadat
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Minden értékesítési tranzakció címkézhető több ** Értékesítő személy** felé, így beállíthat és követhet célokat."
 ,S.O. No.,VR sz.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Kérjük, hozzon létre Vevőt ebből az Érdeklődésből: {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Kérjük, hozzon létre Vevőt ebből az Érdeklődésből: {0}"
 DocType: Price List,Applicable for Countries,Alkalmazandó ezekhez az Országokhoz
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Csak ""Jóváhagyott"" és ""Elutasított"" állapottal rendelkező távollét igényeket lehet benyújtani"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Diák csoport neve kötelező sorban {0}
@@ -2622,7 +2624,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Könyvelési tétel a Készlethez
 DocType: Vehicle Service,Engine Oil,Motorolaj
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,"Tétel: {0}, nem létezik"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,"Tétel: {0}, nem létezik"
 DocType: Sales Invoice,Customer Address,Vevő címe
 DocType: Employee Loan,Loan Details,Hitel részletei
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,"Sor {0}: Befejezve Mennyiség nagyobbnak kell lennie, mint nulla."
@@ -2686,7 +2688,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Raktárak meglévő ügylettekkel nem konvertálhatóak csoporttá.
 DocType: Assessment Result Tool,Result HTML,Eredmény HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Lejárat dátuma
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Add diákok
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Add diákok
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Kérjük, válassza ki a {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2750,7 +2752,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Keresztbe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Egy tudományos kifejezés ezzel a 'Tanév ' {0} és a 'Félév neve' {1} már létezik. Kérjük, módosítsa ezeket a bejegyzéseket, és próbálja újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel már vannak tranzakciók ehhez az  elemhez: {0}, ezért nem tudja megváltoztatni ennek az értékét {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel már vannak tranzakciók ehhez az  elemhez: {0}, ezért nem tudja megváltoztatni ennek az értékét {1}"
 DocType: UOM,Must be Whole Number,Egész számnak kell lennie
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Új távollét lefoglalása (napokban)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,A {0} Széria sz. nem létezik
@@ -2793,7 +2795,7 @@
 DocType: Supplier,Last Day of the Next Month,Utolsó nap a következő hónapban
 DocType: Support Settings,Auto close Issue after 7 days,Automatikus lezárása az ügyeknek 7 nap után
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollétet nem lehet kiosztani előbb mint {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kiosztás rekordhoz {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékesség / Referencia dátum túllépése engedélyezett az ügyfél hitelezésre {0} nap(ok)al
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékesség / Referencia dátum túllépése engedélyezett az ügyfél hitelezésre {0} nap(ok)al
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Tanuló kérelmező
 DocType: Asset Category Account,Accumulated Depreciation Account,Halmozott értékcsökkenés számla
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
@@ -2821,7 +2823,7 @@
 DocType: Asset,Item Code,Tételkód
 DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
 DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
 DocType: Lead,Market Segment,Piaci rész
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},"Fizetett összeg nem lehet nagyobb, mint a teljes negatív kinntlévő összeg {0}"
@@ -2839,7 +2841,7 @@
 DocType: Production Planning Tool,Create Material Requests,Anyagigénylés létrehozása
 DocType: Employee Education,School/University,Iskola / Egyetem
 DocType: Payment Request,Reference Details,Hivatkozó Részletek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Várható érték a hasznos élettartam után kevesebbnek kell lennie, mint a bruttó beszerzés összege"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Várható érték a hasznos élettartam után kevesebbnek kell lennie, mint a bruttó beszerzés összege"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Elérhető mennyiség a raktárban
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Számlázott összeg
 DocType: Asset,Double Declining Balance,Progresszív leírási modell egyenleg
@@ -2860,19 +2862,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség számlának Eszköz / Kötelezettség típusú számlának kell lennie, mivel ez a Készlet egyeztetés egy kezdő könyvelési tétel"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Folyósított összeg nem lehet nagyobb, a kölcsön összegénél {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Beszerzési megrendelés száma szükséges ehhez az elemhez {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Gyártási rendelés nincs létrehozva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Gyártási rendelés nincs létrehozva
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" dátumnál későbbinek kell lennie a ""Dátumig"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},"Nem lehet megváltoztatni az állapotát, mivel a hallgató: {0} hozzá van fűzve ehhez az alkalmazáshoz: {1}"
 DocType: Asset,Fully Depreciated,Teljesen amortizálódott
 ,Stock Projected Qty,Készlet kivetített Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Jelzett Nézőszám HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Árajánlatok mind javaslatok, a vásárlói részére kiküldött ajánlatok"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Árajánlatok mind javaslatok, a vásárlói részére kiküldött ajánlatok"
 DocType: Sales Order,Customer's Purchase Order,Vevői  Beszerzési megrendelés
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Széria sz. és Köteg
 DocType: Warranty Claim,From Company,Cégtől
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Értékelési kritériumok pontszám összegének ennyinek kell lennie: {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Kérjük, állítsa be a könyvelt amortizációk számát"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Kérjük, állítsa be a könyvelt amortizációk számát"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Érték vagy menny
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Gyártási rendeléseket nem lehet megemelni erre:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Perc
@@ -3000,7 +3002,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Diákcsoport
 DocType: Shopping Cart Settings,Quotation Series,Árajánlat szériák
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Egy tétel létezik azonos névvel ({0}), kérjük, változtassa meg a tétel csoport nevét, vagy nevezze át a tételt"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Kérjük, válasszon vevőt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,"Kérjük, válasszon vevőt"
 DocType: C-Form,I,én
 DocType: Company,Asset Depreciation Cost Center,Vagyoneszköz Értékcsökkenés Költséghely
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
@@ -3019,19 +3021,18 @@
 DocType: Vehicle,Insurance Details,Biztosítási részletek
 DocType: Account,Payable,Kifizetendő
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Kérjük, írja be a törlesztési időszakokat"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Követelések ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Követelések ({0})
 DocType: Pricing Rule,Margin,Árkülönbözet
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Új Vevők
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruttó nyereség %
 DocType: Appraisal Goal,Weightage (%),Súlyozás (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Végső dátum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
 DocType: Lead,Address Desc,Cím leírása
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Ügyfél kötelező
 DocType: Journal Entry,JV-,KT-
 DocType: Topic,Topic Name,Téma neve
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Legalább az Értékesítést vagy Beszerzést választani kell
-DocType: Grading Structure,Grade Intervals,Évfolyam periódusai
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Válassza ki a vállalkozása fajtáját.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Ahol a gyártási műveleteket végzik.
 DocType: Asset Movement,Source Warehouse,Forrás raktár
@@ -3060,6 +3061,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi Felbontás százaléka
 DocType: Territory,Territory Targets,Területi célok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Vásárlói csoport&gt; Terület
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},"Kérjük, állítsa be alapértelmezettnek {0} ebben a vállalkozásban {1}"
 DocType: Cheque Print Template,Starting position from top edge,Kiinduló helyzet a felső széltől
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Ugyanaz a szállító már többször megjelenik
@@ -3111,7 +3113,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Újra rendelendő mennyiség
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Jelenlegi munkalehetőségek
 DocType: Company,Stock Adjustment Account,Készlet igazítás számla
-DocType: Journal Entry,Write Off,Leíró
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Leíró
 DocType: Timesheet Detail,Operation ID,Művelet ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Rendszer felhasználói (belépés) ID. Ha be van állítva, ez lesz az alapértelmezés minden HR űrlaphoz."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Feladó {1}
@@ -3122,8 +3124,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Beszállító szállít a Vevőnek
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) elfogyott
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Következő Dátumnak nagyobbnak kell lennie, mint a Beküldés dátuma"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mutassa az adókedvezmény-felbontást
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Határidő / referencia dátum nem lehet {0} utáni
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Mutassa az adókedvezmény-felbontást
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Határidő / referencia dátum nem lehet {0} utáni
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Adatok importálása és exportálása
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Készlet bejegyzés létezik erre a készletre: {0}, így akkor nem lehet újra kiírni, illetve módosítani"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nem talált diákokat
@@ -3135,13 +3137,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátumot az Ügyfél kiválasztása előtt"
 DocType: Program Enrollment,School House,Iskola épület
 DocType: Serial No,Out of AMC,ÉKSz időn túl
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Kérjük, válasszon Árajánlatot"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Karbantartási látogatás készítés
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Kérjük, válasszon Árajánlatot"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Karbantartási látogatás készítés
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
 DocType: Company,Default Cash Account,Alapértelmezett készpénzforgalmi számla
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Vállalkozás (nem vevő vagy beszállító) törzsadat.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ez a Tanuló jelenlétén alapszik
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nincs diák ebben
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,További tételek hozzáadása vagy nyisson új űrlapot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Kérjük, írja be: 'Várható szállítási időpont"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"A {0} Szállítóleveleket törölni kell, mielőtt lemondásra kerül a Vevői rendelés"
@@ -3187,9 +3190,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Főkönyvi egyeztetés előtt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Címzett {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadva (a vállalkozás pénznemében)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Tétel adó sor: {0} , melynek vagy adó vagy bevétel vagy kiadás vagy megterhelhető főkönyvi típusú számlának kell lennie."
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Tétel adó sor: {0} , melynek vagy adó vagy bevétel vagy kiadás vagy megterhelhető főkönyvi típusú számlának kell lennie."
 DocType: Sales Order,Partly Billed,Részben számlázott
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,"Tétel: {0}, befektetett eszköz tételnek kell lennie"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Tétel: {0}, befektetett eszköz tételnek kell lennie"
 DocType: Item,Default BOM,Alapértelmezett anyagjegyzék BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Kérjük ismítelje meg a cég nevét, a jóváhagyáshoz."
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Teljes fennálló kintlévő össz
@@ -3211,7 +3214,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista váltási árfolyama
 DocType: Purchase Invoice Item,Rate,Arány
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Belső
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Cím Neve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Cím Neve
 DocType: Stock Entry,From BOM,Anyagjegyzékből
 DocType: Assessment Code,Assessment Code,Értékelés kód
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Alapvető
@@ -3236,7 +3239,7 @@
 DocType: Purchase Invoice,Print Language,Nyomtatási nyelv
 DocType: Salary Slip,Total Working Hours,Teljes munkaidő
 DocType: Stock Entry,Including items for sub assemblies,Tartalmazza a részegységek tételeit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Összes Terület
 DocType: Purchase Invoice,Items,Tételek
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Tanuló már részt.
@@ -3255,16 +3258,14 @@
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és eddig időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdék
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
 DocType: Shipping Rule,Calculate Based On,Számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
 DocType: Assessment Plan,Supervisor Name,Felügyelő neve
 DocType: Program Enrollment Course,Program Enrollment Course,Program Jelentkezés kurzus
-DocType: Grading Structure,Grading Structure,Osztályozási szerkezet
 DocType: Purchase Taxes and Charges,Valuation and Total,Készletérték és Teljes érték
 DocType: Tax Rule,Shipping City,Szállítási Város
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ez a tétel pont egy változata ennen: {0} (Sablon).  Jellemzők átmásolásra kerülnek a sablonokra, kivéve, ha a be van álítva a 'Ne másolja'"
 DocType: Notification Control,Customize the Notification,Értesítés testreszabása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Pénzforgalom a működtetésből
 DocType: Sales Invoice,Shipping Rule,Szállítási szabály
@@ -3287,6 +3288,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Nincs alapértelmezett Anyagjegyzék erre a tételre {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátumot  először"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Nyitás dátumának előbb kel llennie mint a  zárás dátuma
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kérjük beállítási számozási sorozat nyilvántartó a Setup&gt; számozás sorozat
 DocType: Leave Control Panel,Carry Forward,Átvihető a szabadság
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Költséghely meglévő tranzakciókkal nem lehet átalakítani főkönyvi számlává
 DocType: Department,Days for which Holidays are blocked for this department.,Napok melyeket az Ünnepnapok blokkolják ezen az osztályon.
@@ -3314,7 +3316,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (Menny)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Quality Inspection,Item Serial No,Tétel-sorozatszám
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Készítsen Alkalmazott nyilvántartást
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Készítsen Alkalmazott nyilvántartást
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Összesen meglévő
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Könyvelési kimutatások
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Óra
@@ -3329,7 +3331,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,"Az új anyagjegyzék, amire lecseréli mindenhol"
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Értékesítési hely kassza
 DocType: Payment Entry,Received Amount,Beérkezett összeg
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Kérjük állítsa be az Alkalmazott megnevezés rendszert az Emberi Erőforrás&gt; HR beállítások alatt
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Készítsen teljes mennyiségre, figyelmen kívül hagyva a már megrendelt mennyiséget"
 DocType: Account,Tax,Adó
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Jelöletlen
@@ -3340,7 +3341,7 @@
 DocType: C-Form,Invoices,Számlák
 DocType: Batch,Source Document Name,Forrás dokumentum neve
 DocType: Job Opening,Job Title,Állás megnevezése
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Felhasználók létrehozása
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Felhasználók létrehozása
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramm
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Gyártáshoz a mennyiségnek nagyobbnak kell lennie, mint 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Látogassa jelentést karbantartási hívást.
@@ -3351,8 +3352,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Költség számla kötelező elem ehhez {0}
 DocType: BOM,Website Description,Weboldal leírása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettó változás a saját tőkében
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail cím egyedinek kell lennie, ez már létezik: {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail címnek egyedinek kell lennie, ez már létezik: {0}"
 DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Nyugta
 ,Sales Register,Értékesítési Regisztráció
@@ -3363,16 +3364,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkesztenivaló.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,"Összefoglaló erre a hónapra, és folyamatban lévő tevékenységek"
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Még nem Vevők!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pénzforgalmi kimutatás
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licensz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válassza ki az átvitelt, ha Ön is szeretné az előző pénzügyi év mérlege ágait erre a költségvetési évre áthozni"
 DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
 DocType: Item,Attributes,Jellemzők
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Kérjük, adja meg a Leíráshoz használt számlát"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Utolsó rendelési dátum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A {0}számlához nem tartozik a {1} vállalat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok sorban {0} nem egyezik szállítólevél
 DocType: Student,Guardian Details,Helyettesítő részletei
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Jelölje a Jelenlétet több alkalmazotthoz
@@ -3397,14 +3400,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Sor {0} # fióknak 'Állóeszköz' típusúnak kell lennie
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Mennyiségen kívül
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Szabályok számítani a szállítási költség egy eladó
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Sorozat kötelező
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Sorozat kötelező
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 DocType: Student Sibling,Student ID,Diákigazolvány ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tevékenységek típusa Idő Naplókhoz
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
 DocType: Training Event,Exam,Vizsga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
 DocType: Leave Allocation,Unused leaves,A fel nem használt távollétek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Kr
 DocType: Tax Rule,Billing State,Számlázási Állam
@@ -3437,7 +3440,7 @@
 DocType: Payment Entry,Account Paid From,Kiegyenlített számla ettől:
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nyersanyag tételkód
 DocType: Journal Entry,Write Off Based On,Leírja ez alapján
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Érdeklődés készítés
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Érdeklődés készítés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Nyomtatás és papíráruk
 DocType: Stock Settings,Show Barcode Field,Mutatása a Vonalkód mezőt
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Beszállítói e-mailek küldése
@@ -3452,6 +3455,7 @@
 DocType: Offer Letter,Awaiting Response,Várakozás válaszra
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Fent
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Megemlít, ha nem szabványos fizetendő számla"
 DocType: Salary Slip,Earning & Deduction,Jövedelem és levonás
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"Választható. Ezt a beállítást kell használni, a különböző tranzakciók szűréséhez."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatív értékelési ár nem megengedett
@@ -3485,7 +3489,7 @@
 DocType: Program Enrollment Tool,Get Students From,Diák űrlapok lekérése
 DocType: Hub Settings,Seller Country,Eladó Országa
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Közzéteszi a tételt a weboldalon
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Csoportosítsa a tanulókat kötegekbe
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Csoportosítsa a tanulókat kötegekbe
 DocType: Authorization Rule,Authorization Rule,Jóváhagyási szabály
 DocType: Sales Invoice,Terms and Conditions Details,Általános szerződési feltételek részletei
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Műszaki adatok
@@ -3544,7 +3548,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Próbaidő
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Bér összetevők
 DocType: Program Enrollment Tool,New Academic Year,Új Tanév
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Vissza / Követelés értesítő
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Vissza / Követelés értesítő
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto Árlista érték beillesztés, ha hiányzik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Teljes fizetett összeg
 DocType: Production Order Item,Transferred Qty,Átvitt Mennyiség
@@ -3585,6 +3589,7 @@
 ,Sales Funnel,Értékesítési csatorna
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Rövidítés kötelező
 DocType: Project,Task Progress,Feladat előrehaladása
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Szekér
 ,Qty to Transfer,Mennyiség az átvitelhez
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Árajánlatok az Érdeklődőknek vagy Vevőknek.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Beosztás engedélyezi a zárolt készlet szerkesztését
@@ -3617,7 +3622,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Mennyiség ({0}) nem lehet egy töredék ebben a sorban {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Díjak gyűjtése
 DocType: Attendance,ATT-,CSAT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
 DocType: Lead,Add to calendar on this date,Adja hozzá a naptárhoz ezen a napon
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
 DocType: Item,Opening Stock,Nyitó állomány
@@ -3635,7 +3640,7 @@
 DocType: Customer,From Lead,Érdeklődésből
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Megrendelések gyártásra bocsátva.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Válasszon pénzügyi évet ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
 DocType: Program Enrollment Tool,Enroll Students,Diákok felvétele
 DocType: Hub Settings,Name Token,Név Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Alapértelmezett értékesítési
@@ -3646,7 +3651,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} a {1} Értékesítési számlához
 DocType: Sales Invoice,SINV-,ÉSZLA-
 DocType: Request for Quotation Item,Project Name,Projekt téma neve
-DocType: Supplier,Mention if non-standard receivable account,"Megemlít, ha nem szabványos bevételi számla"
+DocType: Customer,Mention if non-standard receivable account,"Megemlít, ha nem szabványos bevételi számla"
 DocType: Journal Entry Account,If Income or Expense,Ha bevétel vagy kiadás
 DocType: Production Order,Required Items,Kötelező elemek
 DocType: Stock Ledger Entry,Stock Value Difference,Készlet értékkülönbözet
@@ -3676,6 +3681,7 @@
 DocType: Item,Taxes,Adók
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Fizetett és nincs leszállítva
 DocType: Project,Default Cost Center,Alapértelmezett költséghely
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa elnevezése sorozat {0} a Setup&gt; Beállítások&gt; elnevezése sorozat"
 DocType: Bank Guarantee,End Date,Befejezés dátuma
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Készlet tranzakciók
 DocType: Budget,Budget Accounts,Költségvetési számlák
@@ -3740,7 +3746,7 @@
 DocType: Customer,Sales Partner and Commission,Értékesítési Partner és a Bizottság
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatláb (%) / év
 ,Project Quantity,Project Mennyiség
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Összesen {0} az összes tételre nulla, lehet, hogy meg kell változtatnia  'Forgalmazói díjak ez alapján'"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Összesen {0} az összes tételre nulla, lehet, hogy meg kell változtatnia  'Forgalmazói díjak ez alapján'"
 DocType: Opportunity,To Discuss,Megvitatni
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} darab ebből: {1} szükséges ebben: {2} a tranzakció befejezéséhez.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatláb (%) Éves
@@ -3763,7 +3769,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Hiányzónak jelöl
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Sor {0}: Anyagjegyzés BOM pénzneme #{1}  egyeznie kell a kiválasztott pénznemhez {2}
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
 DocType: Homepage,Tag Line,Jelmondat sor
 DocType: Fee Component,Fee Component,Díj komponens
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flotta kezelés
@@ -3780,7 +3786,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,{0} raktár nem létezik
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció az ERPNext Hub–hoz
 DocType: Monthly Distribution,Monthly Distribution Percentages,Havi Felbontás százalékai
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,A kiválasztott elemnek nem lehet Kötege
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,A kiválasztott elemnek nem lehet Kötege
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Értékelés mértéke nem található erre a tételre {0}, mely kötelező a számviteli bejegyzések megtételére ehhez {1} {2}. Ha a tétel mintaként bonyolítódik ebben {1}, kérem említse meg ezt az {1} Tétel  táblázatban. Ellenkező esetben, kérjük hozzon létre egy bejövő készlet tranzakciót a tételre vagy említése meg az értékelési árat a Tétel rekordjában, majd próbálja benyújtani / törölni ezt a bejegyzést"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% anyag tételek szállítva Beszállítói szállítólevélhez
 DocType: Project,Customer Details,Vevő részletek
@@ -3797,7 +3803,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Benyújtott megbízásokat nem törölheti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már Nekünk tartozik, akkor nem szabad beállítani ""Ennek egyenlege"", mint ""Tőlünk követel"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Minőségbiztosítás
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,"Tétel {0} ,le lett tiltva"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,"Tétel {0} ,le lett tiltva"
 DocType: Employee Loan,Repay Fixed Amount per Period,Fix összeg visszafizetése időszakonként
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget erre a tételre: {0}"
 DocType: Employee External Work History,Employee External Work History,Alkalmazott korábbi munkahelyei
@@ -3823,7 +3829,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Tanuló e-mail azonosító
 DocType: Employee,Notice (days),Felmondás (nap(ok))
 DocType: Tax Rule,Sales Tax Template,Forgalmi adó Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Válassza ki a tételeket a számla mentéséhez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Válassza ki a tételeket a számla mentéséhez
 DocType: Employee,Encashment Date,Beváltás dátuma
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Készlet igazítás
@@ -3856,6 +3862,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Terhelési értesítés kiadva
 DocType: Production Order,Warehouses,Raktárak
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tárgyi eszköz nem vihető át
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ez a Tétel egy változata ennek: {0} (sablon).
 DocType: Workstation,per hour,óránként
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Beszerzés
 DocType: Announcement,Announcement,Közlemény
@@ -3871,7 +3878,7 @@
 DocType: Account,Receivable,Bevételek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Sor # {0}: nem szabad megváltoztatni a beszállítót, mivel már van rá Beszerzési  Megrendelés"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Beosztást, amely lehetővé tette, hogy nyújtson be tranzakciókat, amelyek meghaladják a követelés határértékeket."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Törzsadatok szinkronizálása, ez eltart egy ideig"
 DocType: Item,Material Issue,Anyag probléma
 DocType: Hub Settings,Seller Description,Eladó Leírása
@@ -3884,7 +3891,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Megrendelt
 DocType: Salary Detail,Component,Összetevő
 DocType: Assessment Criteria,Assessment Criteria Group,Értékelési kritériumok Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},"Nyitva halmozott ÉCS kisebbnek kell lennie, mint egyenlő {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},"Nyitva halmozott ÉCS kisebbnek kell lennie, mint egyenlő {0}"
 DocType: Warehouse,Warehouse Name,Raktár neve
 DocType: Naming Series,Select Transaction,Válasszon Tranzakciót
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Kérjük, adja be Beosztás jóváhagyásra vagy Felhasználó jóváhagyásra"
@@ -3918,7 +3925,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani ezt a költségvetési évet alapértelmezettként, kattintson erre: 'Beállítás alapértelmezettként'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Csatlakozik
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Hiány Mennyisége
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
 DocType: Employee Loan,Repay from Salary,Bérből törleszteni
 DocType: Leave Application,LAP/,TAVOLL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Fizetési igény ehhez {0} {1} ezzel az összeggel {2}
@@ -3936,7 +3943,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Értékelés eredménye részlet
 DocType: Employee Education,Employee Education,Alkalmazott képzése
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Ismétlődő elem csoport található a csoport táblázatában
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
 DocType: Salary Slip,Net Pay,Nettó fizetés
 DocType: Account,Account,Számla
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Széria sz. {0} már beérkezett
@@ -3945,7 +3952,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Raktár {0} nem kapcsolódik semmilyen számlához, hozzon létre / összekapcsoljon a megfelelő (Vagyoneszköz) számlát a raktárhoz."
 DocType: Purchase Invoice,Recurring Id,Ismétlődő Id
 DocType: Customer,Sales Team Details,Értékesítő csapat részletei
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Véglegesen törli?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Véglegesen törli?
 DocType: Expense Claim,Total Claimed Amount,Összes Garanciális összeg
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciális értékesítési lehetőségek.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Érvénytelen {0}
@@ -3956,13 +3963,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Állítsa be az Iskolát az ERPNext-ben
 DocType: Sales Invoice,Base Change Amount (Company Currency),Bázis váltó összeg (Vállalat pénzneme)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárakra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárakra
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Először mentse el a dokumentumot.
 DocType: Account,Chargeable,Felszámítható
 DocType: Company,Change Abbreviation,Váltópénz rövidítése
 DocType: Expense Claim Detail,Expense Date,Költség igénylés dátuma
 DocType: Item,Max Discount (%),Max. engedmény (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Utolsó megrendelés összege
+DocType: Task,Is Milestone,van Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail címzetje
 DocType: Budget,Warn,Figyelmeztet
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bármely egyéb megjegyzések, említésre méltó erőfeszítés, aminek a nyilvántartásba kell kerülnie."
@@ -3995,11 +4003,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint` kisebbnek kell lennie,  %d napnál."
 DocType: Tax Rule,Purchase Tax Template,Beszerzési megrendelés Forgalmi adót sablon
 ,Project wise Stock Tracking,Projekt téma szerinti raktárkészlet követése
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Karbantartási ütemterv {0} létezik erre {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tényleges Mennyiség (forrásnál / célnál)
 DocType: Item Customer Detail,Ref Code,Hiv. kód
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Alkalmazott adatai.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Kérjük, állítsa be a Következő Értékcsökkenés dátumát"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Kérjük, állítsa be a Következő Értékcsökkenés dátumát"
 DocType: HR Settings,Payroll Settings,Bérszámfejtés Beállítások
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Egyeztesse az összeköttetésben nem álló számlákat és a kifizetéseket.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Rendelés helye
@@ -4022,7 +4029,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Csekkek és betétek helytelenül elszámoltak
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,A {0} számla: Nem rendelheti saját szülő számlájának
 DocType: Purchase Invoice Item,Price List Rate,Árlista árak
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Árajánlatok létrehozása vevők részére
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Árajánlatok létrehozása vevők részére
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mutasd a ""Készleten"", vagy ""Nincs készleten"" , az ebben a raktárban álló állomány alapján."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Anyagjegyzék (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Átlagos idő foglalás a beszállító általi szállításhoz
@@ -4044,7 +4051,7 @@
 DocType: Asset,Disposal Date,Eltávolítás időpontja
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailt fog küldeni a vállalkozás összes aktív alkalmazottja részére az adott órában, ha nincsenek szabadságon. A válaszok összefoglalását éjfélkor küldi."
 DocType: Employee Leave Approver,Employee Leave Approver,Alkalmazott Távollét Jóváhagyó
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Sor {0}: Egy Újrarendelés bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Sor {0}: Egy Újrarendelés bejegyzés már létezik erre a raktárban {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Nem jelentheti elveszettnek, mert kiment az Árajánlat."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Képzési Visszajelzés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Gyártási rendelést: {0} be kell benyújtani
@@ -4052,7 +4059,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tanfolyam kötelező ebben a sorban {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A végső nap nem lehet, a kezdő dátum előtti"
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
 DocType: Batch,Parent Batch,Szülő Köteg
 DocType: Cheque Print Template,Cheque Print Template,Csekk nyomtatás Sablon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Költséghelyek listája
@@ -4096,7 +4103,7 @@
 DocType: Item,Variant Based On,Változat ez alapján
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Összesen kijelölés súlyozásának 100% -nak kell lennie. Ez:  {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ön Beszállítói
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Nem lehet beállítani elveszettnek ezt a Vevői rendelést, mivel végre van hajtva."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nem lehet beállítani elveszettnek ezt a Vevői rendelést, mivel végre van hajtva."
 DocType: Request for Quotation Item,Supplier Part No,Beszállítói alkatrész sz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Feladó
@@ -4106,7 +4113,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Feladó: {0} a {1} -hez
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Sor # {0}: Nem beszállító erre a tételre {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,"Sor {0}: Óra értéknek nagyobbnak kell lennie, mint nulla."
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezeket a tételeket több csoportba a weboldalon.
@@ -4115,20 +4122,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Nincs engedélye a zárolt értékek beállítására
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nem egyeztetett bejegyzések lekérdezése
 DocType: Payment Reconciliation,From Invoice Date,Számla dátumától
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Számlázási pénznemnek ugyanannak vagy a vállalat vagy a Ügyfél vállalatának alapértelmezett pénznemének kell lennie.
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Számlázási pénznemnek ugyanannak vagy a vállalat vagy a Ügyfél vállalatának alapértelmezett pénznemének kell lennie.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Hagyja beváltása
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Mit csinál?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Raktárba
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Minden Student Felvételi
 ,Average Commission Rate,Átlagos jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Részvételt nem lehet megjelölni jövőbeni dátumhoz
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: School House,House Name,Ház név
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Frissítse a többletköltségeket a tétel beszerzési költségének kiszámítására
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektromos
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adjuk hozzá a többi a szervezet, mint a felhasználók számára. Azt is hozzá meghívni ügyfelek a portál hozzáadásával őket Kapcsolatok"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adjuk hozzá a többi a szervezet, mint a felhasználók számára. Azt is hozzá meghívni ügyfelek a portál hozzáadásával őket Kapcsolatok"
 DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet (Ki - Be)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Sor {0}: átváltási árfolyam kötelező
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Felhasználói azonosítót nem állított be az Alkalmazotthoz: {0}
@@ -4137,7 +4144,7 @@
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Születésnapi emlékeztető {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Utolsó rendeléstől eltel napok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
 DocType: Buying Settings,Naming Series,Sorszámozási csoportok
 DocType: Leave Block List,Leave Block List Name,Távollét blokk lista neve
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Biztosítás kezdeti dátumának kisebbnek kell lennie, mint a biztosítás befejezés dátuma"
@@ -4152,7 +4159,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},A bérpapír az Alkalmazotthoz: {0} már létrehozott erre a jelenléti ívre: {1}
 DocType: Vehicle Log,Odometer,Kilométer-számláló
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Tétel {0} letiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Tétel {0} letiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Az időszak eleje és vége kötelező ehhez a visszatérőhöz: {0}
@@ -4165,7 +4172,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
 DocType: Sales Invoice Timesheet,Billing Hours,Számlázási Óra(k)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Alapértelmezett anyagjegyzék BOM {0} nem található
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Érintse a tételeket, ahhoz,  hogy ide tegye"
 DocType: Fees,Program Enrollment,Program Beiratkozási
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Kérjük, állítsa be {0}"
@@ -4262,7 +4270,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
 DocType: Issue,First Responded On,Első válasz időpontja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása a tételeknek több csoportban
-DocType: Grade Interval,Grade Interval,Évfolyam intervalluma
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Pénzügyi év kezdő dátumát és a pénzügyi év befelyező dátumát már meghatározták a Pénzügyi évben: {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Végső Dátum frissítve
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Osztott Batch
@@ -4270,6 +4277,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF letöltése
 DocType: Production Order,Planned End Date,Tervezett befejezési dátum
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Ahol az anyagok tárolva vannak.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Szállító&gt; Szállító Type
 DocType: Request for Quotation,Supplier Detail,Beszállító adatai
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Hiba az űrlapban vagy feltételben: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Számlázott összeg
@@ -4314,7 +4322,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Telepítsen egy egyszerű weboldalt a vállalkozásunkhoz
 DocType: Payment Reconciliation,Receivable / Payable Account,Bevételek / Fizetendő számla
 DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői rendelési tétel
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet hozzárendelni ehhez a Csoport számlához {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Kérjük, adjon meg szülő költséghelyet"
@@ -4347,7 +4355,7 @@
 DocType: Assessment Plan Criteria,Maximum Score,Maximális pontszám
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Készítsen szabályokat az ügyletek korlátozására az értékek alapján.
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Hagyja üresen, ha diák csoportokat évente hozza létre"
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a munkanapok száma tartalmazni fogja a ünnepeket, és ez csökkenti a napi bér összegét"
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a munkanapok száma tartalmazni fogja az ünnepeket, és ez csökkenti a napi bér összegét"
 DocType: Purchase Invoice,Total Advance,Összes előleg
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"A kifejezés végső dátuma nem lehet korábbi, mint a kifejezés kezdete. Kérjük javítsa ki a dátumot, és próbálja újra."
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Áraj számláló
@@ -4371,7 +4379,7 @@
 ,Items To Be Requested,Tételek kell kérni
 DocType: Purchase Order,Get Last Purchase Rate,Utolsó Beszerzési ár lekérése
 DocType: Company,Company Info,Vállakozás adatai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Költséghely szükséges költségtérítési igény könyveléséhez
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Vagyon tárgyak alkalmazás (vagyoni eszközök)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ez az Alkalmazott jelenlétén alapszik
@@ -4384,13 +4392,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Tiltsa a felhasználóknak, hogy eltávozást igényelhessenek a következő napokra."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Beszerzés összege
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Beszállító árajánlata :{0} létrehozva
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Befejező év nem lehet a kezdés évnél korábbi
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Befejező év nem lehet a kezdés évnél korábbi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Alkalmazotti juttatások
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiségeknek egyezniük kell a  {1} sorban lévő {0} tétel mennyiségével
 DocType: Production Order,Manufactured Qty,Gyártott menny.
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Kérjük, állítsa be az alapértelmezett Ünnepet erre az Alkalmazottra: {0} vagy Vállalkozásra: {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nem létezik
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nem létezik
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vevők számlái
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt téma azonosító
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
@@ -4399,15 +4407,17 @@
 DocType: Quality Inspection Reading,Reading 3,Olvasás 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bizonylat típusa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,"Árlista nem található, vagy letiltva"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,"Árlista nem található, vagy letiltva"
 DocType: Employee Loan Application,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Elengedett alkalmazott: {0} , be kell állítani mint 'Távol'"
 DocType: Guardian,Guardian,"Gyám, helyettesítő"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Értékelés: {0} létrehozva a(z)  {1} alkalmazottra a megadott dátum tartományban
 DocType: Employee,Education,Oktatás
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Töröl
 DocType: Selling Settings,Campaign Naming By,Kampányt elnevezte
 DocType: Employee,Current Address Is,Jelenlegi cím
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,módosított
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Választható. Megadja cég alapértelmezett pénznemét, ha nincs meghatározva."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Könyvelési naplóbejegyzések.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Elérhető Mennyiség a befozatali raktárról
@@ -4444,7 +4454,7 @@
 DocType: Hub Settings,Hub Settings,Hub Beállítások
 DocType: Project,Gross Margin %,Bruttó árkülönbözet %
 DocType: BOM,With Operations,Műveletek is
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént {0} pénznemben a {1} céghez. Kérjük, válasszon bevételi vagy kifizetendő számlát ebben a pénznemben {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént {0} pénznemben a {1} céghez. Kérjük, válasszon bevételi vagy kifizetendő számlát ebben a pénznemben {0}."
 DocType: Asset,Is Existing Asset,Meglévő eszköz
 DocType: Salary Detail,Statistical Component,Statisztikai összetevő
 ,Monthly Salary Register,Havi fizetés Regisztráció
@@ -4498,7 +4508,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo csatolása
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Készletszintek
 DocType: Customer,Commission Rate,Jutalék értéke
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Változat létrehozás
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Változat létrehozás
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zárja osztályonként a távollét igényeket.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Fizetés mód legyen Kapott, Fizetett és Belső Transzfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Elemzés
@@ -4511,6 +4521,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Termelés engedélyezése az ünnepnapokon
 DocType: Sales Order,Customer's Purchase Order Date,Vevő beszerzési megrendelésének dátuma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Alap készlet
+DocType: Shopping Cart Settings,Show Public Attachments,Itt találhatóak a nyilvános mellékletek
 DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
 DocType: Payment Gateway Account,Payment Gateway Account,Fizetési átjáró számla fiókja
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,A fizetés befejezése után a felhasználót átirányítja a kiválasztott oldalra.
@@ -4535,7 +4546,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem jelezzen szimbólumokat, mint $$ stb. a pénznemek mellett."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Követelés Napok
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Tanuló köteg létrehozás
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Tanuló köteg létrehozás
 DocType: Leave Type,Is Carry Forward,Ez átvitt
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Elemek lekérése Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Érdeklődés idő napokban
@@ -4554,7 +4565,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Ez nyitás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kérjük állatsa be a számozási sorozatokat a rendezvényekre a Telepítés &gt; Számozás sorozat alatt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,A {0} számla nem létezik
 DocType: Account,Cash,Készpénz
 DocType: Employee,Short biography for website and other publications.,Rövid életrajz a honlaphoz és egyéb kiadványokhoz.
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index b8a0ed4..66dec22 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Barang kadaluarsa Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Akun Pembayaran Rekening
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Tampilkan Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Tampilkan Varian
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Bahan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kuantitas
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kesehatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Keterlambatan pembayaran (Hari)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Beban layanan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Periode
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Periklanan (Promosi)
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Perusahaan yang sama dimasukkan lebih dari sekali
 DocType: Employee,Married,Menikah
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak diizinkan untuk {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Tidak diizinkan untuk {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Mendapatkan Stok Barang-Stok Barang dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan setup Employee Naming System di Human Resource&gt; HR Settings
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tidak ada item yang terdaftar
 DocType: Payment Reconciliation,Reconcile,Rekonsiliasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toko Kelontongan
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 DocType: Process Payroll,Make Bank Entry,Buat Entri Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pensiun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Berikutnya Penyusutan Tanggal tidak boleh sebelum Tanggal Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Berikutnya Penyusutan Tanggal tidak boleh sebelum Tanggal Pembelian
 DocType: SMS Center,All Sales Person,Semua Salesmen
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Distribusi Bulanan ** membantu Anda mendistribusikan Anggaran / Target di antara bulan-bulan jika bisnis Anda memiliki musim.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Tidak item yang ditemukan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Tidak item yang ditemukan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama orang
 DocType: Sales Invoice Item,Sales Invoice Item,Faktur Penjualan Stok Barang
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",misalnya &quot;Sekolah Dasar&quot; atau &quot;Universitas&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Laporan saham
 DocType: Warehouse,Warehouse Detail,Detail Gudang
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah menyeberang untuk Konsumen {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah menyeberang untuk Konsumen {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Akhir tidak bisa lebih lambat dari Akhir Tahun Tanggal Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Aset Tetap"" tidak dapat dicentang, karena ada catatan Asset terhadap item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Aset Tetap"" tidak dapat dicentang, karena ada catatan Asset terhadap item"
 DocType: Vehicle Service,Brake Oil,rem Minyak
 DocType: Tax Rule,Tax Type,Jenis pajak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Gambar Stok Barang (jika tidak slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Sebuah Konsumen ada dengan nama yang sama
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif per Jam / 60) * Masa Beroperasi Sebenarnya
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Pilih BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Biaya Produk Terkirim
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Liburan di {0} bukan antara Dari Tanggal dan To Date
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,Kelas
 DocType: Sales Invoice Item,Delivered By Supplier,Terkirim Oleh Supplier
 DocType: SMS Center,All Contact,Semua Kontak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Pesanan produksi sudah dibuat untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Pesanan produksi sudah dibuat untuk semua item dengan BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Pekerjaan sehari-hari
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} dibekukan
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Silakan pilih Perusahaan yang ada untuk menciptakan Chart of Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Beban Stok
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pilih Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entri
 DocType: Journal Entry Account,Credit in Company Currency,Kredit di Perusahaan Mata
 DocType: Delivery Note,Installation Status,Status Instalasi
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Apakah Anda ingin memperbarui kehadiran? <br> Hadir: {0} \ <br> Absen: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Bahan pasokan baku untuk Pembelian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Setidaknya satu cara pembayaran diperlukan untuk POS faktur.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Setidaknya satu cara pembayaran diperlukan untuk POS faktur.
 DocType: Products Settings,Show Products as a List,Tampilkan Produk sebagai sebuah Daftar
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Unduh Template, isi data yang sesuai dan melampirkan gambar yang sudah dimodifikasi.
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Membuat Penyusutan Masuk
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Permintaan Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,membuat Karyawan
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,membuat Karyawan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Eksekusi
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Rincian operasi yang dilakukan.
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Rencana kunjungan pemeliharaan.
 DocType: SMS Settings,Enter url parameter for message,Entrikan parameter url untuk pesan
 DocType: POS Profile,Customer Groups,Grup Pelanggan
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Laporan keuangan
 DocType: Guardian,Students,siswa
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Aturan untuk menerapkan harga dan diskon.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Harga List harus berlaku untuk Membeli atau Jual
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
 DocType: Company,Default Payroll Payable Account,Default Payroll Hutang Akun
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Grup
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Grup
 DocType: Sales Invoice,Is Opening Entry,Entri Pembuka?
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebutkan jika akun non-standar piutang yang berlaku
 DocType: Course Schedule,Instructor Name,instruktur Nama
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Stok Barang di Faktur Penjualan
 ,Production Orders in Progress,Order produksi dalam Proses
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Kas Bersih dari Pendanaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
 DocType: Lead,Address & Contact,Alamat & Kontak
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan 'cuti tak terpakai' dari alokasi sebelumnya
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Jumlah (via Waktu Lembar)
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Cuti Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Stok Barang
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Publikasikan di Hub
 DocType: Student Admission,Student Admission,Mahasiswa Pendaftaran
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Item {0} dibatalkan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
 DocType: Item,Purchase Details,Rincian pembelian
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui Email pada penciptaan Permintaan Bahan otomatis
 DocType: Journal Entry,Multi Currency,Multi Mata Uang
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipe Faktur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Nota Pengiriman
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Persiapan Pajak
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Biaya Asset Terjual
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Entri pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok Barang
-DocType: Grade Interval,Min Score,Min Skor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok Barang
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
 DocType: Student Applicant,Admitted,mengakui
 DocType: Workstation,Rent Cost,Biaya Sewa
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Nilai pesanan
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transaksi Bank / Cash terhadap partai atau untuk internal transfer
 DocType: Shipping Rule,Valid for Countries,Berlaku untuk Negara
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Stok Barang ini adalah Template dan tidak dapat digunakan dalam transaksi. Item atribut akan disalin ke dalam varian kecuali 'Tidak ada Copy' diatur
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Stok Barang ini adalah Template dan tidak dapat digunakan dalam transaksi. Item atribut akan disalin ke dalam varian kecuali 'Tidak ada Copy' diatur
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order Diperhitungkan
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Entrikan 'Ulangi pada Hari Bulan' nilai bidang
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Tarif Pajak
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} ke {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Pilih Stok Barang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Dikonversi ke non-Grup
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (banyak) dari Item.
 DocType: C-Form Invoice Detail,Invoice Date,Faktur Tanggal
 DocType: GL Entry,Debit Amount,Jumlah Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Buat Grup Mahasiswa
@@ -435,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,Permintaan Quotation
 DocType: Salary Slip Timesheet,Working Hours,Jam Kerja
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mengubah mulai / nomor urut saat ini dari seri yang ada.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Buat Pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Buat Pelanggan baru
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Aturan Harga terus menang, pengguna akan diminta untuk mengatur Prioritas manual untuk menyelesaikan konflik."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Buat Purchase Order
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Buat Purchase Order
 ,Purchase Register,Register Pembelian
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Biaya yang Berlaku
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Hari Libur.
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Dari Package No
 DocType: Item Attribute,To Range,Berkisar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Efek Saham dan Deposit
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak dapat mengubah metode valuasi, karena ada transaksi terhadap beberapa item yang tidak memiliki metode penilaian sendiri"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah cuti wajib dialokasikan
 DocType: Job Opening,Description of a Job Opening,Deskripsi dari Lowongan Pekerjaan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kegiatan tertunda untuk hari ini
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Biaya Operasi Tambahan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telepon Darurat
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Membeli
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Harap tentukan nilai untuk Threshold 0%
 DocType: Sales Order,To Deliver,Mengirim
 DocType: Purchase Invoice Item,Item,Barang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
 DocType: Account,Profit and Loss,Laba Rugi
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Pengaturan Subkontrak
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Laporan Instalasi Stok Barang
 DocType: Production Plan Item,Pending Qty,Qty Tertunda
 DocType: Budget,Ignore,Diabaikan
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} tidak aktif
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS dikirim ke nomor berikut: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensi penyiapan cek untuk pencetakan
 DocType: Salary Slip,Salary Slip Timesheet,Daftar Absen Slip Gaji
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Jumlah Nilai Komisi
 DocType: Pricing Rule,Sales Partner,Mitra Penjualan
 DocType: Buying Settings,Purchase Receipt Required,Diperlukan Nota Penerimaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Tingkat penilaian adalah wajib jika Stock Membuka masuk
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Tingkat penilaian adalah wajib jika Stock Membuka masuk
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis terlebih dahulu
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Keuangan / akuntansi Tahun Berjalan
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nilai akumulasi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Membuat Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Membuat Sales Order
 DocType: Project Task,Project Task,Tugas Proyek
 ,Lead Id,Id Kesempatan
 DocType: C-Form Invoice Detail,Grand Total,Nilai Jumlah Total
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Lanjutkan Lampiran
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumen Langganan
 DocType: Leave Control Panel,Allocate,Alokasi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Retur Penjualan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Retur Penjualan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Catatan: Jumlah daun dialokasikan {0} tidak boleh kurang dari daun yang telah disetujui {1} untuk periode
 DocType: Announcement,Posted By,Dikirim oleh
 DocType: Item,Delivered by Supplier (Drop Ship),Dikirim oleh Supplier (Drop Shipment)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Menengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Harap atur Perusahaan
 DocType: Purchase Order Item,Billed Amt,Nilai Tagihan
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Penjualan Faktur Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Pilih Account Pembayaran untuk membuat Bank Masuk
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Buat catatan Karyawan untuk mengelola daun, klaim biaya dan gaji"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Buat catatan Karyawan untuk mengelola daun, klaim biaya dan gaji"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tambahkan ke Basis Pengetahuan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Penulisan Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Masuk Pengurangan
@@ -656,8 +660,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Hubungan dengan Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manajer
 DocType: Payment Entry,Payment From / To,Pembayaran Dari / Untuk
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Rentang Tanggal
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},batas kredit baru kurang dari jumlah yang luar biasa saat ini bagi pelanggan. batas kredit harus minimal {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},batas kredit baru kurang dari jumlah yang luar biasa saat ini bagi pelanggan. batas kredit harus minimal {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Parameter Penerima
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan' dan 'Kelompokkan Dengan' tidak bisa sama
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Tanggal Resolusi
 DocType: Student Batch Name,Batch Name,Batch Nama
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Absen dibuat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Mendaftar
 DocType: Selling Settings,Customer Naming By,Penamaan Konsumen Dengan
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Akan menampilkan siswa sebagai Hadir di Student Bulanan Kehadiran Laporan
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Kehadiran mahasiswa
 DocType: Sales Invoice Timesheet,Time Sheet,Lembar waktu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Baku Berbasis Pada
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Harap Masukan Item Detail
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Harap Masukan Item Detail
 DocType: Interest,Interest,Bunga
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pra penjualan
 DocType: Purchase Receipt,Other Details,Detail lainnya
@@ -727,7 +730,7 @@
 ,Absent Student Report,Laporan Absen Siswa
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Term Surat Penawaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item memiliki varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} tidak ditemukan
 DocType: Bin,Stock Value,Nilai Stok
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Perusahaan {0} tidak ada
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,Tanggal Berakhir Garansi
 DocType: Material Request Item,Quantity and Warehouse,Kuantitas dan Gudang
 DocType: Sales Invoice,Commission Rate (%),Komisi Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Silahkan pilih Program
 DocType: Project,Estimated Cost,Estimasi biaya
 DocType: Purchase Order,Link to material requests,Link ke permintaan bahan
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} bukan merupakan Stok Barang persediaan
 DocType: Mode of Payment Account,Default Account,Akun Standar
 DocType: Payment Entry,Received Amount (Company Currency),Menerima Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Kesempatan harus diatur apabila Peluang berasal dari Kesempatan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Kesempatan harus diatur apabila Peluang berasal dari Kesempatan
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Silakan pilih dari hari mingguan
 DocType: Production Order Operation,Planned End Time,Rencana Waktu Berakhir
 ,Sales Person Target Variance Item Group-Wise,Sales Person Sasaran Variance Stok Barang Group-Wise
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Daftar Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Kirim Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Tidak ada Izin
 DocType: Company,Default Bank Account,Standar Rekening Bank
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik terlebih dahulu"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Supplier Quotation,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Student Group sudah diupdate
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Student Group sudah diupdate
 DocType: SMS Center,All Customer Contact,Semua Kontak Konsumen
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload keseimbangan Stok melalui csv.
 DocType: Warehouse,Tree Details,Detail pohon
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Nilai Minimum Faktur
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Biaya Pusat {2} bukan milik Perusahaan {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akun {2} tidak dapat di Kelompokkan
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {idx}: {doctype} {DOCNAME} tidak ada di atas &#39;{doctype}&#39; table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {idx}: {doctype} {DOCNAME} tidak ada di atas &#39;{doctype}&#39; table
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tidak ada tugas
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari bulan yang otomatis faktur akan dihasilkan misalnya 05, 28 dll"
 DocType: Asset,Opening Accumulated Depreciation,Membuka Penyusutan Akumulasi
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,Tingkat Moving Average
 DocType: Production Planning Tool,Select Items,Pilih Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Jadwal Kuliah
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Jadwal Kuliah
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: HR Settings,Enter retirement age in years,Memasuki usia pensiun di tahun
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Gudang
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Impor Absensi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Semua Grup Stok Barang/Item
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Semua Grup Stok Barang/Item
 DocType: Process Payroll,Activity Log,Log Aktivitas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Laba / Rugi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Order Pembelian untuk Dibayar
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Proyeksi Qty
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Awal'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka yang Harus Dilakukan
 DocType: Notification Control,Delivery Note Message,Pesan Nota Pengiriman
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tanggal Block List Cuti
 DocType: Pricing Rule,Price or Discount,Harga atau Diskon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total Biaya Berlaku di Purchase meja Jenis Penerimaan harus sama dengan jumlah Pajak dan Biaya
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total Biaya Berlaku di Purchase meja Jenis Penerimaan harus sama dengan jumlah Pajak dan Biaya
 DocType: Sales Team,Incentives,Insentif
 DocType: SMS Log,Requested Numbers,Nomor yang Diminta
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanya Mendapatkan Bahan Baku
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,Standar Akun Hutang
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Fee Structure,Components,komponen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Uang Muka Faktur Pembelian
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default akun Bank / Cash akan secara otomatis diperbarui di Gaji Journal Entri saat mode ini dipilih.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Interval untuk Kode kelas {0} tumpang tindih dengan interval kelas untuk kelas lainnya. Silakan periksa interval {0} dan {1} dan coba lagi
 DocType: BOM,Raw Material Cost(Company Currency),Biaya Bahan Baku (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Order Produksi ini.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Baris # {0}: Tarif tidak boleh lebih besar dari tarif yang digunakan di {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Situs Barang
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti).
 DocType: Timesheet Detail,Bill,Tagihan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Putih
 DocType: SMS Center,All Lead (Open),Semua Kesempatan (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} di gudang {1} pada postingan kali entri ({2} {3})
@@ -1051,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type harus menjadi salah satu {0}
 DocType: Lead,Next Contact Date,Tanggal Komunikasi Selanjutnya
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty Pembukaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
 DocType: Student Batch Name,Student Batch Name,Mahasiswa Nama Batch
 DocType: Holiday List,Holiday List Name,Daftar Nama Hari Libur
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Jumlah Pinjaman
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Tentukan {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
 DocType: Delivery Note,Delivery To,Pengiriman Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Order Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} tidak dapat negatif
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Diskon
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Diskon
 DocType: Asset,Total Number of Depreciations,Total Jumlah Penyusutan
 DocType: Sales Invoice Item,Rate With Margin,Tingkat Dengan Margin
 DocType: Workstation,Wages,Upah
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,Nama Organisasi
 DocType: Tax Rule,Shipping State,Negara Pengirim
 ,Projected Quantity as Source,Proyeksi Jumlah sebagai Sumber
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Termasuk item non-saham
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Beban Penjualan
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Standar Pusat Biaya Jual
 DocType: Sales Partner,Implementation Partner,Mitra Implementasi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kode Pos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Kode Pos
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} adalah {1}
 DocType: Opportunity,Contact Info,Informasi Kontak
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Membuat Stok Entri
@@ -1152,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Aturan Pengiriman Belanja Shoping Cart
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Order produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
 ,Ordered Items To Be Billed,Item Pesanan Tertagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 DocType: Global Defaults,Global Defaults,Standar Global
@@ -1187,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Masukkan Item Code untuk mendapatkan Nomor Batch
 DocType: Stock Settings,Default Item Group,Standar Item Grup
 DocType: Employee Loan,Partially Disbursed,sebagian Dicairkan
-DocType: Grading Structure,Grading System Name,Nama Grading Sistem
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database Supplier.
 DocType: Account,Balance Sheet,Neraca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modus pembayaran tidak dikonfigurasi. Silakan periksa, apakah akun telah ditetapkan pada Cara Pembayaran atau POS Profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modus pembayaran tidak dikonfigurasi. Silakan periksa, apakah akun telah ditetapkan pada Cara Pembayaran atau POS Profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Sales Anda akan mendapatkan pengingat pada tanggal ini untuk menghubungi Konsumen
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,item yang sama tidak dapat dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Account lebih lanjut dapat dibuat di bawah Grup, tapi entri dapat dilakukan terhadap non-Grup"
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Pekerjaan Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Silakan tentukan setidaknya satu atribut dalam tabel Atribut
 DocType: Announcement,All Students,Semua murid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} harus item non-saham
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} harus item non-saham
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Lihat Buku Besar
 DocType: Grading Scale,Intervals,interval
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Paling Awal
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Mahasiswa Nomor Ponsel
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Rest of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Faktur Berjalan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu Anda merencanakan dan menindaklanjuti pembelian Anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu Anda merencanakan dan menindaklanjuti pembelian Anda
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Total Issue / transfer kuantitas {0} Material Permintaan {1} \ tidak dapat lebih besar dari yang diminta kuantitas {2} untuk Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kecil
@@ -1297,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Produk atau Jasa
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ini adalah kelompok Stok Barang akar dan tidak dapat diedit.
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Nomor roll grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total semua bobot tugas harus 1. Sesuaikan bobot dari semua tugas Proyek sesuai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Perlengkapan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
@@ -1341,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entri
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} item berlangsung
 DocType: Workstation,Workstation Name,Nama Workstation
-DocType: Grade Interval,Grade Code,Kode kelas
+DocType: Grading Scale Interval,Grade Code,Kode kelas
 DocType: POS Item Group,POS Item Group,POS Barang Grup
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
@@ -1357,7 +1355,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Perangkat keras
 DocType: Sales Order,Recurring Upto,berulang Upto
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Silakan pilih sebuah Perusahaan
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Silakan pilih sebuah Perusahaan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Tanggal Faktur Supplier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rentang Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,Tidak ada Kunjungan
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark absensi
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark absensi
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Jadwal Pemeliharaan {0} ada terhadap {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,mahasiswa Mendaftarkan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata uang dari Rekening Penutupan harus {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah poin untuk semua tujuan harus 100. Ini adalah {0}
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Chart of Account
 DocType: Material Request,Terms and Conditions Content,Syarat dan Ketentuan Konten
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
 DocType: Maintenance Visit,Unscheduled,Tidak Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Detail,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
 DocType: Pricing Rule,"Higher the number, higher the priority","Semakin tinggi angkanya, semakin tinggi prioritas"
 ,Purchase Invoice Trends,Pembelian Faktur Trends
 DocType: Employee,Better Prospects,Prospek yang Lebih Baik
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Baris # {0}: Kumpulan {1} hanya memiliki {2} qty. Silakan pilih batch lain yang memiliki {3} qty available atau membagi baris menjadi beberapa baris, untuk mengirimkan / mengeluarkan dari beberapa batch"
 DocType: Vehicle,License Plate,Pelat
 DocType: Appraisal,Goals,tujuan
 DocType: Warranty Claim,Warranty / AMC Status,Garansi / Status AMC
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika account beku, entri yang diizinkan untuk pengguna terbatas."
 DocType: Email Digest,Bank Balance,Saldo bank
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri Akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri Akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pekerjaan, kualifikasi yang dibutuhkan dll"
 DocType: Journal Entry Account,Account Balance,Saldo Akun Rekening
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Aturan pajak untuk transaksi.
@@ -1458,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tampilkan P &amp; saldo L tahun fiskal tertutup ini
 DocType: Shipping Rule,Shipping Account,Account Pengiriman
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Akun {2} tidak aktif
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Membuat Penjualan Pesanan untuk membantu Anda merencanakan pekerjaan Anda dan memberikan tepat waktu
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Membuat Penjualan Pesanan untuk membantu Anda merencanakan pekerjaan Anda dan memberikan tepat waktu
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Total Biaya Tambahan
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Untuk Dinilai
 DocType: Asset Movement,Stock Manager,Manajer Stok Barang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Slip Packing
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Slip Packing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Sewa Kantor
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Impor Gagal!
@@ -1495,7 +1495,7 @@
 DocType: Sales Invoice,Source,Sumber
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Tampilkan ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Cuti Tanpa Bayar
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ini {0} konflik dengan {1} untuk {2} {3}
 DocType: Student Attendance Tool,Students HTML,siswa HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,Tanggal Meninggalkan
 DocType: Pricing Rule,For Price List,Untuk Daftar Harga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Pencarian eksekutif
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Buat Memimpin
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Buat Memimpin
 DocType: Maintenance Schedule,Schedules,Jadwal
 DocType: Purchase Invoice Item,Net Amount,Nilai Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
@@ -1541,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Terdaftar
 DocType: Sales Invoice Item,Brand Name,Merek Nama
 DocType: Purchase Receipt,Transporter Details,Detail transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kotak
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mungkin Pemasok
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisasi
@@ -1574,7 +1574,7 @@
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM default untuk {0} tidak ditemukan untuk Proyek {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Klaim untuk biaya perusahaan.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Siswa di jantung dari sistem, menambahkan semua siswa Anda"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Siswa di jantung dari sistem, menambahkan semua siswa Anda"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: tanggal Jarak {1} tidak bisa sebelum Cek Tanggal {2}
 DocType: Company,Default Holiday List,Standar Daftar Hari Libur
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Dari Waktu dan Untuk Waktu {1} adalah tumpang tindih dengan {2}
@@ -1586,20 +1586,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) yang Anda lamar cuti adalah hari libur. Anda tidak perlu mengajukan cuti.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Kirim ulang Pembayaran Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,tugas baru
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Membuat Quotation
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Membuat Quotation
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Laporan lainnya
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Stop Pengingat Ulang Tahun
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Silahkan mengatur default Payroll Hutang Akun di Perusahaan {0}
 DocType: SMS Center,Receiver List,Daftar Penerima
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Cari Barang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Cari Barang
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Dikonsumsi Jumlah
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Perubahan bersih dalam kas
 DocType: Assessment Plan,Grading Scale,Skala penilaian
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Sudah lengkap
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Permintaan pembayaran sudah ada {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
@@ -1637,7 +1637,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Mengumpulkan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Terhadap Faktur Supplier {0} di tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak dapat menghapus Tahun Anggaran {0}. Tahun fiskal {0} diatur sebagai default di Global Settings
 DocType: Journal Entry,Entry Type,Entri Type
 ,Customer Credit Balance,Saldo Kredit Konsumen
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,Belajar di Same Institute
 DocType: Territory,Territory Manager,Manager Wilayah
 DocType: Packed Item,To Warehouse (Optional),Untuk Gudang (pilihan)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Dibayar Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Invoice,Additional Discount,Diskon Tambahan
 DocType: Selling Settings,Selling Settings,Pengaturan Penjualan
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Lihat Troli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Laporan Kekurangan Barang / Item
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat Entri Bursa ini
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Berikutnya Penyusutan Tanggal wajib untuk aset baru
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Berikutnya Penyusutan Tanggal wajib untuk aset baru
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Kelompok terpisah berdasarkan Kelompok untuk setiap Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unit tunggal Item.
 DocType: Fee Category,Fee Category,biaya Kategori
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Pusat Biaya diperlukan untuk akun 'Rugi Laba' {2}. Silakan membuat Pusat Biaya default untuk Perusahaan.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Konsumen sudah ada dengan nama yang sama, silakan mengubah nama Konsumen atau mengubah nama Grup Konsumen"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Konsumen sudah ada dengan nama yang sama, silakan mengubah nama Konsumen atau mengubah nama Grup Konsumen"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Kontak baru
 DocType: Territory,Parent Territory,Wilayah Induk
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Rekonsiliasi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak kolom. Mengekspor laporan dan mencetaknya menggunakan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,No. Batch
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Tidak dapat menemukan tukar untuk {0} ke {1} untuk tanggal kunci {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Memungkinkan Penjualan beberapa Order terhadap Purchase Order Konsumen
 DocType: Student Group Instructor,Student Group Instructor,Instruktur Kelompok Mahasiswa
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Ponsel Tidak
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Utama
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varian
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Utama
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
 DocType: Employee Attendance Tool,Employees HTML,Karyawan HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
 DocType: Employee,Leave Encashed?,Cuti dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari Bidang Usaha Wajib Diisi
 DocType: Email Digest,Annual Expenses,Beban tahunan
 DocType: Item,Variants,Varian
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Buat Order Pembelian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Buat Order Pembelian
 DocType: SMS Center,Send To,Kirim Ke
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang dialokasikan
@@ -1764,7 +1761,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Penilaian
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Gandakan Serial ada dimasukkan untuk Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sebuah kondisi untuk Aturan Pengiriman
-DocType: Grading Structure,Grading Intervals,Interval Grading
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,masukkan
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Tidak bisa overbill untuk Item {0} berturut-turut {1} lebih dari {2}. Untuk memungkinkan over-billing, silakan diatur dalam Membeli Pengaturan"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Silahkan mengatur filter berdasarkan Barang atau Gudang
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,Pengendali Otorisasi
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ditolak Gudang adalah wajib terhadap ditolak Stok Barang {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pembayaran
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Mengelola pesanan Anda
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Mengelola pesanan Anda
 DocType: Production Order Operation,Actual Time and Cost,Waktu dan Biaya Aktual
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimal {0} dapat dibuat untuk Item {1} terhadap Sales Order {2}
 DocType: Employee,Salutation,Panggilan
 DocType: Course,Course Abbreviation,Singkatan saja
 DocType: Student Leave Application,Student Leave Application,Mahasiswa Cuti Aplikasi
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Karyawan {0} tentang Half hari {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak boleh lebih besar dari max jam kerja {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Nyala
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundel item pada saat penjualan.
 DocType: Quotation Item,Actual Qty,Jumlah Aktual
 DocType: Sales Invoice Item,References,Referensi
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan item yang sama. Harap diperbaiki dan coba lagi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Rekan
 DocType: Asset Movement,Asset Movement,Gerakan aset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Cart baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Cart baru
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} bukan merupakan Stok Barang serial
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
 DocType: Vehicle,Wheels,roda
@@ -1828,9 +1825,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Menonaktifkan penciptaan log waktu terhadap Order Produksi. Operasi tidak akan dilacak terhadap Orde Produksi
 DocType: Student,Student Mobile Number,Mahasiswa Nomor Ponsel
 DocType: Item,Has Variants,Memiliki Varian
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID adalah wajib
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
 DocType: Sales Person,Parent Sales Person,Induk Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Faktur Berulang/Langganan
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Pengelolaan Proyek
@@ -1838,7 +1835,7 @@
 DocType: Budget,Fiscal Year,Tahun Fiskal
 DocType: Vehicle Log,Fuel Price,Harga BBM
 DocType: Budget,Budget,Anggaran belanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus item non-saham.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus item non-saham.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Anggaran tidak dapat ditugaskan terhadap {0}, karena itu bukan Penghasilan atau Beban akun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
 DocType: Student Admission,Application Form Route,Form aplikasi Route
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Jumlah {0} {1} dipotong terhadap {2}
 DocType: Employee,Salary Information,Informasi Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Karyawan
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Stok Barang Grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Tarif dan Pajak
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Harap masukkan tanggal Referensi
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Pendapatan konsumen langganan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pasangan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
 DocType: Asset,Depreciation Schedule,Jadwal penyusutan
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Tanggal Setengah Hari harus di antara Tanggal Mulai dan Tanggal Akhir
@@ -1944,13 +1941,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
 ,Quotation Trends,Trend Quotation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master Stok Barang untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
 DocType: Shipping Rule Condition,Shipping Amount,Jumlah Pengiriman
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Jumlah Pending
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
 DocType: Purchase Order,Delivered,Dikirim
 ,Vehicle Expenses,Beban kendaraan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
+DocType: Serial No,Invoice Details,Detail faktur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
 DocType: Purchase Receipt,Vehicle Number,Nomor Kendaraan
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tanggal dimana berulang faktur akan berhenti
 DocType: Employee Loan,Loan Amount,Jumlah pinjaman
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskon Tambahan
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Cuti Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Kelompok Non-kelompok
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Olahraga
 DocType: Loan Type,Loan Name,pinjaman Nama
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,Akuisisi Konsumen dan Loyalitas
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Gudang di mana Anda mempertahankan stok item ditolak
 DocType: Production Order,Skip Material Transfer,Lewati Transfer Material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Tidak dapat menemukan nilai tukar untuk {0} sampai {1} untuk tanggal kunci {2}. Buat catatan Currency Exchange secara manual
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Tahun keuangan Anda berakhir pada
 DocType: POS Profile,Price List,Daftar Harga
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} adalah Tahun Anggaran default. Silahkan me-refresh browser Anda agar perubahan dapat terwujud
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Item {0} telah dikembalikan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Anggaran ** mewakili Tahun Keuangan. Semua entri akuntansi dan transaksi besar lainnya dilacak terhadap Tahun Anggaran ** **.
 DocType: Opportunity,Customer / Lead Address,Konsumen / Alamat Kesempatan
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Peringatan: Sertifikat SSL tidak valid pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Peringatan: Sertifikat SSL tidak valid pada lampiran {0}
 DocType: Student Admission,Eligibility,kelayakan
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Lead membantu Anda mendapatkan bisnis, menambahkan semua kontak Anda dan lebih sebagai lead Anda"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Lead membantu Anda mendapatkan bisnis, menambahkan semua kontak Anda dan lebih sebagai lead Anda"
 DocType: Production Order Operation,Actual Operation Time,Waktu Operasi Aktual
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Pengurangan
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Pilih Perusahaan ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Biarkan kosong jika dianggap untuk semua departemen
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Process Payroll,Fortnightly,sekali dua minggu
 DocType: Currency Exchange,From Currency,Dari mata uang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak dapat memilih jenis biaya sebagai 'Pada Row Sebelumnya Jumlah' atau 'On Sebelumnya Row Jumlah' untuk baris terlebih dahulu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barang Turunan tidak boleh berupa sebuah Bundel Produk. Silahkan hapus barang `{0}` dan simpan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,menambahkan Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,menambahkan Timesheets
 DocType: Vehicle Service,Service Item,layanan Barang
 DocType: Bank Guarantee,Bank Guarantee,Garansi Bank
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Silahkan klik 'Menghasilkan Jadwal' untuk mendapatkan jadwal
@@ -2126,8 +2125,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan ditampilkan jika Harga Daftar tidak diatur
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Silakan tentukan negara untuk Aturan Pengiriman ini atau periksa Seluruh Dunia Pengiriman
 DocType: Stock Entry,Total Incoming Value,Total nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit Untuk diperlukan
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Daftar Harga
 DocType: Offer Letter Term,Offer Term,Penawaran Term
 DocType: Quality Inspection,Quality Manager,Manajer Mutu
@@ -2160,14 +2159,14 @@
 DocType: Opportunity,Lost Reason,Alasan Kehilangan
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Alamat baru
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Masukkan Dokumen Penerimaan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Semua Stok Barang telah tertagih
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Masukkan Dokumen Penerimaan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Semua Stok Barang telah tertagih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
 DocType: Project,External,Eksternal
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Perizinan
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produksi Pesanan Dibuat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Produksi Pesanan Dibuat: {0}
 DocType: Branch,Branch,Cabang
 DocType: Guardian,Mobile Number,Nomor handphone
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Branding
@@ -2176,7 +2175,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} tidak ditemukan
 DocType: Scheduling Tool,Student Batch,Mahasiswa Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Konsumen Anda
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,membuat Siswa
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,membuat Siswa
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Anda telah diundang untuk berkolaborasi pada proyek: {0}
 DocType: Leave Block List Date,Block Date,Blokir Tanggal
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Terapkan Sekarang
@@ -2199,8 +2198,9 @@
 DocType: SMS Log,Sent To,Dikirim Ke
 DocType: Payment Request,Make Sales Invoice,Buat Faktur Penjualan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Berikutnya Hubungi Tanggal tidak dapat di masa lalu
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Berikutnya Hubungi Tanggal tidak dapat di masa lalu
 DocType: Company,For Reference Only.,Untuk referensi saja.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Pilih Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Valid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Jumlah Uang Muka
@@ -2214,7 +2214,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Kasus No tidak bisa 0
 DocType: Item,Show a slideshow at the top of the page,Tampilkan slideshow di bagian atas halaman
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMS
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Toko
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Toko
 DocType: Serial No,Delivery Time,Waktu Pengiriman
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Umur Berdasarkan
 DocType: Item,End of Life,Akhir Riwayat
@@ -2230,8 +2230,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Material/Stok Barang
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini adalah lebih dari batas oleh {0} {1} untuk item {4}. Apakah Anda membuat yang lain {3} terhadap yang sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Pilih akun berubah jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Pilih akun berubah jumlah
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
 DocType: Stock Settings,Allow Negative Stock,Izinkkan Stok Negatif
@@ -2242,7 +2242,7 @@
 DocType: Budget Account,Budget Account,Akun anggaran
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak dapat mengubah mata uang default perusahaan, karena ada transaksi yang ada. Transaksi harus dibatalkan untuk mengubah mata uang default."
-DocType: Grade Interval,Grade Description,kelas Keterangan
+DocType: Grading Scale Interval,Grade Description,kelas Keterangan
 DocType: Stock Entry,Purchase Receipt No,No Nota Penerimaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Uang Earnest
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
@@ -2280,7 +2280,7 @@
 DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
 DocType: Warranty Claim,Raised By,Diangkat Oleh
 DocType: Payment Gateway Account,Payment Account,Akun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Perubahan bersih Piutang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensasi Off
 DocType: Offer Letter,Accepted,Diterima
@@ -2293,7 +2293,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update Stok, faktur berisi penurunan Stok Barang pengiriman."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update Stok, faktur berisi penurunan Stok Barang pengiriman."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Jurnal Entry Cepat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap Stok Barang
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
@@ -2307,7 +2307,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nama lembaga yang Anda menyiapkan sistem ini.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Pencatatan Akuntansi telah dibekukan sampai tanggal ini, tidak seorang pun yang bisa melakukan / memodifikasi pencatatan kecuali peran yang telah ditentukan di bawah ini."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Harap menyimpan dokumen sebelum menghasilkan jadwal pemeliharaan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Harap menyimpan dokumen sebelum menghasilkan jadwal pemeliharaan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status proyek
 DocType: UOM,Check this to disallow fractions. (for Nos),Centang untuk melarang fraksi. (Untuk Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Berikut Pesanan Produksi diciptakan:
@@ -2330,6 +2330,7 @@
 DocType: Email Digest,How frequently?,Seberapa sering?
 DocType: Purchase Receipt,Get Current Stock,Dapatkan Stok saat ini
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree Bill of Material
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 DocType: Student,Joining Date,Tanggal Bergabung
 ,Employees working on a holiday,Karyawan yang bekerja pada hari libur
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Hadir
@@ -2430,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produksi
 DocType: Guardian,Occupation,Pendudukan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,Dokumen ini
 DocType: Installation Note Item,Installed Qty,Terpasang Qty
@@ -2453,7 +2454,7 @@
 DocType: Notification Control,Sales Order Message,Pesan Nota Penjualan
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nilai Default seperti Perusahaan, Mata Uang, Tahun Anggaran Current, dll"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Silakan pilih Batch for Item {0}. Tidak dapat menemukan satu bets yang memenuhi persyaratan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Silakan pilih Batch for Item {0}. Tidak dapat menemukan satu bets yang memenuhi persyaratan ini
 DocType: Process Payroll,Select Employees,Pilih Karyawan
 DocType: Opportunity,Potential Sales Deal,Kesepakatan potensial Penjualan
 DocType: Payment Entry,Cheque/Reference Date,Cek / Tanggal Referensi
@@ -2470,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global Profil POS {0} sudah dibuat untuk perusahaan {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Ganti Stok Barang / BOM di semua BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,dokumen tanda terima harus diserahkan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,dokumen tanda terima harus diserahkan
 DocType: Purchase Invoice Item,Received Qty,Qty Diterima
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Tidak Dibayar dan tidak Terkirim
@@ -2483,7 +2484,7 @@
 ,To Produce,Untuk Menghasilkan
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Daftar gaji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,membuat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,membuat Pengguna
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasi paket untuk pengiriman (untuk mencetak)
 DocType: Bin,Reserved Quantity,Reserved Kuantitas
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Harap masukkan alamat email yang benar
@@ -2495,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Template cacat tidak harus template default
 DocType: Account,Income Account,Akun Penghasilan
 DocType: Payment Request,Amount in customer's currency,Jumlah dalam mata uang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Pengiriman
 DocType: Stock Reconciliation Item,Current Qty,Jumlah saat ini
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Lihat ""Rate Of Material Berbasis"" dalam Biaya Bagian"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Sebelumnya
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Batch Student membantu Anda melacak kehadiran, penilaian dan biaya untuk siswa"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Batch Student membantu Anda melacak kehadiran, penilaian dan biaya untuk siswa"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Total Dialokasikan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal masuk untuk gaji dari {0} ke {1}
@@ -2522,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Melacak Memimpin menurut Produksi Type.
 DocType: Item Supplier,Item Supplier,Item Supplier
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan Stok
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
@@ -2532,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Akan mengirim email tentang acara untuk pegawai dengan status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Tergantung pada Tugas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage Group Konsumen Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Lampiran dapat ditunjukkan tanpa mengaktifkan keranjang belanja
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Baru Nama Biaya Pusat
 DocType: Leave Control Panel,Leave Control Panel,Cuti Control Panel
@@ -2544,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,Debit Untuk
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tidak ada slip gaji ditemukan antara {0} dan {1}
 ,Pending SO Items For Purchase Request,Pending SO Items Untuk Pembelian Permintaan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Penerimaan Mahasiswa
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} dinonaktifkan
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} dinonaktifkan
 DocType: Supplier,Billing Currency,Mata Uang Penagihan
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra Besar
@@ -2565,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Produk Pilihan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Semua Grup Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Gudang baru Nama
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Wilayah
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
 DocType: Stock Settings,Default Valuation Method,Metode Perhitungan Standar
@@ -2583,7 +2585,7 @@
 DocType: Price List,Price List Master,Daftar Harga Guru
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Penjualan dapat ditandai terhadap beberapa ** Orang Penjualan ** sehingga Anda dapat mengatur dan memonitor target.
 ,S.O. No.,SO No
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Silakan membuat Konsumen dari Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Silakan membuat Konsumen dari Lead {0}
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Hanya Tinggalkan Aplikasi status &#39;Disetujui&#39; dan &#39;Ditolak&#39; dapat disampaikan
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Mahasiswa Nama Group adalah wajib berturut-turut {0}
@@ -2675,7 +2677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Entri Akunting untuk Stok
 DocType: Vehicle Service,Engine Oil,Oli mesin
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat Konsumen
 DocType: Employee Loan,Loan Details,Detail pinjaman
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Selesai Qty harus lebih besar dari nol.
@@ -2739,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke grup.
 DocType: Assessment Result Tool,Result HTML,hasil HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Kadaluarsa pada
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Tambahkan Siswa
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Tambahkan Siswa
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Silahkan pilih {0}
 DocType: C-Form,C-Form No,C-Form ada
 DocType: BOM,Exploded_items,Pembesaran Item
@@ -2803,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,batas Dilalui
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Ventura
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Istilah akademik dengan ini &#39;Tahun Akademik&#39; {0} dan &#39;Nama Term&#39; {1} sudah ada. Harap memodifikasi entri ini dan coba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Karena ada transaksi yang ada terhadap barang {0}, Anda tidak dapat mengubah nilai {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Karena ada transaksi yang ada terhadap barang {0}, Anda tidak dapat mengubah nilai {1}"
 DocType: UOM,Must be Whole Number,Harus Nomor Utuh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),cuti baru Dialokasikan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial ada {0} tidak ada
@@ -2846,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,Hari terakhir dari Bulan Depan
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue dekat setelah 7 hari
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat dialokasikan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit Konsumen dengan {0} hari (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit Konsumen dengan {0} hari (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Mahasiswa Pemohon
 DocType: Asset Category Account,Accumulated Depreciation Account,Akun Penyusutan Akumulasi
 DocType: Stock Settings,Freeze Stock Entries,Bekukan Stok Entri
@@ -2874,7 +2876,7 @@
 DocType: Asset,Item Code,Kode Item
 DocType: Production Planning Tool,Create Production Orders,Buat Order Produksi
 DocType: Serial No,Warranty / AMC Details,Garansi / Detail AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
 DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Dibayar Jumlah tidak dapat lebih besar dari jumlah total outstanding negatif {0}
@@ -2892,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,Buat Order Permintaan Material
 DocType: Employee Education,School/University,Sekolah / Universitas
 DocType: Payment Request,Reference Details,Detail referensi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
 DocType: Sales Invoice Item,Available Qty at Warehouse,Jumlah Tersedia di Gudang
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jumlah Tagihan
 DocType: Asset,Double Declining Balance,Ganda Saldo Menurun
@@ -2913,19 +2915,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Entri Pembukaan"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Dicairkan Jumlah tidak dapat lebih besar dari Jumlah Pinjaman {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Pesanan produksi tidak diciptakan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Pesanan produksi tidak diciptakan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},tidak dapat mengubah status sebagai mahasiswa {0} terkait dengan aplikasi mahasiswa {1}
 DocType: Asset,Fully Depreciated,sepenuhnya disusutkan
 ,Stock Projected Qty,Stock Proyeksi Jumlah
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Konsumen {0} bukan milik proyek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Konsumen {0} bukan milik proyek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ditandai HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Kutipan proposal, tawaran Anda telah dikirim ke pelanggan Anda"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Kutipan proposal, tawaran Anda telah dikirim ke pelanggan Anda"
 DocType: Sales Order,Customer's Purchase Order,Purchase Order Konsumen
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial dan Batch
 DocType: Warranty Claim,From Company,Dari Perusahaan
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Jumlah Skor Kriteria Penilaian perlu {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Silakan mengatur Jumlah Penyusutan Dipesan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Silakan mengatur Jumlah Penyusutan Dipesan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Nilai atau Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Menit
@@ -3053,7 +3055,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kelompok mahasiswa
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok Stok Barang atau mengubah nama item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Silakan pilih pelanggan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Silakan pilih pelanggan
 DocType: C-Form,I,saya
 DocType: Company,Asset Depreciation Cost Center,Asset Pusat Penyusutan Biaya
 DocType: Sales Order Item,Sales Order Date,Tanggal Nota Penjualan
@@ -3072,19 +3074,18 @@
 DocType: Vehicle,Insurance Details,Detail asuransi
 DocType: Account,Payable,Hutang
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Masukkan Periode Pembayaran
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitur ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitur ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Konsumen baru
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Laba Kotor%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Izin Tanggal
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Jumlah Pembelian kotor adalah wajib
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Jumlah Pembelian kotor adalah wajib
 DocType: Lead,Address Desc,Deskripsi Alamat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partai adalah wajib
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,topik Nama
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,"Setidaknya salah satu, Jual atau Beli harus dipilih"
-DocType: Grading Structure,Grade Intervals,Interval kelas
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pilih jenis bisnis anda.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dimana operasi manufaktur dilakukan.
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
@@ -3113,6 +3114,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Silahkan mengatur default {0} di Perusahaan {1}
 DocType: Cheque Print Template,Starting position from top edge,Mulai posisi dari tepi atas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,pemasok yang sama telah dimasukkan beberapa kali
@@ -3164,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Susun ulang Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Job Openings saat
 DocType: Company,Stock Adjustment Account,Penyesuaian Stock Akun
-DocType: Journal Entry,Write Off,Mencoret
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Mencoret
 DocType: Timesheet Detail,Operation ID,ID Operasi
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Pengguna Sistem (login) ID. Jika diset, itu akan menjadi default untuk semua bentuk HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
@@ -3175,8 +3177,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Supplier memberikan kepada Konsumen
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form/Item/{0}) habis persediaannya
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Tanggal berikutnya harus lebih besar dari Tanggal Posting
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Tampilkan pajak break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Tampilkan pajak break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Impor dan Ekspor
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entri saham ada terhadap Warehouse {0}, maka Anda tidak dapat kembali menetapkan atau memodifikasinya"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Tidak ada siswa Ditemukan
@@ -3188,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Dari AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Silakan pilih Kutipan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Membuat Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Silakan pilih Kutipan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Membuat Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
 DocType: Company,Default Cash Account,Standar Rekening Kas
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Perusahaan (tidak Konsumen atau Supplier) Master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Hal ini didasarkan pada kehadiran mahasiswa ini
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Tidak ada siswa
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Menambahkan item lebih atau bentuk penuh terbuka
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Entrikan 'Diharapkan Pengiriman Tanggal'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
@@ -3240,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum rekonsiliasi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Pajak dan Biaya Ditambahkan (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
 DocType: Sales Order,Partly Billed,Sebagian Ditagih
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} harus menjadi Asset barang Tetap
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} harus menjadi Asset barang Tetap
 DocType: Item,Default BOM,BOM Standar
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Posisi Amt
@@ -3264,7 +3267,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Daftar Harga Tukar
 DocType: Purchase Invoice Item,Rate,Menilai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Menginternir
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nama alamat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Nama alamat
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment Code,Assessment Code,Kode penilaian
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Dasar
@@ -3289,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,cetak Bahasa
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Stock Entry,Including items for sub assemblies,Termasuk item untuk sub rakitan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Masukkan nilai harus positif
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Masukkan nilai harus positif
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Mahasiswa sudah terdaftar.
@@ -3308,16 +3311,14 @@
 DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
 DocType: Assessment Plan,Supervisor Name,Nama pengawas
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Pendaftaran Program
-DocType: Grading Structure,Grading Structure,Struktur Grading
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
 DocType: Tax Rule,Shipping City,Pengiriman Kota
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Stok Barang ini adalah Varian dari {0} (Template). Atribut akan disalin dari template kecuali 'No Copy' diatur
 DocType: Notification Control,Customize the Notification,Sesuaikan Pemberitahuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Arus Kas dari Operasi
 DocType: Sales Invoice,Shipping Rule,Aturan Pengiriman
@@ -3340,6 +3341,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tanggal pembukaan harus sebelum Tanggal Penutupan
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup&gt; Numbering Series
 DocType: Leave Control Panel,Carry Forward,Carry Teruskan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke buku
 DocType: Department,Days for which Holidays are blocked for this department.,Hari yang Holidays diblokir untuk departemen ini.
@@ -3367,7 +3369,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 DocType: Quality Inspection,Item Serial No,Item Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Buat Rekaman Karyawan
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Buat Rekaman Karyawan
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Hadir
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Laporan akuntansi
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Jam
@@ -3382,7 +3384,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru setelah penggantian
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,menerima Jumlah
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan setup Employee Naming System di Human Resource&gt; HR Settings
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Buat kuantitas penuh, mengabaikan kuantitas sudah pada pesanan"
 DocType: Account,Tax,PPN
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,tidak Ditandai
@@ -3393,7 +3394,7 @@
 DocType: C-Form,Invoices,Faktur
 DocType: Batch,Source Document Name,Nama dokumen sumber
 DocType: Job Opening,Job Title,Jabatan
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Buat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Buat Pengguna
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Kunjungi laporan untuk panggilan pemeliharaan.
@@ -3404,8 +3405,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih Ekuitas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
 DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Penerimaan
 ,Sales Register,Daftar Penjualan
@@ -3416,16 +3417,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tidak ada yang mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
 DocType: Customer Group,Customer Group Name,Nama Kelompok Konsumen
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Belum ada pelanggan
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Laporan arus kas
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisensi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya cuti tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
 DocType: Item,Attributes,Atribut
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Cukup masukkan Write Off Akun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Order terakhir Tanggal
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
 DocType: Student,Guardian Details,Detail wali
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran untuk beberapa karyawan
@@ -3450,14 +3453,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akun harus bertipe &#39;Fixed Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Aturan untuk menghitung jumlah pengiriman untuk penjualan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Jasa Keuangan
 DocType: Student Sibling,Student ID,Identitas Siswa
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Jenis kegiatan untuk Waktu Log
 DocType: Tax Rule,Sales,Penjualan
 DocType: Stock Entry Detail,Basic Amount,Jumlah Dasar
 DocType: Training Event,Exam,Ujian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Stok Barang {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Stok Barang {0}
 DocType: Leave Allocation,Unused leaves,cuti terpakai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Negara penagihan
@@ -3490,7 +3493,7 @@
 DocType: Payment Entry,Account Paid From,Akun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan Baku Item Code
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,membuat Memimpin
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,membuat Memimpin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Cetak dan Alat Tulis
 DocType: Stock Settings,Show Barcode Field,Tampilkan Barcode Lapangan
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Kirim Pemasok Email
@@ -3505,6 +3508,7 @@
 DocType: Offer Letter,Awaiting Response,Menunggu Respon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Di atas
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut tidak valid {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Sebutkan jika akun hutang non-standar
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
@@ -3538,7 +3542,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Siswa Dari
 DocType: Hub Settings,Seller Country,Penjual Negara
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikasikan Produk di Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Kelompok siswa Anda dalam batch
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Kelompok siswa Anda dalam batch
 DocType: Authorization Rule,Authorization Rule,Regulasi Autorisasi
 DocType: Sales Invoice,Terms and Conditions Details,Syarat dan Ketentuan Detail
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Spesifikasi
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Percobaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,Baru Tahun Akademik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Kembali / Nota Kredit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Kembali / Nota Kredit
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Jumlah Total Dibayar
 DocType: Production Order Item,Transferred Qty,Ditransfer Qty
@@ -3638,6 +3642,7 @@
 ,Sales Funnel,Penjualan Saluran
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Singkatan wajib diisi
 DocType: Project,Task Progress,tugas Kemajuan
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Troli
 ,Qty to Transfer,Jumlah Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Harga untuk Memimpin atau Konsumen.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran Diizinkan untuk mengedit Stok beku
@@ -3670,7 +3675,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantitas ({0}) tidak boleh menjadi pecahan dalam baris {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,kumpulkan Biaya
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
 DocType: Lead,Add to calendar on this date,Tambahkan ke kalender pada tanggal ini
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Aturan untuk menambahkan biaya pengiriman.
 DocType: Item,Opening Stock,Stok pembuka
@@ -3689,7 +3694,7 @@
 DocType: Customer,From Lead,Dari Timbal
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order dirilis untuk produksi.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Siswa
 DocType: Hub Settings,Name Token,Nama Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Jual
@@ -3700,7 +3705,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nama Proyek
-DocType: Supplier,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
+DocType: Customer,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
 DocType: Production Order,Required Items,Produk yang dibutuhkan
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai Stok Perbedaan
@@ -3730,6 +3735,7 @@
 DocType: Item,Taxes,PPN
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Dibayar dan Tidak Terkirim
 DocType: Project,Default Cost Center,Standar Biaya Pusat
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup&gt; Settings&gt; Naming Series
 DocType: Bank Guarantee,End Date,Tanggal Berakhir
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transaksi saham
 DocType: Budget,Budget Accounts,Akun anggaran
@@ -3794,7 +3800,7 @@
 DocType: Customer,Sales Partner and Commission,Penjualan Mitra dan Komisi
 DocType: Employee Loan,Rate of Interest (%) / Year,Tingkat bunga (%) / Tahun
 ,Project Quantity,proyek Kuantitas
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Distribusikan Biaya Berdasarkan&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Distribusikan Biaya Berdasarkan&#39;"
 DocType: Opportunity,To Discuss,Untuk Diskusikan
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} dibutuhkan dalam {2} untuk menyelesaikan transaksi ini.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tingkat bunga (%) Tahunan
@@ -3817,7 +3823,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Mata dari BOM # {1} harus sama dengan mata uang yang dipilih {2}
 DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
 DocType: Homepage,Tag Line,klimaks
 DocType: Fee Component,Fee Component,biaya Komponen
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Manajemen armada
@@ -3834,7 +3840,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Gudang {0} tidak ada
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Untuk mendaftar ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Persentase Distribusi bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tingkat valuasi tidak ditemukan Item {0}, yang diperlukan untuk melakukan entri akuntansi {1} {2}. Jika item bertransaksi sebagai item sampel dalam {1}, harap menyebutkan bahwa dalam {1} meja Item. Jika tidak, silakan membuat transaksi saham yang masuk untuk tingkat valuasi item atau menyebutkan dalam catatan Item, dan kemudian mencoba submiting / membatalkan entri ini"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Dari materi yang Terkirim terhadap Pengiriman ini Note
 DocType: Project,Customer Details,Rincian Konsumen
@@ -3851,7 +3857,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,perintah yang disampaikan tidak dapat dihapus
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Manajemen Kualitas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} telah dinonaktifkan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} telah dinonaktifkan
 DocType: Employee Loan,Repay Fixed Amount per Period,Membayar Jumlah Tetap per Periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
 DocType: Employee External Work History,Employee External Work History,Karyawan Eksternal Riwayat Pekerjaan
@@ -3877,7 +3883,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Mahasiswa ID Email
 DocType: Employee,Notice (days),Notice (hari)
 DocType: Tax Rule,Sales Tax Template,Template Pajak Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Pilih item untuk menyimpan faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Pilih item untuk menyimpan faktur
 DocType: Employee,Encashment Date,Pencairan Tanggal
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Penyesuaian Stock
@@ -3910,6 +3916,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Ditempatkan
 DocType: Production Order,Warehouses,Gudang
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aset tidak dapat ditransfer
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Item ini adalah Variant dari {0} (Template).
 DocType: Workstation,per hour,per jam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,pembelian
 DocType: Announcement,Announcement,Pengumuman
@@ -3925,7 +3932,7 @@
 DocType: Account,Receivable,Piutang
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Supplier sebagai Purchase Order sudah ada
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peran yang diperbolehkan untuk mengirimkan transaksi yang melebihi batas kredit yang ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Pilih Produk untuk Industri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Pilih Produk untuk Industri
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
 DocType: Item,Material Issue,Keluar Barang
 DocType: Hub Settings,Seller Description,Penjual Deskripsi
@@ -3938,7 +3945,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
 DocType: Salary Detail,Component,Komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria penilaian Grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Membuka Penyusutan Akumulasi harus kurang dari sama dengan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Membuka Penyusutan Akumulasi harus kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Entrikan Menyetujui Peran atau Menyetujui Pengguna
@@ -3972,7 +3979,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk mengatur Tahun Anggaran ini sebagai Default, klik 'Set as Default'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Ikut
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Employee Loan,Repay from Salary,Membayar dari Gaji
 DocType: Leave Application,LAP/,PUTARAN/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Meminta pembayaran terhadap {0} {1} untuk jumlah {2}
@@ -3990,7 +3997,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Penilaian Detil Hasil
 DocType: Employee Education,Employee Education,Pendidikan Karyawan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Kelompok barang duplikat yang ditemukan dalam tabel grup item
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
 DocType: Salary Slip,Net Pay,Nilai Bersih Terbayar
 DocType: Account,Account,Akun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial ada {0} telah diterima
@@ -3999,7 +4006,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Gudang {0} tidak terkait dengan akun, silakan membuat / menautkan (Asset) akun yang sesuai untuk gudang."
 DocType: Purchase Invoice,Recurring Id,Berulang Id
 DocType: Customer,Sales Team Details,Rincian Tim Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Hapus secara permanen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Hapus secara permanen?
 DocType: Expense Claim,Total Claimed Amount,Jumlah Total Diklaim
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensi peluang untuk menjadi penjualan.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Valid {0}
@@ -4010,13 +4017,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Pengaturan Sekolah Anda di ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Dasar Perubahan Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Simpan dokumen terlebih dahulu.
 DocType: Account,Chargeable,Dapat Dibebankan
 DocType: Company,Change Abbreviation,Ubah Singkatan
 DocType: Expense Claim Detail,Expense Date,Beban Tanggal
 DocType: Item,Max Discount (%),Max Diskon (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Jumlah Order terakhir
+DocType: Task,Is Milestone,Adalah tonggak
 DocType: Daily Work Summary,Email Sent To,Email dikirim ke
 DocType: Budget,Warn,Peringatan: Cuti aplikasi berisi tanggal blok berikut
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
@@ -4049,11 +4057,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stock yang sudah lebih lama dari` harus lebih kecil dari %d hari.
 DocType: Tax Rule,Purchase Tax Template,Pembelian Template Pajak
 ,Project wise Stock Tracking,Project Tracking Stock bijaksana
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Jadwal Pemeliharaan {0} ada terhadap {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Jumlah Aktual (di sumber/target)
 DocType: Item Customer Detail,Ref Code,Ref Kode
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Catatan karyawan.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
 DocType: HR Settings,Payroll Settings,Pengaturan Payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Cocokkan Faktur non-linked dan Pembayaran.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Order
@@ -4076,7 +4083,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak benar dibersihkan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
 DocType: Purchase Invoice Item,Price List Rate,Daftar Harga Tingkat
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Buat kutipan pelanggan
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Buat kutipan pelanggan
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Tampilkan ""In Stock"" atau ""Tidak di Bursa"" didasarkan pada stok yang tersedia di gudang ini."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Material (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Rata-rata waktu yang dibutuhkan oleh Supplier untuk memberikan
@@ -4098,7 +4105,7 @@
 DocType: Asset,Disposal Date,pembuangan Tanggal
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email akan dikirim ke semua Karyawan Aktif perusahaan pada jam tertentu, jika mereka tidak memiliki liburan. Ringkasan tanggapan akan dikirim pada tengah malam."
 DocType: Employee Leave Approver,Employee Leave Approver,Approver Cuti Karyawan
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,pelatihan Masukan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Order produksi {0} harus diserahkan
@@ -4106,7 +4113,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tentu saja adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Tambah / Edit Harga
 DocType: Batch,Parent Batch,Induk induk
 DocType: Cheque Print Template,Cheque Print Template,Template Print Cek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Bagan Pusat Biaya
@@ -4150,7 +4157,7 @@
 DocType: Item,Variant Based On,Varian Berbasis Pada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Supplier Anda
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
 DocType: Request for Quotation Item,Supplier Part No,Pemasok Bagian Tidak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',tidak bisa memotong ketika kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Diterima dari
@@ -4160,7 +4167,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier untuk item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: nilai Jam harus lebih besar dari nol.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
 DocType: Issue,Content Type,Tipe Konten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Stok Barang ini dalam beberapa kelompok di website.
@@ -4169,20 +4176,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,Dari Faktur Tanggal
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,mata uang penagihan harus sama dengan mata uang mata uang atau rekening pihak baik bawaan comapany ini
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,mata uang penagihan harus sama dengan mata uang mata uang atau rekening pihak baik bawaan comapany ini
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Tinggalkan Pencairan
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Apa pekerjaannya?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Semua Penerimaan Mahasiswa
 ,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Bernomor Urut' tidak bisa 'dipilih' untuk item non-stok"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Bernomor Urut' tidak bisa 'dipilih' untuk item non-stok"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
 DocType: School House,House Name,Nama rumah
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Memperbarui biaya tambahan untuk menghitung biaya mendarat item
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Listrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tambahkan sisa organisasi Anda sebagai pengguna Anda. Anda juga dapat menambahkan mengundang Pelanggan portal Anda dengan menambahkan mereka dari Kontak
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tambahkan sisa organisasi Anda sebagai pengguna Anda. Anda juga dapat menambahkan mengundang Pelanggan portal Anda dengan menambahkan mereka dari Kontak
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID tidak ditetapkan untuk Karyawan {0}
@@ -4191,7 +4198,7 @@
 DocType: Item,Customer Code,Kode Konsumen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Birthday Reminder untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jumlah Hari Semenjak Order Terakhir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Buying Settings,Naming Series,Series Penamaan
 DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tanggal asuransi mulai harus kurang dari tanggal asuransi End
@@ -4206,7 +4213,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk daftar absen {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,Qty Terorder
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM tidak mengandung stok barang
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periode Dari dan Untuk Periode tanggal wajib bagi berulang {0}
@@ -4219,7 +4226,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Jumlah Nilai Write Off (mata uang perusahaan)
 DocType: Sales Invoice Timesheet,Billing Hours,Jam penagihan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM default untuk {0} tidak ditemukan
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Ketuk item untuk menambahkannya di sini
 DocType: Fees,Program Enrollment,Program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Landing Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Silakan set {0}
@@ -4317,7 +4325,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Ditangani Pertama kali pada
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
-DocType: Grade Interval,Grade Interval,kelas Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tanggal Mulai dan Akhir Tahun Fiskal Tanggal sudah ditetapkan pada Tahun Anggaran {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Cukai Tanggal diperbarui
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split batch
@@ -4325,6 +4332,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Unduh PDF
 DocType: Production Order,Planned End Date,Tanggal Akhir Planning
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Dimana Item Disimpan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 DocType: Request for Quotation,Supplier Detail,pemasok Detil
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Kesalahan dalam rumus atau kondisi: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Nilai Tertagih Faktur
@@ -4369,7 +4377,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup website sederhana untuk organisasi saya
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Stok Barang di Order Penjualan
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Entrikan pusat biaya orang tua
@@ -4426,7 +4434,7 @@
 ,Items To Be Requested,Items Akan Diminta
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Company,Company Info,Info Perusahaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Pilih atau menambahkan pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Pilih atau menambahkan pelanggan baru
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,pusat biaya diperlukan untuk memesan klaim biaya
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Hal ini didasarkan pada kehadiran Karyawan ini
@@ -4439,13 +4447,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna dari membuat Aplikasi Leave pada hari-hari berikutnya.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Manfaat Karyawan
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Qty Diproduksi
 DocType: Purchase Receipt Item,Accepted Quantity,Qty Diterima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Silahkan mengatur default Liburan Daftar Karyawan {0} atau Perusahaan {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak ada
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} tidak ada
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Tagihan diajukan ke Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
@@ -4454,15 +4462,17 @@
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Pusat
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Employee Loan Application,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
 DocType: Guardian,Guardian,Wali
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} telah dibuat untuk karyawan {1} dalam rentang tanggal tertentu
 DocType: Employee,Education,Pendidikan
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Penamaan Kampanye Promosi dengan
 DocType: Employee,Current Address Is,Alamat saat ini adalah
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,diubah
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opsional. Set mata uang default perusahaan, jika tidak ditentukan."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
@@ -4499,7 +4509,7 @@
 DocType: Hub Settings,Hub Settings,Pengaturan Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri Akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri Akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
 DocType: Asset,Is Existing Asset,Apakah ada Asset
 DocType: Salary Detail,Statistical Component,Komponen statistik
 ,Monthly Salary Register,Daftar Gaji Bulanan
@@ -4553,7 +4563,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pasang Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Tingkat saham
 DocType: Customer,Commission Rate,Tingkat Komisi
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Buat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Buat Varian
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis Pembayaran harus menjadi salah satu Menerima, Pay dan Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4566,6 +4576,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Izinkan Produksi di hari libur
 DocType: Sales Order,Customer's Purchase Order Date,Konsumen Purchase Order Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Modal / Saham
+DocType: Shopping Cart Settings,Show Public Attachments,Tampilkan Lampiran Umum
 DocType: Packing Slip,Package Weight Details,Paket Berat Detail
 DocType: Payment Gateway Account,Payment Gateway Account,Pembayaran Rekening Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
@@ -4590,7 +4601,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Jangan menunjukkan simbol seperti $ etc sebelah mata uang.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Membuat Batch Mahasiswa
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Membuat Batch Mahasiswa
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Dapatkan item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Memimpin Waktu Hari
@@ -4609,7 +4620,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah sanksi
 DocType: GL Entry,Is Opening,Apakah Membuka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Akun {0} tidak ada
 DocType: Account,Cash,Kas
 DocType: Employee,Short biography for website and other publications.,Biografi singkat untuk website dan publikasi lainnya.
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 7bd05a0..35cfbc1 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Hópur Item Fyrning Staða
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode greiðslureikning
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Sýna Afbrigði
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Sýna Afbrigði
 DocType: Academic Term,Academic Term,fræðihugtak
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,efni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,magn
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Heilbrigðisþjónusta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Töf á greiðslu (dagar)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,þjónusta Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,reikningur
 DocType: Maintenance Schedule Item,Periodicity,tíðni
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Reikningsár {0} er krafist
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Auglýsingar
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama fyrirtæki er slegið oftar en einu sinni
 DocType: Employee,Married,giftur
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ekki leyft {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ekki leyft {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Fá atriði úr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Vara {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Engin atriði skráð
 DocType: Payment Reconciliation,Reconcile,sætta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,matvöruverslun
 DocType: Quality Inspection Reading,Reading 1,lestur 1
 DocType: Process Payroll,Make Bank Entry,Gera Bank færslu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,lífeyrissjóðir
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Næsta Afskriftir Dagsetning má ekki vera áður kaupdegi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næsta Afskriftir Dagsetning má ekki vera áður kaupdegi
 DocType: SMS Center,All Sales Person,Allt Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Mánaðarleg dreifing ** hjálpar þér að dreifa fjárhagsáætlunar / Target yfir mánuði ef þú ert árstíðasveiflu í fyrirtæki þínu.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ekki atriði fundust
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Ekki atriði fundust
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Laun Uppbygging vantar
 DocType: Lead,Person Name,Sá Name
 DocType: Sales Invoice Item,Sales Invoice Item,Velta Invoice Item
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",td &quot;Primary School&quot; eða &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lager Skýrslur
 DocType: Warehouse,Warehouse Detail,Warehouse Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Lokadagur getur ekki verið síðar en árslok Dagsetning skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fast Asset&quot; getur ekki verið valið, eins Asset met hendi á móti hlut"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fast Asset&quot; getur ekki verið valið, eins Asset met hendi á móti hlut"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Tax Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Þú hefur ekki heimild til að bæta við eða endurnýja færslum áður {0}
 DocType: BOM,Item Image (if not slideshow),Liður Image (ef ekki myndasýning)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,An Viðskiptavinur til staðar með sama nafni
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Raunveruleg Rekstur Time
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Veldu BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Veldu BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnaður við afhent Items
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,The frídagur á {0} er ekki á milli Frá Dagsetning og hingað
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,bekk
 DocType: Sales Invoice Item,Delivered By Supplier,Samþykkt með Birgir
 DocType: SMS Center,All Contact,Allt samband við
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Framleiðslu Order þegar búið fyrir öll atriði með BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Framleiðslu Order þegar búið fyrir öll atriði með BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,árslaunum
 DocType: Daily Work Summary,Daily Work Summary,Daily Work Yfirlit
 DocType: Period Closing Voucher,Closing Fiscal Year,Lokun fjárhagsársins
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} er frosinn
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} er frosinn
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vinsamlegast veldu núverandi fyrirtæki til að búa til töflu yfir reikninga
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,lager Útgjöld
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Veldu Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit í félaginu Gjaldmiðill
 DocType: Delivery Note,Installation Status,uppsetning Staða
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Viltu uppfæra mætingu? <br> Present: {0} \ <br> Fjarverandi: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Samþykkt + Hafnað Magn verður að vera jöfn Móttekin magn fyrir lið {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Framboð Raw Materials til kaups
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,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.
 DocType: Products Settings,Show Products as a List,Sýna vörur sem lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Sæktu sniðmát, fylla viðeigandi gögn og hengja við um hana. Allt dagsetningar og starfsmaður samspil völdu tímabili mun koma í sniðmát, með núverandi aðsóknarmet"
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Gera Afskriftir færslu
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Beiðni Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,gera starfsmanni
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,gera starfsmanni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,framkvæmd
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Upplýsingar um starfsemi fram.
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Áætlun um heimsóknir viðhald.
 DocType: SMS Settings,Enter url parameter for message,Sláðu url breytu fyrir skilaboð
 DocType: POS Profile,Customer Groups,Hópar viðskiptavina
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Ársreikningur
 DocType: Guardian,Students,nemendur
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Reglur um beitingu verðlagningu og afslátt.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Verðlisti verður að gilda fyrir að kaupa eða selja
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Fyrirfram upphæð getur ekki verið meiri en {0} {1}
 DocType: Naming Series,Series List for this Transaction,Series List fyrir þessa færslu
 DocType: Company,Default Payroll Payable Account,Default Launaskrá Greiðist Reikningur
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Uppfæra Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Uppfæra Email Group
 DocType: Sales Invoice,Is Opening Entry,Er Opnun færslu
 DocType: Customer Group,Mention if non-standard receivable account applicable,Umtal ef non-staðall nái reikning við
 DocType: Course Schedule,Instructor Name,kennari Name
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Gegn sölureikningi Item
 ,Production Orders in Progress,Framleiðslu Pantanir í vinnslu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Handbært fé frá fjármögnun
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
 DocType: Lead,Address & Contact,Heimilisfang &amp; Hafa samband
 DocType: Leave Allocation,Add unused leaves from previous allocations,Bæta ónotuðum blöð frá fyrri úthlutanir
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Næsta Fastir {0} verður búin til á {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total kostnaðarútreikninga Magn (með Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Liður Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Skildu Bannaður
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Árleg
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sættir Item
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,Birta á Hub
 DocType: Student Admission,Student Admission,Student Aðgangseyrir
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Liður {0} er hætt
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Liður {0} er hætt
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,efni Beiðni
 DocType: Bank Reconciliation,Update Clearance Date,Uppfæra Úthreinsun Dagsetning
 DocType: Item,Purchase Details,kaup Upplýsingar
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Tilkynna með tölvupósti á sköpun sjálfvirka Material Beiðni
 DocType: Journal Entry,Multi Currency,multi Gjaldmiðill
 DocType: Payment Reconciliation Invoice,Invoice Type,Reikningar Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Afhendingarseðilinn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Afhendingarseðilinn
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Setja upp Skattar
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostnaðarverð seldrar Eignastýring
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Greiðsla Entry hefur verið breytt eftir að þú draga það. Vinsamlegast rífa það aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
-DocType: Grade Interval,Min Score,Min Einkunn
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Samantekt fyrir þessa viku og bið starfsemi
 DocType: Student Applicant,Admitted,viðurkenndi
 DocType: Workstation,Rent Cost,Rent Kostnaður
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Panta gildi
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / reiðufé gagnvart aðila eða fyrir innra flytja
 DocType: Shipping Rule,Valid for Countries,Gildir fyrir löndum
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Þetta atriði er sniðmát og ekki er hægt að nota í viðskiptum. Item eiginleika verður að afrita yfir í afbrigði nema &quot;Enginn Afrita&quot; er sett
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Þetta atriði er sniðmát og ekki er hægt að nota í viðskiptum. Item eiginleika verður að afrita yfir í afbrigði nema &quot;Enginn Afrita&quot; er sett
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Pöntunin Talin
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Starfsmaður tilnefningu (td forstjóri, framkvæmdastjóri osfrv)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Vinsamlegast sláðu inn &quot;Endurtakið á Dagur mánaðar &#39;gildissvæðið
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,skatthlutfall
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} þegar úthlutað fyrir starfsmann {1} fyrir tímabilið {2} til {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Veldu Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Hópur Nei verður að vera það sama og {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Umbreyta til non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Hópur (fullt) af hlut.
 DocType: C-Form Invoice Detail,Invoice Date,Dagsetning reiknings
 DocType: GL Entry,Debit Amount,debet Upphæð
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Það getur aðeins verið 1 Account á félaginu í {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Það getur aðeins verið 1 Account á félaginu í {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Vinsamlega sjá viðhengi
 DocType: Purchase Order,% Received,% móttekin
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Búa Student Hópar
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Beiðni um tilvitnun
 DocType: Salary Slip Timesheet,Working Hours,Vinnutími
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Breyta upphafsdegi / núverandi raðnúmer núverandi röð.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Búa til nýja viðskiptavini
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Búa til nýja viðskiptavini
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ef margir Verðlagning Reglur halda áfram að sigra, eru notendur beðnir um að setja Forgangur höndunum til að leysa deiluna."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Búa innkaupapantana
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Búa innkaupapantana
 ,Purchase Register,kaup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,gildandi Gjöld
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global stillingar fyrir alla framleiðsluaðferðum.
 DocType: Accounts Settings,Accounts Frozen Upto,Reikninga Frozen uppí
 DocType: SMS Log,Sent On,sendi á
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
 DocType: HR Settings,Employee record is created using selected field. ,Starfsmaður færsla er búin til með völdu sviði.
 DocType: Sales Order,Not Applicable,Á ekki við
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday skipstjóri.
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,Frá pakkinn nr
 DocType: Item Attribute,To Range,til Hóflegt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verðbréfa
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ekki er hægt að breyta matunaraðferð, þar sem viðskipti eiga sér stað gegn sumum hlutum sem ekki hafa eigin matunaraðferð"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Samtals lauf úthlutað er nauðsynlegur
 DocType: Job Opening,Description of a Job Opening,Lýsing á starf opnun
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bið starfsemi fyrir dag
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vinsamlegast sláðu Warehouse sem efni Beiðni verði hækkað
 DocType: Production Order,Additional Operating Cost,Viðbótarupplýsingar rekstrarkostnaður
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,snyrtivörur
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Að sameinast, eftirfarandi eiginleika verða að vera það sama fyrir bæði atriði"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Að sameinast, eftirfarandi eiginleika verða að vera það sama fyrir bæði atriði"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Neyðarnúmer Sími
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kaupa
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vinsamlegast tilgreindu einkunn fyrir Þröskuld 0%
 DocType: Sales Order,To Deliver,til Bera
 DocType: Purchase Invoice Item,Item,Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
 DocType: Journal Entry,Difference (Dr - Cr),Munur (Dr - Cr)
 DocType: Account,Profit and Loss,Hagnaður og tap
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Annast undirverktöku
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,Uppsetning Note Item
 DocType: Production Plan Item,Pending Qty,Bíður Magn
 DocType: Budget,Ignore,Hunsa
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} er ekki virkur
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} er ekki virkur
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS send til eftirfarandi númer: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Skipulag athuga mál fyrir prentun
 DocType: Salary Slip,Salary Slip Timesheet,Laun Slip Timesheet
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,alls Commission
 DocType: Pricing Rule,Sales Partner,velta Partner
 DocType: Buying Settings,Purchase Receipt Required,Kvittun Áskilið
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Verðmat Rate er nauðsynlegur ef Opnun Stock inn
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Verðmat Rate er nauðsynlegur ef Opnun Stock inn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Engar færslur finnast í Invoice töflunni
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vinsamlegast veldu Company og Party Gerð fyrst
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financial / bókhald ári.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Uppsafnaður Gildi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Því miður, Serial Nos ekki hægt sameinuð"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Gera Velta Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Gera Velta Order
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,Halda áfram Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,endurtaka Viðskiptavinir
 DocType: Leave Control Panel,Allocate,úthluta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,velta Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,velta Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Ath: Samtals úthlutað leyfi {0} ætti ekki að vera minna en þegar hafa verið samþykktar leyfi {1} fyrir tímabilið
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Samþykkt með Birgir (Drop Ship)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,Tilvitnun Til
 DocType: Lead,Middle Income,Middle Tekjur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Úthlutað magn getur ekki verið neikvæð
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vinsamlegast settu fyrirtækið
 DocType: Purchase Order Item,Billed Amt,billed Amt
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Velta Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Tilvísunarnúmer &amp; Frestdagur er nauðsynlegt fyrir {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Veldu Greiðslureikningur að gera Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Búa Employee skrár til að stjórna lauf, kostnað kröfur og launaskrá"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Búa Employee skrár til að stjórna lauf, kostnað kröfur og launaskrá"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Bæta við Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Tillaga Ritun
 DocType: Payment Entry Deduction,Payment Entry Deduction,Greiðsla Entry Frádráttur
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Tengsl Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,framkvæmdastjóri
 DocType: Payment Entry,Payment From / To,Greiðsla Frá / Til
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Tímabil
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ný hámarksupphæð er minna en núverandi útistandandi upphæð fyrir viðskiptavininn. Hámarksupphæð þarf að vera atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ný hámarksupphæð er minna en núverandi útistandandi upphæð fyrir viðskiptavininn. Hámarksupphæð þarf að vera atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Sama atriði hefur verið slegið mörgum sinnum.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Byggt á' og 'hópað eftir' getur ekki verið það sama"
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,upplausn Dagsetning
 DocType: Student Batch Name,Batch Name,hópur Name
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet búið:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,innritast
 DocType: Selling Settings,Customer Naming By,Viðskiptavinur Nafngift By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mun sýna nemandann eins staðar í námsmanna Monthly Aðsókn Report
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,Student Aðsókn
 DocType: Sales Invoice Timesheet,Time Sheet,Tímatafla
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raw Materials miðað við
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Vinsamlegast sláðu inn Item upplýsingar
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Vinsamlegast sláðu inn Item upplýsingar
 DocType: Interest,Interest,vextir
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Forsala
 DocType: Purchase Receipt,Other Details,aðrar upplýsingar
@@ -726,7 +729,7 @@
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Næst verður send í tölvupósti á:
 DocType: Offer Letter Term,Offer Letter Term,Tilboð Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Liður hefur afbrigði.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Liður hefur afbrigði.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Liður {0} fannst ekki
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Fyrirtæki {0} er ekki til
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,Ábyrgð í Fyrningardagsetning
 DocType: Material Request Item,Quantity and Warehouse,Magn og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Þóknun Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nafngerðaröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vinsamlegast veldu Forrit
 DocType: Project,Estimated Cost,áætlaður kostnaður
 DocType: Purchase Order,Link to material requests,Tengill á efni beiðna
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ekki birgðir Item
 DocType: Mode of Payment Account,Default Account,Sjálfgefið Reikningur
 DocType: Payment Entry,Received Amount (Company Currency),Fékk Magn (Company Gjaldmiðill)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead verður að setja ef Tækifæri er gert úr Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Lead verður að setja ef Tækifæri er gert úr Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vinsamlegast veldu viku burt daginn
 DocType: Production Order Operation,Planned End Time,Planned Lokatími
 ,Sales Person Target Variance Item Group-Wise,Velta Person Target Dreifni Item Group-Wise
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Verðskrá ekki valið
 DocType: Employee,Family Background,Family Background
 DocType: Request for Quotation Supplier,Send Email,Senda tölvupóst
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,engin heimild
 DocType: Company,Default Bank Account,Sjálfgefið Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Að sía byggt á samningsaðila, velja Party Sláðu fyrst"
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Enginn starfsmaður fannst
 DocType: Supplier Quotation,Stopped,Tappi
 DocType: Item,If subcontracted to a vendor,Ef undirverktaka til seljanda
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Nemendahópur er þegar uppfærð.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Nemendahópur er þegar uppfærð.
 DocType: SMS Center,All Customer Contact,Allt Viðskiptavinur samband við
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Hlaða lager jafnvægi í gegnum CSV.
 DocType: Warehouse,Tree Details,Tree Upplýsingar
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Lágmark Reikningsupphæð
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostnaður Center {2} ekki tilheyra félaginu {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} getur ekki verið Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Liður Row {idx}: {DOCTYPE} {DOCNAME} er ekki til í að ofan &#39;{DOCTYPE}&#39; borð
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Liður Row {idx}: {DOCTYPE} {DOCNAME} er ekki til í að ofan &#39;{DOCTYPE}&#39; borð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Engin verkefni
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagur mánaðarins sem farartæki reikningur vilja vera mynda td 05, 28 osfrv"
 DocType: Asset,Opening Accumulated Depreciation,Opnun uppsöfnuðum afskriftum
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Meta
 DocType: Production Planning Tool,Select Items,Valið Atriði
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} gegn frumvarpinu {1} dags {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,námskeið Stundaskrá
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,námskeið Stundaskrá
 DocType: Maintenance Visit,Completion Status,Gengið Staða
 DocType: HR Settings,Enter retirement age in years,Sláðu eftirlaunaaldur í ár
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Leyfa yfir afhendingu eða viðtöku allt uppí þennan prósent
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,innflutningur Aðsókn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Allir Item Hópar
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Allir Item Hópar
 DocType: Process Payroll,Activity Log,virkni Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Hagnaður / Tap
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Sjálfkrafa semja skilaboð á framlagningu viðskiptum.
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Purchase Order til greiðslu
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Áætlaðar Magn
 DocType: Sales Invoice,Payment Due Date,Greiðsla Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open Til Gera
 DocType: Notification Control,Delivery Note Message,Afhending Note Message
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Magn
 DocType: Leave Block List Date,Leave Block List Date,Skildu Block List Dagsetning
 DocType: Pricing Rule,Price or Discount,Verð eða Afsláttur
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Samtals greiðsla í kvittun atriðum borðið verður að vera það sama og Samtals skatta og gjöld
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Samtals greiðsla í kvittun atriðum borðið verður að vera það sama og Samtals skatta og gjöld
 DocType: Sales Team,Incentives,Incentives
 DocType: SMS Log,Requested Numbers,umbeðin Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Aðeins fá hráefni
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,Sjálfgefin greiðast reikningar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Starfsmaður {0} er ekki virkur eða er ekki til
 DocType: Fee Structure,Components,Hluti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
 DocType: Quality Inspection Reading,Reading 6,lestur 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kaupa Reikningar Advance
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Greiðsla gegn sölu / Purchase Order ætti alltaf að vera merkt sem fyrirfram
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Cash reikningur verður sjálfkrafa uppfærð í laun dagbókarfærslu þegar þessi háttur er valinn.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",The millibili fyrir Grade Code {0} skarast við bekk fresti öðrum bekk. Vinsamlegast athugaðu millibili {0} og {1} og reyndu aftur
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Kostnaður (Company Gjaldmiðill)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Allir hlutir hafa þegar verið flutt í þessari framleiðslu Order.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Gengi má ekki vera hærra en hlutfallið sem notað er í {1} {2}
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Hlaða bréf höfuðið og merki. (Þú getur breytt þeim síðar).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Næsta Afskriftir Date er færður sem síðasta dags
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Næsta Afskriftir Date er færður sem síðasta dags
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,White
 DocType: SMS Center,All Lead (Open),Allt Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Magn er ekki í boði fyrir {4} í vöruhús {1} á að senda sinn færslunnar ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type verður að vera einn af {0}
 DocType: Lead,Next Contact Date,Næsta samband við þann
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,opnun Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
 DocType: Student Batch Name,Student Batch Name,Student Hópur Name
 DocType: Holiday List,Holiday List Name,Holiday List Nafn
 DocType: Repayment Schedule,Balance Loan Amount,Balance lánsfjárhæð
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Tilgreindu {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjarlægðar atriði með engin breyting á magni eða verðmæti.
 DocType: Delivery Note,Delivery To,Afhending Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
 DocType: Production Planning Tool,Get Sales Orders,Fá sölu skipunum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} er ekki hægt að neikvæð
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,afsláttur
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,afsláttur
 DocType: Asset,Total Number of Depreciations,Heildarfjöldi Afskriftir
 DocType: Sales Invoice Item,Rate With Margin,Meta með skák
 DocType: Workstation,Wages,laun
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,nafn samtaka
 DocType: Tax Rule,Shipping State,Sendingar State
 ,Projected Quantity as Source,Áætlaðar Magn eins Source
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Atriði verður að bæta með því að nota &quot;fá atriði úr greiðslukvittanir &#39;hnappinn
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Atriði verður að bæta með því að nota &quot;fá atriði úr greiðslukvittanir &#39;hnappinn
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Fela ekki lager atriði
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,sölukostnaður
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,gegn
 DocType: Item,Default Selling Cost Center,Sjálfgefið Selja Kostnaður Center
 DocType: Sales Partner,Implementation Partner,framkvæmd Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Póstnúmer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Póstnúmer
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Velta Order {0} er {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Gerð lager færslur
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,dreifingaraðili
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Framleiðslu Order {0} verður lokað áður en hætta þessu Velta Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Vinsamlegast settu &#39;Virkja Viðbótarupplýsingar afslátt&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Vinsamlegast settu &#39;Virkja Viðbótarupplýsingar afslátt&#39;
 ,Ordered Items To Be Billed,Pantaði Items verður innheimt
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Frá Range þarf að vera minna en við úrval
 DocType: Global Defaults,Global Defaults,Global Vanskil
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vinsamlegast sláðu Item Code til að fá lotunúmer
 DocType: Stock Settings,Default Item Group,Sjálfgefið Item Group
 DocType: Employee Loan,Partially Disbursed,hluta ráðstafað
-DocType: Grading Structure,Grading System Name,Einkunnakerfi Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Birgir gagnagrunni.
 DocType: Account,Balance Sheet,Efnahagsreikningur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Greiðsla Mode er ekki stillt. Vinsamlegast athugaðu hvort reikningur hefur verið sett á Mode Greiðslur eða POS Profile.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Greiðsla Mode er ekki stillt. Vinsamlegast athugaðu hvort reikningur hefur verið sett á Mode Greiðslur eða POS Profile.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,velta manneskja mun fá áminningu á þessari dagsetningu til að hafa samband við viðskiptavini
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama atriði er ekki hægt inn mörgum sinnum.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Frekari reikninga er hægt að gera undir Hópar, en færslur er hægt að gera á móti non-hópa"
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,vinnu
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Vinsamlegast tilgreindu að minnsta kosti einn eiginleiki í þeim einkennum töflunni
 DocType: Announcement,All Students,Allir nemendur
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Liður {0} verður að a non-birgðir atriði
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Liður {0} verður að a non-birgðir atriði
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Skoða Ledger
 DocType: Grading Scale,Intervals,millibili
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,elstu
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","An Item Group til staðar með sama nafni, vinsamlegast breyta hlutinn nafni eða endurnefna atriði hópinn"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","An Item Group til staðar með sama nafni, vinsamlegast breyta hlutinn nafni eða endurnefna atriði hópinn"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Item {0} getur ekki Hópur
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ekki heimild til að breyta frosinn reikning {0}
 DocType: Journal Entry,Get Outstanding Invoices,Fá útistandandi reikninga
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Kaup pantanir hjálpa þér að skipuleggja og fylgja eftir kaupum þínum
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Kaup pantanir hjálpa þér að skipuleggja og fylgja eftir kaupum þínum
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Heildarkostnaður Issue / Transfer magn {0} í efni Beiðni {1} \ má ekki vera meiri en óskað magn {2} fyrir lið {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Lítil
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vörur eða þjónustu
 DocType: Mode of Payment,Mode of Payment,Háttur á greiðslu
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Þetta er rót atriði hóp og ekki hægt að breyta.
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,Group Roll Number
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Fyrir {0}, aðeins kredit reikninga er hægt að tengja við aðra gjaldfærslu"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Alls öllum verkefni lóðum skal vera 1. Stilltu vigta allar verkefni verkefni í samræmi við
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Liður {0} verður að vera Sub-dregist Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital útbúnaður
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Verðlagning Regla er fyrst valið byggist á &#39;Virkja Á&#39; sviði, sem getur verið Item, Item Group eða Brand."
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,Dagbókarfærsla
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} atriði í gangi
 DocType: Workstation,Workstation Name,Workstation Name
-DocType: Grade Interval,Grade Code,bekk Code
+DocType: Grading Scale Interval,Grade Code,bekk Code
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Sendu Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Vélbúnaður
 DocType: Sales Order,Recurring Upto,Fastir uppí
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vinsamlegast veldu Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vinsamlegast veldu Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Birgir Dagsetning reiknings
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Þú þarft að virkja Shopping Cart
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Matur
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Engin heimsókna
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Viðhaldsáætlun {0} er til staðar gegn {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,innritast nemandi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Gjaldmiðill lokun reiknings skal vera {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summa stig fyrir allar markmiðum ætti að vera 100. Það er {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Mynd reikninga
 DocType: Material Request,Terms and Conditions Content,Skilmálar og skilyrði Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,getur ekki verið meiri en 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
 DocType: Maintenance Visit,Unscheduled,unscheduled
 DocType: Employee,Owned,eigu
 DocType: Salary Detail,Depends on Leave Without Pay,Fer um leyfi án launa
 DocType: Pricing Rule,"Higher the number, higher the priority","Hærri sem talan, hærri forgang"
 ,Purchase Invoice Trends,Kaupa Reikningar Trends
 DocType: Employee,Better Prospects,betri horfur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} hefur aðeins {2} magn. Vinsamlegast veldu annað lotu sem hefur {3} magn í boði eða skipt röðina í margar línur til að afhenda / gefa út úr mörgum lotum
 DocType: Vehicle,License Plate,Númeraplata
 DocType: Appraisal,Goals,mörk
 DocType: Warranty Claim,Warranty / AMC Status,Ábyrgð í / AMC Staða
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Starfsmaður getur ekki skýrslu við sjálfan sig.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ef reikningur er frosinn, eru færslur leyft að afmörkuðum notendum."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Bókhald Entry fyrir {0}: {1} Aðeins er hægt að gera í gjaldmiðli: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Bókhald Entry fyrir {0}: {1} Aðeins er hægt að gera í gjaldmiðli: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Job uppsetningu, hæfi sem krafist o.fl."
 DocType: Journal Entry Account,Account Balance,Staða reiknings
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Tax Regla fyrir viðskiptum.
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Sýna P &amp; unclosed fjárhagsári er L jafnvægi
 DocType: Shipping Rule,Shipping Account,Sendingar Account
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er óvirkur
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Gera Velta Pantanir til að hjálpa þér að skipuleggja vinnu þína og skila á tíma
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Gera Velta Pantanir til að hjálpa þér að skipuleggja vinnu þína og skila á tíma
 DocType: Quality Inspection,Readings,Upplestur
 DocType: Stock Entry,Total Additional Costs,Samtals viðbótarkostnað
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,til Value
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source vöruhús er nauðsynlegur fyrir röð {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,pökkun Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,pökkun Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,skrifstofa leigu
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Innflutningur mistókst!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Sýna lokaðar
 DocType: Leave Type,Is Leave Without Pay,Er Leyfi án launa
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Engar færslur finnast í Greiðsla töflunni
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Þessi {0} átök með {1} fyrir {2} {3}
 DocType: Student Attendance Tool,Students HTML,nemendur HTML
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,Dagsetning Keyrsla
 DocType: Pricing Rule,For Price List,Fyrir verðskrá
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Búa Leiða
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Búa Leiða
 DocType: Maintenance Schedule,Schedules,Skrár
 DocType: Purchase Invoice Item,Net Amount,Virði
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,program innritun nemenda
 DocType: Sales Invoice Item,Brand Name,Vörumerki
 DocType: Purchase Receipt,Transporter Details,Transporter Upplýsingar
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Sjálfgefið vöruhús er nauðsynlegt til valið atriði
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Sjálfgefið vöruhús er nauðsynlegt til valið atriði
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Möguleg Birgir
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,The Organization
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,lestur 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Sjálfgefin BOM fyrir {0} ekki að finna fyrir Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Kröfur fyrir VÍS.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Nemendur eru í hjarta kerfisins, bæta við öllum nemendum"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Nemendur eru í hjarta kerfisins, bæta við öllum nemendum"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Úthreinsun dagsetning {1} er ekki hægt áður Ávísun Dagsetning {2}
 DocType: Company,Default Holiday List,Sjálfgefin Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Frá tíma og tíma af {1} er skörun við {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Daginn (s) sem þú ert að sækja um leyfi eru frí. Þú þarft ekki að sækja um leyfi.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Endursenda Greiðsla tölvupóst
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,nýtt verkefni
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,gera Tilvitnun
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,gera Tilvitnun
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,aðrar skýrslur
 DocType: Dependent Task,Dependent Task,Dependent Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Breytistuðull fyrir sjálfgefið Mælieiningin skal vera 1 í röðinni {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Breytistuðull fyrir sjálfgefið Mælieiningin skal vera 1 í röðinni {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leyfi af gerð {0} má ekki vera lengri en {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prófaðu að skipuleggja starfsemi fyrir X daga fyrirvara.
 DocType: HR Settings,Stop Birthday Reminders,Stop afmælisáminningar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Vinsamlegast settu Default Launaskrá Greiðist reikning í félaginu {0}
 DocType: SMS Center,Receiver List,Receiver List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,leit Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,leit Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,neytt Upphæð
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Net Breyting á Cash
 DocType: Assessment Plan,Grading Scale,flokkun Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mælieiningin {0} hefur verið slegið oftar en einu sinni í viðskipta Factor töflu
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mælieiningin {0} hefur verið slegið oftar en einu sinni í viðskipta Factor töflu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,þegar lokið
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Greiðsla Beiðni þegar til staðar {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnaður af úthlutuðum Items
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,safna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Gegn Birgir Invoice {0} dagsett {1}
 DocType: Customer,Default Price List,Sjálfgefið Verðskrá
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Þú getur ekki eytt Fiscal Year {0}. Reikningsár {0} er sett sem sjálfgefið í Global Settings
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Viðskiptavinur Credit Balance
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,Nám í sömu Institute
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Til Lager (Valfrjálst)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Payment Entry,Paid Amount (Company Currency),Greiddur Magn (Company Gjaldmiðill)
 DocType: Purchase Invoice,Additional Discount,Viðbótarupplýsingar Afsláttur
 DocType: Selling Settings,Selling Settings,selja Stillingar
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Skoða í körfu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,markaðskostnaður
 ,Item Shortage Report,Liður Skortur Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Þyngd er getið, \ nVinsamlega nefna &quot;Þyngd UOM&quot; of"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Þyngd er getið, \ nVinsamlega nefna &quot;Þyngd UOM&quot; of"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Efni Beiðni notað til að gera þetta lager Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Næsta Afskriftir Date er nauðsynlegur fyrir nýrri eign
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Næsta Afskriftir Date er nauðsynlegur fyrir nýrri eign
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Aðskilja námskeið byggt fyrir hverja lotu
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single eining hlut.
 DocType: Fee Category,Fee Category,Fee Flokkur
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kostnaður Center er nauðsynlegt fyrir &#39;RekstrarliÃ&#39; reikning {2}. Vinsamlegast setja upp sjálfgefið kostnaðarstað til félagsins.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Viðskiptavinur Group til staðar með sama nafni vinsamlegast breyta Customer Name eða endurnefna Viðskiptavinur Group
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Viðskiptavinur Group til staðar með sama nafni vinsamlegast breyta Customer Name eða endurnefna Viðskiptavinur Group
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,nýtt samband við
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,lestur 2
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,sættir JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Of margir dálkar. Flytja skýrslu og prenta það með töflureikni.
 DocType: Purchase Invoice Item,Batch No,hópur Nei
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ekki er hægt að finna gengi fyrir {0} til {1} fyrir helstu dagsetningu {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leyfa mörgum sölu skipunum gegn Purchase Order viðskiptavinar
 DocType: Student Group Instructor,Student Group Instructor,Nemandi hópur kennari
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Setja forskeyti fyrir númerakerfi röð á viðskiptum þínum
 DocType: Employee Attendance Tool,Employees HTML,starfsmenn HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Sjálfgefið BOM ({0}) verður að vera virkt fyrir þetta atriði eða sniðmátið sitt
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Sjálfgefið BOM ({0}) verður að vera virkt fyrir þetta atriði eða sniðmátið sitt
 DocType: Employee,Leave Encashed?,Leyfi Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Tækifæri Frá sviði er nauðsynlegur
 DocType: Email Digest,Annual Expenses,Árleg útgjöld
 DocType: Item,Variants,afbrigði
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Gera Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Gera Purchase Order
 DocType: SMS Center,Send To,Senda til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
 DocType: Payment Reconciliation Payment,Allocated amount,úthlutað magn
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,úttektir
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Afrit Serial Nei slegið í lið {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Skilyrði fyrir Shipping reglu
-DocType: Grading Structure,Grading Intervals,flokkun Hlé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,vinsamlegast sláðu
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Ekki er hægt að overbill fyrir atriðið {0} in row {1} meira en {2}. Til að leyfa yfir-innheimtu, skaltu stilla á að kaupa Stillingar"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Vinsamlegast settu síuna miðað Item eða Warehouse
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,Heimildin Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Hafnað Warehouse er nauðsynlegur móti hafnað Item {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,greiðsla
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Stjórna pantanir
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Stjórna pantanir
 DocType: Production Order Operation,Actual Time and Cost,Raunveruleg tíma og kostnað
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Efni Beiðni um hámark {0} má gera ráð fyrir lið {1} gegn Velta Order {2}
 DocType: Employee,Salutation,Kveðjan
 DocType: Course,Course Abbreviation,Auðvitað Skammstöfun
 DocType: Student Leave Application,Student Leave Application,Student Leave Umsókn
 DocType: Item,Will also apply for variants,Mun einnig gilda fyrir afbrigði
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Starfsmaður {0} á hálfan dag á {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Samtals vinnutími ætti ekki að vera meiri en max vinnutíma {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Á
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Knippi atriði á sölu.
 DocType: Quotation Item,Actual Qty,Raunveruleg Magn
 DocType: Sales Invoice Item,References,Tilvísanir
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Þú hefur slegið afrit atriði. Vinsamlegast lagfæra og reyndu aftur.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Félagi
 DocType: Asset Movement,Asset Movement,Asset Hreyfing
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nýtt körfu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,nýtt körfu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Liður {0} er ekki serialized Item
 DocType: SMS Center,Create Receiver List,Búa Receiver lista
 DocType: Vehicle,Wheels,hjól
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Slekkur sköpun tíma logs gegn Production Orders. Reksturinn skal ekki raktar gegn Production Order
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,hefur Afbrigði
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Heiti Monthly Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Hópur auðkenni er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Hópur auðkenni er nauðsynlegur
 DocType: Sales Person,Parent Sales Person,Móðurfélag Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Fastir Invoice
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Annast verkefni
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,Fiscal Year
 DocType: Vehicle Log,Fuel Price,eldsneyti verð
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Fjárhagsáætlun er ekki hægt að úthlutað gegn {0}, eins og það er ekki tekjur eða gjöld reikning"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,náð
 DocType: Student Admission,Application Form Route,Umsóknareyðublað Route
@@ -1848,7 +1845,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Upphæð {0} {1} frádráttar {2}
 DocType: Employee,Salary Information,laun Upplýsingar
 DocType: Sales Person,Name and Employee ID,Nafn og Starfsmannafélag ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
 DocType: Website Item Group,Website Item Group,Vefsíða Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Skyldur og skattar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur
@@ -1905,7 +1902,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Endurtaka Tekjur viðskiptavinar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) verða að hafa hlutverk &#39;kostnað samþykkjari&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,pair
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
 DocType: Asset,Depreciation Schedule,Afskriftir Stundaskrá
 DocType: Bank Reconciliation Detail,Against Account,Against reikninginn
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date ætti að vera á milli Frá Dagsetning og hingað
@@ -1922,13 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
 ,Quotation Trends,Tilvitnun Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Group ekki getið í master lið fyrir lið {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
 DocType: Shipping Rule Condition,Shipping Amount,Sendingar Upphæð
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bíður Upphæð
 DocType: Purchase Invoice Item,Conversion Factor,ummyndun Factor
 DocType: Purchase Order,Delivered,afhent
 ,Vehicle Expenses,ökutæki Útgjöld
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
+DocType: Serial No,Invoice Details,Reikningsupplýsingar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
 DocType: Purchase Receipt,Vehicle Number,ökutæki Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Dagsetningin sem endurteknar reikningur verður að hætta
 DocType: Employee Loan,Loan Amount,lánsfjárhæð
@@ -1951,7 +1949,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Viðbótarupplýsingar Afsláttur Upphæð
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
 DocType: Leave Block List Allow,Leave Block List Allow,Skildu Block List Leyfa
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Íþróttir
 DocType: Loan Type,Loan Name,lán Name
@@ -1962,6 +1960,7 @@
 ,Customer Acquisition and Loyalty,Viðskiptavinur Kaup og Hollusta
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse þar sem þú ert að halda úttekt hafnað atriðum
 DocType: Production Order,Skip Material Transfer,Hoppa yfir efni
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Ekki er hægt að finna gengi fyrir {0} til {1} fyrir lykilatriði {2}. Vinsamlegast búðu til gjaldeyrisviðskipti handvirkt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Fjárhagsár lýkur á
 DocType: POS Profile,Price List,Verðskrá
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nú sjálfgefið Fiscal Year. Vinsamlegast hressa vafrann til að breytingin taki gildi.
@@ -1999,9 +1998,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Liður {0} hefur þegar verið skilað
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** táknar fjárhagsári. Öll bókhald færslur og aðrar helstu viðskipti eru raktar gegn ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Viðskiptavinur / Lead Address
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
 DocType: Student Admission,Eligibility,hæfi
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leiðir hjálpa þér að fá fyrirtæki, bæta alla tengiliði þína og fleiri sem leiðir þínar"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leiðir hjálpa þér að fá fyrirtæki, bæta alla tengiliði þína og fleiri sem leiðir þínar"
 DocType: Production Order Operation,Actual Operation Time,Raunveruleg Operation Time
 DocType: Authorization Rule,Applicable To (User),Gildir til (User)
 DocType: Purchase Taxes and Charges,Deduct,draga
@@ -2040,7 +2039,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Veldu Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Skildu eftir autt ef það er talið að öllum deildum
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tegundir ráðninga (varanleg, samningur, nemi o.fl.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
 DocType: Process Payroll,Fortnightly,hálfsmánaðarlega
 DocType: Currency Exchange,From Currency,frá Gjaldmiðill
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vinsamlegast veldu úthlutað magn, tegundir innheimtuseðla og reikningsnúmerið í atleast einni röð"
@@ -2056,7 +2055,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Get ekki valið gjald tegund sem &quot;On Fyrri Row Upphæð &#39;eða&#39; Á fyrri röðinni Samtals &#39;fyrir fyrstu röðinni
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barnið Item ætti ekki að vera Product Knippi. Fjarlægðu hlut `{0}` og vista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,bæta við timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,bæta við timesheets
 DocType: Vehicle Service,Service Item,þjónusta Item
 DocType: Bank Guarantee,Bank Guarantee,Bankábyrgð
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; til að fá áætlun
@@ -2104,8 +2103,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Verð verður ekki sýnd ef verðskrá er ekki sett
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vinsamlegast tilgreindu land fyrir þessa Shipping reglu eða stöðva Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Alls Komandi Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Skuldfærslu Til er krafist
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Skuldfærslu Til er krafist
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kaupverðið List
 DocType: Offer Letter Term,Offer Term,Tilboð Term
 DocType: Quality Inspection,Quality Manager,gæðastjóri
@@ -2138,14 +2137,14 @@
 DocType: Opportunity,Lost Reason,Lost Ástæða
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ný Address
 DocType: Quality Inspection,Sample Size,Prufustærð
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vinsamlegast sláðu inn Kvittun Skjal
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Allir hlutir hafa nú þegar verið færðar á vörureikning
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vinsamlegast sláðu inn Kvittun Skjal
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Allir hlutir hafa nú þegar verið færðar á vörureikning
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vinsamlegast tilgreinið gilt &quot;Frá máli nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Frekari stoðsviða er hægt að gera undir Hópar en færslur er hægt að gera á móti non-hópa
 DocType: Project,External,ytri
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Notendur og heimildir
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Framleiðslu Pantanir Búið til: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Framleiðslu Pantanir Búið til: {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Farsímanúmer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Prentun og merkingu
@@ -2154,7 +2153,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial Nei {0} fannst ekki
 DocType: Scheduling Tool,Student Batch,Student Hópur
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Viðskiptavinir þínir
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,gera Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,gera Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Þér hefur verið boðið að vinna að verkefninu: {0}
 DocType: Leave Block List Date,Block Date,Block Dagsetning
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Sæktu um núna
@@ -2177,8 +2176,9 @@
 DocType: SMS Log,Sent To,send til
 DocType: Payment Request,Make Sales Invoice,Gera sölureikning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,hugbúnaður
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Næsta Hafa Date getur ekki verið í fortíðinni
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Næsta Hafa Date getur ekki verið í fortíðinni
 DocType: Company,For Reference Only.,Til viðmiðunar aðeins.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Veldu lotu nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ógild {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Magn
@@ -2192,7 +2192,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case Nei getur ekki verið 0
 DocType: Item,Show a slideshow at the top of the page,Sýnið skyggnusýningu efst á síðunni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,verslanir
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,verslanir
 DocType: Serial No,Delivery Time,Afhendingartími
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Öldrun Byggt á
 DocType: Item,End of Life,End of Life
@@ -2208,8 +2208,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Efni
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tilgreina rekstur, rekstrarkostnaði og gefa einstakt notkun eigi að rekstri þínum."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Þetta skjal er yfir mörkum með {0} {1} fyrir lið {4}. Ert þú að gera annað {3} gegn sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Veldu breyting upphæð reiknings
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Veldu breyting upphæð reiknings
 DocType: Purchase Invoice,Price List Currency,Verðskrá Gjaldmiðill
 DocType: Naming Series,User must always select,Notandi verður alltaf að velja
 DocType: Stock Settings,Allow Negative Stock,Leyfa Neikvæð lager
@@ -2220,7 +2220,7 @@
 DocType: Budget Account,Budget Account,Budget Account
 DocType: Quality Inspection,Verified By,staðfest af
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Get ekki breytt sjálfgefið mynt félagsins, vegna þess að það eru núverandi viðskiptum. Viðskipti verða að vera lokað til að breyta sjálfgefið mynt."
-DocType: Grade Interval,Grade Description,gráðu Lýsing
+DocType: Grading Scale Interval,Grade Description,gráðu Lýsing
 DocType: Stock Entry,Purchase Receipt No,Kvittun Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Búa Laun Slip
@@ -2258,7 +2258,7 @@
 DocType: Upload Attendance,Attendance To Date,Aðsókn að Dagsetning
 DocType: Warranty Claim,Raised By,hækkaðir um
 DocType: Payment Gateway Account,Payment Account,greiðsla Reikningur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Net Breyta viðskiptakrafna
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,jöfnunaraðgerðir Off
 DocType: Offer Letter,Accepted,Samþykkt
@@ -2271,7 +2271,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Sendingar Regla Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Þú getur ekki breytt hlutfall ef BOM getið agianst hvaða atriði
 DocType: Employee,Previous Work Experience,Fyrri Starfsreynsla
@@ -2285,7 +2285,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Skilmálar og Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,The nafn af the Institute sem þú ert að setja upp þetta kerfi.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bókhald færsla fryst upp til þessa dagsetningu, enginn getur gert / breyta færslu, nema hlutverki sem tilgreindur er hér."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vistaðu skjalið áður kynslóð viðhald áætlun
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vistaðu skjalið áður kynslóð viðhald áætlun
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Hakaðu við þetta til að banna broti. (NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Eftirfarandi Framleiðslu Pantanir voru búnar:
@@ -2308,6 +2308,7 @@
 DocType: Email Digest,How frequently?,Hversu oft?
 DocType: Purchase Receipt,Get Current Stock,Fá núverandi lager
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tré Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Student,Joining Date,Tengja Dagsetning
 ,Employees working on a holiday,Starfsmenn sem vinna í frí
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
@@ -2388,7 +2389,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Úthreinsun Date ekki getið
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,framleiðsla
 DocType: Guardian,Occupation,Atvinna
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Byrja Bætt verður fyrir lokadagsetningu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Byrja Bætt verður fyrir lokadagsetningu
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Alls (Magn)
 DocType: Sales Invoice,This Document,Þetta skjal
 DocType: Installation Note Item,Installed Qty,uppsett Magn
@@ -2411,7 +2412,7 @@
 DocType: Notification Control,Sales Order Message,Velta Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Default gildi eins Company, Gjaldmiðill, yfirstandandi reikningsári, o.fl."
 DocType: Payment Entry,Payment Type,greiðsla Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vinsamlegast veldu lotu fyrir hlut {0}. Ekki er hægt að finna eina lotu sem uppfyllir þessa kröfu
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vinsamlegast veldu lotu fyrir hlut {0}. Ekki er hægt að finna eina lotu sem uppfyllir þessa kröfu
 DocType: Process Payroll,Select Employees,Select Starfsmenn
 DocType: Opportunity,Potential Sales Deal,Hugsanleg sala Deal
 DocType: Payment Entry,Cheque/Reference Date,Ávísun / Frestdagur
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} þegar búin að fyrirtæki {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Skipta Item / BOM í öllum BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvittun skjal skal skilað
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvittun skjal skal skilað
 DocType: Purchase Invoice Item,Received Qty,fékk Magn
 DocType: Stock Entry Detail,Serial No / Batch,Serial Nei / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ekki greidd og ekki skilað
@@ -2441,7 +2442,7 @@
 ,To Produce,Að framleiða
 apps/erpnext/erpnext/config/hr.py +93,Payroll,launaskrá
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Fyrir röð {0} í {1}. Til eru {2} í lið gengi, raðir {3} skal einnig"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,gera notanda
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,gera notanda
 DocType: Packing Slip,Identification of the package for the delivery (for print),Auðkenning pakka fyrir afhendingu (fyrir prentun)
 DocType: Bin,Reserved Quantity,frátekin Magn
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vinsamlegast sláðu inn gilt netfang
@@ -2453,11 +2454,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Óvirkt sniðmát má ekki vera sjálfgefið sniðmát
 DocType: Account,Income Account,tekjur Reikningur
 DocType: Payment Request,Amount in customer's currency,Upphæð í mynt viðskiptavinarins
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Afhending
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Afhending
 DocType: Stock Reconciliation Item,Current Qty,Núverandi Magn
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Sjá &quot;Rate Af efni byggt á&quot; í kosta lið
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Fyrri
 DocType: Appraisal Goal,Key Responsibility Area,Key Ábyrgð Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Námsmaður Lotur hjálpa þér að fylgjast með mætingu, mat og gjalda fyrir nemendur"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Námsmaður Lotur hjálpa þér að fylgjast með mætingu, mat og gjalda fyrir nemendur"
 DocType: Payment Entry,Total Allocated Amount,Samtals úthlutað magn
 DocType: Item Reorder,Material Request Type,Efni Beiðni Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry fyrir laun frá {0} til {1}
@@ -2480,7 +2482,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Vísbendingar um Industry tegund.
 DocType: Item Supplier,Item Supplier,Liður Birgir
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Öllum vistföngum.
 DocType: Company,Stock Settings,lager Stillingar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samruni er aðeins mögulegt ef eftirfarandi eiginleikar eru sömu í báðum skrám. Er Group, Root Tegund, Company"
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Mun senda tölvupóst um atburðinn til starfsmanna með stöðu &#39;Open&#39;
 DocType: Task,Depends on Tasks,Fer á Verkefni
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Stjórna Viðskiptavinur Group Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Viðhengi má sjá án þess að gera körfu kleift
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nýtt Kostnaður Center Name
 DocType: Leave Control Panel,Leave Control Panel,Skildu Control Panel
@@ -2502,11 +2505,10 @@
 DocType: Sales Invoice,Debit To,debet Til
 DocType: Delivery Note,Required only for sample item.,Aðeins nauðsynlegt fyrir sýnishorn hlut.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Raunveruleg Magn eftir viðskipti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Engin laun miði fannst á milli {0} og {1}
 ,Pending SO Items For Purchase Request,Bíður SO Hlutir til kaupa Beiðni
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Innlagnir
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} er óvirk
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} er óvirk
 DocType: Supplier,Billing Currency,Innheimta Gjaldmiðill
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Auka stór
@@ -2523,7 +2525,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Heimasíðan Valin Vara
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Allir Námsmat Hópar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nýtt Warehouse Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Alls {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Alls {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territory
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vinsamlegast nefna engin heimsókna krafist
 DocType: Stock Settings,Default Valuation Method,Sjálfgefið Verðmatsaðferð
@@ -2541,7 +2543,7 @@
 DocType: Price List,Price List Master,Verðskrá Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Öll sala Viðskipti má tagged móti mörgum ** sölufólk ** þannig að þú getur sett og fylgjast markmið.
 ,S.O. No.,SO nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Vinsamlegast búa til viðskiptavina frá Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Vinsamlegast búa til viðskiptavina frá Lead {0}
 DocType: Price List,Applicable for Countries,Gildir fyrir löndum
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Aðeins Skildu Umsóknir með stöðu &quot;Samþykkt&quot; og &quot;Hafnað &#39;er hægt að skila
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Group Name er skylda í röð {0}
@@ -2621,7 +2623,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Bókhalds Færsla fyrir Lager
 DocType: Vehicle Service,Engine Oil,Vélarolía
 DocType: Sales Invoice,Sales Team1,velta TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Liður {0} er ekki til
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Liður {0} er ekki til
 DocType: Sales Invoice,Customer Address,viðskiptavinur Address
 DocType: Employee Loan,Loan Details,lán Nánar
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Lokið Magn verður að vera hærri en núll.
@@ -2685,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í hópinn.
 DocType: Assessment Result Tool,Result HTML,niðurstaða HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,rennur út
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Bæta Nemendur
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Bæta Nemendur
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vinsamlegast veldu {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2751,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,An fræðihugtak með þessu &quot;skólaárinu &#39;{0} og&#39; Term Name &#39;{1} er þegar til. Vinsamlegast breyttu þessum færslum og reyndu aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Eins og það eru núverandi reiðufé gegn færslu {0} er ekki hægt að breyta gildi {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Eins og það eru núverandi reiðufé gegn færslu {0} er ekki hægt að breyta gildi {1}
 DocType: UOM,Must be Whole Number,Verður að vera heil tala
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Ný Leaves Úthlutað (í dögum)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial Nei {0} er ekki til
@@ -2792,7 +2794,7 @@
 DocType: Supplier,Last Day of the Next Month,Last Day næsta mánaðar
 DocType: Support Settings,Auto close Issue after 7 days,Auto nálægt Issue eftir 7 daga
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leyfi ekki hægt að skipta áður en {0}, sem orlof jafnvægi hefur þegar verið fært sendar í framtíðinni leyfi úthlutun met {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Ath: Vegna / Frestdagur umfram leyfð viðskiptavina kredit dagar eftir {0} dag (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Ath: Vegna / Frestdagur umfram leyfð viðskiptavina kredit dagar eftir {0} dag (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Umsækjandi
 DocType: Asset Category Account,Accumulated Depreciation Account,Uppsöfnuðum afskriftum Reikningur
 DocType: Stock Settings,Freeze Stock Entries,Frysta lager Entries
@@ -2820,7 +2822,7 @@
 DocType: Asset,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Búa Framleiðandi Pantanir
 DocType: Serial No,Warranty / AMC Details,Ábyrgð í / AMC Nánar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
 DocType: Journal Entry,User Remark,Notandi Athugasemd
 DocType: Lead,Market Segment,Market Segment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Greiddur Upphæð má ekki vera meiri en heildar neikvæð útistandandi {0}
@@ -2838,7 +2840,7 @@
 DocType: Production Planning Tool,Create Material Requests,Búa Efni beiðnum
 DocType: Employee Education,School/University,Skóli / University
 DocType: Payment Request,Reference Details,Tilvísun Upplýsingar
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Væntanlegur Value Eftir nýtingartíma verður að vera minna en Gross kaupverði
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Væntanlegur Value Eftir nýtingartíma verður að vera minna en Gross kaupverði
 DocType: Sales Invoice Item,Available Qty at Warehouse,Laus Magn á Lager
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,billed Upphæð
 DocType: Asset,Double Declining Balance,Tvöfaldur Minnkandi Balance
@@ -2859,19 +2861,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Munurinn Reikningur verður að vera Eigna- / Ábyrgðartegund reikningur, þar sem þetta Stock Sáttargjörð er Opening Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Andvirði lánsins getur ekki verið hærri en Lánsupphæðir {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Framleiðsla Order ekki búin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Framleiðsla Order ekki búin
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Frá Dagsetning &#39;verður að vera eftir&#39; Til Dagsetning &#39;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Get ekki breytt stöðu sem nemandi {0} er tengd við beitingu nemandi {1}
 DocType: Asset,Fully Depreciated,Alveg afskrifaðar
 ,Stock Projected Qty,Stock Áætlaðar Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Aðsókn HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",Tilvitnanir eru tillögur tilboðum þú sendir til viðskiptavina þinna
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",Tilvitnanir eru tillögur tilboðum þú sendir til viðskiptavina þinna
 DocType: Sales Order,Customer's Purchase Order,Viðskiptavinar Purchase Order
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial Nei og Batch
 DocType: Warranty Claim,From Company,frá Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa skora á mat Criteria þarf að vera {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Vinsamlegast settu Fjöldi Afskriftir Bókað
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vinsamlegast settu Fjöldi Afskriftir Bókað
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Gildi eða Magn
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Pantanir geta ekki hækkað um:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
@@ -2999,7 +3001,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tilvitnun Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",Atriði til staðar með sama nafni ({0}) skaltu breyta liður heiti hópsins eða endurnefna hlutinn
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vinsamlegast veldu viðskiptavin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Vinsamlegast veldu viðskiptavin
 DocType: C-Form,I,ég
 DocType: Company,Asset Depreciation Cost Center,Eignastýring Afskriftir Kostnaður Center
 DocType: Sales Order Item,Sales Order Date,Velta Order Dagsetning
@@ -3018,19 +3020,18 @@
 DocType: Vehicle,Insurance Details,Tryggingar Upplýsingar
 DocType: Account,Payable,greiðist
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vinsamlegast sláðu inn lánstíma
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Skuldarar ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Skuldarar ({0})
 DocType: Pricing Rule,Margin,spássía
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ný Viðskiptavinir
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Framlegð%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,úthreinsun Dagsetning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Purchase Upphæð er nauðsynlegur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Purchase Upphæð er nauðsynlegur
 DocType: Lead,Address Desc,Heimilisfang karbósýklískan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party er nauðsynlegur
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast einn af selja eða kaupa verður að vera valinn
-DocType: Grading Structure,Grade Intervals,gráðu Hlé
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Veldu eðli rekstrar þíns.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvar framleiðslu aðgerðir eru gerðar.
 DocType: Asset Movement,Source Warehouse,Source Warehouse
@@ -3059,6 +3060,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mánaðarleg Dreifing Hlutfall
 DocType: Territory,Territory Targets,Territory markmið
 DocType: Delivery Note,Transporter Info,Transporter Upplýsingar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Vinsamlegast settu sjálfgefið {0} í félaginu {1}
 DocType: Cheque Print Template,Starting position from top edge,Upphafsstöðu frá efstu brún
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Sama birgir hefur verið slegið mörgum sinnum
@@ -3110,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Uppröðun Magn
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Núverandi Op Atvinna
 DocType: Company,Stock Adjustment Account,Stock jöfnunarreikning
-DocType: Journal Entry,Write Off,Afskrifa
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskrifa
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (ur) ID. Ef sett, mun það verða sjálfgefið fyrir allar HR eyðublöð."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Frá {1}
@@ -3121,8 +3123,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Birgir skilar til viðskiptavinar
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) er út af lager
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Næsta Dagsetning verður að vera hærri en að senda Dagsetning
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Sýna skattur brjóta upp
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Sýna skattur brjóta upp
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gögn Innflutningur og útflutningur
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Lager færslur eru á móti Warehouse {0}, þess vegna getur þú ekki farið aftur framselja eða breyta henni"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Engar nemendur Found
@@ -3134,13 +3136,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Út af AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vinsamlegast veldu Tilvitnanir
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Gera Viðhald Heimsókn
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vinsamlegast hafðu samband við til notanda sem hefur sala Master Manager {0} hlutverki
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vinsamlegast veldu Tilvitnanir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gera Viðhald Heimsókn
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vinsamlegast hafðu samband við til notanda sem hefur sala Master Manager {0} hlutverki
 DocType: Company,Default Cash Account,Sjálfgefið Cash Reikningur
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ekki viðskiptamenn eða birgja) skipstjóri.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Þetta er byggt á mætingu þessa Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Engar nemendur í
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Bæta við fleiri atriði eða opnu fulla mynd
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Vinsamlegast sláðu inn &#39;áætlaðan fæðingardag&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Afhending Skýringar {0} verður lokað áður en hætta þessu Velta Order
@@ -3186,9 +3189,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,áður sátta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skattar og gjöld bætt (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Liður Tax Row {0} verður að hafa hliðsjón af tegund skatta eða tekjur eða gjöld eða Skuldfæranlegar
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Liður Tax Row {0} verður að hafa hliðsjón af tegund skatta eða tekjur eða gjöld eða Skuldfæranlegar
 DocType: Sales Order,Partly Billed,hluta Billed
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Liður {0} verður að vera fast eign Item
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Liður {0} verður að vera fast eign Item
 DocType: Item,Default BOM,Sjálfgefið BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Vinsamlega munið gerð nafn fyrirtækis til að staðfesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Alls Framúrskarandi Amt
@@ -3210,7 +3213,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Verðskrá Exchange Rate
 DocType: Purchase Invoice Item,Rate,Gefa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,netfang Nafn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,netfang Nafn
 DocType: Stock Entry,From BOM,frá BOM
 DocType: Assessment Code,Assessment Code,mat Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Basic
@@ -3235,7 +3238,7 @@
 DocType: Purchase Invoice,Print Language,Print Tungumál
 DocType: Salary Slip,Total Working Hours,Samtals Vinnutíminn
 DocType: Stock Entry,Including items for sub assemblies,Þ.mt atriði fyrir undir þingum
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Sláðu gildi verður að vera jákvæð
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Sláðu gildi verður að vera jákvæð
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Allir Territories
 DocType: Purchase Invoice,Items,atriði
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Nemandi er nú skráður.
@@ -3254,16 +3257,14 @@
 DocType: Issue,Opening Time,opnun Time
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Frá og Til dagsetningar krafist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verðbréf &amp; hrávöru ungmennaskipti
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Reikna miðað við
 DocType: Delivery Note Item,From Warehouse,frá Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
 DocType: Assessment Plan,Supervisor Name,Umsjón Name
 DocType: Program Enrollment Course,Program Enrollment Course,Forritunarnámskeið
-DocType: Grading Structure,Grading Structure,flokkun Uppbygging
 DocType: Purchase Taxes and Charges,Valuation and Total,Verðmat og Total
 DocType: Tax Rule,Shipping City,Sendingar City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Þetta atriði er afbrigði af {0} (Snið). Eiginleika að afrita yfir frá sniðmáti nema &quot;Enginn Afrita&quot; er sett
 DocType: Notification Control,Customize the Notification,Sérsníða tilkynningu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Handbært fé frá rekstri
 DocType: Sales Invoice,Shipping Rule,Sendingar Regla
@@ -3286,6 +3287,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ekkert sjálfgefið BOM er til fyrir lið {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vinsamlegast veldu dagsetningu birtingar fyrst
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Opnun Date ætti að vera áður lokadegi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Númerakerfi
 DocType: Leave Control Panel,Carry Forward,Haltu áfram
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnaður Center við núverandi viðskipti er ekki hægt að breyta í höfuðbók
 DocType: Department,Days for which Holidays are blocked for this department.,Dagar sem Frídagar eru læst í þessari deild.
@@ -3313,7 +3315,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Alls (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Skemmtun &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Liður Serial Nei
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Búa Employee Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Búa Employee Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,alls Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,bókhald Yfirlýsingar
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,klukkustund
@@ -3328,7 +3330,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Hin nýja BOM eftir skipti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Sölustaður
 DocType: Payment Entry,Received Amount,fékk Upphæð
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Búa til fullt magn, hunsa magn þegar á röð"
 DocType: Account,Tax,Tax
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ekki Marked
@@ -3339,7 +3340,7 @@
 DocType: C-Form,Invoices,reikningar
 DocType: Batch,Source Document Name,Heimild skjal Nafn
 DocType: Job Opening,Job Title,Starfsheiti
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Búa notendur
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Búa notendur
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Heimsókn skýrslu fyrir símtal viðhald.
@@ -3350,8 +3351,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kostnað reikningur er nauðsynlegur fyrir lið {0}
 DocType: BOM,Website Description,Vefsíða Lýsing
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net breyting á eigin fé
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kvittun
 ,Sales Register,velta Nýskráning
@@ -3362,16 +3363,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Það er ekkert að breyta.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Samantekt fyrir þennan mánuð og bið starfsemi
 DocType: Customer Group,Customer Group Name,Viðskiptavinar Group Name
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Engar viðskiptavinir ennþá!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Sjóðstreymi
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,License
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vinsamlegast veldu Yfirfæranlegt ef þú vilt líka að fela jafnvægi fyrra reikningsári er fer að þessu fjárhagsári
 DocType: GL Entry,Against Voucher Type,Against Voucher Tegund
 DocType: Item,Attributes,Eigindir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Vinsamlegast sláðu afskrifa reikning
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Síðasta Röð Dagsetning
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Reikningur {0} er ekki tilheyrir fyrirtækinu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
 DocType: Student,Guardian Details,Guardian Upplýsingar
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Mæting fyrir margar starfsmenn
@@ -3396,14 +3399,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Reikningur verður að vera af gerðinni &#39;Fast Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,út Magn
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reglur til að reikna sendingarkostnað upphæð fyrir sölu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series er nauðsynlegur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series er nauðsynlegur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tegundir starfsemi fyrir Time Logs
 DocType: Tax Rule,Sales,velta
 DocType: Stock Entry Detail,Basic Amount,grunnfjárhæð
 DocType: Training Event,Exam,Exam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
 DocType: Leave Allocation,Unused leaves,ónotuð leyfi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,cr
 DocType: Tax Rule,Billing State,Innheimta State
@@ -3436,7 +3439,7 @@
 DocType: Payment Entry,Account Paid From,Reikningur greitt frá
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Skrifaðu Off byggt á
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,gera Blý
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,gera Blý
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Prenta og Ritföng
 DocType: Stock Settings,Show Barcode Field,Sýna Strikamerki Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Senda Birgir póst
@@ -3451,6 +3454,7 @@
 DocType: Offer Letter,Awaiting Response,bíður svars
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,hér að framan
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Tilgreindu ef ekki staðlað greiðslureikningur
 DocType: Salary Slip,Earning & Deduction,Launin &amp; Frádráttur
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valfrjálst. Þessi stilling verður notuð til að sía í ýmsum viðskiptum.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Neikvætt Verðmat Rate er ekki leyfð
@@ -3484,7 +3488,7 @@
 DocType: Program Enrollment Tool,Get Students From,Fá nemendur frá
 DocType: Hub Settings,Seller Country,Seljandi Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Birta Atriði á vefsvæðinu
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Hópur nemenda þín í lotur
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Hópur nemenda þín í lotur
 DocType: Authorization Rule,Authorization Rule,Heimildin Regla
 DocType: Sales Invoice,Terms and Conditions Details,Skilmálar og skilyrði Nánar
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,upplýsingar
@@ -3543,7 +3547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,reynslulausn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,laun Hluti
 DocType: Program Enrollment Tool,New Academic Year,Nýtt skólaár
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innskotið Verðlisti hlutfall ef vantar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Samtals greitt upphæð
 DocType: Production Order Item,Transferred Qty,flutt Magn
@@ -3584,6 +3588,7 @@
 ,Sales Funnel,velta trekt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skammstöfun er nauðsynlegur
 DocType: Project,Task Progress,verkefni Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Körfu
 ,Qty to Transfer,Magn á að flytja
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes að leiðir eða viðskiptavini.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Hlutverk Leyft að breyta fryst lager
@@ -3616,7 +3621,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Magn ({0}) getur ekki verið brot í röð {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,innheimta gjald
 DocType: Attendance,ATT-,viðhorfin
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
 DocType: Lead,Add to calendar on this date,Bæta við dagatal á þessum degi
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglur til að bæta sendingarkostnað.
 DocType: Item,Opening Stock,opnun Stock
@@ -3634,7 +3639,7 @@
 DocType: Customer,From Lead,frá Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pantanir út fyrir framleiðslu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Veldu fjárhagsársins ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
 DocType: Program Enrollment Tool,Enroll Students,innritast Nemendur
 DocType: Hub Settings,Name Token,heiti Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selja
@@ -3645,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} gegn sölureikningi {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,nafn verkefnis
-DocType: Supplier,Mention if non-standard receivable account,Umtal ef non-staðall nái reikning
+DocType: Customer,Mention if non-standard receivable account,Umtal ef non-staðall nái reikning
 DocType: Journal Entry Account,If Income or Expense,Ef tekjur eða gjöld
 DocType: Production Order,Required Items,Nauðsynleg Items
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Mismunur
@@ -3675,6 +3680,7 @@
 DocType: Item,Taxes,Skattar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Greitt og ekki afhent
 DocType: Project,Default Cost Center,Sjálfgefið Kostnaður Center
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nafngerðaröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 DocType: Bank Guarantee,End Date,Lokadagur
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,lager Viðskipti
 DocType: Budget,Budget Accounts,Budget reikningar
@@ -3739,7 +3745,7 @@
 DocType: Customer,Sales Partner and Commission,Velta Partner og framkvæmdastjórnarinnar
 DocType: Employee Loan,Rate of Interest (%) / Year,Vextir (%) / Ár
 ,Project Quantity,Project Magn
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Alls {0} á öllum hlutum er núll, getur verið að þú ættir að breyta &#39;Úthluta Gjöld Byggt á&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Alls {0} á öllum hlutum er núll, getur verið að þú ættir að breyta &#39;Úthluta Gjöld Byggt á&#39;"
 DocType: Opportunity,To Discuss,Að ræða
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} einingar {1} þörf {2} að ljúka þessari færslu.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rate of Interest (%) Árleg
@@ -3762,7 +3768,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Gjaldmiðill af BOM # {1} ætti að vera jafn völdu gjaldmiðil {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Lo Stjórn
@@ -3779,7 +3785,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} er ekki til
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Register Fyrir ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mánaðarleg Dreifing Prósentur
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Valið atriði getur ekki Hópur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valið atriði getur ekki Hópur
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verðmat hlutfall fannst ekki í lið {0}, sem er nauðsynlegt til að gera bókhald færslur fyrir {1} {2}. Ef hluturinn er transacting sem sýnishorn hlut í {1}, skaltu nefna að í {1} Liður borð. Annars skaltu búa mótteknu lager viðskipti fyrir hlutinn eða nefna verðmats hraða í Item met, og þá reyna submiting / hætta við þessa færslu"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af efnum afhent gegn þessum Delivery Note
 DocType: Project,Customer Details,Nánar viðskiptavina
@@ -3796,7 +3802,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Lagðar pantanir ekki hægt að eyða
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Viðskiptajöfnuður þegar í Debit, þú ert ekki leyft að setja &#39;Balance Verður Be&#39; eins og &#39;Credit &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gæðastjórnun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Liður {0} hefur verið gerð óvirk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Liður {0} hefur verið gerð óvirk
 DocType: Employee Loan,Repay Fixed Amount per Period,Endurgreiða Föst upphæð á hvern Tímabil
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vinsamlegast sláðu inn magn fyrir lið {0}
 DocType: Employee External Work History,Employee External Work History,Starfsmaður Ytri Vinna Saga
@@ -3822,7 +3828,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Tilkynning (dagar)
 DocType: Tax Rule,Sales Tax Template,Söluskattur Snið
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Veldu atriði til að bjarga reikning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Veldu atriði til að bjarga reikning
 DocType: Employee,Encashment Date,Encashment Dagsetning
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Stock Leiðrétting
@@ -3855,6 +3861,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debet Note Útgefið
 DocType: Production Order,Warehouses,Vöruhús
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eign er ekki hægt að flytja
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Þetta atriði er afbrigði af {0} (sniðmát).
 DocType: Workstation,per hour,á klukkustund
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Innkaupastjóri
 DocType: Announcement,Announcement,Tilkynning
@@ -3870,7 +3877,7 @@
 DocType: Account,Receivable,viðskiptakröfur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ekki leyfilegt að breyta birgi Purchase Order er þegar til
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Hlutverk sem er leyft að leggja viðskiptum sem fara lánamörk sett.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Veldu Hlutir til Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Veldu Hlutir til Manufacture
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
 DocType: Item,Material Issue,efni Issue
 DocType: Hub Settings,Seller Description,Seljandi Lýsing
@@ -3883,7 +3890,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pantaði
 DocType: Salary Detail,Component,Component
 DocType: Assessment Criteria,Assessment Criteria Group,Námsmat Viðmið Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Opnun uppsöfnuðum afskriftum verður að vera minna en eða jafnt og {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Opnun uppsöfnuðum afskriftum verður að vera minna en eða jafnt og {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Veldu Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vinsamlegast sláðu inn Samþykkir hlutverki eða samþykkir notandi
@@ -3917,7 +3924,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Til að stilla þessa rekstrarárs sem sjálfgefið, smelltu á &#39;Setja sem sjálfgefið&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Join
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,skortur Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
 DocType: Employee Loan,Repay from Salary,Endurgreiða frá Laun
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Biðum greiðslu gegn {0} {1} fyrir upphæð {2}
@@ -3935,7 +3942,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Mat Niðurstaða Detail
 DocType: Employee Education,Employee Education,starfsmaður Menntun
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Afrit atriði hópur í lið töflunni
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
 DocType: Salary Slip,Net Pay,Net Borga
 DocType: Account,Account,Reikningur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Nei {0} hefur þegar borist
@@ -3944,7 +3951,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",Warehouse {0} er ekki tengd við hvaða reikning skaltu búa / tengja samsvarandi (eign) reikningur fyrir lager.
 DocType: Purchase Invoice,Recurring Id,Fastir Id
 DocType: Customer,Sales Team Details,Upplýsingar Söluteymi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eyða varanlega?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Eyða varanlega?
 DocType: Expense Claim,Total Claimed Amount,Alls tilkalli Upphæð
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Hugsanleg tækifæri til að selja.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ógild {0}
@@ -3955,13 +3962,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Skipulag School þín í ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Breyta Upphæð (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Engar bókhald færslur fyrir eftirfarandi vöruhús
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Engar bókhald færslur fyrir eftirfarandi vöruhús
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Vistaðu skjalið fyrst.
 DocType: Account,Chargeable,ákæru
 DocType: Company,Change Abbreviation,Breyta Skammstöfun
 DocType: Expense Claim Detail,Expense Date,Expense Dagsetning
 DocType: Item,Max Discount (%),Max Afsláttur (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Síðasta Order Magn
+DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,Tölvupóstur sendur til
 DocType: Budget,Warn,Warn
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Allar aðrar athugasemdir, athyglisvert áreynsla sem ætti að fara í skrám."
@@ -3994,11 +4002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Eldri Than` ætti að vera minni en% d daga.
 DocType: Tax Rule,Purchase Tax Template,Kaup Tax sniðmáti
 ,Project wise Stock Tracking,Project vitur Stock mælingar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Viðhald Dagskrá {0} hendi á móti {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Raunveruleg Magn (á uppspretta / miða)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Employee færslur.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
 DocType: HR Settings,Payroll Settings,launaskrá Stillingar
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Passa non-tengd og greiðslur.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Panta
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Tékkar og Innlán rangt hreinsaðar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Reikningur {0}: Þú getur ekki framselt sig sem foreldri reikning
 DocType: Purchase Invoice Item,Price List Rate,Verðskrá Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Búa viðskiptavina tilvitnanir
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Búa viðskiptavina tilvitnanir
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Sýna &quot;Á lager&quot; eða &quot;ekki til á lager&quot; byggist á lager í boði í þessum vöruhúsi.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Meðaltal tíma tekin af birgi að skila
@@ -4043,7 +4050,7 @@
 DocType: Asset,Disposal Date,förgun Dagsetning
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Póstur verður sendur á öllum virkum Starfsmenn félagsins á tilteknu klukkustund, ef þeir hafa ekki frí. Samantekt á svörum verður sent á miðnætti."
 DocType: Employee Leave Approver,Employee Leave Approver,Starfsmaður Leave samþykkjari
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An Uppröðun færslu þegar til fyrir þessa vöruhús {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An Uppröðun færslu þegar til fyrir þessa vöruhús {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Get ekki lýst því sem glatast, af því Tilvitnun hefur verið gert."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Þjálfun Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Framleiðslu Order {0} Leggja skal fram
@@ -4051,7 +4058,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Auðvitað er skylda í röð {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hingað til er ekki hægt að áður frá dagsetningu
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Bæta við / Breyta Verð
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Bæta við / Breyta Verð
 DocType: Batch,Parent Batch,Foreldri hópur
 DocType: Cheque Print Template,Cheque Print Template,Ávísun Prenta Snið
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Mynd af stoðsviða
@@ -4095,7 +4102,7 @@
 DocType: Item,Variant Based On,Variant miðað við
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Alls weightage úthlutað ætti að vera 100%. Það er {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Birgjar þín
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Get ekki stillt eins Lost og Sales Order er gert.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Get ekki stillt eins Lost og Sales Order er gert.
 DocType: Request for Quotation Item,Supplier Part No,Birgir Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Vaulation og heildar&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,fékk frá
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Frá {0} fyrir {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Setja Birgir fyrir lið {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Hours verður að vera stærri en núll.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Vefsíða Image {0} fylgir tl {1} er ekki hægt að finna
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Vefsíða Image {0} fylgir tl {1} er ekki hægt að finna
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tölva
 DocType: Item,List this Item in multiple groups on the website.,Listi þetta atriði í mörgum hópum á vefnum.
@@ -4114,20 +4121,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Þú hefur ekki heimild til að setja Frozen gildi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Fá Unreconciled færslur
 DocType: Payment Reconciliation,From Invoice Date,Frá dagsetningu reiknings
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Innheimta gjaldmiðli skal vera jöfn gjaldmiðil eða aðili reikning gjaldmiðli hvoru vanræksla Comapany er
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Innheimta gjaldmiðli skal vera jöfn gjaldmiðil eða aðili reikning gjaldmiðli hvoru vanræksla Comapany er
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Skildu Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Hvað gerir það?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,til Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Allir Student Innlagnir
 ,Average Commission Rate,Meðal framkvæmdastjórnarinnar Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Hefur Serial Nei &#39;getur ekki verið&#39; Já &#39;fyrir non-lager lið
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Hefur Serial Nei &#39;getur ekki verið&#39; Já &#39;fyrir non-lager lið
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Aðsókn er ekki hægt að merkja fyrir framtíð dagsetningar
 DocType: Pricing Rule,Pricing Rule Help,Verðlagning Regla Hjálp
 DocType: School House,House Name,House Name
 DocType: Purchase Taxes and Charges,Account Head,Head Reikningur
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Uppfærðu aukakostnað að reikna lenti kostnað af hlutum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Electrical
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Bætið restinni af fyrirtækinu þínu sem notendur. Þú getur einnig bætt við boðið viðskiptavinum sínum að vefsíðunni þinni með því að bæta þeim við úr Tengiliðum
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Bætið restinni af fyrirtækinu þínu sem notendur. Þú getur einnig bætt við boðið viðskiptavinum sínum að vefsíðunni þinni með því að bæta þeim við úr Tengiliðum
 DocType: Stock Entry,Total Value Difference (Out - In),Heildarverðmæti Mismunur (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate er nauðsynlegur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID ekki sett fyrir Starfsmaður {0}
@@ -4136,7 +4143,7 @@
 DocType: Item,Customer Code,viðskiptavinur Code
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Afmæli Áminning fyrir {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar frá síðustu Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
 DocType: Buying Settings,Naming Series,nafngiftir Series
 DocType: Leave Block List,Leave Block List Name,Skildu Block List Nafn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tryggingar Start dagsetning ætti að vera minna en tryggingar lokadagsetning
@@ -4151,7 +4158,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Laun Slip starfsmanns {0} þegar búið fyrir tíma blaði {1}
 DocType: Vehicle Log,Odometer,kílómetramæli
 DocType: Sales Order Item,Ordered Qty,Raðaður Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Liður {0} er óvirk
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Liður {0} er óvirk
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen uppí
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Tímabil Frá og tímabil Til dagsetningar lögboðnum fyrir endurteknar {0}
@@ -4164,7 +4171,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skrifaðu Off Upphæð (Company Gjaldmiðill)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Sjálfgefið BOM fyrir {0} fannst ekki
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Pikkaðu á atriði til að bæta þeim við hér
 DocType: Fees,Program Enrollment,program Innritun
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landað Kostnaður Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vinsamlegast settu {0}
@@ -4261,7 +4269,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Heildverslun
 DocType: Issue,First Responded On,Fyrst svöruðu
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Skráning Liður í mörgum hópum
-DocType: Grade Interval,Grade Interval,gráðu Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Reikningsár Start Date og Fiscal Year End Date eru nú þegar sett í Fiscal Year {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Úthreinsun Date uppfært
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Skipta lotu
@@ -4269,6 +4276,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Sækja PDF
 DocType: Production Order,Planned End Date,Áætlaðir Lokadagur
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvar hlutir eru geymdar.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 DocType: Request for Quotation,Supplier Detail,birgir Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Villa í formúlu eða ástandi: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Upphæð á reikningi
@@ -4313,7 +4321,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Skipulag einföld vefsíða fyrir fyrirtæki mitt
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Viðskiptakröfur Account
 DocType: Delivery Note Item,Against Sales Order Item,Gegn Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
 DocType: Item,Default Warehouse,Sjálfgefið Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Fjárhagsáætlun er ekki hægt að úthlutað gegn Group reikninginn {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vinsamlegast sláðu foreldri kostnaðarstað
@@ -4370,7 +4378,7 @@
 ,Items To Be Requested,Hlutir til að biðja
 DocType: Purchase Order,Get Last Purchase Rate,Fá Síðasta kaupgengi
 DocType: Company,Company Info,Upplýsingar um fyrirtæki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostnaður sent er nauðsynlegt að bóka kostnað kröfu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Umsókn um Funds (eignum)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Þetta er byggt á mætingu þessa starfsmanns
@@ -4383,13 +4391,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Hættu notendur frá gerð yfirgefa Umsóknir um næstu dögum.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,kaup Upphæð
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Birgir Tilvitnun {0} búin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,starfskjör
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakkað magn verður að vera jafnt magn fyrir lið {0} í röð {1}
 DocType: Production Order,Manufactured Qty,Framleiðandi Magn
 DocType: Purchase Receipt Item,Accepted Quantity,Samþykkt Magn
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vinsamlegast setja sjálfgefið Holiday lista fyrir Starfsmaður {0} eða fyrirtækis {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} er ekki til
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} er ekki til
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Víxlar vakti til viðskiptavina.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Engin {0}: Upphæð má ekki vera meiri en Bíður Upphæð á móti kostnað {1} kröfu. Bið Upphæð er {2}
@@ -4398,15 +4406,17 @@
 DocType: Quality Inspection Reading,Reading 3,lestur 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,skírteini Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
 DocType: Employee Loan Application,Approved,samþykkt
 DocType: Pricing Rule,Price,verð
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Starfsmaður létta á {0} skal stilla eins &#39;Vinstri&#39;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Úttekt {0} búin til starfsmanns {1} á tilteknu tímabili
 DocType: Employee,Education,menntun
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Herferð Nafngift By
 DocType: Employee,Current Address Is,Núverandi Heimilisfang er
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Breytt
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valfrjálst. Leikmynd sjálfgefið mynt félagsins, ef ekki tilgreint."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Bókhald dagbók færslur.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Laus Magn á frá vöruhúsi
@@ -4443,7 +4453,7 @@
 DocType: Hub Settings,Hub Settings,Hub Stillingar
 DocType: Project,Gross Margin %,Heildarframlegð %
 DocType: BOM,With Operations,með starfsemi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bókhald færslur hafa verið gerðar í gjaldmiðli {0} fyrir fyrirtæki {1}. Vinsamlegast veldu nái eða greiða ber reikning með gjaldeyri {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bókhald færslur hafa verið gerðar í gjaldmiðli {0} fyrir fyrirtæki {1}. Vinsamlegast veldu nái eða greiða ber reikning með gjaldeyri {0}.
 DocType: Asset,Is Existing Asset,Er núverandi eign
 DocType: Salary Detail,Statistical Component,Tölfræðilegur hluti
 ,Monthly Salary Register,Mánaðarlaunum Register
@@ -4497,7 +4507,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,hengja Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lager Levels
 DocType: Customer,Commission Rate,Framkvæmdastjórnin Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,gera Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,gera Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block orlofsrétt umsóknir deild.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Greiðsla Type verður að vera einn af fáum, Borga og Innri Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4510,6 +4520,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Leyfa Framleiðsla á helgidögum
 DocType: Sales Order,Customer's Purchase Order Date,Viðskiptavinar Purchase Order Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Sýna opinberar viðhengi
 DocType: Packing Slip,Package Weight Details,Pakki Þyngd Upplýsingar
 DocType: Payment Gateway Account,Payment Gateway Account,Greiðsla Gateway Reikningur
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Að lokinni greiðslu áframsenda notandann til valda síðu.
@@ -4534,7 +4545,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ekki sýna tákn eins og $ etc hliðina gjaldmiðlum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Hálfur dagur)
 DocType: Supplier,Credit Days,Credit Days
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Gera Student Hópur
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Gera Student Hópur
 DocType: Leave Type,Is Carry Forward,Er bera fram
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Fá atriði úr BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days
@@ -4553,7 +4564,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,bundnar Upphæð
 DocType: GL Entry,Is Opening,er Opnun
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: gjaldfærslu ekki hægt að tengja með {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Númerakerfi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Reikningur {0} er ekki til
 DocType: Account,Cash,Cash
 DocType: Employee,Short biography for website and other publications.,Stutt ævisaga um vefsíðu og öðrum ritum.
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 88b2713..26c0d7a 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -20,12 +20,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
 DocType: Vehicle Service,Mileage,Chilometraggio
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vuoi davvero di accantonare questo bene?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selezionare Predefinito Fornitore
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selezionare il Fornitore predefinito
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},E' necessario specificare la  valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
 DocType: Purchase Order,Customer Contact,Customer Contact
 DocType: Job Applicant,Job Applicant,Candidati
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Questo si basa su operazioni contro questo fornitore. Vedere cronologia sotto per i dettagli
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Questo si basa su operazioni relative a questo fornitore. Vedere cronologia sotto per i dettagli
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nessun altro risultato.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legale
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},Il tipo di imposta / tassa non può essere inclusa nella tariffa della riga {0}
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Item scadenza di stato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Assegno Bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostra Varianti
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra Varianti
 DocType: Academic Term,Academic Term,Termine Accademico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantità
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistenza Sanitaria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ritardo nel pagamento (Giorni)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,spese per servizi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} è richiesto
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,pubblicità
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La stessa azienda viene inserito più di una volta
 DocType: Employee,Married,Sposato
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non consentito per {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Non consentito per {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Ottenere elementi dal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Impostare il sistema di denominazione dei dipendenti in risorse umane&gt; Impostazioni HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prodotto {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nessun elemento elencato
 DocType: Payment Reconciliation,Reconcile,conciliare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Drogheria
 DocType: Quality Inspection Reading,Reading 1,Lettura 1
 DocType: Process Payroll,Make Bank Entry,Aggiungi Banca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondi Pensione
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
 DocType: SMS Center,All Sales Person,Tutti i Venditori
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Distribuzione mensile ** aiuta a distribuire il Budget / Target nei mesi, nel caso di di business stagionali."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Non articoli trovati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Non articoli trovati
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Stipendio Struttura mancante
 DocType: Lead,Person Name,Nome Person
 DocType: Sales Invoice Item,Sales Invoice Item,Fattura Voce
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","ad esempio, &quot;scuola elementare&quot; o &quot;Università&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reports Magazzino
 DocType: Warehouse,Warehouse Detail,Dettagli Magazzino
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia fine non può essere successiva alla data di fine anno dell&#39;anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionato, in quanto esiste già un movimento collegato"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionato, in quanto esiste già un movimento collegato"
 DocType: Vehicle Service,Brake Oil,olio freno
 DocType: Tax Rule,Tax Type,Tipo fiscale
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
 DocType: BOM,Item Image (if not slideshow),Immagine Articolo (se non slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Esiste un cliente con lo stesso nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tasso Orario / 60) * tempo operazione effettivo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Seleziona la Distinta Materiali
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Seleziona la Distinta Materiali
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo di oggetti consegnati
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,La vacanza su {0} non è tra da Data e A Data
@@ -167,7 +170,7 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nessun record congedo trovato per dipendente {0} per {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Inserisci prima azienda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Seleziona prima azienda
-DocType: Employee Education,Under Graduate,Sotto Laurea
+DocType: Employee Education,Under Graduate,Laureando
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
 DocType: Journal Entry Account,Employee Loan,prestito dipendenti
@@ -181,20 +184,20 @@
 DocType: Expense Claim Detail,Claim Amount,Importo Reclamo
 DocType: Employee,Mr,Sig.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Gruppo di clienti duplicato trovato nella tabella gruppo cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornitore Tipo / fornitore
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornitore Tipo / Fornitore
 DocType: Naming Series,Prefix,Prefisso
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumabile
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Log Importazione
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tirare Materiale Richiesta di tipo Produzione sulla base dei criteri di cui sopra
 DocType: Training Result Employee,Grade,Grado
-DocType: Sales Invoice Item,Delivered By Supplier,Consegnato da parte del fornitore
+DocType: Sales Invoice Item,Delivered By Supplier,Consegnato dal Fornitore
 DocType: SMS Center,All Contact,Tutti i contatti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordine di produzione già creato per tutti gli elementi con BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Ordine di produzione già creato per tutti gli elementi con BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Stipendio Annuo
 DocType: Daily Work Summary,Daily Work Summary,Riepilogo lavori giornaliero
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} è bloccato
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} è bloccato
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Seleziona esistente Società per la creazione di piano dei conti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Spese di stoccaggio
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleziona Target Warehouse
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credito in Società Valuta
 DocType: Delivery Note,Installation Status,Stato di installazione
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vuoi aggiornare presenze? <br> Presente: {0} \ <br> Assente: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Quantità accettata + rifiutata deve essere uguale alla quantità ricevuta per {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Fornire Materie Prime per l'Acquisto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,è richiesto almeno una modalità di pagamento per POS fattura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,è richiesto almeno una modalità di pagamento per POS fattura.
 DocType: Products Settings,Show Products as a List,Mostra prodotti sotto forma di elenco
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Scarica il modello, compilare i dati appropriati e allegare il file modificato.
@@ -222,12 +225,12 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Crea una scrittura per l'ammortamento
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipo di richiesta
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Crea Dipendente
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Crea Dipendente
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,emittente
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,esecuzione
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,I dettagli delle operazioni effettuate.
 DocType: Serial No,Maintenance Status,Stato di manutenzione
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: richiesto conto Fornitore per il conto di debito  {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Il campo Fornitore è richiesto per il conto di debito  {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Oggetti e prezzi
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Ore totali: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dalla data deve essere entro l'anno fiscale. Assumendo Dalla Data = {0}
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Piano per le visite di manutenzione.
 DocType: SMS Settings,Enter url parameter for message,Inserisci parametri url per il messaggio
 DocType: POS Profile,Customer Groups,Gruppi clienti
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Bilancio d&#39;esercizio
 DocType: Guardian,Students,Alunni
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Le modalità di applicazione di prezzi e sconti .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prezzo di listino deve essere applicabile per l'acquisto o la vendita di
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
 DocType: Company,Default Payroll Payable Account,Payroll di mora dovuti account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aggiorna e-mail Gruppo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aggiorna Gruppo Email
 DocType: Sales Invoice,Is Opening Entry,Sta aprendo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menzione se conto credito non standard applicabile
 DocType: Course Schedule,Instructor Name,Istruttore Nome
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Contro fattura di vendita dell'oggetto
 ,Production Orders in Progress,Ordini di produzione in corso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Di cassa netto da finanziamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
 DocType: Lead,Address & Contact,Indirizzo e Contatto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Aggiungere le foglie non utilizzate precedentemente assegnata
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totale Costing Importo (tramite Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Registrazioni bancarie
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,Pubblicare in Hub
 DocType: Student Admission,Student Admission,L&#39;ammissione degli studenti
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,L'articolo {0} è annullato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Richiesta materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 DocType: Item,Purchase Details,"Acquisto, i dati"
@@ -346,12 +350,12 @@
 DocType: Email Digest,New Quotations,Nuovo Preventivo
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Messaggi di posta elettronica stipendio slittamento al dipendente sulla base di posta preferito selezionato a dipendenti
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Il primo responsabile ferie della lista sarà impostato come il responsabile ferie di default
-DocType: Tax Rule,Shipping County,County spedizione
+DocType: Tax Rule,Shipping County,Distretto di  Spedizione
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Imparare
 DocType: Asset,Next Depreciation Date,Data ammortamento successivo
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo attività per dipendente
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},Fornitore fattura n esiste in Acquisto Fattura {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},La Fattura Fornitore non esiste nella Fattura di Acquisto {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gestire venditori ad albero
 DocType: Job Applicant,Cover Letter,Lettera di presentazione
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Gli assegni in circolazione e depositi per cancellare
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica tramite e-mail sulla creazione di Richiesta automatica Materiale
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo Fattura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota di Consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Documento Di Trasporto
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costo del bene venduto
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Pagamento ingresso è stato modificato dopo l'tirato. Si prega di tirare di nuovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
-DocType: Grade Interval,Min Score,Punteggio Min
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
 DocType: Student Applicant,Admitted,Ammesso
 DocType: Workstation,Rent Cost,Affitto Costo
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valore dell&#39;ordine
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transazioni Banca / Cassa solo contro partner o per giroconto
 DocType: Shipping Rule,Valid for Countries,Valido per paesi
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Questo articolo è un modello e non può essere utilizzato nelle transazioni. Attributi Voce verranno copiate nelle varianti meno che sia impostato 'No Copy'
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Questo articolo è un modello e non può essere utilizzato nelle transazioni. Attributi Voce verranno copiate nelle varianti meno che sia impostato 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totale ordine Considerato
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Inserisci ' Ripetere il giorno del mese ' valore di campo
@@ -400,13 +403,13 @@
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} già allocato il dipendente {1} per il periodo {2} a {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Seleziona elemento
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Fattura di Acquisto {0} è già stata presentata
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La Fattura di Acquisto {0} è già stata presentata
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lotto di un articolo
 DocType: C-Form Invoice Detail,Invoice Date,Data fattura
 DocType: GL Entry,Debit Amount,Importo Debito
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creazione di gruppi di studenti
@@ -435,15 +438,15 @@
 DocType: Request for Quotation,Request for Quotation,Richiesta di offerta
 DocType: Salary Slip Timesheet,Working Hours,Orario di lavoro
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Cambia l'inizio/numero sequenza corrente per una serie esistente
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Creare un nuovo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Creare un nuovo cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se più regole dei prezzi continuano a prevalere, gli utenti sono invitati a impostare manualmente la priorità per risolvere il conflitto."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Creare ordini d&#39;acquisto
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Creare ordini d&#39;acquisto
 ,Purchase Register,Registro Acquisti
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Spese applicabili
 DocType: Workstation,Consumable Cost,Costo consumabili
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
-DocType: Purchase Receipt,Vehicle Date,Veicolo
+DocType: Purchase Receipt,Vehicle Date,Data Veicolo
 DocType: Student Log,Medical,Medico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motivo per Perdere
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Il proprietario del Lead non può essere il Lead stesso
@@ -463,12 +466,12 @@
 DocType: Delivery Note,% Installed,% Installato
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Aule / Laboratori etc dove le lezioni possono essere programmati.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Inserisci il nome della società prima
-DocType: Purchase Invoice,Supplier Name,Nome fornitore
+DocType: Purchase Invoice,Supplier Name,Nome Fornitore
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leggere il manuale ERPNext
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,In attesa di ordini di acquisto
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Imposta automaticamente seriale Nos sulla base FIFO
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare fornitore Numero fattura Uniqueness
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare l'unicità del numero fattura fornitore
 DocType: Vehicle Service,Oil Change,Cambio olio
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','A Caso N.' non può essere minore di 'Da Caso N.'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
@@ -480,7 +483,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati fino al
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vacanza principale.
@@ -501,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Da Pacchetto N.
 DocType: Item Attribute,To Range,Per Intervallo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,I titoli e depositi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossibile modificare il metodo di valutazione, in quanto vi sono transazioni contro alcuni elementi che non hanno il proprio metodo di valutazione"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Foglie totali assegnate è obbligatoria
 DocType: Job Opening,Description of a Job Opening,Descrizione dell'Offerta di Lavoro
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Attività di attesa per oggi
@@ -527,7 +531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
 DocType: Production Order,Additional Operating Cost,Ulteriori costi di esercizio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
 DocType: Shipping Rule,Net Weight,Peso netto
 DocType: Employee,Emergency Phone,Telefono di emergenza
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Acquistare
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definisci il grado per Soglia 0%
 DocType: Sales Order,To Deliver,Consegnare
 DocType: Purchase Invoice Item,Item,Articolo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
 DocType: Journal Entry,Difference (Dr - Cr),Differenza ( Dr - Cr )
 DocType: Account,Profit and Loss,Profitti e Perdite
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestione conto lavoro / terzista
@@ -553,7 +557,7 @@
 DocType: Company,Delete Company Transactions,Elimina transazioni Azienda
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare tasse e ricarichi
-DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
+DocType: Purchase Invoice,Supplier Invoice No,Fattura Fornitore N°
 DocType: Territory,For reference,Per riferimento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossibile eliminare N. di serie {0}, come si usa in transazioni di borsa"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Chiusura (Cr)
@@ -562,22 +566,22 @@
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 DocType: Production Plan Item,Pending Qty,In attesa Quantità
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} non è attivo
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} non è attivo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS inviato al seguenti numeri: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Dimensioni di controllo di configurazione per la stampa
 DocType: Salary Slip,Salary Slip Timesheet,Stipendio slittamento Timesheet
-apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
+apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per ricevuta d'acquisto del conto lavoro
 DocType: Pricing Rule,Valid From,valido dal
 DocType: Sales Invoice,Total Commission,Commissione Totale
 DocType: Pricing Rule,Sales Partner,Partner vendite
 DocType: Buying Settings,Purchase Receipt Required,Acquisto necessaria la ricevuta
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Il valore stimato e' obbligatorio se si tratta di una Disponibilità inziale di Magazzino
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Il valore stimato e' obbligatorio se si tratta di una Disponibilità inziale di Magazzino
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valori accumulati
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Crea Ordine di vendita
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Crea Ordine di vendita
 DocType: Project Task,Project Task,Progetto Task
 ,Lead Id,Id del Lead
 DocType: C-Form Invoice Detail,Grand Total,Somma totale
@@ -594,17 +598,17 @@
 DocType: Job Applicant,Resume Attachment,Riprendi Allegato
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ripetere i clienti
 DocType: Leave Control Panel,Allocate,Assegna
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Ritorno di vendite
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Totale foglie assegnati {0} non deve essere inferiore a foglie già approvati {1} per il periodo
 DocType: Announcement,Posted By,Pubblicato da
-DocType: Item,Delivered by Supplier (Drop Ship),Consegnato da Supplier (Drop Ship)
+DocType: Item,Delivered by Supplier (Drop Ship),Consegnato dal Fornitore (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Potenziali Clienti.
 DocType: Authorization Rule,Customer or Item,Cliente o Voce
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Database Clienti.
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Importo concesso non può essere negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Imposti la Società
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
@@ -615,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fattura Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selezionare Account pagamento per rendere Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Creare record dei dipendenti per la gestione foglie, rimborsi spese e del libro paga"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Creare record dei dipendenti per la gestione foglie, rimborsi spese e del libro paga"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Aggiungere al Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Scrivere proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagamento Entry Deduzione
@@ -623,7 +627,7 @@
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Se selezionata, materie prime per gli oggetti che sono sub-contratto saranno inclusi nella sezione Richieste Materiale"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Principali
 DocType: Assessment Plan,Maximum Assessment Score,Massimo punteggio
-apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Aggiornamento banca data delle relative operazioni
+apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Aggiorna le date delle transazioni bancarie
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Monitoraggio tempo
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
 DocType: Packing Slip Item,DN Detail,Dettaglio DN
@@ -646,18 +650,17 @@
 DocType: Buying Settings,Settings for Buying Module,Impostazioni per il Modulo Acquisti
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} non appartiene alla società {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Inserisci RICEVUTA primo
-DocType: Buying Settings,Supplier Naming By,Fornitore di denominazione
+DocType: Buying Settings,Supplier Naming By,Fornitore da Nome
 DocType: Activity Type,Default Costing Rate,Tasso Costing Predefinito
 DocType: Maintenance Schedule,Maintenance Schedule,Programma di manutenzione
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Poi Regole dei prezzi vengono filtrati in base a cliente, Gruppo Cliente, Territorio, Fornitore, Fornitore Tipo, Campagna, Partner di vendita ecc"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Quindi le Regole dei prezzi vengono filtrate in base a cliente, Gruppo Cliente, Territorio, Fornitore, Tipo Fornitore, Campagna, Partner di vendita ecc"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Variazione netta Inventario
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Prestito gestione del personale
 DocType: Employee,Passport Number,Numero di passaporto
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Rapporto con Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Il pagamento da / a
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervallo di date
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuovo limite di credito è inferiore a corrente importo dovuto per il cliente. Limite di credito deve essere atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuovo limite di credito è inferiore a corrente importo dovuto per il cliente. Limite di credito deve essere atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
 DocType: SMS Settings,Receiver Parameter,Ricevitore Parametro
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basato Su' e 'Raggruppato Per' non può essere lo stesso
@@ -667,7 +670,7 @@
 DocType: Issue,Resolution Date,Risoluzione Data
 DocType: Student Batch Name,Batch Name,Batch Nome
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet creato:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Iscriversi
 DocType: Selling Settings,Customer Naming By,Cliente nominato di
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mostrerà lo studente come presente nel Presenze Monthly Report
@@ -680,7 +683,7 @@
 DocType: Supplier,Fixed Days,Giorni fissi
 DocType: Quotation Item,Item Balance,Saldo
 DocType: Sales Invoice,Packing List,Lista di imballaggio
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordini di acquisto prestate a fornitori.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordini di acquisto emessi ai Fornitori.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,editoria
 DocType: Activity Cost,Projects User,Progetti utente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumato
@@ -709,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,La partecipazione degli studenti
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materie prime calcolate in base a
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Inserisci il dettaglio articolo
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Inserisci il dettaglio articolo
 DocType: Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Le vendite Pre
 DocType: Purchase Receipt,Other Details,Altri dettagli
@@ -727,7 +730,7 @@
 ,Absent Student Report,Report Assenze Studente
 DocType: Email Digest,Next email will be sent on:,La prossima Email verrà inviata il:
 DocType: Offer Letter Term,Offer Letter Term,Termine di Offerta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Articolo ha varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolo {0} non trovato
 DocType: Bin,Stock Value,Valore Giacenza
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Società di {0} non esiste
@@ -736,7 +739,6 @@
 DocType: Serial No,Warranty Expiry Date,Data di scadenza Garanzia
 DocType: Material Request Item,Quantity and Warehouse,Quantità e Magazzino
 DocType: Sales Invoice,Commission Rate (%),Tasso Commissione (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie Naming per {0} tramite Impostazioni&gt; Impostazioni&gt; Serie di denominazione
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleziona Programma
 DocType: Project,Estimated Cost,Costo stimato
 DocType: Purchase Order,Link to material requests,Collegamento alle richieste di materiale
@@ -754,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} non è un articolo in scorta
 DocType: Mode of Payment Account,Default Account,Account Predefinito
 DocType: Payment Entry,Received Amount (Company Currency),Importo ricevuto (Società di valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Il Lead deve essere impostato se l'opportunità è generata da un Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Il Lead deve essere impostato se l'opportunità è generata da un Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Seleziona il giorno di riposo settimanale
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person target Varianza articolo Group- Wise
@@ -837,7 +839,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Request for Quotation Supplier,Send Email,Invia Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nessuna autorizzazione
 DocType: Company,Default Bank Account,Conto Banca Predefinito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrare sulla base del partito, selezionare Partito Digitare prima"
@@ -850,7 +852,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nessun dipendente trovato
 DocType: Supplier Quotation,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Il gruppo studente è già aggiornato.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Il gruppo studente è già aggiornato.
 DocType: SMS Center,All Customer Contact,Tutti Contatti Clienti
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Carica Saldo delle Scorte tramite csv.
 DocType: Warehouse,Tree Details,Dettagli Albero
@@ -861,8 +863,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Importo Minimo Fattura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Il Centro di Costo {2} non appartiene all'azienda {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Il conto {2} non può essere un gruppo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Articolo Row {} IDX: {DOCTYPE} {} docname non esiste nel precedente &#39;{} doctype&#39; tavolo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} è già completato o annullato
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Articolo Row {} IDX: {DOCTYPE} {} docname non esiste nel precedente &#39;{} doctype&#39; tavolo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} è già completato o annullato
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nessuna attività
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Il giorno del mese per cui la fattura automatica sarà generata, ad esempio 05, 28 ecc"
 DocType: Asset,Opening Accumulated Depreciation,Apertura del deprezzamento accumulato
@@ -878,7 +880,7 @@
 DocType: Bin,Moving Average Rate,Tasso Media Mobile
 DocType: Production Planning Tool,Select Items,Selezionare Elementi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} per fattura {1} in data {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Orario del corso
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Orario del corso
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: HR Settings,Enter retirement age in years,Inserire l&#39;età pensionabile in anni
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Obiettivo Magazzino
@@ -886,7 +888,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Importa presenze
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tutti i Gruppi
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tutti i Gruppi
 DocType: Process Payroll,Activity Log,Registro attività
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Utile / Perdita
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
@@ -897,7 +899,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ordine d&#39;acquisto a pagamento
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Pagamento Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Apertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Aperto per fare
 DocType: Notification Control,Delivery Note Message,Messaggio del Documento di Trasporto
@@ -913,7 +915,7 @@
 DocType: Item Reorder,Re-Order Qty,Quantità Ri-ordino
 DocType: Leave Block List Date,Leave Block List Date,Lascia Block List Data
 DocType: Pricing Rule,Price or Discount,Prezzo o Sconto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totale oneri addebitati in Acquisto tabella di carico Gli articoli devono essere uguale Totale imposte e oneri
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totale oneri addebitati in Acquisto tabella di carico Gli articoli devono essere uguale Totale imposte e oneri
 DocType: Sales Team,Incentives,Incentivi
 DocType: SMS Log,Requested Numbers,Numeri richiesti
 DocType: Production Planning Tool,Only Obtain Raw Materials,Ottenere solo materie prime
@@ -971,8 +973,7 @@
 DocType: Supplier,Default Payable Accounts,Contabilità Fornitori Predefinita
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Fee Structure,Components,componenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Acquisto Advance Fattura
@@ -1005,14 +1006,14 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Per &#39;prodotto Bundle&#39;, Warehouse, numero di serie e Batch No sarà considerata dal &#39;Packing List&#39; tavolo. Se Magazzino e Batch No sono gli stessi per tutti gli elementi di imballaggio per un elemento qualsiasi &#39;Product Bundle&#39;, questi valori possono essere inseriti nella tabella principale elemento, i valori verranno copiati a &#39;Packing List&#39; tavolo."
 DocType: Job Opening,Publish on website,Pubblicare sul sito web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Le spedizioni verso i clienti.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Fornitore Data fattura non può essere maggiore di Data Pubblicazione
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,La data Fattura Fornitore non può essere superiore della Data Registrazione
 DocType: Purchase Invoice Item,Purchase Order Item,Ordine di acquisto dell&#39;oggetto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Proventi indiretti
 DocType: Student Attendance Tool,Student Attendance Tool,Strumento Presenze
 DocType: Cheque Print Template,Date Settings,Impostazioni della data
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varianza
 ,Company Name,Nome Azienda
-DocType: SMS Center,Total Message(s),Messaggio Total ( s )
+DocType: SMS Center,Total Message(s),Totale Messaggi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Selezionare la voce per il trasferimento
 DocType: Purchase Invoice,Additional Discount Percentage,Additional Percentuale di sconto
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
@@ -1024,8 +1025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimico
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Predefinito conto bancario / Cash sarà aggiornato automaticamente in Stipendio diario quando viene selezionata questa modalità.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Gli intervalli di codice Grade {0} si sovrappone alla intervalli di grado per gli altri gradi. Si prega di controllare gli intervalli di {0} e {1} e riprovare
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Società di valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Riga # {0}: la velocità non può essere superiore alla velocità utilizzata in {1} {2}
@@ -1037,7 +1036,7 @@
 DocType: BOM Website Item,BOM Website Item,Distinta Base dell'Articolo sul Sito Web
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
 DocType: Timesheet Detail,Bill,Conto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Successivo ammortamento Data viene inserita come data passata
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Successivo ammortamento Data viene inserita come data passata
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bianco
 DocType: SMS Center,All Lead (Open),Tutti i Lead (Aperti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riga {0}: Qtà non disponibile per {4} in magazzino {1} al momento della pubblicazione della voce ({2} {3})
@@ -1045,13 +1044,13 @@
 DocType: Item,Automatically Create New Batch,Crea automaticamente un nuovo batch
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Fare
 DocType: Student Admission,Admission Start Date,L&#39;ammissione Data di inizio
-DocType: Journal Entry,Total Amount in Words,Importo totale in parole
+DocType: Journal Entry,Total Amount in Words,Importo Totale in lettere
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Il mio carrello
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
 DocType: Lead,Next Contact Date,Data del contatto successivo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantità di apertura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
 DocType: Student Batch Name,Student Batch Name,Studente Batch Nome
 DocType: Holiday List,Holiday List Name,Nome elenco vacanza
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del prestito Importo
@@ -1060,8 +1059,8 @@
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vuoi davvero ripristinare questo bene rottamato?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},Quantità per {0}
-DocType: Leave Application,Leave Application,Lascia Applicazione
-apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lascia strumento Allocazione
+DocType: Leave Application,Leave Application,Applicazione Permessi
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Strumento Allocazione Permessi
 DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
 DocType: Workstation,Net Hour Rate,Tasso Netto Orario
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost ricevuta di acquisto
@@ -1071,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Si prega di specificare un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Eliminati elementi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} non può essere negativo
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Sconto
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Sconto
 DocType: Asset,Total Number of Depreciations,Numero totale degli ammortamenti
 DocType: Sales Invoice Item,Rate With Margin,Vota con margine
 DocType: Workstation,Wages,Salari
@@ -1085,7 +1084,7 @@
 DocType: Item,Manufacturer,Produttore
 DocType: Landed Cost Item,Purchase Receipt Item,RICEVUTA articolo
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-DocType: POS Profile,Sales Invoice Payment,Fattura di vendita pagamento
+DocType: POS Profile,Sales Invoice Payment,Pagamento Fattura di vendita
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Riservato a ordini di vendita / Magazzino prodotti finiti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Importo di vendita
 DocType: Repayment Schedule,Interest Amount,Ammontare Interessi
@@ -1102,7 +1101,7 @@
 DocType: Lead,Organization Name,Nome organizzazione
 DocType: Tax Rule,Shipping State,Stato Spedizione
 ,Projected Quantity as Source,Proiezione Quantità come sorgente
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Includi elementi non-azione
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Spese di vendita
@@ -1110,7 +1109,7 @@
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
 DocType: Sales Partner,Implementation Partner,Partner di implementazione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,CAP
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,CAP
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} è {1}
 DocType: Opportunity,Contact Info,Info Contatto
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Creazione scorte
@@ -1119,7 +1118,7 @@
 DocType: Item,Default Supplier,Fornitore Predefinito
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nel corso di produzione Allowance Percentuale
 DocType: Employee Loan,Repayment Schedule,Piano di rimborso
-DocType: Shipping Rule Condition,Shipping Rule Condition,Spedizione Regola Condizioni
+DocType: Shipping Rule Condition,Shipping Rule Condition,Condizioni Regola di Spedizione
 DocType: Holiday List,Get Weekly Off Dates,Ottieni cadenze settimanali
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data di Fine non può essere inferiore a Data di inizio
 DocType: Sales Person,Select company name first.,Selezionare il nome della società prima.
@@ -1129,7 +1128,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Età media
 DocType: School Settings,Attendance Freeze Date,Data di congelamento della frequenza
 DocType: Opportunity,Your sales person who will contact the customer in future,Il vostro venditore che contatterà il cliente in futuro
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere organizzazioni o individui .
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere società o persone fisiche
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Visualizza tutti i prodotti
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Età di piombo minima (giorni)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,tutte le Distinte Materiali
@@ -1150,9 +1149,9 @@
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contributo%
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numeri di registrazione dell'azienda per il vostro riferimento. numero Tassa, ecc"
 DocType: Sales Partner,Distributor,Distributore
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrello Regola Spedizione
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regola Spedizione del Carrello
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 DocType: Global Defaults,Global Defaults,Predefiniti Globali
@@ -1179,19 +1178,18 @@
 DocType: Purchase Invoice,Is Return,È Return
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Ritorno / Nota di Debito
 DocType: Price List Country,Price List Country,Listino Prezzi Nazione
-DocType: Item,UOMs,UOMs
+DocType: Item,UOMs,Unità di Misure
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} numeri di serie validi per l'articolo {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Codice Articolo non può essere modificato per N. di Serie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profilo {0} già creato per l&#39;utente: {1} e società {2}
-DocType: Sales Invoice Item,UOM Conversion Factor,Fattore di Conversione UOM
+DocType: Sales Invoice Item,UOM Conversion Factor,Fattore di conversione Unità di Misura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Inserisci Codice Articolo per ottenere il numero di lotto
 DocType: Stock Settings,Default Item Group,Gruppo Articoli Predefinito
 DocType: Employee Loan,Partially Disbursed,parzialmente erogato
-DocType: Grading Structure,Grading System Name,Nome Grading System
-apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banca dati dei fornitori.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database dei fornitori.
 DocType: Account,Balance Sheet,Bilancio Patrimoniale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Il rivenditore riceverà un promemoria in questa data per contattare il cliente
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Lo stesso articolo non può essere inserito più volte.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ulteriori conti possono essere fatti in Gruppi, ma le voci possono essere fatte contro i non-Gruppi"
@@ -1210,7 +1208,7 @@
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lasciare vuoto se considerato per tutti i rami
 DocType: Bank Guarantee,Validity in Days,Validità in giorni
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma non è applicabile per la fattura: {0}
-DocType: Payment Reconciliation,Unreconciled Payment Details,Non riconciliate Particolari di pagamento
+DocType: Payment Reconciliation,Unreconciled Payment Details,Dettagli di pagamento non riconciliati
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Conteggio ordini
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Purchase Order,Group same items,stessi articoli di gruppo
@@ -1228,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Attività svolta
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Specifica almeno un attributo nella tabella Attributi
 DocType: Announcement,All Students,Tutti gli studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Voce {0} deve essere un elemento non-azione
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Voce {0} deve essere un elemento non-azione
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,vista Ledger
 DocType: Grading Scale,Intervals,intervalli
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,No. studente in mobilità
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Lotto
@@ -1255,7 +1253,7 @@
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenere la stessa tariffa per l'intero ciclo di acquisto
 DocType: Opportunity Item,Opportunity Item,Opportunità articolo
 ,Student and Guardian Contact Details,Student and Guardian Contatti
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,Riga {0}: Per il fornitore {0} Indirizzo e-mail è tenuto ad inviare e-mail
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,Riga {0}: Per il fornitore {0} l'Indirizzo e-mail è richiesto per inviare l'e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Apertura temporanea
 ,Employee Leave Balance,Saldo del Congedo Dipendete
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Il Saldo del Conto {0} deve essere sempre {1}
@@ -1272,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
 DocType: Journal Entry,Get Outstanding Invoices,Ottieni fatture non saldate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Sales Order {0} non è valido
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Gli ordini di acquisto ti aiutano a pianificare e monitorare i tuoi acquisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Gli ordini di acquisto ti aiutano a pianificare e monitorare i tuoi acquisti
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantità emissione / trasferimento totale {0} in Materiale Richiesta {1} \ non può essere maggiore di quantità richiesta {2} per la voce {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Piccolo
@@ -1290,14 +1288,14 @@
 DocType: Employee,Place of Issue,Luogo di emissione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,contratto
 DocType: Email Digest,Add Quote,Aggiungere Citazione
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,UOM coversion factor required for UOM: {0} in Item: {1},Fattore di conversione Unità di Misura è obbligatorio per Unità di Misura: {0} alla voce: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agricoltura
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,I vostri prodotti o servizi
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
@@ -1314,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Numero di rotolo di gruppo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totale di tutti i pesi compito dovrebbe essere 1. Regolare i pesi di tutte le attività del progetto di conseguenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Attrezzature Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
@@ -1336,12 +1334,12 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota : Questo centro di costo è un gruppo . Non può fare scritture contabili contro i gruppi .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Esiste magazzino Bambino per questo magazzino. Non è possibile eliminare questo magazzino.
 DocType: Item,Website Item Groups,Sito gruppi di articoli
-DocType: Purchase Invoice,Total (Company Currency),Totale (Società Valuta)
+DocType: Purchase Invoice,Total (Company Currency),Totale (Valuta Società)
 apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Numero di serie {0} è entrato più di una volta
-DocType: Depreciation Schedule,Journal Entry,Libro Giornale
+DocType: Depreciation Schedule,Journal Entry,Registrazione Contabile
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} articoli in lavorazione
 DocType: Workstation,Workstation Name,Nome workstation
-DocType: Grade Interval,Grade Code,Codice grado
+DocType: Grading Scale Interval,Grade Code,Codice grado
 DocType: POS Item Group,POS Item Group,POS Gruppo Articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Distinta Base {0} non appartiene alla voce {1}
@@ -1357,9 +1355,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,ricorrente Fino
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Seleziona una società
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Seleziona una società
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Lascia Privilege
-DocType: Purchase Invoice,Supplier Invoice Date,Fornitore Data fattura
+DocType: Purchase Invoice,Supplier Invoice Date,Data fattura Fornitore
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,È necessario abilitare Carrello
 DocType: Payment Entry,Writeoff,Cancellare
 DocType: Appraisal Template Goal,Appraisal Template Goal,Valutazione Modello Obiettivo
@@ -1373,7 +1371,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,cibo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamma invecchiamento 3
 DocType: Maintenance Schedule Item,No of Visits,Num. di Visite
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Segna come Presenza
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Segna come Presenza
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Il programma di manutenzione {0} esiste contro {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,studente iscrivendosi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta del Conto di chiusura deve essere {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somma dei punti per tutti gli obiettivi dovrebbero essere 100. E &#39;{0}
@@ -1382,7 +1381,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Apri la Distinta Base {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazzino non può essere modificato per Serial No.
 DocType: Authorization Rule,Average Discount,Sconto Medio
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,Unità di misura
 DocType: Rename Tool,Utilities,Utilità
 DocType: Purchase Invoice Item,Accounting,Contabilità
 DocType: Employee,EMP/,EMP /
@@ -1422,13 +1421,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Piano dei Conti
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Maintenance Visit,Unscheduled,Non in programma
 DocType: Employee,Owned,Di proprietà
 DocType: Salary Detail,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
 DocType: Pricing Rule,"Higher the number, higher the priority","Più alto è il numero, maggiore è la priorità"
 ,Purchase Invoice Trends,Acquisto Tendenze Fattura
 DocType: Employee,Better Prospects,Prospettive Migliori
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riga # {0}: Il batch {1} ha solo {2} qty. Si prega di selezionare un altro batch che dispone di {3} qty disponibile o si divide la riga in più righe, per consegnare / emettere da più batch"
 DocType: Vehicle,License Plate,Targa
 DocType: Appraisal,Goals,Obiettivi
 DocType: Warranty Claim,Warranty / AMC Status,Garanzia / AMC Stato
@@ -1447,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se l'account viene bloccato , le voci sono autorizzati a utenti con restrizioni ."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilo Posizione , qualifiche richieste ecc"
 DocType: Journal Entry Account,Account Balance,Saldo a bilancio
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regola fiscale per le operazioni.
@@ -1456,9 +1456,9 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}:Per la Contabilità Clienti è necessario specificare un Cliente  {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale tasse e spese (Azienda valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostra di P &amp; L saldi non chiusa anno fiscale di
-DocType: Shipping Rule,Shipping Account,Account Spedizione
+DocType: Shipping Rule,Shipping Account,Conto di Spedizione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Il conto {2} è inattivo
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Creare gli Ordini di Vendita ti aiuta a pianificare la lavorazione e a consegnare entro i tempi stabiliti
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Creare gli Ordini di Vendita ti aiuta a pianificare la lavorazione e a consegnare entro i tempi stabiliti
 DocType: Quality Inspection,Readings,Letture
 DocType: Stock Entry,Total Additional Costs,Totale Costi aggiuntivi
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Per Valore
 DocType: Asset Movement,Stock Manager,Responsabile di magazzino
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Deposito Origine è obbligatorio per riga {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Documento di trasporto
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Documento di trasporto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Affitto Ufficio
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Impostazioni del gateway configurazione di SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importazione non riuscita!
@@ -1491,11 +1491,11 @@
 DocType: Company,Services,Servizi
 DocType: HR Settings,Email Salary Slip to Employee,E-mail busta paga per i dipendenti
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Selezionare Fornitore Possibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Selezionare il Fornitore Possibile
 DocType: Sales Invoice,Source,Fonte
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra chiusa
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Questo {0} conflitti con {1} per {2} {3}
 DocType: Student Attendance Tool,Students HTML,Gli studenti HTML
@@ -1513,7 +1513,7 @@
 DocType: Student,Date of Leaving,Data di partenza
 DocType: Pricing Rule,For Price List,Per Listino Prezzi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Creare un Lead
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Creare un Lead
 DocType: Maintenance Schedule,Schedules,Orari
 DocType: Purchase Invoice Item,Net Amount,Importo Netto
 DocType: Purchase Order Item Supplied,BOM Detail No,Dettaglio BOM N.
@@ -1523,14 +1523,14 @@
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
 DocType: Student,Leaving Certificate Number,Lasciando Numero del certificato
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponibile Quantità Batch in magazzino
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aggiornamento Formato di stampa
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aggiornamento Formato di Stampa
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Aiuto
-DocType: Purchase Invoice,Select Shipping Address,Selezionare indirizzo di spedizione
+DocType: Purchase Invoice,Select Shipping Address,Selezionare Indirizzo di spedizione
 DocType: Leave Block List,Block Holidays on important days.,Vacanze di blocco nei giorni importanti.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,Contabilità Sommario Crediti
 DocType: Employee Loan,Monthly Repayment Amount,Ammontare Rimborso Mensile
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
-DocType: UOM,UOM Name,UOM Nome
+DocType: UOM,UOM Name,Nome Unità di Misura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Contributo Importo
 DocType: Purchase Invoice,Shipping Address,Indirizzo di spedizione
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Questo strumento consente di aggiornare o correggere la quantità e la valutazione delle azioni nel sistema. Viene tipicamente utilizzato per sincronizzare i valori di sistema e ciò che esiste realmente in vostri magazzini.
@@ -1541,9 +1541,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,iscrizioni Programma
 DocType: Sales Invoice Item,Brand Name,Nome Marchio
 DocType: Purchase Receipt,Transporter Details,Transporter Dettagli
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Deposito di default è richiesto per gli elementi selezionati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Deposito di default è richiesto per gli elementi selezionati
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Scatola
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Fornitore possibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Fornitore Possibile
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,L'Organizzazione
 DocType: Budget,Monthly Distribution,Distribuzione Mensile
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista Receiver è vuoto . Si prega di creare List Ricevitore
@@ -1574,32 +1574,32 @@
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM predefinito per {0} non trovato per il progetto {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Reclami per spese dell'azienda.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Gli studenti sono al cuore del sistema, aggiungere tutti gli studenti"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Gli studenti sono al cuore del sistema, aggiungere tutti gli studenti"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Data di Liquidazione {1} non può essere prima Assegno Data {2}
 DocType: Company,Default Holiday List,Lista vacanze predefinita
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Riga {0}: From Time To Time e di {1} si sovrappone {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Passività in Giacenza
 DocType: Purchase Invoice,Supplier Warehouse,Magazzino Fornitore
 DocType: Opportunity,Contact Mobile No,Cellulare Contatto
-,Material Requests for which Supplier Quotations are not created,Richieste di materiale con le quotazioni dei fornitori non sono creati
+,Material Requests for which Supplier Quotations are not created,Richieste di materiale per le quali non sono state create Quotazioni dal Fornitore
 DocType: Student Group,Set 0 for no limit,Impostare 0 per nessun limite
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le giornate per cui si stanno segnando le ferie sono già di vacanze. Non è necessario chiedere un permesso.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Invia di nuovo pagamento Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nuovo compito
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Crea preventivo
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Crea preventivo
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Altri Reports
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Si prega di impostare di default Payroll conto da pagare in azienda {0}
 DocType: SMS Center,Receiver List,Lista Ricevitore
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Cerca articolo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Cerca articolo
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantità consumata
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variazione netta delle disponibilità
 DocType: Assessment Plan,Grading Scale,Scala di classificazione
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stata inserita più volte nella tabella di conversione
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Già completato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Richiesta di pagamento già esistente {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
@@ -1611,12 +1611,12 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} quantità non può essere una frazione
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Fornitore Tipo master.
-DocType: Purchase Order Item,Supplier Part Number,Numero di parte del fornitore
+DocType: Purchase Order Item,Supplier Part Number,Numero di articolo del fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
 DocType: Sales Invoice,Reference Document,Documento di riferimento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{0} {1} is cancelled or stopped,{0} {1} viene cancellato o fermato
 DocType: Accounts Settings,Credit Controller,Controllare Credito
-DocType: Delivery Note,Vehicle Dispatch Date,Veicolo Spedizione Data
+DocType: Delivery Note,Vehicle Dispatch Date,Data Spedizione Veicolo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,La Ricevuta di Acquisto {0} non è stata presentata
 DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni per in linea carrello della spesa, come le regole di trasporto, il listino prezzi ecc"
@@ -1630,20 +1630,20 @@
 DocType: BOM Item,BOM Item,BOM Articolo
 DocType: Appraisal,For Employee,Per Dipendente
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Crea una scrittura per l'esborso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riga {0}: Advance contro Fornitore deve essere addebito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riga {0}: L'anticipo verso Fornitore deve essere un debito
 DocType: Company,Default Values,Valori Predefiniti
 DocType: Expense Claim,Total Amount Reimbursed,Dell&#39;importo totale rimborsato
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Questo si basa su tronchi contro questo veicolo. Vedere cronologia sotto per i dettagli
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Collezionare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Contro Fornitore Invoice {0} {1} datato
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Al ricevimento della Fattura Fornitore {0} datata {1}
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,record di Asset Movimento {0} creato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,record di Asset Movimento {0} creato
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Non è possibile cancellare l&#39;anno fiscale {0}. Anno fiscale {0} è impostato in modo predefinito in Impostazioni globali
 DocType: Journal Entry,Entry Type,Tipo voce
 ,Customer Credit Balance,Balance Credit clienti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Variazione Netta in Contabilità Fornitori
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente richiesto per ' Customerwise Discount '
-apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Risale aggiornamento versamento bancario con riviste.
+apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Aggiorna le date di pagamento bancario con il Giornale.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Prezzi
 DocType: Quotation,Term Details,Dettagli Termini
 DocType: Project,Total Sales Cost (via Sales Order),Costo totale di vendita (tramite ordine di vendita)
@@ -1659,10 +1659,10 @@
 DocType: Salary Slip,Loan repayment,Rimborso del prestito
 DocType: Purchase Invoice,End date of current invoice's period,Data di fine del periodo di fatturazione corrente
 DocType: Pricing Rule,Applicable For,applicabile per
-DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare pagamento sulla cancellazione di fattura
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare il pagamento per la cancellazione della fattura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},lettura corrente dell&#39;odometro inserito deve essere maggiore di contachilometri iniziale veicolo {0}
-DocType: Shipping Rule Country,Shipping Rule Country,Regola Spedizione Nazione
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Permessi e presenze
+DocType: Shipping Rule Country,Shipping Rule Country,Regola Spedizione per Nazione
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Permessi e Presenze
 DocType: Maintenance Visit,Partially Completed,Parzialmente completato
 DocType: Leave Type,Include holidays within leaves as leaves,Includere le vacanze entro i fogli come foglie
 DocType: Sales Invoice,Packed Items,Pranzo Articoli
@@ -1677,7 +1677,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studiare in stesso Istituto
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Al Deposito (opzionale)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 DocType: Payment Entry,Paid Amount (Company Currency),Importo versato (Società valuta)
 DocType: Purchase Invoice,Additional Discount,Sconto aggiuntivo
 DocType: Selling Settings,Selling Settings,Vendere Impostazioni
@@ -1687,9 +1686,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vedi Carrello
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Richiesta di materiale usata per l'entrata giacenza
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Successivo ammortamento Data è obbligatoria per i nuovi beni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Successivo ammortamento Data è obbligatoria per i nuovi beni
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separare il gruppo di corso per ogni batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unità singola di un articolo.
 DocType: Fee Category,Fee Category,Fee Categoria
@@ -1705,8 +1704,7 @@
 DocType: Course Assessment Criteria,Weightage,Pesa
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: E' richiesto il Centro di Costo per il Conto Economico {2}. Configura un Centro di Costo di default per l'azienda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo Clienti&gt; Territorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nuovo contatto
 DocType: Territory,Parent Territory,Territorio genitore
 DocType: Quality Inspection Reading,Reading 2,Lettura 2
@@ -1733,20 +1731,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Riconciliazione JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Troppe colonne. Esportare il report e stamparlo utilizzando un foglio di calcolo.
 DocType: Purchase Invoice Item,Batch No,Lotto N.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Impossibile trovare tasso di cambio per {0} a {1} per la data {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Consentire a più ordini di vendita contro ordine di acquisto di un cliente
 DocType: Student Group Instructor,Student Group Instructor,Istruttore del gruppo di studenti
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,principale
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,principale
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
 DocType: Employee Attendance Tool,Employees HTML,Dipendenti HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia non incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Email Digest,Annual Expenses,Spese annuali
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Crea ordine d'acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Crea ordine d'acquisto
 DocType: SMS Center,Send To,Invia a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Somma stanziata
@@ -1757,14 +1754,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Specificare il magazzino Work- in- Progress prima della Conferma
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Richiedente per Lavoro.
 DocType: Purchase Order Item,Warehouse and Reference,Magazzino e Riferimenti
-DocType: Supplier,Statutory info and other general information about your Supplier,Informazioni obbligatorie e altre Informazioni Generali sul tuo Fornitore
+DocType: Supplier,Statutory info and other general information about your Supplier,Informazioni legali e altre Informazioni generali sul tuo Fornitore
 DocType: Item,Serial Nos and Batches,Numero e lotti seriali
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Forza del gruppo studente
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Perizie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condizione per una regola di trasporto
-DocType: Grading Structure,Grading Intervals,Intervalli di classificazione
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prego entra
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Non può overbill per la voce {0} in riga {1} più di {2}. Per consentire over-billing, impostare in Impostazioni acquisto"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Si prega di impostare il filtro in base al punto o in un magazzino
@@ -1777,16 +1773,17 @@
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Rifiutato Warehouse è obbligatoria per la voce respinto {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Versamento
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestisci i tuoi ordini
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestisci i tuoi ordini
 DocType: Production Order Operation,Actual Time and Cost,Tempo reale e costi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Richiesta materiale di massimo {0} può essere fatto per la voce {1} contro ordine di vendita {2}
 DocType: Employee,Salutation,Appellativo
 DocType: Course,Course Abbreviation,Abbreviazione corso
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} sulla mezza giornata su {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},l&#39;orario di lavoro totale non deve essere maggiore di ore di lavoro max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Articoli Combinati e tempi di vendita.
 DocType: Quotation Item,Actual Qty,Q.tà reale
 DocType: Sales Invoice Item,References,Riferimenti
@@ -1796,7 +1793,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hai inserito degli elementi duplicati . Si prega di correggere e riprovare .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Movimento Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nuovo carrello
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Nuovo carrello
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'articolo {0} non è un elemento serializzato
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
 DocType: Vehicle,Wheels,Ruote
@@ -1828,17 +1825,17 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Disabilita la creazione di registri di tempo contro gli ordini di produzione. Le operazioni non devono essere monitorati contro ordine di produzione
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ha varianti
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,L&#39;ID batch è obbligatorio
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,L&#39;ID batch è obbligatorio
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Fattura ricorrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestione progetti
 DocType: Supplier,Supplier of Goods or Services.,Fornitore di beni o servizi.
 DocType: Budget,Fiscal Year,Anno Fiscale
-DocType: Vehicle Log,Fuel Price,Fuel Prezzo
+DocType: Vehicle Log,Fuel Price,Prezzo Carburante
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Un Bene Strumentale  deve essere un Bene Non di Magazzino
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Un Bene Strumentale  deve essere un Bene Non di Magazzino
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bilancio non può essere assegnato contro {0}, in quanto non è un conto entrate o uscite"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Raggiunto
 DocType: Student Admission,Application Form Route,Modulo di domanda di percorso
@@ -1870,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Importo {0} {1} dedotto contro {2}
 DocType: Employee,Salary Information,Informazioni stipendio
 DocType: Sales Person,Name and Employee ID,Nome e ID Dipendente
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Dazi e tasse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Inserisci Data di riferimento
@@ -1927,7 +1924,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ripetere Revenue clienti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,coppia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
 DocType: Asset,Depreciation Schedule,piano di ammortamento
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,La data di mezza giornata deve essere compresa da Data a Data
@@ -1940,24 +1937,25 @@
 DocType: Employee,Personal Details,Dettagli personali
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Si prega di impostare &#39;Asset Centro ammortamento dei costi&#39; in compagnia {0}
 ,Maintenance Schedules,Programmi di manutenzione
-DocType: Task,Actual End Date (via Time Sheet),Actual Data fine (da Time Sheet)
+DocType: Task,Actual End Date (via Time Sheet),Data di fine effettiva (da Time Sheet)
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
 DocType: Purchase Order,Delivered,Consegnato
-,Vehicle Expenses,spese del veicolo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
+,Vehicle Expenses,Spese del veicolo
+DocType: Serial No,Invoice Details,Dettagli della fattura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
 DocType: Purchase Receipt,Vehicle Number,Numero di veicoli
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data in cui la fattura ricorrente si concluderà
 DocType: Employee Loan,Loan Amount,Ammontare del prestito
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Riga {0}: Distinta materiali non trovato per la voce {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totale foglie assegnati {0} non può essere inferiore a foglie già approvati {1} per il periodo
 DocType: Journal Entry,Accounts Receivable,Conti esigibili
-,Supplier-Wise Sales Analytics,Fornitore - Wise vendita Analytics
+,Supplier-Wise Sales Analytics,Estensione statistiche di Vendita Fornitore
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Inserisci Importo pagato
 DocType: Salary Structure,Select employees for current Salary Structure,Selezionare i dipendenti per i struttura di stipendio
 DocType: Production Order,Use Multi-Level BOM,Utilizzare BOM Multi-Level
@@ -1973,7 +1971,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia permesso blocco lista
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppo di Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportivo
 DocType: Loan Type,Loan Name,Nome prestito
@@ -1984,6 +1982,7 @@
 ,Customer Acquisition and Loyalty,Acquisizione e fidelizzazione dei clienti
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazzino dove si conservano Giacenze di Articoli Rifiutati
 DocType: Production Order,Skip Material Transfer,Salta il trasferimento dei materiali
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Impossibile trovare il tasso di cambio per {0} a {1} per la data chiave {2}. Si prega di creare un record Exchange Exchange manualmente
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Il tuo anno finanziario termina il
 DocType: POS Profile,Price List,Listino Prezzi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} è ora l'anno fiscale predefinito. Si prega di aggiornare il browser perché la modifica abbia effetto .
@@ -1998,7 +1997,7 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,A seguito di richieste di materiale sono state sollevate automaticamente in base al livello di riordino della Voce
 DocType: Email Digest,Pending Sales Orders,In attesa di ordini di vendita
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
-apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fattore UOM conversione è necessaria in riga {0}
+apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fattore di conversione Unità di Misurà è obbligatoria sulla riga {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno dei ordini di vendita, fattura di vendita o diario"
 DocType: Salary Component,Deduction,Deduzioni
@@ -2021,9 +2020,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e le altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Lead
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 DocType: Student Admission,Eligibility,Eleggibilità
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","I Leads ti aiutano ad incrementare il tuo business, aggiungi tutti i tuoi contatti come tuoi leads"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","I Leads ti aiutano ad incrementare il tuo business, aggiungi tutti i tuoi contatti come tuoi leads"
 DocType: Production Order Operation,Actual Operation Time,Tempo lavoro effettiva
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
@@ -2047,7 +2046,7 @@
 DocType: BOM,Scrap Material Cost,Costo rottami Materiale
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino
 DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta)
-DocType: Asset,Supplier,Fornitori
+DocType: Asset,Supplier,Fornitore
 DocType: C-Form,Quarter,Trimestrale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Spese Varie
 DocType: Global Defaults,Default Company,Azienda Predefinita
@@ -2062,7 +2061,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Seleziona Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lasciare vuoto se considerato per tutti i reparti
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Process Payroll,Fortnightly,Quindicinale
 DocType: Currency Exchange,From Currency,Da Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
@@ -2070,7 +2069,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Prezzo (Valuta Azienda)
 DocType: Student Guardian,Others,Altri
-DocType: Payment Entry,Unallocated Amount,Quantità non assegnata
+DocType: Payment Entry,Unallocated Amount,Importo non allocato
 apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Non riesco a trovare un prodotto trovato. Si prega di selezionare un altro valore per {0}.
 DocType: POS Profile,Taxes and Charges,Tasse e Costi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un prodotto o un servizio che viene acquistato, venduto o conservato in magazzino."
@@ -2078,7 +2077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Non è possibile selezionare il tipo di carica come 'On Fila Indietro Importo ' o 'On Precedente totale riga ' per la prima fila
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,L'elemento figlio non dovrebbe essere un pacchetto di prodotti. Si prega di rimuovere l'elemento `{0}` e salvare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancario
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Aggiungere schede attività
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Aggiungere schede attività
 DocType: Vehicle Service,Service Item,servizio Voce
 DocType: Bank Guarantee,Bank Guarantee,Garanzia bancaria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
@@ -2109,7 +2108,7 @@
 DocType: Employee,Blood Group,Gruppo Discendenza
 DocType: Production Order Operation,Pending,In attesa
 DocType: Course,Course Name,Nome del corso
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gli utenti che possono approvare le applicazioni lasciare un specifico del dipendente
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utenti che possono approvare le domande di permesso di un dipendente specifico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Apparecchiature per ufficio
 DocType: Purchase Invoice Item,Qty,Qtà
 DocType: Fiscal Year,Companies,Aziende
@@ -2125,8 +2124,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,I prezzi non verranno visualizzati se listino non è impostata
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Si prega di specificare un Paese per questa regola di trasporto o controllare Spedizione in tutto il mondo
 DocType: Stock Entry,Total Incoming Value,Totale Valore Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debito A è richiesto
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debito A è richiesto
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Acquisto Listino Prezzi
 DocType: Offer Letter Term,Offer Term,Termine Offerta
 DocType: Quality Inspection,Quality Manager,Responsabile Qualità
@@ -2159,27 +2158,27 @@
 DocType: Opportunity,Lost Reason,Motivo della perdita
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nuovo indirizzo
 DocType: Quality Inspection,Sample Size,Dimensione del campione
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Si prega di inserire Ricevuta Documento
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Si prega di inserire Ricevuta Documento
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Si prega di specificare una valida &#39;Dalla sentenza n&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
 DocType: Project,External,Esterno
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e autorizzazioni
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e Permessi
 DocType: Vehicle Log,VLOG.,VIDEO BLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordini produzione creata: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Ordini produzione creata: {0}
 DocType: Branch,Branch,Ramo
 DocType: Guardian,Mobile Number,Numero di cellulare
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Stampa e Branding
 DocType: Bin,Actual Quantity,Quantità reale
-DocType: Shipping Rule,example: Next Day Shipping,esempio: Next Day spedizione
+DocType: Shipping Rule,example: Next Day Shipping,esempio: Spedizione il Giorno Successivo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} non trovato
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,I vostri clienti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Crea Studente
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Crea Studente
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sei stato invitato a collaborare al progetto: {0}
 DocType: Leave Block List Date,Block Date,Data Blocco
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Applica ora
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qty effettivo {0} / Qty di attesa {1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Quantità effettiva {0} / Quantità attesa {1}
 DocType: Sales Order,Not Delivered,Non Consegnati
 ,Bank Clearance Summary,Sintesi Liquidazione Banca
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
@@ -2198,8 +2197,9 @@
 DocType: SMS Log,Sent To,Inviato A
 DocType: Payment Request,Make Sales Invoice,Crea Fattura di vendita
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Successivo Contattaci data non puó essere in passato
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Successivo Contattaci data non puó essere in passato
 DocType: Company,For Reference Only.,Per riferimento soltanto.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Seleziona il numero di lotto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Non valido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Importo Anticipo
@@ -2213,7 +2213,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso No. Non può essere 0
 DocType: Item,Show a slideshow at the top of the page,Visualizzare una presentazione in cima alla pagina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Distinte Materiali
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,negozi
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,negozi
 DocType: Serial No,Delivery Time,Tempo Consegna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Invecchiamento Basato Su
 DocType: Item,End of Life,Fine Vita
@@ -2223,14 +2223,14 @@
 DocType: Purchase Order,Customer Mobile No,Clienti mobile No
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Traccia reddito separata e spesa per verticali di prodotto o divisioni.
 DocType: Rename Tool,Rename Tool,Rename Tool
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,aggiornamento dei costi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Aggiorna il Costo
 DocType: Item Reorder,Item Reorder,Articolo riordino
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Visualizza foglio paga
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material Transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specificare le operazioni, costi operativi e dare una gestione unica di no a vostre operazioni."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Questo documento è oltre il limite da {0} {1} per item {4}. State facendo un altro {3} contro lo stesso {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,conto importo Selezionare cambiamento
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,conto importo Selezionare cambiamento
 DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
 DocType: Naming Series,User must always select,L&#39;utente deve sempre selezionare
 DocType: Stock Settings,Allow Negative Stock,Permetti Scorte Negative
@@ -2241,7 +2241,7 @@
 DocType: Budget Account,Budget Account,Il budget dell&#39;account
 DocType: Quality Inspection,Verified By,Verificato da
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Non è possibile cambiare la valuta di default dell'azienda , perché ci sono le transazioni esistenti . Le operazioni devono essere cancellate per cambiare la valuta di default ."
-DocType: Grade Interval,Grade Description,Grade Descrizione
+DocType: Grading Scale Interval,Grade Description,Grade Descrizione
 DocType: Stock Entry,Purchase Receipt No,RICEVUTA No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Caparra
 DocType: Process Payroll,Create Salary Slip,Creare busta paga
@@ -2279,7 +2279,7 @@
 DocType: Upload Attendance,Attendance To Date,Data Fine Frequenza
 DocType: Warranty Claim,Raised By,Sollevata dal
 DocType: Payment Gateway Account,Payment Account,Conto di Pagamento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Si prega di specificare Società di procedere
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Si prega di specificare Società di procedere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Variazione netta dei crediti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,compensativa Off
 DocType: Offer Letter,Accepted,Accettato
@@ -2292,7 +2292,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Regola di Spedizione
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,user Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
@@ -2306,7 +2306,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Il nome dell&#39;istituto per il quale si sta impostando questo sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registrazione contabile congelato fino a questa data, nessuno può / Modifica voce eccetto ruolo specificato di seguito."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stato del progetto
 DocType: UOM,Check this to disallow fractions. (for Nos),Seleziona per disabilitare frazioni. (per NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,sono stati creati i seguenti ordini di produzione:
@@ -2329,6 +2329,7 @@
 DocType: Email Digest,How frequently?,Con quale frequenza?
 DocType: Purchase Receipt,Get Current Stock,Richiedi disponibilità
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Albero di Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 DocType: Student,Joining Date,Unire Data
 ,Employees working on a holiday,I dipendenti che lavorano in un giorno festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Segna come Presente
@@ -2359,7 +2360,7 @@
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distributore di terze parti / distributore / commissionario / affiliato / rivenditore che vende i prodotti delle aziende per una commissione.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Inserisci parametri statici della url qui (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)"
-DocType: Task,Actual Start Date (via Time Sheet),Data Inizio Effettiva (da Time Sheet)
+DocType: Task,Actual Start Date (via Time Sheet),Data di inizio effettiva (da Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamma invecchiamento 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -2417,7 +2418,7 @@
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
 apps/erpnext/erpnext/config/accounts.py +294,"e.g. Bank, Cash, Credit Card","p. es. Banca, Bonifico, Contanti, Carta di credito"
 DocType: Lead Source,Source Name,Source Name
-DocType: Journal Entry,Credit Note,Nota Credito
+DocType: Journal Entry,Credit Note,Nota di Credito
 DocType: Warranty Claim,Service Address,Service Indirizzo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Mobili e Infissi
 DocType: Item,Manufacture,Produzione
@@ -2429,7 +2430,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Liquidazione data non menzionato
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,produzione
 DocType: Guardian,Occupation,Occupazione
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totale (Quantità)
 DocType: Sales Invoice,This Document,Questo documento
 DocType: Installation Note Item,Installed Qty,Qtà installata
@@ -2443,7 +2444,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +290, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Segnala un problema
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Spese Utility
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Spese di utenza
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Sopra
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: diario {1} non ha conto {2} o già confrontato con un altro buono
 DocType: Buying Settings,Default Buying Price List,Predefinito acquisto Prezzo di listino
@@ -2452,7 +2453,7 @@
 DocType: Notification Control,Sales Order Message,Sales Order Messaggio
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Impostare i valori predefiniti , come Società , valuta , corrente anno fiscale , ecc"
 DocType: Payment Entry,Payment Type,Tipo di pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un unico batch che soddisfi questo requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un unico batch che soddisfi questo requisito
 DocType: Process Payroll,Select Employees,Selezionare Dipendenti
 DocType: Opportunity,Potential Sales Deal,Deal potenziale di vendita
 DocType: Payment Entry,Cheque/Reference Date,Assegno / Reference Data
@@ -2469,7 +2470,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},POS profilo globale {0} già creato per l&#39;azienda {1}
 DocType: Purchase Order,Ref SQ,Rif. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Sostituire Voce / BOM in tutte le distinte base
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,La Ricevuta deve essere presentata
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,La Ricevuta deve essere presentata
 DocType: Purchase Invoice Item,Received Qty,Quantità ricevuta
 DocType: Stock Entry Detail,Serial No / Batch,Serial n / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Non pagato ma non ritirato
@@ -2482,7 +2483,7 @@
 ,To Produce,per produrre
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Libro paga
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per riga {0} a {1}. Per includere {2} a tasso Item, righe {3} deve essere inclusa anche"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Crea Utente
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Crea Utente
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificazione del pacchetto per la consegna (per la stampa)
 DocType: Bin,Reserved Quantity,Riservato Quantità
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Inserisci indirizzo email valido
@@ -2494,11 +2495,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,modello disabili non deve essere modello predefinito
 DocType: Account,Income Account,Conto Proventi
 DocType: Payment Request,Amount in customer's currency,Importo nella valuta del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Recapito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Recapito
 DocType: Stock Reconciliation Item,Current Qty,Quantità corrente
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vedere &quot;tasso di materiali a base di&quot; in Costing Sezione
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Area Responsabilità Chiave
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","I lotti degli studenti aiutano a tenere traccia di presenza, le valutazioni e le tasse per gli studenti"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","I lotti degli studenti aiutano a tenere traccia di presenza, le valutazioni e le tasse per gli studenti"
 DocType: Payment Entry,Total Allocated Amount,Totale importo assegnato
 DocType: Item Reorder,Material Request Type,Tipo di richiesta materiale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural diario per gli stipendi da {0} a {1}
@@ -2509,7 +2511,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Ordine di acquisto Message
 DocType: Tax Rule,Shipping Country,Spedizione Nazione
-DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Nascondere l&#39;ID fiscale di clienti da operazioni di vendita
+DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Nascondere P. IVA / Cod. Fis. dei clienti dalle operazioni di vendita
 DocType: Upload Attendance,Upload HTML,Carica HTML
 DocType: Employee,Relieving Date,Alleviare Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regola Pricing è fatto per sovrascrivere Listino Prezzi / definire la percentuale di sconto, sulla base di alcuni criteri."
@@ -2521,7 +2523,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Monitora i Leads per settore.
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. Gruppo,Tipo Radice, Azienda"
@@ -2531,6 +2533,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Invierà una e-mail circa l'evento per i dipendenti con status di 'Aperto'
 DocType: Task,Depends on Tasks,Dipende Compiti
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gestire cliente con raggruppamento ad albero
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Gli allegati possono essere visualizzati senza abilitare il carrello
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nuovo Nome Centro di costo
 DocType: Leave Control Panel,Leave Control Panel,Lascia il Pannello di controllo
@@ -2543,11 +2546,10 @@
 DocType: Sales Invoice,Debit To,Addebito a
 DocType: Delivery Note,Required only for sample item.,Richiesto solo per la voce di esempio.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà reale post-transazione
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nessun slittamento di stipendio trovato tra {0} e {1}
 ,Pending SO Items For Purchase Request,Elementi in sospeso così per Richiesta di Acquisto
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Ammissioni di studenti
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} è disabilitato
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} è disabilitato
 DocType: Supplier,Billing Currency,Fatturazione valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2564,7 +2566,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage prodotto in vetrina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tutti i gruppi di valutazione
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nuovo nome Magazzino
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totale {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totale {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
 DocType: Stock Settings,Default Valuation Method,Metodo Valutazione Predefinito
@@ -2582,7 +2584,7 @@
 DocType: Price List,Price List Master,Listino Principale
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tutte le transazioni di vendita possono essere etichettati contro più persone ** ** di vendita in modo da poter impostare e monitorare gli obiettivi.
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Si prega di creare il Cliente dal Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Si prega di creare il Cliente dal Lead {0}
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Solo Lasciare applicazioni con lo stato &#39;approvato&#39; e &#39;rifiutato&#39; possono essere presentate
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Nome gruppo è obbligatoria in riga {0}
@@ -2620,7 +2622,7 @@
  1. Modi di controversie indirizzamento, indennità, responsabilità, ecc 
  1. Indirizzo e contatti della vostra azienda."
 DocType: Attendance,Leave Type,Lascia Tipo
-DocType: Purchase Invoice,Supplier Invoice Details,Fornitore Dettagli fattura
+DocType: Purchase Invoice,Supplier Invoice Details,Dettagli Fattura Fornitore
 apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / account Differenza ({0}) deve essere un 'utile o perdita' conto
 DocType: Project,Copied From,Copiato da
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nome errore: {0}
@@ -2674,7 +2676,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Voce contabilità per giacenza
 DocType: Vehicle Service,Engine Oil,Olio motore
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
 DocType: Employee Loan,Loan Details,prestito Dettagli
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Riga {0}: Quantità compilato deve essere maggiore di zero.
@@ -2688,7 +2690,7 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Fiscale Ammontare Dopo Ammontare Sconto (Società valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Obiettivo Magazzino è obbligatoria per la riga {0}
 DocType: Cheque Print Template,Primary Settings,Impostazioni primarie
-DocType: Purchase Invoice,Select Supplier Address,Selezione indirizzo del fornitore
+DocType: Purchase Invoice,Select Supplier Address,Selezione l'indirizzo del Fornitore
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Aggiungere dipendenti
 DocType: Purchase Invoice Item,Quality Inspection,Controllo Qualità
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
@@ -2738,11 +2740,11 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Magazzini con transazione esistenti non possono essere convertiti in gruppo.
 DocType: Assessment Result Tool,Result HTML,risultato HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Scade il
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Aggiungere studenti
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Aggiungere studenti
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Si prega di selezionare {0}
 DocType: C-Form,C-Form No,C-Form N.
 DocType: BOM,Exploded_items,Articoli_esplosi
-DocType: Employee Attendance Tool,Unmarked Attendance,Partecipazione Contrassegno
+DocType: Employee Attendance Tool,Unmarked Attendance,Partecipazione non contrassegnata
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,ricercatore
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programma Strumento di Iscrizione per studenti
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nome o e-mail è obbligatorio
@@ -2770,7 +2772,7 @@
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Orari del corso cancellato:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
-DocType: Accounts Settings,Make Payment via Journal Entry,Effettua il pagamento tramite Libro Giornale
+DocType: Accounts Settings,Make Payment via Journal Entry,Effettua il pagamento tramite Registrazione Contabile
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Printed On,Stampato su
 DocType: Item,Inspection Required before Delivery,Ispezione richiesta prima della consegna
 DocType: Item,Inspection Required before Purchase,Ispezione Richiesto prima di Acquisto
@@ -2794,7 +2796,7 @@
 DocType: Sales Invoice,Sales Team,Team di vendita
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate entry
 DocType: Program Enrollment Tool,Get Students,ottenere gli studenti
-DocType: Serial No,Under Warranty,Sotto Garanzia
+DocType: Serial No,Under Warranty,In Garanzia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Errore]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In parole saranno visibili una volta che si salva l&#39;ordine di vendita.
 ,Employee Birthday,Compleanno Dipendente
@@ -2802,7 +2804,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limite Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capitale a rischio
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Un termine accademico con questo &#39;Anno Accademico&#39; {0} e &#39;Term Nome&#39; {1} esiste già. Si prega di modificare queste voci e riprovare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Poiché esistono transazioni esistenti rispetto all'oggetto {0}, non è possibile modificare il valore di {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Poiché esistono transazioni esistenti rispetto all'oggetto {0}, non è possibile modificare il valore di {1}"
 DocType: UOM,Must be Whole Number,Deve essere un Numero Intero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuove ferie attribuiti (in giorni)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} non esiste
@@ -2824,7 +2826,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro di costo con le transazioni esistenti non può essere convertito in gruppo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Importo {0} {1} {2} {3}
 DocType: Account,Depreciation,ammortamento
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore(i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Impiegato presenze Strumento
 DocType: Guardian Student,Guardian Student,Guardiano Student
 DocType: Supplier,Credit Limit,Limite Credito
@@ -2845,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Ultimo giorno del mese prossimo
 DocType: Support Settings,Auto close Issue after 7 days,Chiudi la controversia automaticamente dopo 7 giorni
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ferie non possono essere assegnati prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Richiedente
 DocType: Asset Category Account,Accumulated Depreciation Account,Conto per il fondo ammortamento
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
@@ -2873,8 +2875,8 @@
 DocType: Asset,Item Code,Codice Articolo
 DocType: Production Planning Tool,Create Production Orders,Crea Ordine Prodotto
 DocType: Serial No,Warranty / AMC Details,Garanzia / AMC Dettagli
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
-DocType: Journal Entry,User Remark,Osservazioni utenti
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
+DocType: Journal Entry,User Remark,Osservazioni dell'utente
 DocType: Lead,Market Segment,Segmento di Mercato
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Importo versato non può essere maggiore di totale importo residuo negativo {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
@@ -2891,7 +2893,7 @@
 DocType: Production Planning Tool,Create Material Requests,Creare Richieste Materiale
 DocType: Employee Education,School/University,Scuola / Università
 DocType: Payment Request,Reference Details,Riferimento Dettagli
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Il valore atteso dopo la durata utile deve essere inferiore all' importo di acquisto lordo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Il valore atteso dopo la durata utile deve essere inferiore all' importo di acquisto lordo
 DocType: Sales Invoice Item,Available Qty at Warehouse,Quantità Disponibile a magazzino
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,importo fatturato
 DocType: Asset,Double Declining Balance,Doppia valori residui
@@ -2912,19 +2914,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Importo erogato non può essere superiore a prestito Importo {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordine di produzione non ha creato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Ordine di produzione non ha creato
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Impossibile cambiare status di studente {0} è collegata con l&#39;applicazione studente {1}
 DocType: Asset,Fully Depreciated,completamente ammortizzato
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marcata presenze HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Le citazioni sono proposte, le offerte che hai inviato ai clienti"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Le citazioni sono proposte, le offerte che hai inviato ai clienti"
 DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,N. di serie e batch
 DocType: Warranty Claim,From Company,Da Azienda
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Somma dei punteggi di criteri di valutazione deve essere {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Si prega di impostare Numero di ammortamenti Prenotato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Si prega di impostare Numero di ammortamenti Prenotato
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valore o Quantità
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuto
@@ -2965,7 +2967,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +278,Select Quantity,Seleziona Quantità
 DocType: Customs Tariff Number,Customs Tariff Number,Numero della tariffa doganale
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Approvazione ruolo non può essere lo stesso ruolo la regola è applicabile ad
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Cancellati da questo Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Disiscriviti da questo Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Messaggio Inviato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Il conto con nodi figli non può essere impostato come libro mastro
 DocType: C-Form,II,II
@@ -2998,7 +3000,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Anche se ci sono più regole sui prezzi con la priorità più alta, si applicano quindi le seguenti priorità interne:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Vuoi davvero confermare tutte le buste paga da {0} a {1}
 DocType: Cheque Print Template,Cheque Height,Assegno Altezza
-DocType: Supplier,Supplier Details,Dettagli Fornitore
+DocType: Supplier,Supplier Details,Dettagli del Fornitore
 DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
@@ -3008,7 +3010,7 @@
 DocType: Purchase Order,Recurring Order,Ordine Ricorrente
 DocType: Company,Default Income Account,Conto predefinito Entrate
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Gruppi clienti / clienti
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Fiscale anni Utile / Perdita (credito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Anni fiscali non chiusi - Utile/Perdita (credito)
 DocType: Sales Invoice,Time Sheets,fogli di presenza
 DocType: Payment Gateway Account,Default Payment Request Message,Predefinito Richiesta Pagamento Messaggio
 DocType: Item Group,Check this if you want to show in website,Seleziona se vuoi mostrare nel sito web
@@ -3037,7 +3039,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Entrambi i magazzini devono appartenere alla stessa società
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nessun contatto ancora aggiunto.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Importo
-apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatture sollevate dai fornitori.
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatture emesse dai fornitori.
 DocType: POS Profile,Write Off Account,Scrivi Off account
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Importo sconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Ritorno Contro Acquisto Fattura
@@ -3052,7 +3054,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Gruppo Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Preventivi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Seleziona cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Seleziona cliente
 DocType: C-Form,I,io
 DocType: Company,Asset Depreciation Cost Center,Asset Centro di ammortamento dei costi
 DocType: Sales Order Item,Sales Order Date,Ordine di vendita Data
@@ -3071,19 +3073,18 @@
 DocType: Vehicle,Insurance Details,Dettagli Assicurazione
 DocType: Account,Payable,pagabile
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Si prega di inserire periodi di rimborso
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitori ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Margine
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuovi clienti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Utile lordo %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidazione
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Importo acquisto è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Importo acquisto è obbligatoria
 DocType: Lead,Address Desc,Desc. indirizzo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party è obbligatoria
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nome argomento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,", Almeno una delle vendere o acquistare deve essere selezionata"
-DocType: Grading Structure,Grade Intervals,Intervalli grade
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selezionare la natura della vostra attività.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dove si svolgono le operazioni di fabbricazione.
 DocType: Asset Movement,Source Warehouse,Deposito Origine
@@ -3093,7 +3094,7 @@
 DocType: C-Form,Total Invoiced Amount,Totale Importo fatturato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,La quantità Min non può essere maggiore della quantità Max
 DocType: Account,Accumulated Depreciation,Fondo di ammortamento
-DocType: Stock Entry,Customer or Supplier Details,Cliente o fornitore Dettagli
+DocType: Stock Entry,Customer or Supplier Details,Dettagli Cliente o Fornitore
 DocType: Employee Loan Application,Required by Date,Richiesto per data
 DocType: Lead,Lead Owner,Responsabile Lead
 DocType: Bin,Requested Quantity,la quantita &#39;richiesta
@@ -3112,9 +3113,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentuale Distribuzione Mensile
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo Clienti&gt; Territorio
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Si prega di impostare di default {0} nell&#39;azienda {1}
 DocType: Cheque Print Template,Starting position from top edge,posizione dal bordo superiore Avvio
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Stesso fornitore è stato inserito più volte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Lo Stesso fornitore è stato inserito più volte
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Utile lordo / Perdita
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Ordine di acquisto Articolo inserito
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nome azienda non può essere azienda
@@ -3152,7 +3154,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Compila il modulo e salva
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Scaricare un report contenete tutte le materie prime con il loro recente stato di inventario
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quotazione attuale in stock
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantità in stock
 DocType: Homepage,"URL for ""All Products""",URL per &quot;tutti i prodotti&quot;
 DocType: Leave Application,Leave Balance Before Application,Lascia bilancio prima applicazione
 DocType: SMS Center,Send SMS,Invia SMS
@@ -3164,19 +3166,19 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Riordina Quantità
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offerte di lavoro
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
-DocType: Journal Entry,Write Off,Cancellare
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Cancellare
 DocType: Timesheet Detail,Operation ID,Operazione ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Utente di sistema (login) ID. Se impostato, esso diventerà di default per tutti i moduli HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Da {1}
 DocType: Task,depends_on,dipende da
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo account. Nota: Si prega di non creare account per Clienti e Fornitori
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo conto. Nota: Si prega di non creare account per Clienti e Fornitori
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Strumento di sostituzione
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
-DocType: Sales Order Item,Supplier delivers to Customer,Fornitore garantisce al Cliente
+DocType: Sales Order Item,Supplier delivers to Customer,il Fornitore consegna al Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) è esaurito
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Successivo data deve essere maggiore di Data Pubblicazione
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostra fiscale break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importazione ed esportazione dati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","le entrate nelle scorte esistono contro Warehouse {0}, quindi non si può ri-assegnare o modificarlo"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nessun studenti hanno trovato
@@ -3188,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Si prega di selezionare Data Pubblicazione prima di selezionare partito
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Fuori di AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Seleziona Citazioni
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Aggiungi visita manutenzione
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Seleziona Citazioni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Aggiungi visita manutenzione
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
 DocType: Company,Default Cash Account,Conto cassa predefinito
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Questo si basa sulla presenza di questo Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nessun studente dentro
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Aggiungere altri elementi o piena forma aperta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,I Documenti di Trasporto {0} devono essere cancellati prima di annullare questo Ordine di Vendita
@@ -3203,7 +3206,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Training Event,Seminar,Seminario
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programma Tassa di iscrizione
-DocType: Item,Supplier Items,Fornitore Articoli
+DocType: Item,Supplier Items,Articoli Fornitore
 DocType: Opportunity,Opportunity Type,Tipo di Opportunità
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nuova Azienda
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Le transazioni possono essere eliminati solo dal creatore della Società
@@ -3240,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prima di riconciliazione
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Tasse e spese aggiuntive (Azienda valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
 DocType: Sales Order,Partly Billed,Parzialmente Fatturato
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Voce {0} deve essere un asset Articolo fisso
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Voce {0} deve essere un asset Articolo fisso
 DocType: Item,Default BOM,Distinta Materiali Predefinita
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Si prega di digitare nuovamente il nome della società per confermare
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale Outstanding Amt
@@ -3264,7 +3267,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Listino Prezzi Tasso di Cambio
 DocType: Purchase Invoice Item,Rate,Prezzo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stagista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,indirizzo Nome
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,indirizzo Nome
 DocType: Stock Entry,From BOM,Da Distinta Materiali
 DocType: Assessment Code,Assessment Code,Codice Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Base
@@ -3272,7 +3275,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","p. es. Kg, Unità, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
-DocType: Bank Reconciliation Detail,Payment Document,documento di pagamento
+DocType: Bank Reconciliation Detail,Payment Document,Documento di Pagamento
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
 DocType: Salary Slip,Salary Structure,Struttura salariale
 DocType: Account,Bank,Banca
@@ -3289,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,Stampa Lingua
 DocType: Salary Slip,Total Working Hours,Orario di lavoro totali
 DocType: Stock Entry,Including items for sub assemblies,Compresi articoli per sub assemblaggi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Inserire il valore deve essere positivo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Inserire il valore deve essere positivo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,tutti i Territori
 DocType: Purchase Invoice,Items,Articoli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studente è già registrato.
@@ -3308,16 +3311,14 @@
 DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data Inizio e Fine sono obbligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal Deposito
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
 DocType: Assessment Plan,Supervisor Name,Nome supervisore
 DocType: Program Enrollment Course,Program Enrollment Course,Corso di iscrizione al programma
-DocType: Grading Structure,Grading Structure,Struttura di classificazione
-DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
+DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Totale
 DocType: Tax Rule,Shipping City,Spedizione Città
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Questo Articolo è una variante di {0} (Modello). Gli attributi vengono copiati dal modello solo se si imposta 'No Copy'
 DocType: Notification Control,Customize the Notification,Personalizzare Notifica
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash flow operativo
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
@@ -3340,6 +3341,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Seleziona Data Pubblicazione primo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data di apertura dovrebbe essere prima Data di chiusura
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di impostare la serie di numeri per la partecipazione tramite Setup&gt; Serie di numerazione
 DocType: Leave Control Panel,Carry Forward,Portare Avanti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro di costo con le transazioni esistenti non può essere convertito in contabilità
 DocType: Department,Days for which Holidays are blocked for this department.,Giorni per i quali le festività sono bloccate per questo reparto.
@@ -3367,7 +3369,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totale (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 DocType: Quality Inspection,Item Serial No,Articolo N. d&#39;ordine
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Creare record dei dipendenti
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Creare record dei dipendenti
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Presente totale
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Prospetti contabili
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ora
@@ -3382,7 +3384,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Il nuovo BOM dopo la sostituzione
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punto di vendita
 DocType: Payment Entry,Received Amount,importo ricevuto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Impostare il sistema di denominazione dei dipendenti in risorse umane&gt; Impostazioni HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Creare per la piena quantità, ignorando la quantità già in ordine"
 DocType: Account,Tax,Tassa
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,non segnato
@@ -3393,7 +3394,7 @@
 DocType: C-Form,Invoices,Fatture
 DocType: Batch,Source Document Name,Nome del documento di origine
 DocType: Job Opening,Job Title,Titolo Posizione
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,creare utenti
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,creare utenti
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Grammo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita rapporto per chiamata di manutenzione.
@@ -3404,8 +3405,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
 DocType: BOM,Website Description,Descrizione del sito
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variazione netta Patrimonio
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Indirizzo e-mail deve essere univoco, esiste già per {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Indirizzo e-mail deve essere univoco, esiste già per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Ricevuta
 ,Sales Register,Registro Vendite
@@ -3416,16 +3417,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Non c'è nulla da modificare.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Riepilogo per questo mese e le attività in corso
 DocType: Customer Group,Customer Group Name,Nome Gruppo Cliente
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nessun Cliente ancora!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rendiconto finanziario
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Si prega di selezionare il riporto se anche voi volete includere equilibrio precedente anno fiscale di parte per questo anno fiscale
 DocType: GL Entry,Against Voucher Type,Per tipo Tagliando
 DocType: Item,Attributes,Attributi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Ultima data di ordine
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
 DocType: Student,Guardian Details,Guardiano Dettagli
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Segna come  Presenze per più Dipendenti
@@ -3441,24 +3444,24 @@
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Da Data {0} per Employee {1} non può essere prima di unirsi Data del dipendente {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,commerciale
-DocType: Payment Entry,Account Paid To,Per account a pagamento
+DocType: Payment Entry,Account Paid To,Account pagato a
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tutti i Prodotti o Servizi.
 DocType: Expense Claim,More Details,Maggiori dettagli
-DocType: Supplier Quotation,Supplier Address,Fornitore Indirizzo
+DocType: Supplier Quotation,Supplier Address,Indirizzo Fornitore
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget per l&#39;account {1} contro {2} {3} è {4}. Si supererà da {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Riga {0} # account deve essere di tipo 'Bene Strumentale'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Quantità
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regole per il calcolo dell&#39;importo di trasporto per una vendita
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series è obbligatorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servizi finanziari
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipi di attività per i registri di tempo
 DocType: Tax Rule,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
 DocType: Training Event,Exam,Esame
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
-DocType: Leave Allocation,Unused leaves,Foglie non utilizzati
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+DocType: Leave Allocation,Unused leaves,Foglie non utilizzate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Stato di fatturazione
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Trasferimento
@@ -3475,7 +3478,7 @@
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Ricevute di acquisto
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Come viene applicata la Regola Tariffaria?
-DocType: Stock Entry,Delivery Note No,Documento di Trasporto N
+DocType: Stock Entry,Delivery Note No,Documento di Trasporto N.
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Se selezionato, acquisto solo le richieste di materiale per le materie prime finali saranno inclusi nella sezione Richieste materiali. In caso contrario, verranno create le richieste dei materiali per gli articoli del genitore"
 DocType: Cheque Print Template,Message to show,Messaggio da mostrare
 DocType: Company,Retail,Vendita al dettaglio
@@ -3487,10 +3490,10 @@
 DocType: Timesheet,TS-,TS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: immetti  un importo a debito o a credito in {2}
 DocType: GL Entry,Remarks,Osservazioni
-DocType: Payment Entry,Account Paid From,Account a pagamento da
+DocType: Payment Entry,Account Paid From,Account pagato da
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codice Articolo Materia Prima
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Crea un Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Crea un Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Di stampa e di cancelleria
 DocType: Stock Settings,Show Barcode Field,Mostra campo del codice a barre
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Inviare e-mail del fornitore
@@ -3505,6 +3508,7 @@
 DocType: Offer Letter,Awaiting Response,In attesa di risposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Sopra
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},attributo non valido {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Si ricorda se un conto non pagabile
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
@@ -3538,13 +3542,13 @@
 DocType: Program Enrollment Tool,Get Students From,Get studenti di
 DocType: Hub Settings,Seller Country,Vendita Paese
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Pubblicare Articoli sul sito web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppo tuoi studenti in batch
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Gruppo tuoi studenti in batch
 DocType: Authorization Rule,Authorization Rule,Ruolo Autorizzazione
 DocType: Sales Invoice,Terms and Conditions Details,Termini e condizioni dettagli
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specificazioni
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelli Tasse di Vendita e Oneri
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Totale (Credito)
-DocType: Repayment Schedule,Payment Date,Data di pagamento
+DocType: Repayment Schedule,Payment Date,Data Pagamento
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nuovo Batch Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numero di ordinazione
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,prova
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componenti stipendio
 DocType: Program Enrollment Tool,New Academic Year,Nuovo anno accademico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Ritorno / nota di credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Ritorno / nota di credito
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Importo totale pagato
 DocType: Production Order Item,Transferred Qty,Quantità trasferito
@@ -3606,7 +3610,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Emesso
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
 apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vendiamo questo articolo
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Fornitore Id
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Id Fornitore
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Dettagli
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Quantità deve essere maggiore di 0
 DocType: Journal Entry,Cash Entry,Cash Entry
@@ -3638,6 +3642,7 @@
 ,Sales Funnel,imbuto di vendita
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,L'abbreviazione è obbligatoria
 DocType: Project,Task Progress,Progresso dell'attività
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carrello
 ,Qty to Transfer,Qtà da Trasferire
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Preventivo a Leads o a Clienti.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
@@ -3670,7 +3675,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},La quantità ({0}) non può essere una frazione nella riga {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,riscuotere i canoni
 DocType: Attendance,ATT-,la tentata
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
 DocType: Lead,Add to calendar on this date,Aggiungi al calendario in questa data
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regole per l'aggiunta di spese di spedizione .
 DocType: Item,Opening Stock,Disponibilità Iniziale
@@ -3688,18 +3693,18 @@
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Gli ordini rilasciati per la produzione.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Program Enrollment Tool,Enroll Students,iscrivere gli studenti
 DocType: Hub Settings,Name Token,Nome Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Listino di Vendita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,È obbligatorio almeno un deposito
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
-DocType: Production Order,Unstopped,unstopped
+DocType: Production Order,Unstopped,Non fermato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} per fattura di vendita {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nome del progetto
-DocType: Supplier,Mention if non-standard receivable account,Menzione se conto credito non standard
+DocType: Customer,Mention if non-standard receivable account,Menzione se conto credito non standard
 DocType: Journal Entry Account,If Income or Expense,Se proventi od oneri
 DocType: Production Order,Required Items,Elementi richiesti
 DocType: Stock Ledger Entry,Stock Value Difference,Differenza Valore Giacenza
@@ -3729,6 +3734,7 @@
 DocType: Item,Taxes,Tasse
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Pagato ma non ritirato
 DocType: Project,Default Cost Center,Centro di costo predefinito
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie Naming per {0} tramite Impostazioni&gt; Impostazioni&gt; Serie di denominazione
 DocType: Bank Guarantee,End Date,Data di Fine
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,transazioni di magazzino
 DocType: Budget,Budget Accounts,contabilità di bilancio
@@ -3786,14 +3792,14 @@
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voce Inventario
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Lo stesso articolo è stato inserito più volte
 DocType: Department,Leave Block List,Lascia il blocco lista
-DocType: Sales Invoice,Tax ID,Codice Fiscale
+DocType: Sales Invoice,Tax ID,P. IVA / Cod. Fis.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,L'articolo {0} non ha Numeri di Serie. La colonna deve essere vuota
 DocType: Accounts Settings,Accounts Settings,Impostazioni Conti
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Approvare
 DocType: Customer,Sales Partner and Commission,Partner vendite e Commissione
 DocType: Employee Loan,Rate of Interest (%) / Year,Tasso di interesse (%) / anno
 ,Project Quantity,Progetto Quantità
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} per tutti gli elementi è pari a zero, può essere che si dovrebbe cambiare &#39;distribuire oneri corrispondenti&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} per tutti gli elementi è pari a zero, può essere che si dovrebbe cambiare &#39;distribuire oneri corrispondenti&#39;"
 DocType: Opportunity,To Discuss,Da Discutere
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unità di {1} necessarie in {2} per completare la transazione.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tasso di interesse (%) Performance
@@ -3816,7 +3822,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Contrassegna come Assente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riga {0}: Valuta del BOM # {1} deve essere uguale alla valuta selezionata {2}
 DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
 DocType: Homepage,Tag Line,Tag Linea
 DocType: Fee Component,Fee Component,Fee Componente
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestione della flotta
@@ -3833,12 +3839,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazzino {0} non esiste
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrati ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentuali Distribuzione Mensile
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,La voce selezionata non può avere Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,La voce selezionata non può avere Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tasso di Valutazione non trovato per la voce {0}, che è necessario per fare delle scritture contabili per {1} {2}. Se l&#39;articolo è transazioni come un elemento di campione nel {1}, si prega di ricordare che nel {1} tavolo Item. In caso contrario, si prega di creare una transazione magazzino in entrata per il tasso di valutazione elemento o menzione nel record elemento e quindi provare submiting / cancellazione di questa voce"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dei materiali consegnati di questa Bolla di Consegna
 DocType: Project,Customer Details,Dettagli Cliente
 DocType: Employee,Reports to,Reports a
-,Unpaid Expense Claim,Non pagato spese rivendicazione
+,Unpaid Expense Claim,Richiesta di spesa non retribuita
 DocType: SMS Settings,Enter url parameter for receiver nos,Inserisci parametri url per NOS ricevuti
 DocType: Payment Entry,Paid Amount,Importo pagato
 DocType: Assessment Plan,Supervisor,Supervisore
@@ -3850,7 +3856,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,gli Ordini Confermati non possono essere eliminati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo a bilancio già nel debito, non è permesso impostare il 'Saldo Futuro' come 'credito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestione della qualità
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Voce {0} è stato disabilitato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Voce {0} è stato disabilitato
 DocType: Employee Loan,Repay Fixed Amount per Period,Rimborsare importo fisso per Periodo
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
 DocType: Employee External Work History,Employee External Work History,Storia lavorativa esterna del Dipendente
@@ -3860,7 +3866,7 @@
 DocType: Item Group,Parent Item Group,Gruppo Padre
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} per {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +23,Cost Centers,Centri di costo
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasso al quale la valuta del fornitore viene convertito in valuta di base dell&#39;azienda
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasso al quale la valuta del fornitore viene convertita in valuta di base dell'azienda
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitti Timings con riga {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Consenti il tasso di valutazione Zero
 DocType: Training Event Employee,Invited,Invitato
@@ -3876,7 +3882,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Avviso ( giorni )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
 DocType: Employee,Encashment Date,Data Incasso
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Regolazione della
@@ -3909,6 +3915,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota di Debito Emessa
 DocType: Production Order,Warehouses,Magazzini
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} attività non può essere trasferito
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Questa voce è una variante di {0} (Template).
 DocType: Workstation,per hour,all'ora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Acquisto
 DocType: Announcement,Announcement,Annuncio
@@ -3922,9 +3929,9 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,valore patrimoniale netto su
 DocType: Account,Receivable,Ricevibile
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non ammessi a cambiare fornitore come già esiste ordine d&#39;acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non è consentito cambiare il Fornitore quando l'Ordine di Acquisto esiste già
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ruolo che è consentito di presentare le transazioni che superano i limiti di credito stabiliti.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","sincronizzazione dei dati principali, potrebbe richiedere un certo tempo"
 DocType: Item,Material Issue,Fornitura materiale
 DocType: Hub Settings,Seller Description,Venditore Descrizione
@@ -3937,7 +3944,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criteri di valutazione del Gruppo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},L&#39;apertura del deprezzamento accumulato deve essere inferiore uguale a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},L&#39;apertura del deprezzamento accumulato deve essere inferiore uguale a {0}
 DocType: Warehouse,Warehouse Name,Nome Deposito
 DocType: Naming Series,Select Transaction,Selezionare Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Inserisci Approvazione ruolo o Approvazione utente
@@ -3971,7 +3978,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per impostare questo anno fiscale come predefinito , clicca su ' Imposta come predefinito'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Aderire
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Employee Loan,Repay from Salary,Rimborsare da Retribuzione
 DocType: Leave Application,LAP/,GIRO/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Richiesta di pagamento contro {0} {1} per quantità {2}
@@ -3989,7 +3996,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,La valutazione dettagliata dei risultati
 DocType: Employee Education,Employee Education,Istruzione Dipendente
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,gruppo di articoli duplicato trovato nella tabella gruppo articoli
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
 DocType: Salary Slip,Net Pay,Retribuzione Netta
 DocType: Account,Account,Account
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
@@ -3998,7 +4005,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magazzino {0} non è legato ad alcun account, creare / collegare l&#39;account corrispondente (Asset) per il magazzino."
 DocType: Purchase Invoice,Recurring Id,Id ricorrente
 DocType: Customer,Sales Team Details,Vendite team Dettagli
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminare in modo permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Eliminare in modo permanente?
 DocType: Expense Claim,Total Claimed Amount,Totale importo richiesto
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenziali opportunità di vendita.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Non valido {0}
@@ -4009,13 +4016,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Imposta la tua scuola a ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantità di modifica (Società di valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salvare prima il documento.
 DocType: Account,Chargeable,Addebitabile
 DocType: Company,Change Abbreviation,Change Abbreviazione
 DocType: Expense Claim Detail,Expense Date,Data Spesa
 DocType: Item,Max Discount (%),Sconto Max (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Ultimo ammontare ordine
+DocType: Task,Is Milestone,È Milestone
 DocType: Daily Work Summary,Email Sent To,Email inviata a
 DocType: Budget,Warn,Avvisa
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
@@ -4040,7 +4048,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Il lotto {0} di {1} scaduto.
 DocType: Sales Invoice,Commission,Commissione
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet per la produzione.
-apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,totale parziale
+apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Sub Totale
 DocType: Salary Detail,Default Amount,Importo Predefinito
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazzino non trovato nel sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Sommario di questo mese
@@ -4048,11 +4056,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Blocca Scorte più vecchie di` dovrebbero essere inferiori %d giorni .
 DocType: Tax Rule,Purchase Tax Template,Acquisto fiscale Template
 ,Project wise Stock Tracking,Progetto saggio Archivio monitoraggio
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programma di manutenzione {0} esiste per {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Q.tà reale (in origine/obiettivo)
 DocType: Item Customer Detail,Ref Code,Codice Rif
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Informazioni Dipendente.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
 DocType: HR Settings,Payroll Settings,Impostazioni Payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Partita Fatture non collegati e pagamenti.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Invia ordine
@@ -4064,7 +4071,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Magazzino è obbligatoria
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dettaglio di conversione
+DocType: UOM Conversion Detail,UOM Conversion Detail,Dettaglio di conversione Unità di Misura
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (w) per 100px (h)
 DocType: Program,Program Abbreviation,Abbreviazione programma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
@@ -4075,7 +4082,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Assegni e depositi cancellati in modo non corretto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Account {0}: non è possibile assegnare se stesso come conto principale
 DocType: Purchase Invoice Item,Price List Rate,Prezzo di Listino
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Creare le citazioni dei clienti
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Creare le citazioni dei clienti
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostra &quot;Disponibile&quot; o &quot;Non disponibile&quot; sulla base di scorte disponibili in questo magazzino.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Distinte materiali (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Tempo medio impiegato dal fornitore di consegnare
@@ -4097,7 +4104,7 @@
 DocType: Asset,Disposal Date,Smaltimento Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Messaggi di posta elettronica verranno inviati a tutti i dipendenti attivi della società nell&#39;ora dato, se non hanno le vacanze. Sintesi delle risposte verrà inviata a mezzanotte."
 DocType: Employee Leave Approver,Employee Leave Approver,Responsabile / Approvatore Ferie
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Formazione Commenti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,L'ordine di produzione {0} deve essere presentato
@@ -4105,7 +4112,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Corso è obbligatoria in riga {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,'A Data' deve essere successiva a 'Da Data'
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Aggiungi / Modifica prezzi
 DocType: Batch,Parent Batch,Parte Batch
 DocType: Cheque Print Template,Cheque Print Template,Assegno modello di stampa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafico Centro di Costo
@@ -4134,7 +4141,7 @@
 DocType: Email Digest,Pending Quotations,In attesa di Citazioni
 apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +75,Please Update SMS Settings,Si prega di aggiornare le impostazioni SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,I prestiti non garantiti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Prestiti non garantiti
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ore di lavoro contro Timesheet
@@ -4148,18 +4155,18 @@
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Gruppo strumento di creazione
 DocType: Item,Variant Based On,Variante calcolate in base a
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100% . E ' {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,I vostri fornitori
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
-DocType: Request for Quotation Item,Supplier Part No,Di parte del fornitore No
+apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,I Vostri Fornitori
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
+DocType: Request for Quotation Item,Supplier Part No,Articolo Fornitore No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Non può dedurre quando categoria è per &#39;valutazione&#39; o &#39;Vaulation e Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Ricevuto da
 DocType: Lead,Converted,Convertito
 DocType: Item,Has Serial No,Ha numero di serie
 DocType: Employee,Date of Issue,Data Pubblicazione
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Da {0} per {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare Fornitore per Articolo {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Riga {0}: valore Ore deve essere maggiore di zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
 DocType: Issue,Content Type,Tipo Contenuto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computer
 DocType: Item,List this Item in multiple groups on the website.,Elenco questo articolo a più gruppi sul sito.
@@ -4168,20 +4175,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore bloccato
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ottieni entrate non riconciliate
 DocType: Payment Reconciliation,From Invoice Date,Da Data fattura
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Valuta di fatturazione deve essere uguale alla valuta di valuta o conto del partito o di comapany di default
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Valuta di fatturazione deve essere uguale alla valuta di valuta o conto del partito o di comapany di default
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,lasciare Incasso
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Che cosa fa ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Al Deposito
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tutte le ammissioni degli studenti
 ,Average Commission Rate,Tasso medio di commissione
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
 DocType: School House,House Name,Nome della casa
 DocType: Purchase Taxes and Charges,Account Head,Riferimento del conto
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Aggiornare costi aggiuntivi per calcolare il costo sbarcato di articoli
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,elettrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Aggiungere il resto della vostra organizzazione come gli utenti. È inoltre possibile aggiungere invitare i clienti a proprio portale con l&#39;aggiunta di loro di contatti
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Aggiungere il resto della vostra organizzazione come gli utenti. È inoltre possibile aggiungere invitare i clienti a proprio portale con l&#39;aggiunta di loro di contatti
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utente non è impostato per Employee {0}
@@ -4190,7 +4197,7 @@
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Promemoria Compleanno per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Giorni dall'ultimo ordine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
 DocType: Buying Settings,Naming Series,Serie Nomine
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Assicurazione Data di inizio deve essere inferiore a Assicurazione Data Fine
@@ -4205,7 +4212,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
 DocType: Vehicle Log,Odometer,Odometro
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Articolo {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Articolo {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periodo Dal periodo e per date obbligatorie per ricorrenti {0}
@@ -4218,7 +4225,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore di fatturazione
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Distinta Materiali predefinita per {0} non trovato
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tocca gli elementi da aggiungere qui
 DocType: Fees,Program Enrollment,programma Iscrizione
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Impostare {0}
@@ -4315,7 +4323,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Ha risposto prima su
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croce Listing dell'oggetto in più gruppi
-DocType: Grade Interval,Grade Interval,Intervallo di grado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Anno fiscale Data di inizio e Data Fine dell'anno fiscale sono già impostati nel Fiscal Year {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidazione Data di aggiornamento
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4323,7 +4330,8 @@
 DocType: Request for Quotation Supplier,Download PDF,Scarica il pdf
 DocType: Production Order,Planned End Date,Data di fine pianificata
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Dove gli elementi vengono memorizzati.
-DocType: Request for Quotation,Supplier Detail,Particolare Fornitore
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
+DocType: Request for Quotation,Supplier Detail,Dettaglio del Fornitore
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Errore nella formula o una condizione: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Importo fatturato
 DocType: Attendance,Attendance,Presenze
@@ -4339,7 +4347,7 @@
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Maestro listino prezzi.
 DocType: Task,Review Date,Data di revisione
 DocType: Purchase Invoice,Advance Payments,Pagamenti anticipati
-DocType: Purchase Taxes and Charges,On Net Total,Sul totale netto
+DocType: Purchase Taxes and Charges,On Net Total,Sul Totale Netto
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valore per l&#39;attributo {0} deve essere all&#39;interno della gamma di {1} a {2} nei incrementi di {3} per la voce {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Obiettivo Magazzino sulla riga {0} deve essere uguale a quello dell'ordine di produzione
 apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
@@ -4367,7 +4375,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Imposta un semplice sito web per la mia organizzazione
 DocType: Payment Reconciliation,Receivable / Payable Account,Contabilità Clienti /Fornitori
 DocType: Delivery Note Item,Against Sales Order Item,Contro Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Inserisci il centro di costo genitore
@@ -4412,7 +4420,7 @@
 DocType: Cheque Print Template,Signatory Position,Posizione firmatario
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Imposta come persa
 DocType: Timesheet,Total Billable Hours,Totale ore fatturabili
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Ricevuta di pagamento Nota
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota Ricevuta di pagamento
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Questo si basa su operazioni contro questo cliente. Vedere cronologia sotto per i dettagli
 DocType: Supplier,Credit Days Based On,Giorni di credito in funzione
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a Importo del pagamento Entry {2}
@@ -4424,7 +4432,7 @@
 ,Items To Be Requested,Articoli da richiedere
 DocType: Purchase Order,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Company,Company Info,Info Azienda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selezionare o aggiungere nuovo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Selezionare o aggiungere nuovo cliente
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Centro di costo è necessario per prenotare un rimborso spese
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Questo si basa sulla presenza di questo dipendente
@@ -4437,13 +4445,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedire agli utenti di effettuare Lascia le applicazioni in giorni successivi.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ammontare dell&#39;acquisto
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Fine anno non può essere prima di inizio anno
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Fine anno non può essere prima di inizio anno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Benefici per i dipendenti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
 DocType: Production Order,Manufactured Qty,Quantità Prodotto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Si prega di impostare un valore predefinito lista per le vacanze per i dipendenti {0} o {1} società
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} non esiste
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} non esiste
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fatture sollevate dai Clienti.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
@@ -4452,15 +4460,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lettura 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Tipo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Listino Prezzi non trovato o disattivato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Employee Loan Application,Approved,Approvato
-DocType: Pricing Rule,Price,prezzo
+DocType: Pricing Rule,Price,Prezzo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
 DocType: Guardian,Guardian,Custode
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Valutazione {0} creato per Employee {1} nel determinato intervallo di date
 DocType: Employee,Education,Educazione
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Campagna di denominazione
 DocType: Employee,Current Address Is,Indirizzo attuale è
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificata
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opzionale. Imposta valuta predefinita dell&#39;azienda, se non specificato."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
@@ -4497,7 +4507,7 @@
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine lordo %
 DocType: BOM,With Operations,Con operazioni
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
 DocType: Asset,Is Existing Asset,È esistente Asset
 DocType: Salary Detail,Statistical Component,Componente statistico
 ,Monthly Salary Register,Registro Stipendio Mensile
@@ -4520,7 +4530,7 @@
 DocType: Assessment Plan,Room,Camera
 DocType: Purchase Order,Advance Paid,Anticipo versato
 DocType: Item,Item Tax,Tax articolo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiale da Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiale al Fornitore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Accise Fattura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Soglia {0}% appare più di una volta
 DocType: Expense Claim,Employees Email Id,Email Dipendenti
@@ -4551,7 +4561,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Allega Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,I livelli delle scorte
 DocType: Customer,Commission Rate,Tasso Commissione
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Crea variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Crea variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocco domande uscita da ufficio.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo di pagamento deve essere uno dei Ricevere, Pay e di trasferimento interno"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitica
@@ -4564,6 +4574,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Consentire una produzione su Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Data ordine acquisto Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capitale Sociale
+DocType: Shopping Cart Settings,Show Public Attachments,Mostra gli allegati pubblici
 DocType: Packing Slip,Package Weight Details,Pacchetto peso
 DocType: Payment Gateway Account,Payment Gateway Account,Pagamento Conto Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Dopo il completamento pagamento reindirizzare utente a pagina selezionata.
@@ -4581,14 +4592,14 @@
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
 ,Supplier Addresses and Contacts,Indirizzi e contatti Fornitore
-,accounts-browser,sfoglia-conti
+,accounts-browser,schema contabile
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Si prega di selezionare Categoria prima
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Progetto Master.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Per consentire un eccesso di fatturazione o sopra-ordinazione, aggiornare &quot;Allowance&quot; in Impostazioni archivio o la voce."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Non visualizzare nessun simbolo tipo € dopo le Valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Crea un Insieme di Studenti
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Crea un Insieme di Studenti
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Recupera elementi da Distinta Base
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Giorni per la Consegna
@@ -4607,7 +4618,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Importo sanzionato
 DocType: GL Entry,Is Opening,Sta aprendo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di impostare la serie di numeri per la partecipazione tramite Setup&gt; Serie di numerazione
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Il Conto {0} non esiste
 DocType: Account,Cash,Contante
 DocType: Employee,Short biography for website and other publications.,Breve biografia per il sito web e altre pubblicazioni.
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 50df73b..7dd5425 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,バッチ項目の有効期限ステータス
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,銀行為替手形
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,バリエーションを表示
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,バリエーションを表示
 DocType: Academic Term,Academic Term,学術用語
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,数量
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,健康管理
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),支払遅延（日数）
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,サービス費用
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会計年度{0}が必要です
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,広告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同じ会社が複数回入力されています
 DocType: Employee,Married,結婚してる
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} は許可されていません
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} は許可されていません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,からアイテムを取得します
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員ネーミングシステムの人事管理&gt;人事管理の設定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},製品{0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,リストされたアイテム
 DocType: Payment Reconciliation,Reconcile,照合
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,食料品
 DocType: Quality Inspection Reading,Reading 1,報告要素1
 DocType: Process Payroll,Make Bank Entry,銀行エントリを作成
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,年金基金
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,次の減価償却日付は購入日の前にすることはできません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,次の減価償却日付は購入日の前にすることはできません
 DocType: SMS Center,All Sales Person,全ての営業担当者
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**毎月分配**は、あなたのビジネスで季節を持っている場合は、数ヶ月を横断予算/ターゲットを配布するのに役立ちます。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,アイテムが見つかりません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,アイテムが見つかりません
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,給与構造の欠落
 DocType: Lead,Person Name,人名
 DocType: Sales Invoice Item,Sales Invoice Item,請求明細
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",例えば、「小学校」や「大学」
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,在庫レポート
 DocType: Warehouse,Warehouse Detail,倉庫の詳細
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,期間終了日は、後の項が（アカデミック・イヤー{}）リンクされている年度の年度終了日を超えることはできません。日付を訂正して、もう一度お試しください。
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
 DocType: Vehicle Service,Brake Oil,ブレーキオイル
 DocType: Tax Rule,Tax Type,税タイプ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: BOM,Item Image (if not slideshow),アイテム画像（スライドショーされていない場合）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名の顧客が存在します
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間単価 ÷ 60）× 実際の作業時間
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOMを選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOMを選択
 DocType: SMS Log,SMS Log,SMSログ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,納品済アイテムの費用
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0}上の休日は、日付からと日付までの間ではありません
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,グレード
 DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーにより配送済
 DocType: SMS Center,All Contact,全ての連絡先
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,すでにBOMを持つすべてのアイテム用に作成した製造指図
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,すでにBOMを持つすべてのアイテム用に作成した製造指図
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,年俸
 DocType: Daily Work Summary,Daily Work Summary,毎日の仕事の概要
 DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} は凍結されています
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} は凍結されています
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,勘定科目表を作成するための既存の会社を選択してください
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,在庫経費
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ターゲット倉庫の選択
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,逆仕訳
 DocType: Journal Entry Account,Credit in Company Currency,会社通貨の貸方
 DocType: Delivery Note,Installation Status,設置ステータス
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",あなたが出席を更新しますか？ <br>現在：{0} \ <br>不在：{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,購入のための原材料供給
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,支払いの少なくとも1モードはPOS請求書に必要とされます。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,支払いの少なくとも1モードはPOS請求書に必要とされます。
 DocType: Products Settings,Show Products as a List,製品を表示するリストとして
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","テンプレートをダウンロードし、適切なデータを記入した後、変更したファイルを添付してください。
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,減価償却のエントリを作成します
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,要求タイプ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,従業員作成
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,従業員作成
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,放送
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,実行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,作業遂行の詳細
@@ -238,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,メンテナンス訪問計画
 DocType: SMS Settings,Enter url parameter for message,メッセージのURLパラメータを入力してください
 DocType: POS Profile,Customer Groups,顧客グループ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,財務諸表
 DocType: Guardian,Students,学生の
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,価格設定と割引を適用するためのルール
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,価格表は売買に適用可能でなければなりません
@@ -263,7 +267,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},前払金は {0} {1} より大きくすることはできません
 DocType: Naming Series,Series List for this Transaction,この取引のシリーズ一覧
 DocType: Company,Default Payroll Payable Account,デフォルトの給与買掛金
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,更新メールグループ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,更新メールグループ
 DocType: Sales Invoice,Is Opening Entry,オープンエントリー
 DocType: Customer Group,Mention if non-standard receivable account applicable,非標準的な売掛金が適応可能な場合に記載
 DocType: Course Schedule,Instructor Name,インストラクターの名前
@@ -275,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,対販売伝票アイテム
 ,Production Orders in Progress,進行中の製造指示
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,財務によるキャッシュ・フロー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
 DocType: Lead,Address & Contact,住所・連絡先
 DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割当から未使用の休暇を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
@@ -301,7 +305,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),（タイムシートを介して）総原価計算量
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,銀行エントリー
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
@@ -320,7 +324,7 @@
 DocType: Item,Publish in Hub,ハブに公開
 DocType: Student Admission,Student Admission,学生の入学
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,アイテム{0}をキャンセルしました
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 DocType: Item,Purchase Details,仕入詳細
@@ -373,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自動的な資材要求の作成時にメールで通知
 DocType: Journal Entry,Multi Currency,複数通貨
 DocType: Payment Reconciliation Invoice,Invoice Type,請求書タイプ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,納品書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,納品書
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,販売資産の取得原価
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
-DocType: Grade Interval,Min Score,最小スコア
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,今週と保留中の活動の概要
 DocType: Student Applicant,Admitted,認められました
 DocType: Workstation,Rent Cost,地代・賃料
@@ -390,7 +393,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,注文額
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,当事者に対してまたは内部転送のための銀行/現金取引
 DocType: Shipping Rule,Valid for Countries,有効な国
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"この商品はテンプレートで、取引内で使用することはできません。
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"この商品はテンプレートで、取引内で使用することはできません。
 「コピーしない」が設定されていない限り、アイテムの属性は、バリエーションにコピーされます"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,検討された注文合計
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
@@ -401,13 +404,13 @@
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} は従業員 {1} の期間 {2} から {3} へ既に割り当てられています
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,アイテムを選択
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,非グループに変換
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,アイテムのバッチ（ロット）
 DocType: C-Form Invoice Detail,Invoice Date,請求日付
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,学生グループを作成します。
@@ -436,9 +439,9 @@
 DocType: Request for Quotation,Request for Quotation,見積依頼
 DocType: Salary Slip Timesheet,Working Hours,労働時間
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,既存のシリーズについて、開始／現在の連続番号を変更します。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,新しい顧客を作成します。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,新しい顧客を作成します。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",複数の価格設定ルールが優先しあった場合、ユーザーは、競合を解決するために、手動で優先度を設定するように求められます。
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,発注書を作成します。
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,発注書を作成します。
 ,Purchase Register,仕入帳
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,適用料金
@@ -481,7 +484,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,全製造プロセスの共通設定
 DocType: Accounts Settings,Accounts Frozen Upto,凍結口座上限
 DocType: SMS Log,Sent On,送信済
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,休日マスター
@@ -502,6 +505,7 @@
 DocType: Packing Slip,From Package No.,参照元梱包番号
 DocType: Item Attribute,To Range,範囲対象
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,有価証券および預金
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",独自の評価方法を持たない一部の商品との取引があるため、評価方法を変更することはできません
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,割り当てられた総葉は必須です
 DocType: Job Opening,Description of a Job Opening,求人の説明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今日のために保留中の活動
@@ -528,7 +532,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
 DocType: Production Order,Additional Operating Cost,追加の営業費用
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化粧品
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,購入
@@ -537,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,しきい値0％のグレードを定義してください
 DocType: Sales Order,To Deliver,配送する
 DocType: Purchase Invoice Item,Item,アイテム
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
 DocType: Journal Entry,Difference (Dr - Cr),差額（借方 - 貸方）
 DocType: Account,Profit and Loss,損益
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,業務委託管理
@@ -563,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 DocType: Production Plan Item,Pending Qty,保留中の数量
 DocType: Budget,Ignore,無視
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1}アクティブではありません
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1}アクティブではありません
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},次の番号に送信されたSMS：{0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,印刷用のセットアップチェック寸法
 DocType: Salary Slip,Salary Slip Timesheet,給与スリップタイムシート
@@ -572,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,手数料合計
 DocType: Pricing Rule,Sales Partner,販売パートナー
 DocType: Buying Settings,Purchase Receipt Required,領収書が必要です
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,期首在庫が入力された場合は評価レートは必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,期首在庫が入力された場合は評価レートは必須です
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累積値
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,受注を作成
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,受注を作成
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
@@ -595,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,再開アタッチメント
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客
 DocType: Leave Control Panel,Allocate,割当
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,販売返品
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,販売返品
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：総割り当てられた葉を{0}の期間のためにすでに承認された葉{1}を下回ってはいけません
 DocType: Announcement,Posted By,投稿者
 DocType: Item,Delivered by Supplier (Drop Ship),サプライヤーより配送済（ドロップシッピング）
@@ -605,7 +609,7 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,割当額をマイナスにすることはできません
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,会社を設定してください
 DocType: Purchase Order Item,Billed Amt,支払額
@@ -616,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,納品書タイムシート
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
 DocType: Process Payroll,Select Payment Account to make Bank Entry,銀行エントリを作るために決済口座を選択
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",葉、経費請求の範囲及び給与を管理するために、従業員レコードを作成します。
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",葉、経費請求の範囲及び給与を管理するために、従業員レコードを作成します。
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ナレッジベースに追加
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,提案の作成
 DocType: Payment Entry Deduction,Payment Entry Deduction,支払エントリ控除
@@ -657,8 +661,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2との関係
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,マネージャー
 DocType: Payment Entry,Payment From / To,/からへの支払い
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,日付範囲
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新たな与信限度は、顧客の現在の残高よりも少ないです。与信限度は、少なくとも{0}である必要があります
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新たな与信限度は、顧客の現在の残高よりも少ないです。与信限度は、少なくとも{0}である必要があります
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,同じアイテムが複数回入力されています
 DocType: SMS Settings,Receiver Parameter,受領者パラメータ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,「参照元」と「グループ元」は同じにすることはできません
@@ -668,7 +671,7 @@
 DocType: Issue,Resolution Date,課題解決日
 DocType: Student Batch Name,Batch Name,バッチ名
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,タイムシートを作成しました：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,登録します
 DocType: Selling Settings,Customer Naming By,顧客名設定
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,学生月次出席報告書では、本のように学生が表示されます
@@ -710,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,学生の出席
 DocType: Sales Invoice Timesheet,Time Sheet,タイムシート
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,原材料に基づくバックフラッシュ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,アイテムの詳細を入力してください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,アイテムの詳細を入力してください
 DocType: Interest,Interest,関心
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,事前販売
 DocType: Purchase Receipt,Other Details,その他の詳細
@@ -728,7 +731,7 @@
 ,Absent Student Report,不在学生レポート
 DocType: Email Digest,Next email will be sent on:,次のメール送信先：
 DocType: Offer Letter Term,Offer Letter Term,雇用契約書条件
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,当社{0}は存在しません。
@@ -737,7 +740,6 @@
 DocType: Serial No,Warranty Expiry Date,保証有効期限
 DocType: Material Request Item,Quantity and Warehouse,数量と倉庫
 DocType: Sales Invoice,Commission Rate (%),手数料率（％）
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,プログラムを選択してください
 DocType: Project,Estimated Cost,推定費用
 DocType: Purchase Order,Link to material requests,材料の要求へのリンク
@@ -755,7 +757,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}は在庫アイテムではありません
 DocType: Mode of Payment Account,Default Account,デフォルトアカウント
 DocType: Payment Entry,Received Amount (Company Currency),受け取った金額（会社通貨）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,週休日を選択してください
 DocType: Production Order Operation,Planned End Time,計画終了時間
 ,Sales Person Target Variance Item Group-Wise,（アイテムグループごとの）各営業ターゲット差違
@@ -845,7 +847,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Request for Quotation Supplier,Send Email,メールを送信
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},注意：不正な添付ファイル{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},注意：不正な添付ファイル{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,権限がありませんん
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
@@ -858,7 +860,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,従業員が見つかりません
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,学生グループはすでに更新されています。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,学生グループはすでに更新されています。
 DocType: SMS Center,All Customer Contact,全ての顧客連絡先
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSVから在庫残高をアップロード
 DocType: Warehouse,Tree Details,ツリーの詳細
@@ -869,8 +871,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小請求額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：原価センタ{2}会社に所属していない{3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}：アカウント{2}グループにすることはできません
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,アイテム行{idxの}：{DOCTYPE} {DOCNAME}上に存在しない &#39;{文書型}&#39;テーブル
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,アイテム行{idxの}：{DOCTYPE} {DOCNAME}上に存在しない &#39;{文書型}&#39;テーブル
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,いいえタスクはありません
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",自動請求を生成する日付（例：05、28など）
 DocType: Asset,Opening Accumulated Depreciation,減価償却累計額を開きます
@@ -886,7 +888,7 @@
 DocType: Bin,Moving Average Rate,移動平均レート
 DocType: Production Planning Tool,Select Items,アイテム選択
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,コーススケジュール
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,コーススケジュール
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: HR Settings,Enter retirement age in years,年間で退職年齢を入力してください
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ターゲット倉庫
@@ -894,7 +896,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
 DocType: Stock Entry,STE-,ステ
 DocType: Upload Attendance,Import Attendance,出勤インポート
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,全てのアイテムグループ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,全てのアイテムグループ
 DocType: Process Payroll,Activity Log,活動ログ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,純損益
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
@@ -905,7 +907,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,発注からの支払
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',「オープニング」
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,行うにオープン
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
@@ -921,7 +923,7 @@
 DocType: Item Reorder,Re-Order Qty,再オーダー数量
 DocType: Leave Block List Date,Leave Block List Date,休暇リスト日付
 DocType: Pricing Rule,Price or Discount,価格または割引
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,購入レシートItemsテーブル内の合計有料合計税金、料金と同じでなければなりません
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,購入レシートItemsテーブル内の合計有料合計税金、料金と同じでなければなりません
 DocType: Sales Team,Incentives,インセンティブ
 DocType: SMS Log,Requested Numbers,要求された番号
 DocType: Production Planning Tool,Only Obtain Raw Materials,原料のみを取得
@@ -979,8 +981,7 @@
 DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Fee Structure,Components,コンポーネント
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
@@ -1032,8 +1033,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,このモードが選択されている場合、デフォルト銀行/現金アカウントは自動的に給与仕訳に更新されます。
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",グレードコード{0}のための間隔が他の学年のためのグレードの間隔と重なっています。間隔{0}と{1}を確認して、もう一度お試しください
 DocType: BOM,Raw Material Cost(Company Currency),原料コスト（会社通貨）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行番号{0}：レートは{1} {2}で使用されているレートより大きくすることはできません
@@ -1045,7 +1044,7 @@
 DocType: BOM Website Item,BOM Website Item,BOMのウェブサイトのアイテム
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
 DocType: Timesheet Detail,Bill,ビル
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ホワイト
 DocType: SMS Center,All Lead (Open),全リード（オープン）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：（{2} {3}）エントリの時間を掲示で{1}倉庫内の{4}の数量は利用できません
@@ -1061,7 +1060,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},注文タイプは{0}のいずれかである必要があります
 DocType: Lead,Next Contact Date,次回連絡日
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,数量を開く
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
 DocType: Student Batch Name,Student Batch Name,学生バッチ名
 DocType: Holiday List,Holiday List Name,休日リストの名前
 DocType: Repayment Schedule,Balance Loan Amount,バランス融資額
@@ -1081,10 +1080,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},{0}を指定してください
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}はマイナスにできません
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,割引
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,割引
 DocType: Asset,Total Number of Depreciations,減価償却の合計数
 DocType: Sales Invoice Item,Rate With Margin,利益率
 DocType: Workstation,Wages,賃金
@@ -1112,7 +1111,7 @@
 DocType: Lead,Organization Name,組織名
 DocType: Tax Rule,Shipping State,出荷状態
 ,Projected Quantity as Source,ソースとして投影数量
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,非在庫品目を含めます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,販売費
@@ -1120,7 +1119,7 @@
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,郵便番号
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,郵便番号
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},受注{0}は{1}です
 DocType: Opportunity,Contact Info,連絡先情報
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,在庫エントリを作成
@@ -1162,7 +1161,7 @@
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
 ,Ordered Items To Be Billed,支払予定注文済アイテム
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,範囲開始は範囲終了よりも小さくなければなりません
 DocType: Global Defaults,Global Defaults,共通デフォルト設定
@@ -1197,11 +1196,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,バッチ番号を取得するために、商品コードを入力してください
 DocType: Stock Settings,Default Item Group,デフォルトアイテムグループ
 DocType: Employee Loan,Partially Disbursed,部分的に支払わ
-DocType: Grading Structure,Grading System Name,グレーディングシステム名
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,サプライヤーデータベース
 DocType: Account,Balance Sheet,貸借対照表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",お支払いモードが設定されていません。アカウントが支払いのモードやPOSプロファイルに設定されているかどうか、確認してください。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",お支払いモードが設定されていません。アカウントが支払いのモードやPOSプロファイルに設定されているかどうか、確認してください。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,営業担当者には、顧客訪問日にリマインドが表示されます。
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同じアイテムを複数回入力することはできません。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
@@ -1238,11 +1236,11 @@
 DocType: Maintenance Visit Purpose,Work Done,作業完了
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,属性テーブル内から少なくとも1つの属性を指定してください
 DocType: Announcement,All Students,全生徒
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,アイテム{0}は非在庫アイテムでなければなりません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,アイテム{0}は非在庫アイテムでなければなりません
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,元帳の表示
 DocType: Grading Scale,Intervals,インターバル
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,学生モバイル号
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
@@ -1282,8 +1280,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,受注{0}は有効ではありません
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,購買発注は、あなたの購入を計画し、フォローアップに役立ちます
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,購買発注は、あなたの購入を計画し、フォローアップに役立ちます
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",企業はマージできません
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",素材要求の総発行/転送量{0}が{1} \項目のための要求数量{2}を超えることはできません{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,S
@@ -1307,7 +1305,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,同期マスタデータ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
@@ -1324,7 +1322,7 @@
 DocType: Student Group Student,Group Roll Number,グループロール番号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,すべてのタスクの重みの合計は1に応じて、すべてのプロジェクトのタスクの重みを調整してくださいする必要があります
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
@@ -1351,7 +1349,7 @@
 DocType: Depreciation Schedule,Journal Entry,仕訳
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,進行中の{0}アイテム
 DocType: Workstation,Workstation Name,作業所名
-DocType: Grade Interval,Grade Code,グレードコード
+DocType: Grading Scale Interval,Grade Code,グレードコード
 DocType: POS Item Group,POS Item Group,POSアイテムのグループ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,メールダイジェスト：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
@@ -1367,7 +1365,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ハードウェア
 DocType: Sales Order,Recurring Upto,定期的な点で最大
 DocType: Attendance,HR Manager,人事マネージャー
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,会社を選択してください
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,会社を選択してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,特別休暇
 DocType: Purchase Invoice,Supplier Invoice Date,サプライヤー請求日
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,「ショッピングカート」を有効にしてください
@@ -1383,7 +1381,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食べ物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,エイジングレンジ３
 DocType: Maintenance Schedule Item,No of Visits,訪問なし
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,マークAttendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,マークAttendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},{1}に対してメンテナンススケジュール{0}が存在します
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,入学学生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},締めるアカウントの通貨は {0} でなければなりません
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},全目標のポイントの合計は100でなければなりませんが、{0}になっています
@@ -1432,13 +1431,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,勘定科目表
 DocType: Material Request,Terms and Conditions Content,規約の内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Detail,Depends on Leave Without Pay,無給休暇に依存
 DocType: Pricing Rule,"Higher the number, higher the priority",大きい数は優先順位が高い
 ,Purchase Invoice Trends,仕入請求傾向
 DocType: Employee,Better Prospects,良い見通し
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行番号{0}：バッチ{1}には{2}個しかありません。 {3}個の利用可能なバッチを選択するか、行を複数の行に分割して、複数のバッチから配信/発行してください
 DocType: Vehicle,License Plate,ナンバープレート
 DocType: Appraisal,Goals,ゴール
 DocType: Warranty Claim,Warranty / AMC Status,保証/ 年間保守契約のステータス
@@ -1457,7 +1457,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,従業員は自分自身に報告することはできません。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",会計が凍結されている場合、エントリは限られたユーザーに許可されています。
 DocType: Email Digest,Bank Balance,銀行残高
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
 DocType: Job Opening,"Job profile, qualifications required etc.",必要な業務内容、資格など
 DocType: Journal Entry Account,Account Balance,口座残高
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,取引のための税ルール
@@ -1468,7 +1468,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,閉じられていない会計年度のP＆L残高を表示
 DocType: Shipping Rule,Shipping Account,出荷アカウント
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}：アカウントは、{2}に不活性であります
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,あなたの仕事を計画に役立つとオンタイム配信するために受注を作ります
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,あなたの仕事を計画に役立つとオンタイム配信するために受注を作ります
 DocType: Quality Inspection,Readings,報告要素
 DocType: Stock Entry,Total Additional Costs,追加費用合計
 DocType: Course Schedule,SH,SH
@@ -1479,7 +1479,7 @@
 DocType: Shipping Rule Condition,To Value,値
 DocType: Asset Movement,Stock Manager,在庫マネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,梱包伝票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,梱包伝票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,事務所賃料
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMSゲートウェイの設定
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
@@ -1505,7 +1505,7 @@
 DocType: Sales Invoice,Source,ソース
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,クローズ済を表示
 DocType: Leave Type,Is Leave Without Pay,無給休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,資産カテゴリーは、固定資産の項目は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,資産カテゴリーは、固定資産の項目は必須です
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,支払テーブルにレコードが見つかりません
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},この{2} {3}の{1}と{0}競合
 DocType: Student Attendance Tool,Students HTML,学生HTML
@@ -1523,7 +1523,7 @@
 DocType: Student,Date of Leaving,立ち去るの日
 DocType: Pricing Rule,For Price List,価格表用
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ヘッドハンティング
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,リードを作成します。
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,リードを作成します。
 DocType: Maintenance Schedule,Schedules,スケジュール
 DocType: Purchase Invoice Item,Net Amount,正味金額
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
@@ -1552,7 +1552,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,プログラム加入契約
 DocType: Sales Invoice Item,Brand Name,ブランド名
 DocType: Purchase Receipt,Transporter Details,輸送業者詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,箱
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,可能性のあるサプライヤー
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,組織
@@ -1585,7 +1585,7 @@
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0}プロジェクト{1}が見つかりませんの既定BOM
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,会社経費の請求
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",学生はシステムの心臓部である、すべての学生を追加します
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",学生はシステムの心臓部である、すべての学生を追加します
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：クリアランス日付は{1} {2}小切手日前にすることはできません
 DocType: Company,Default Holiday List,デフォルト休暇リスト
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：の時間との時間から{1}と重なっている{2}
@@ -1597,20 +1597,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日（複数可）は祝日です。あなたは休暇を申請する必要はありません。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,支払メールを再送信
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新しい仕事
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,見積を作成
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,見積を作成
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,その他のレポート
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
 DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
 DocType: SMS Center,Receiver List,受領者リスト
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,探索項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,探索項目
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消費額
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金の純変更
 DocType: Assessment Plan,Grading Scale,評価尺度
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,すでに完了
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},支払い要求がすでに存在している{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
@@ -1648,7 +1648,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,収集します
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,資産運動レコード{0}を作成
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,資産運動レコード{0}を作成
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,あなたは年度{0}を削除することはできません。年度{0}はグローバル設定でデフォルトとして設定されています
 DocType: Journal Entry,Entry Type,エントリタイプ
 ,Customer Credit Balance,顧客貸方残高
@@ -1689,7 +1689,6 @@
 DocType: Student Sibling,Studying in Same Institute,同研究所で学びます
 DocType: Territory,Territory Manager,地域マネージャ
 DocType: Packed Item,To Warehouse (Optional),倉庫に（オプション）
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Payment Entry,Paid Amount (Company Currency),支払額（会社通貨）
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
@@ -1699,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,カート内を見ます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,この在庫エントリを作成するために使用される資材要求
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,次の減価償却日は、新しい資産のために必須です
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,次の減価償却日は、新しい資産のために必須です
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,バッチごとに個別のコースベースのグループ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,アイテムの１単位
 DocType: Fee Category,Fee Category,料金カテゴリー
@@ -1717,9 +1716,8 @@
 DocType: Course Assessment Criteria,Weightage,重み付け
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：コストセンターは「損益」アカウント{2}のために必要とされます。会社のデフォルトのコストセンターを設定してください。
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
 顧客名か顧客グループのどちらかの名前を変更してください"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新しい連絡先
 DocType: Territory,Parent Territory,上位地域
 DocType: Quality Inspection Reading,Reading 2,報告要素2
@@ -1746,20 +1744,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,照合 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 DocType: Purchase Invoice Item,Batch No,バッチ番号
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},{1}キー日付の{2}に{0}の為替レートを見つけることができません。
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,顧客の発注に対する複数の受注を許可
 DocType: Student Group Instructor,Student Group Instructor,学生グループインストラクター
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2モバイルはありません
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,メイン
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,バリエーション
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,メイン
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,バリエーション
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
 DocType: Employee Attendance Tool,Employees HTML,従業員HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
 DocType: Employee,Leave Encashed?,現金化された休暇？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機会元フィールドは必須です
 DocType: Email Digest,Annual Expenses,年間費用
 DocType: Item,Variants,バリエーション
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Payment Reconciliation Payment,Allocated amount,割当額
@@ -1777,7 +1774,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,査定
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,出荷ルールの条件
-DocType: Grading Structure,Grading Intervals,グレーディング間隔
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,入力してください
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行の項目{0}のoverbillできません{1}より{2}。過剰請求を許可するには、[設定]を購入するに設定してください
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,アイテムまたは倉庫に基づくフィルタを設定してください
@@ -1790,16 +1786,17 @@
 DocType: Authorization Control,Authorization Control,認証コントロール
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：倉庫拒否は却下されたアイテムに対して必須である{1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,支払
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ご注文を管理します
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ご注文を管理します
 DocType: Production Order Operation,Actual Time and Cost,実際の時間とコスト
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},資材要求の最大値{0}は、注{2}に対するアイテム{1}から作られます
 DocType: Employee,Salutation,敬称（例：Mr. Ms.）
 DocType: Course,Course Abbreviation,コースの略
 DocType: Student Leave Application,Student Leave Application,学生休業申出
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},上半分の日に従業員{0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},総労働時間は最大労働時間よりも大きくてはいけません{0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,オン
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,販売時に商品をまとめる
 DocType: Quotation Item,Actual Qty,実際の数量
 DocType: Sales Invoice Item,References,参照
@@ -1809,7 +1806,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,同じ商品が重複入力されました。修正してやり直してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,同僚
 DocType: Asset Movement,Asset Movement,アセット・ムーブメント
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,新しいカート
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,新しいカート
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,アイテム{0}にはシリアル番号が付与されていません
 DocType: SMS Center,Create Receiver List,受領者リストを作成
 DocType: Vehicle,Wheels,車輪
@@ -1841,9 +1838,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,製造指示に対する時間ログの作成を無効にします。作業は製造指図を追跡しません
 DocType: Student,Student Mobile Number,学生携帯電話番号
 DocType: Item,Has Variants,バリエーションあり
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,バッチIDは必須です
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,バッチIDは必須です
 DocType: Sales Person,Parent Sales Person,親販売担当者
 DocType: Purchase Invoice,Recurring Invoice,定期的な請求
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,プロジェクト管理
@@ -1851,7 +1848,7 @@
 DocType: Budget,Fiscal Year,会計年度
 DocType: Vehicle Log,Fuel Price,燃料価格
 DocType: Budget,Budget,予算
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",収入または支出でない予算は、{0} に対して割り当てることができません
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,達成
 DocType: Student Admission,Application Form Route,申込書ルート
@@ -1882,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},量は{0} {1} {2}に対する控除します
 DocType: Employee,Salary Information,給与情報
 DocType: Sales Person,Name and Employee ID,名前と従業員ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
 DocType: Website Item Group,Website Item Group,ウェブサイトの項目グループ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,関税と税金
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,基準日を入力してください
@@ -1940,7 +1937,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,リピート顧客の収益
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0}（{1}）は「経費承認者」の権限を持っている必要があります
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,組
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,生産のためのBOMと数量を選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,生産のためのBOMと数量を選択
 DocType: Asset,Depreciation Schedule,減価償却スケジュール
 DocType: Bank Reconciliation Detail,Against Account,アカウントに対して
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半日日付は日付からと日付までの間であるべきです
@@ -1957,13 +1954,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
 DocType: Purchase Order,Delivered,納品済
 ,Vehicle Expenses,車両費
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
+DocType: Serial No,Invoice Details,請求書の詳細
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
 DocType: Purchase Receipt,Vehicle Number,車両番号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,繰り返し請求停止予定日
 DocType: Employee Loan,Loan Amount,融資額
@@ -1986,7 +1984,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：項目は固定資産であるとして数量は、1でなければなりません。複数の数量のための個別の行を使用してください。
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,グループから非グループ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,スポーツ
 DocType: Loan Type,Loan Name,ローン名前
@@ -1997,6 +1995,7 @@
 ,Customer Acquisition and Loyalty,顧客獲得とロイヤルティ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,返品を保管する倉庫
 DocType: Production Order,Skip Material Transfer,マテリアル転送をスキップする
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,キー日付{2}の{0}から{1}への為替レートを見つけることができません。通貨レコードを手動で作成してください
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,会計年度終了日
 DocType: POS Profile,Price List,価格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}はデフォルト会計年度です。変更を反映するためにブラウザを更新してください
@@ -2034,9 +2033,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,アイテム{0}はすでに返品されています
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,「会計年度」は、会計年度を表します。すべての会計記帳および他の主要な取引は、「会計年度」に対して記録されます。
 DocType: Opportunity,Customer / Lead Address,顧客／リード住所
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},注意：添付ファイル{0}のSSL証明書が無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},注意：添付ファイル{0}のSSL証明書が無効です
 DocType: Student Admission,Eligibility,適格性
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",リードは、あなたのリードとしてすべての連絡先などを追加、あなたがビジネスを得るのを助けます
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",リードは、あなたのリードとしてすべての連絡先などを追加、あなたがビジネスを得るのを助けます
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),（ユーザー）に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
@@ -2074,7 +2073,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,会社を選択...
 DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Process Payroll,Fortnightly,2週間ごとの
 DocType: Currency Exchange,From Currency,通貨から
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
@@ -2090,7 +2089,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,最初の行には、「前行の数量」「前行の合計」などの料金タイプを選択することはできません
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子アイテムは、製品バンドルであってはなりません。項目を削除 `{0} &#39;と保存してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業務
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,タイムシートを追加
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,タイムシートを追加
 DocType: Vehicle Service,Service Item,サービスアイテム
 DocType: Bank Guarantee,Bank Guarantee,銀行保証
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
@@ -2138,8 +2137,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,価格表が設定されていない場合の価格は表示されません
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,配送ルールに国を指定するか、全世界出荷をチェックしてください
 DocType: Stock Entry,Total Incoming Value,収入価値合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,デビットへが必要とされます
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わのactivitesのための時間、コストおよび課金を追跡するのに役立ち
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,デビットへが必要とされます
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わのactivitesのための時間、コストおよび課金を追跡するのに役立ち
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格表
 DocType: Offer Letter Term,Offer Term,雇用契約条件
 DocType: Quality Inspection,Quality Manager,品質管理者
@@ -2172,14 +2171,14 @@
 DocType: Opportunity,Lost Reason,失われた理由
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新しい住所
 DocType: Quality Inspection,Sample Size,サンプルサイズ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,領収書の文書を入力してください。
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,全てのアイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,領収書の文書を入力してください。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,全てのアイテムはすでに請求済みです
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',有効な「参照元ケース番号」を指定してください
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
 DocType: Project,External,外部
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ユーザーと権限
 DocType: Vehicle Log,VLOG.,VLOG。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},作成された製造指図：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},作成された製造指図：{0}
 DocType: Branch,Branch,支社・支店
 DocType: Guardian,Mobile Number,携帯電話番号
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷とブランディング
@@ -2188,7 +2187,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,シリアル番号 {0} は見つかりません
 DocType: Scheduling Tool,Student Batch,学生バッチ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,あなたの顧客
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,学生を作ります
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,学生を作ります
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},プロジェクト：{0} の共同作業に招待されました
 DocType: Leave Block List Date,Block Date,ブロック日付
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,今すぐ適用
@@ -2211,8 +2210,9 @@
 DocType: SMS Log,Sent To,送信先
 DocType: Payment Request,Make Sales Invoice,納品書を作成
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ソフト
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,次の連絡先の日付は、過去にすることはできません
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,次の連絡先の日付は、過去にすることはできません
 DocType: Company,For Reference Only.,参考用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,バッチ番号を選択
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無効な{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,前払額
@@ -2226,7 +2226,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ケース番号は0にすることはできません
 DocType: Item,Show a slideshow at the top of the page,ページの上部にスライドショーを表示
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,部品表
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,店舗
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,店舗
 DocType: Serial No,Delivery Time,納品時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,エイジング基準
 DocType: Item,End of Life,提供終了
@@ -2242,8 +2242,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,資材配送
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,この文書では、アイテム{4}の{0} {1}によって限界を超えています。あなたが作っている同じに対して別の{3} {2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,保存した後、繰り返し設定をしてください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,変化量のアカウントを選択
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,保存した後、繰り返し設定をしてください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,変化量のアカウントを選択
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
@@ -2255,7 +2255,7 @@
 DocType: Quality Inspection,Verified By,検証者
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","既存の取引が存在するため、会社のデフォルトの通貨を変更することができません。
 デフォルトの通貨を変更するには取引をキャンセルする必要があります。"
-DocType: Grade Interval,Grade Description,等級説明
+DocType: Grading Scale Interval,Grade Description,等級説明
 DocType: Stock Entry,Purchase Receipt No,領収書番号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,手付金
 DocType: Process Payroll,Create Salary Slip,給与伝票を作成する
@@ -2293,7 +2293,7 @@
 DocType: Upload Attendance,Attendance To Date,出勤日
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Gateway Account,Payment Account,支払勘定
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,続行する会社を指定してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,続行する会社を指定してください
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,売掛金の純変更
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,代償オフ
 DocType: Offer Letter,Accepted,承認済
@@ -2306,7 +2306,7 @@
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ユーザーフォーラム
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,クイック仕訳エントリー
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
 DocType: Employee,Previous Work Experience,前職歴
@@ -2320,7 +2320,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,規約１
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,あなたはこのシステムを設定している研究所の名前。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会計エントリーはこの日から凍結され、以下の役割を除いて実行／変更できません。
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,プロジェクトステータス
 DocType: UOM,Check this to disallow fractions. (for Nos),数に小数を許可しない場合チェック
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,以下の製造指示が作成されました：
@@ -2343,6 +2343,7 @@
 DocType: Email Digest,How frequently?,どのくらいの頻度？
 DocType: Purchase Receipt,Get Current Stock,在庫状況を取得
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,部品表ツリー
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Student,Joining Date,参加日
 ,Employees working on a holiday,休日に従事している従業員
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,マークプレゼント
@@ -2450,7 +2451,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,決済日が記入されていません
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,製造
 DocType: Guardian,Occupation,職業
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),合計（量）
 DocType: Sales Invoice,This Document,この文書
 DocType: Installation Note Item,Installed Qty,設置済数量
@@ -2473,7 +2474,7 @@
 DocType: Notification Control,Sales Order Message,受注メッセージ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",会社、通貨、会計年度などのデフォルト値を設定
 DocType: Payment Entry,Payment Type,支払タイプ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,アイテム{0}のバッチを選択してください。この要件を満たす単一のバッチを見つけることができません
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,アイテム{0}のバッチを選択してください。この要件を満たす単一のバッチを見つけることができません
 DocType: Process Payroll,Select Employees,従業員を選択
 DocType: Opportunity,Potential Sales Deal,潜在的販売取引
 DocType: Payment Entry,Cheque/Reference Date,小切手/リファレンス日
@@ -2490,7 +2491,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},グローバルPOSプロファイル {0} が会社 {1} に作成されています
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,すべての部品表でアイテム／部品表を交換してください
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,領収書の文書を提出しなければなりません
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,領収書の文書を提出しなければなりません
 DocType: Purchase Invoice Item,Received Qty,受領数
 DocType: Stock Entry Detail,Serial No / Batch,シリアル番号／バッチ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,有料とNot配信されません
@@ -2503,7 +2504,7 @@
 ,To Produce,製造
 apps/erpnext/erpnext/config/hr.py +93,Payroll,給与
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ユーザーを作成します
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ユーザーを作成します
 DocType: Packing Slip,Identification of the package for the delivery (for print),納品パッケージの識別票（印刷用）
 DocType: Bin,Reserved Quantity,予約数量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,有効なメールアドレスを入力してください
@@ -2515,11 +2516,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,[無効]テンプレートは、デフォルトのテンプレートであってはなりません
 DocType: Account,Income Account,収益勘定
 DocType: Payment Request,Amount in customer's currency,顧客通貨での金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,配送
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,配送
 DocType: Stock Reconciliation Item,Current Qty,現在の数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",原価計算セクションの「資材単価基準」を参照してください。
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,前の
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",学生のバッチは、あなたが学生のための出席、アセスメントとサービス料を追跡するのに役立ち
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",学生のバッチは、あなたが学生のための出席、アセスメントとサービス料を追跡するのに役立ち
 DocType: Payment Entry,Total Allocated Amount,総配分される金額
 DocType: Item Reorder,Material Request Type,資材要求タイプ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} {1}への給与Accural仕訳
@@ -2542,7 +2544,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,業種によってリードを追跡
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
@@ -2552,6 +2554,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',「開く」の状態で、従業員へのイベントに関する電子メールを送信します
 DocType: Task,Depends on Tasks,タスクに依存
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,顧客グループツリーを管理します。
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ショッピングカートを有効にせずに添付ファイルを表示することができます
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新しいコストセンター名
 DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
@@ -2564,11 +2567,10 @@
 DocType: Sales Invoice,Debit To,借方計上
 DocType: Delivery Note,Required only for sample item.,サンプルアイテムにのみ必要です
 DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0}と{1}の間で見つかりませ給与スリップません
 ,Pending SO Items For Purchase Request,仕入要求のため保留中の受注アイテム
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生の入学
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} は無効になっています
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} は無効になっています
 DocType: Supplier,Billing Currency,請求通貨
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,XL
@@ -2585,7 +2587,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ホームページ人気商品
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,すべての評価グループ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),合計{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),合計{0}（{1}）
 DocType: C-Form Invoice Detail,Territory,地域
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,必要な訪問の数を記述してください
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
@@ -2603,7 +2605,7 @@
 DocType: Price List,Price List Master,価格表マスター
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
 ,S.O. No.,受注番号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},リード{0}から顧客を作成してください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},リード{0}から顧客を作成してください
 DocType: Price List,Applicable for Countries,国に適用
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,「承認済み」と「拒否」に提出することができる状態でアプリケーションをのみを残します
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},学生グループ名は、行で必須です{0}
@@ -2694,7 +2696,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,在庫の会計エントリー
 DocType: Vehicle Service,Engine Oil,エンジンオイル
 DocType: Sales Invoice,Sales Team1,販売チーム1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
 DocType: Employee Loan,Loan Details,ローン詳細
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：完了数量はゼロより大きくなければなりません。
@@ -2758,7 +2760,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,既存の取引に倉庫を基に変換することはできません。
 DocType: Assessment Result Tool,Result HTML,結果HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,有効期限
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,学生を追加
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,学生を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0}を選択してください
 DocType: C-Form,C-Form No,C-フォームはありません
 DocType: BOM,Exploded_items,Exploded_items
@@ -2822,7 +2824,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,リミットクロス
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ベンチャーキャピタル
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,この「アカデミックイヤー &#39;{0}と{1}はすでに存在している「中期名」との学術用語。これらのエントリを変更して、もう一度お試しください。
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",項目{0}に対する既存のトランザクションがあるとして、あなたは{1}の値を変更することはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",項目{0}に対する既存のトランザクションがあるとして、あなたは{1}の値を変更することはできません
 DocType: UOM,Must be Whole Number,整数でなければなりません
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新しい有給休暇（日数）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,シリアル番号 {0}は存在しません
@@ -2865,7 +2867,7 @@
 DocType: Supplier,Last Day of the Next Month,次月末日
 DocType: Support Settings,Auto close Issue after 7 days,7日後にオートクローズ号
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",前に割り当てることができないままに、{0}、休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように{1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,学生申請者
 DocType: Asset Category Account,Accumulated Depreciation Account,減価償却累計額勘定
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
@@ -2893,7 +2895,7 @@
 DocType: Asset,Item Code,アイテムコード
 DocType: Production Planning Tool,Create Production Orders,製造指示を作成
 DocType: Serial No,Warranty / AMC Details,保証/ 年間保守契約の詳細
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
 DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
@@ -2911,7 +2913,7 @@
 DocType: Production Planning Tool,Create Material Requests,資材要求を作成
 DocType: Employee Education,School/University,学校/大学
 DocType: Payment Request,Reference Details,リファレンス詳細
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,残存価額は購入総額未満でなければなりません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,残存価額は購入総額未満でなければなりません
 DocType: Sales Invoice Item,Available Qty at Warehouse,倉庫の利用可能数量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,請求金額
 DocType: Asset,Double Declining Balance,ダブル定率
@@ -2932,19 +2934,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支出額は、ローン額を超えることはできません{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,製造指図が作成されていません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,製造指図が作成されていません
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},学生としてのステータスを変更することはできません{0}学生のアプリケーションとリンクされている{1}
 DocType: Asset,Fully Depreciated,完全に減価償却
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Employee Attendance Tool,Marked Attendance HTML,著しい出席HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",名言は、あなたの顧客に送られてきた入札提案されています
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",名言は、あなたの顧客に送られてきた入札提案されています
 DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,シリアル番号とバッチ
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,評価基準のスコアの合計は{0}にする必要があります。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,予約された減価償却の数を設定してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,予約された減価償却の数を設定してください
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,値または数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,分
@@ -3072,7 +3074,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生グループ
 DocType: Shopping Cart Settings,Quotation Series,見積シリーズ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,顧客を選択してください
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,顧客を選択してください
 DocType: C-Form,I,私
 DocType: Company,Asset Depreciation Cost Center,資産減価償却コストセンター
 DocType: Sales Order Item,Sales Order Date,受注日
@@ -3091,19 +3093,18 @@
 DocType: Vehicle,Insurance Details,保険の詳細
 DocType: Account,Payable,買掛
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,返済期間を入力してください。
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),債務者（{0}）
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),債務者（{0}）
 DocType: Pricing Rule,Margin,マージン
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新規顧客
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,粗利益％
 DocType: Appraisal Goal,Weightage (%),重み付け（％）
 DocType: Bank Reconciliation Detail,Clearance Date,決済日
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,購入総額は必須です
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,購入総額は必須です
 DocType: Lead,Address Desc,住所種別
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,党は必須です
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,トピック名
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,販売または購入のいずれかを選択する必要があります
-DocType: Grading Structure,Grade Intervals,グレード間隔
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,あなたのビジネスの性質を選択します。
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,製造作業が行なわれる場所
 DocType: Asset Movement,Source Warehouse,出庫元
@@ -3132,6 +3133,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
 DocType: Territory,Territory Targets,ターゲット地域
 DocType: Delivery Note,Transporter Info,輸送情報
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},会社のデフォルト{0}を設定してください。{1}
 DocType: Cheque Print Template,Starting position from top edge,上端からの位置を開始
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,同じサプライヤーが複数回入力されています
@@ -3183,7 +3185,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,再注文数量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,現在の求人
 DocType: Company,Stock Adjustment Account,在庫調整勘定
-DocType: Journal Entry,Write Off,償却
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,償却
 DocType: Timesheet Detail,Operation ID,操作ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",システムユーザー（ログイン）IDを指定します。設定すると、すべての人事フォームのデフォルトになります。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：{1}から
@@ -3194,8 +3196,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,サプライヤーから顧客に配送
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃フォーム/商品/ {0}）在庫切れです
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,次の日は、転記日付よりも大きくなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,表示減税アップ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,データインポート・エクスポート
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",ストックエントリは、したがって、あなたが再割り当てたり、それを変更することはできません、倉庫{0}に対して存在します
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,いいえ学生は見つかりませんでした
@@ -3207,13 +3209,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,パーティーを選択する前に転記日付を選択してください
 DocType: Program Enrollment,School House,スクールハウス
 DocType: Serial No,Out of AMC,年間保守契約外
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,見積もりを選択してください
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,メンテナンス訪問を作成
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,見積もりを選択してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,メンテナンス訪問を作成
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
 DocType: Company,Default Cash Account,デフォルトの現金勘定
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,これは、この生徒の出席に基づいています
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,学生はいない
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,複数のアイテムまたは全開フォームを追加
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
@@ -3259,9 +3262,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,照合前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),租税公課が追加されました。（報告通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
 DocType: Sales Order,Partly Billed,一部支払済
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,アイテムは、{0}固定資産項目でなければなりません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,アイテムは、{0}固定資産項目でなければなりません
 DocType: Item,Default BOM,デフォルト部品表
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,確認のため会社名を再入力してください
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,残高合計
@@ -3283,7 +3286,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
 DocType: Purchase Invoice Item,Rate,単価／率
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,インターン
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,アドレス名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,アドレス名称
 DocType: Stock Entry,From BOM,参照元部品表
 DocType: Assessment Code,Assessment Code,評価コード
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,基本
@@ -3308,7 +3311,7 @@
 DocType: Purchase Invoice,Print Language,プリント言語
 DocType: Salary Slip,Total Working Hours,総労働時間
 DocType: Stock Entry,Including items for sub assemblies,組立部品のためのアイテムを含む
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,入力値は正でなければなりません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,入力値は正でなければなりません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,全ての領域
 DocType: Purchase Invoice,Items,アイテム
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生はすでに登録されています。
@@ -3327,16 +3330,14 @@
 DocType: Issue,Opening Time,「時間」を開く
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,期間日付が必要です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムいいえ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムいいえ
 DocType: Assessment Plan,Supervisor Name,上司の名前
 DocType: Program Enrollment Course,Program Enrollment Course,プログラム入学コース
-DocType: Grading Structure,Grading Structure,グレーディング構造
 DocType: Purchase Taxes and Charges,Valuation and Total,評価と総合
 DocType: Tax Rule,Shipping City,出荷先の市
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,この商品は、{0}（テンプレート）のバリエーションです。「コピーしない」が設定されていない限り、属性は、テンプレートからコピーされます
 DocType: Notification Control,Customize the Notification,通知をカスタマイズ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,営業活動によるキャッシュフロー
 DocType: Sales Invoice,Shipping Rule,出荷ルール
@@ -3359,6 +3360,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,最初の転記日付を選択してください
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開始日は終了日より前でなければなりません
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 DocType: Leave Control Panel,Carry Forward,繰り越す
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,既存の取引があるコストセンターは、元帳に変換することはできません
 DocType: Department,Days for which Holidays are blocked for this department.,この部門のために休暇期間指定されている日
@@ -3386,7 +3388,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),合計（数）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
 DocType: Quality Inspection,Item Serial No,アイテムシリアル番号
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,従業員レコードを作成します。
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,従業員レコードを作成します。
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,総現在価値
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,計算書
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,時
@@ -3401,7 +3403,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,交換後の新しい部品表
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,POS
 DocType: Payment Entry,Received Amount,受け取った金額
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員ネーミングシステムの人事管理&gt;人事管理の設定
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",順序にすでに数量を無視して、完全な量のために作成します。
 DocType: Account,Tax,税
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,マークされていません
@@ -3412,7 +3413,7 @@
 DocType: C-Form,Invoices,請求
 DocType: Batch,Source Document Name,ソースドキュメント名
 DocType: Job Opening,Job Title,職業名
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ユーザーの作成
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ユーザーの作成
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,グラム
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,メンテナンス要請の訪問レポート。
@@ -3423,8 +3424,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: BOM,Website Description,ウェブサイトの説明
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,資本の純変動
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",電子メールアドレスは一意である必要があり、すでに{0}のために存在します
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子メールアドレスは一意である必要があり、すでに{0}のために存在します
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,領収書
 ,Sales Register,販売登録
@@ -3435,16 +3436,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,編集するものがありません
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,今月と保留中の活動の概要
 DocType: Customer Group,Customer Group Name,顧客グループ名
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,まだカスタマーはいません！
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,キャッシュフロー計算書
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ライセンス
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,過去の会計年度の残高を今年度に含めて残したい場合は「繰り越す」を選択してください
 DocType: GL Entry,Against Voucher Type,対伝票タイプ
 DocType: Item,Attributes,属性
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最終注文日
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
 DocType: Student,Guardian Details,ガーディアン詳細
 DocType: C-Form,C-Form,C-フォーム
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,複数の従業員のためのマーク出席
@@ -3469,14 +3472,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',行{0}＃のアカウントタイプでなければなりません &quot;固定資産&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,出量
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,シリーズは必須です
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,シリーズは必須です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融サービス
 DocType: Student Sibling,Student ID,学生証
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,時間ログの活動の種類
 DocType: Tax Rule,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
 DocType: Training Event,Exam,試験
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の休暇
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,貸方
 DocType: Tax Rule,Billing State,請求状況
@@ -3509,7 +3512,7 @@
 DocType: Payment Entry,Account Paid From,アカウントから支払わ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原材料アイテムコード
 DocType: Journal Entry,Write Off Based On,償却基準
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,リードを作ります
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,リードを作ります
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,印刷と文房具
 DocType: Stock Settings,Show Barcode Field,ショーバーコードフィールド
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,サプライヤーメールを送信
@@ -3524,6 +3527,7 @@
 DocType: Offer Letter,Awaiting Response,応答を待っています
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,上記
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},無効な属性{0} {1}
+DocType: Supplier,Mention if non-standard payable account,標準でない支払い可能な口座
 DocType: Salary Slip,Earning & Deduction,収益と控除
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
@@ -3557,7 +3561,7 @@
 DocType: Program Enrollment Tool,Get Students From,からの留学生を取得
 DocType: Hub Settings,Seller Country,販売者所在国
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ウェブサイト上でアイテムを公開
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,バッチでグループの学生
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,バッチでグループの学生
 DocType: Authorization Rule,Authorization Rule,認証ルール
 DocType: Sales Invoice,Terms and Conditions Details,規約の詳細
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,仕様
@@ -3616,7 +3620,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,試用
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,給与コンポーネント
 DocType: Program Enrollment Tool,New Academic Year,新学期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,リターン/クレジットノート
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,リターン/クレジットノート
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,支出額合計
 DocType: Production Order Item,Transferred Qty,移転数量
@@ -3657,6 +3661,7 @@
 ,Sales Funnel,セールスファネル
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,略称は必須です
 DocType: Project,Task Progress,タスクの進捗状況
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,カート
 ,Qty to Transfer,転送する数量
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,リードや顧客への見積。
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
@@ -3689,7 +3694,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）は行{1}の小数部にはできません
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,料金を徴収
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
 DocType: Lead,Add to calendar on this date,この日付でカレンダーに追加
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,送料を追加するためのルール
 DocType: Item,Opening Stock,期首在庫
@@ -3707,7 +3712,7 @@
 DocType: Customer,From Lead,リードから
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,製造の指示
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Program Enrollment Tool,Enroll Students,学生を登録
 DocType: Hub Settings,Name Token,名前トークン
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準販売
@@ -3718,7 +3723,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},納品書{1}に対する{0}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,プロジェクト名
-DocType: Supplier,Mention if non-standard receivable account,非標準の売掛金の場合に記載
+DocType: Customer,Mention if non-standard receivable account,非標準の売掛金の場合に記載
 DocType: Journal Entry Account,If Income or Expense,収益または費用の場合
 DocType: Production Order,Required Items,必要なもの
 DocType: Stock Ledger Entry,Stock Value Difference,在庫価値の差違
@@ -3749,6 +3754,7 @@
 DocType: Item,Taxes,税
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,支払済かつ未配送
 DocType: Project,Default Cost Center,デフォルトコストセンター
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 DocType: Bank Guarantee,End Date,終了日
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,株式取引
 DocType: Budget,Budget Accounts,予算アカウント
@@ -3813,7 +3819,7 @@
 DocType: Customer,Sales Partner and Commission,販売パートナーと手数料
 DocType: Employee Loan,Rate of Interest (%) / Year,利子率（％）/年
 ,Project Quantity,プロジェクト数量
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",合計{0}のすべての項目について、ゼロであるあなたは「配布に基づく料金」を変更する必要がありますすることができます
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",合計{0}のすべての項目について、ゼロであるあなたは「配布に基づく料金」を変更する必要がありますすることができます
 DocType: Opportunity,To Discuss,連絡事項
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0}は、このトランザクションを完了するために、{2}に必要な{1}の単位。
 DocType: Loan Type,Rate of Interest (%) Yearly,利子率（％）年間
@@ -3836,7 +3842,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,マーク不在
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOMの＃の通貨は、{1}選択した通貨と同じでなければなりません{2}
 DocType: Journal Entry Account,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,受注{0}は提出されていません
 DocType: Homepage,Tag Line,タグライン
 DocType: Fee Component,Fee Component,手数料コンポーネント
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,フリート管理
@@ -3853,7 +3859,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,倉庫{0}は存在しません
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hubに登録する
 DocType: Monthly Distribution,Monthly Distribution Percentages,月次配分割合
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,選択した項目はバッチを持てません
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,選択した項目はバッチを持てません
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",評価レート{1} {2}のための会計エントリを行うために必要とされる項目{0}、見つかりません。項目は、サンプルアイテムとして取引されている場合は、{1}、{1}項目テーブルであることを言及してください。それ以外の場合は、アイテムの着信在庫トランザクションを作成したり、言及評価率を項目レコードにして、このエントリをキャンセル/ submitingしてみてください
 DocType: Delivery Note,% of materials delivered against this Delivery Note,％の資材が納品済（この納品書を対象）
 DocType: Project,Customer Details,顧客の詳細
@@ -3870,7 +3876,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,提出された注文を削除することはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,品質管理
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,アイテム{0}は無効になっています
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,アイテム{0}は無効になっています
 DocType: Employee Loan,Repay Fixed Amount per Period,期間ごとの固定額を返済
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
@@ -3896,7 +3902,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,学生メールID
 DocType: Employee,Notice (days),お知らせ（日）
 DocType: Tax Rule,Sales Tax Template,販売税テンプレート
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,請求書を保存する項目を選択します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,請求書を保存する項目を選択します
 DocType: Employee,Encashment Date,現金化日
 DocType: Training Event,Internet,インターネット
 DocType: Account,Stock Adjustment,在庫調整
@@ -3929,6 +3935,7 @@
 DocType: Purchase Invoice,Debit Note Issued,デビットノート発行
 DocType: Production Order,Warehouses,倉庫
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}資産を転送することはできません
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,このアイテムは{0}（テンプレート）の変形です。
 DocType: Workstation,per hour,毎時
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購入
 DocType: Announcement,Announcement,発表
@@ -3944,7 +3951,7 @@
 DocType: Account,Receivable,売掛金
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：注文がすでに存在しているとして、サプライヤーを変更することはできません
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,設定された与信限度額を超えた取引を提出することが許可されている役割
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,製造する項目を選択します
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,製造する項目を選択します
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",マスタデータの同期、それはいくつかの時間がかかる場合があります
 DocType: Item,Material Issue,資材課題
 DocType: Hub Settings,Seller Description,販売者の説明
@@ -3957,7 +3964,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,注文済
 DocType: Salary Detail,Component,成分
 DocType: Assessment Criteria,Assessment Criteria Group,評価基準のグループ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},減価償却累計額を開くことに等しい未満でなければなりません{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},減価償却累計額を開くことに等しい未満でなければなりません{0}
 DocType: Warehouse,Warehouse Name,倉庫名
 DocType: Naming Series,Select Transaction,取引を選択
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,「役割承認」または「ユーザー承認」を入力してください
@@ -3991,7 +3998,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",この会計年度をデフォルト値に設定するには、「デフォルトに設定」をクリックしてください
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,参加
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Employee Loan,Repay from Salary,給与から返済
 DocType: Leave Application,LAP/,ラップ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},量のために、{0} {1}に対する支払いを要求{2}
@@ -4009,7 +4016,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,評価結果の詳細
 DocType: Employee Education,Employee Education,従業員教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,項目グループテーブルで見つかった重複するアイテム群
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
 DocType: Salary Slip,Net Pay,給与総計
 DocType: Account,Account,アカウント
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,シリアル番号{0}はすでに受領されています
@@ -4018,7 +4025,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",倉庫{0}任意のアカウントにリンクされていない、作成/倉庫のための対応（資産）のアカウントをリンクしてください。
 DocType: Purchase Invoice,Recurring Id,繰り返しID
 DocType: Customer,Sales Team Details,営業チームの詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,完全に削除しますか？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,完全に削除しますか？
 DocType: Expense Claim,Total Claimed Amount,請求額合計
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潜在的販売機会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},無効な {0}
@@ -4029,13 +4036,14 @@
 DocType: Warehouse,PIN,ピン
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,セットアップERPNextであなたの学校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基本変化量（会社通貨）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,先に文書を保存してください
 DocType: Account,Chargeable,請求可能
 DocType: Company,Change Abbreviation,略語を変更
 DocType: Expense Claim Detail,Expense Date,経費日付
 DocType: Item,Max Discount (%),最大割引（％）
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最新の注文額
+DocType: Task,Is Milestone,マイルストーンです
 DocType: Daily Work Summary,Email Sent To,に送信されたメール
 DocType: Budget,Warn,警告する
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
@@ -4068,11 +4076,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
 DocType: Tax Rule,Purchase Tax Template,購入税テンプレート
 ,Project wise Stock Tracking,プロジェクトごとの在庫追跡
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},メンテナンス予定{0}が {0}に対して存在しています
 DocType: Stock Entry Detail,Actual Qty (at source/target),実際の数量（ソース/ターゲットで）
 DocType: Item Customer Detail,Ref Code,参照コード
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,従業員レコード
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,次の減価償却日を設定してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,次の減価償却日を設定してください
 DocType: HR Settings,Payroll Settings,給与計算の設定
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,注文する
@@ -4095,7 +4102,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,小切手及び預金が不正にクリア
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,アカウント{0}：自身を親アカウントに割当することはできません
 DocType: Purchase Invoice Item,Price List Rate,価格表単価
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,顧客の引用符を作成します。
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,顧客の引用符を作成します。
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",この倉庫での利用可能な在庫に基づいて「在庫あり」または「在庫切れ」を表示します
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),部品表（BOM）
 DocType: Item,Average time taken by the supplier to deliver,サプライヤー配送平均時間
@@ -4117,7 +4124,7 @@
 DocType: Asset,Disposal Date,処分日
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",彼らは休日を持っていない場合は電子メールは、与えられた時間で、会社のすべてのActive従業員に送信されます。回答の概要は、深夜に送信されます。
 DocType: Employee Leave Approver,Employee Leave Approver,従業員休暇承認者
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,トレーニングフィードバック
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
@@ -4125,7 +4132,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},コースは、行{0}に必須です
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,終了日を開始日の前にすることはできません
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc文書型
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,価格の追加/編集
 DocType: Batch,Parent Batch,親バッチ
 DocType: Cheque Print Template,Cheque Print Template,小切手印刷テンプレート
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,コストセンターの表
@@ -4169,7 +4176,7 @@
 DocType: Item,Variant Based On,バリアントベースで
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100％でなければなりません。{0}になっています。
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,サプライヤー
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
 DocType: Request for Quotation Item,Supplier Part No,サプライヤー型番
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',カテゴリが「評価」または「Vaulationと合計」のためのものであるときに控除することはできません。
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,受領元
@@ -4179,7 +4186,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}： {1}のための{0}から
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：アイテム {1} にサプライヤーを設定してください
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：時間値がゼロより大きくなければなりません。
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
 DocType: Issue,Content Type,コンテンツタイプ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
@@ -4188,20 +4195,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
 DocType: Payment Reconciliation,From Invoice Date,請求書の日付から
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,課金通貨はいずれかのデフォルトcomapanyの通貨やパーティーの口座通貨に等しくなければなりません
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,課金通貨はいずれかのデフォルトcomapanyの通貨やパーティーの口座通貨に等しくなければなりません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,現金化を残します
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,これは何？
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,倉庫
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,すべての学生の入学
 ,Average Commission Rate,平均手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
 DocType: School House,House Name,家名
 DocType: Purchase Taxes and Charges,Account Head,勘定科目
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,アイテムの陸揚費用を計算するために、追加の費用を更新してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,電気
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ユーザーとして、組織の残りの部分を追加します。また、連絡先からそれらを追加して、ポータルにお客様を招待追加することができます
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ユーザーとして、組織の残りの部分を追加します。また、連絡先からそれらを追加して、ポータルにお客様を招待追加することができます
 DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計（出 - 入）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},従業員{0}のユーザーIDが未設定です。
@@ -4210,7 +4217,7 @@
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0}のための誕生日リマインダー
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
 DocType: Buying Settings,Naming Series,シリーズ名を付ける
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保険開始日は、保険終了日未満でなければなりません
@@ -4225,7 +4232,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},従業員の給与スリップ{0}はすでにタイムシート用に作成した{1}
 DocType: Vehicle Log,Odometer,オドメーター
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,アイテム{0}は無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,アイテム{0}は無効です
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},繰り返し {0} には期間開始日と終了日が必要です
@@ -4238,7 +4245,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額（会社通貨）
 DocType: Sales Invoice Timesheet,Billing Hours,課金時間
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0}が見つかりませんのデフォルトのBOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ここに追加する項目をタップします
 DocType: Fees,Program Enrollment,プログラム登録
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0}を設定してください
@@ -4337,7 +4345,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,小売・卸売
 DocType: Issue,First Responded On,初回返答
 DocType: Website Item Group,Cross Listing of Item in multiple groups,複数のグループのアイテムのクロスリスト
-DocType: Grade Interval,Grade Interval,グレードインターバル
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},会計年度開始・終了日は、すでに会計年度{0}に設定されています
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,クリアランス日更新
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,バッチ分割
@@ -4345,6 +4352,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDFのダウンロード
 DocType: Production Order,Planned End Date,計画終了日
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,アイテムが保存される場所
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 DocType: Request for Quotation,Supplier Detail,サプライヤー詳細
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},式または条件でエラーが発生しました：{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,請求された額
@@ -4389,7 +4397,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,セットアップ自分の組織のためのシンプルなウェブサイト
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,親コストセンターを入力してください
@@ -4446,7 +4454,7 @@
 ,Items To Be Requested,要求されるアイテム
 DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Company,Company Info,会社情報
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,選択するか、新規顧客を追加
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,選択するか、新規顧客を追加
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,原価センタは、経費請求を予約するために必要とされます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用（資産）
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,これは、この従業員の出席に基づいています
@@ -4459,13 +4467,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,以下の日にはユーザーからの休暇申請を受け付けない
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,購入金額
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,サプライヤー見積 {0} 作成済
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,終了年は開始年前にすることはできません
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,終了年は開始年前にすることはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,従業員給付
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Production Order,Manufactured Qty,製造数量
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}は存在しません
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}：{1}は存在しません
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,顧客あて請求
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
@@ -4474,15 +4482,17 @@
 DocType: Quality Inspection Reading,Reading 3,報告要素3
 ,Hub,ハブ
 DocType: GL Entry,Voucher Type,伝票タイプ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,価格表が見つからないか無効になっています
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Employee Loan Application,Approved,承認済
 DocType: Pricing Rule,Price,価格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
 DocType: Guardian,Guardian,保護者
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,指定期間内の従業員 {1} の査定 {0} が作成されました
 DocType: Employee,Education,教育
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,デル
 DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
 DocType: Employee,Current Address Is,現住所は：
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,変更された
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫内利用可能数量
@@ -4519,7 +4529,7 @@
 DocType: Hub Settings,Hub Settings,ハブの設定
 DocType: Project,Gross Margin %,粗利益率％
 DocType: BOM,With Operations,操作で
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリがすでに会社{1}の通貨{0}に存在します。債権または債務アカウントを通貨{0}で選択してください。
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリがすでに会社{1}の通貨{0}に存在します。債権または債務アカウントを通貨{0}で選択してください。
 DocType: Asset,Is Existing Asset,既存の資産は、
 DocType: Salary Detail,Statistical Component,統計コンポーネント
 ,Monthly Salary Register,月給登録
@@ -4573,7 +4583,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ロゴを添付
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,在庫レベル
 DocType: Customer,Commission Rate,手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,バリエーション作成
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,部門別休暇申請
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",お支払い方法の種類は、受信のいずれかで支払うと内部転送する必要があります
 apps/erpnext/erpnext/config/selling.py +179,Analytics,分析
@@ -4586,6 +4596,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,休日に製造を許可
 DocType: Sales Order,Customer's Purchase Order Date,顧客の発注日
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,株式資本
+DocType: Shopping Cart Settings,Show Public Attachments,パブリックアタッチメントを表示する
 DocType: Packing Slip,Package Weight Details,パッケージ重量詳細
 DocType: Payment Gateway Account,Payment Gateway Account,ペイメントゲートウェイアカウント
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支払完了後、選択したページにリダイレクトします
@@ -4610,7 +4621,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,学生のバッチを作ります
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,学生のバッチを作ります
 DocType: Leave Type,Is Carry Forward,繰越済
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,部品表からアイテムを取得
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,リードタイム日数
@@ -4629,7 +4640,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: GL Entry,Is Opening,オープン
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借方エントリは{1}とリンクすることができません
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,アカウント{0}は存在しません
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,ウェブサイトや他の出版物のための略歴
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 8059438..1c2c269 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,ធាតុបាច់ស្ថានភាពផុតកំណត់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,សេចក្តីព្រាងធនាគារ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
 DocType: Academic Term,Academic Term,រយៈពេលនៃការសិក្សា
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,សម្ភារៈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,បរិមាណដែលត្រូវទទួលទាន
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ការថែទាំសុខភាព
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ការចំណាយសេវា
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,វិក័យប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ឆ្នាំសារពើពន្ធ {0} ត្រូវបានទាមទារ
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ការផ្សព្វផ្សាយពាណិជ្ជកម្ម
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ក្រុមហ៊ុនដូចគ្នាត្រូវបានបញ្ចូលច្រើនជាងម្ដង
 DocType: Employee,Married,រៀបការជាមួយ
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,ទទួលបានធាតុពី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ផលិតផល {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,គ្មានធាតុដែលបានរាយ
 DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,គ្រឿងទេស
 DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
 DocType: Process Payroll,Make Bank Entry,ធ្វើឱ្យធាតុរបស់ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,មូលនិធិសោធននិវត្តន៍
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
 DocType: SMS Center,All Sales Person,ការលក់របស់បុគ្គលទាំងអស់
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** ចែកចាយប្រចាំខែអាចជួយឱ្យអ្នកចែកថវិកា / គោលដៅនៅទូទាំងខែប្រសិនបើអ្នកមានរដូវកាលនៅក្នុងអាជីវកម្មរបស់អ្នក។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,មិនមានធាតុដែលបានរកឃើញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,មិនមានធាតុដែលបានរកឃើញ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Lead,Person Name,ឈ្មោះបុគ្គល
 DocType: Sales Invoice Item,Sales Invoice Item,ការលក់វិក័យប័ត្រធាតុ
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ឧទាហរណ៍ &quot;សាលាបឋមសិក្សា&quot; ឬ &quot;សាកលវិទ្យាល័យ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,របាយការណ៍ភាគហ៊ុន
 DocType: Warehouse,Warehouse Detail,ពត៌មានលំអិតឃ្លាំង
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,កាលបរិច្ឆេទបញ្ចប់រយៈពេលមិនអាចមាននៅពេលក្រោយជាងឆ្នាំបញ្ចប់កាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន &quot;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន &quot;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
 DocType: Vehicle Service,Brake Oil,ប្រេងហ្វ្រាំង
 DocType: Tax Rule,Tax Type,ប្រភេទពន្ធលើ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យបន្ថែមឬធ្វើឱ្យទាន់សម័យធាតុមុន {0}
 DocType: BOM,Item Image (if not slideshow),រូបភាពធាតុ (ប្រសិនបើមិនមានការបញ្ចាំងស្លាយ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,អតិថិជនមួយដែលមានឈ្មោះដូចគ្នា
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ហួរអត្រា / 60) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ជ្រើស Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,ជ្រើស Bom
 DocType: SMS Log,SMS Log,ផ្ញើសារជាអក្សរចូល
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,តម្លៃនៃធាតុដែលបានផ្តល់
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ថ្ងៃឈប់សម្រាកនៅលើ {0} គឺមិនមានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,ថ្នាក់ទី
 DocType: Sales Invoice Item,Delivered By Supplier,បានបញ្ជូនដោយអ្នកផ្គត់ផ្គង់
 DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,លំដាប់ផលិតកម្មបានបង្កើតរួចសម្រាប់ធាតុទាំងអស់ដែលមាន Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,លំដាប់ផលិតកម្មបានបង្កើតរួចសម្រាប់ធាតុទាំងអស់ដែលមាន Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
 DocType: Daily Work Summary,Daily Work Summary,សង្ខេបការងារប្រចាំថ្ងៃ
 DocType: Period Closing Voucher,Closing Fiscal Year,បិទឆ្នាំសារពើពន្ធ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ជាកក
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ជាកក
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,សូមជ្រើសក្រុមហ៊ុនដែលមានស្រាប់សម្រាប់ការបង្កើតគណនីគំនូសតាង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ការចំណាយភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ជ្រើសគោលដៅឃ្លាំង
@@ -202,12 +205,12 @@
 DocType: Journal Entry,Contra Entry,ចូល contra
 DocType: Journal Entry Account,Credit in Company Currency,ឥណទានក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
 DocType: Delivery Note,Installation Status,ស្ថានភាពនៃការដំឡើង
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",តើអ្នកចង់ធ្វើឱ្យទាន់សម័យចូលរួម? <br> បច្ចុប្បន្ន: {0} \ <br> អវត្តមាន: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ ទទួលយកបានច្រានចោល Qty ត្រូវតែស្មើនឹងទទួលបានបរិមាណសម្រាប់ធាតុ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ការផ្គត់ផ្គង់សម្ភារៈសម្រាប់ការទិញសាច់ឆៅ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,របៀបយ៉ាងហោចណាស់មួយនៃការទូទាត់ត្រូវបានទាមទារសម្រាប់វិក័យប័ត្រម៉ាស៊ីនឆូតកាត។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,របៀបយ៉ាងហោចណាស់មួយនៃការទូទាត់ត្រូវបានទាមទារសម្រាប់វិក័យប័ត្រម៉ាស៊ីនឆូតកាត។
 DocType: Products Settings,Show Products as a List,បង្ហាញផលិតផលជាបញ្ជី
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",ទាញយកទំព័រគំរូបំពេញទិន្នន័យត្រឹមត្រូវហើយភ្ជាប់ឯកសារដែលបានកែប្រែ។ កាលបរិច្ឆេទនិងបុគ្គលិកទាំងអស់រួមបញ្ចូលគ្នានៅក្នុងរយៈពេលដែលបានជ្រើសនឹងមកនៅក្នុងពុម្ពដែលមានស្រាប់ជាមួយនឹងកំណត់ត្រាវត្តមាន
@@ -221,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ធ្វើឱ្យធាតុរំលស់
 DocType: Appraisal Template Goal,KRA,ក្រៈ
 DocType: Lead,Request Type,ប្រភេទនៃសំណើសុំ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ធ្វើឱ្យបុគ្គលិក
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ធ្វើឱ្យបុគ្គលិក
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ការផ្សព្វផ្សាយ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ការប្រតិបត្តិ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ពត៌មានលំអិតនៃការប្រតិបត្ដិការនេះបានអនុវត្ត។
@@ -237,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ផែនការសម្រាប់ការមើលថែទាំ។
 DocType: SMS Settings,Enter url parameter for message,បញ្ចូលប៉ារ៉ាម៉ែត្រ URL សម្រាប់សារ
 DocType: POS Profile,Customer Groups,ក្រុមផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,របាយការណ៍ហិរញ្ញវត្ថុ
 DocType: Guardian,Students,និស្សិត
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ក្បួនសម្រាប់ការដាក់ពាក្យសុំការកំណត់តម្លៃនិងការបញ្ចុះតម្លៃ។
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,បញ្ជីតម្លៃត្រូវតែមានការអនុវត្តសម្រាប់ទិញឬលក់
@@ -262,7 +266,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
 DocType: Naming Series,Series List for this Transaction,បញ្ជីស៊េរីសម្រាប់ប្រតិបត្តិការនេះ
 DocType: Company,Default Payroll Payable Account,បើកប្រាក់បៀវត្សត្រូវបង់លំនាំដើមគណនី
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ធ្វើឱ្យទាន់សម័យគ្រុបអ៊ីម៉ែល
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ធ្វើឱ្យទាន់សម័យគ្រុបអ៊ីម៉ែល
 DocType: Sales Invoice,Is Opening Entry,ត្រូវការបើកចូល
 DocType: Customer Group,Mention if non-standard receivable account applicable,និយាយបានបើគណនីដែលមិនមែនជាស្តង់ដាទទួលអនុវត្តបាន
 DocType: Course Schedule,Instructor Name,ឈ្មោះគ្រូបង្ហាត់
@@ -274,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,ការប្រឆាំងនឹងការធាតុលក់វិក័យប័ត្រ
 ,Production Orders in Progress,ការបញ្ជាទិញផលិតកម្មក្នុងវឌ្ឍនភាព
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,សាច់ប្រាក់សុទ្ធពីការផ្តល់ហិរញ្ញប្បទាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
 DocType: Lead,Address & Contact,អាសយដ្ឋានទំនាក់ទំនង
 DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែមស្លឹកដែលមិនបានប្រើពីការបែងចែកពីមុន
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},កើតឡើងបន្ទាប់ {0} នឹងត្រូវបានបង្កើតនៅលើ {1}
@@ -300,7 +304,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),សរុបការចំណាយចំនួនទឹកប្រាក់ (តាមរយៈសន្លឹកម៉ោង)
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ធាតុធនាគារ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
@@ -319,7 +323,7 @@
 DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
 DocType: Student Admission,Student Admission,ការចូលរបស់សិស្ស
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
 DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
@@ -372,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូនដំណឹងដោយអ៊ីមែលនៅលើការបង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
 DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,ដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ការរៀបចំពន្ធ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,តម្លៃនៃការលក់អចលនទ្រព្យ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
-DocType: Grade Interval,Min Score,ពិន្ទុនាទី
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Student Applicant,Admitted,បានទទួលស្គាល់ថា
 DocType: Workstation,Rent Cost,ការចំណាយជួល
@@ -389,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,តម្លៃលំដាប់
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ប្រតិបតិ្តការធនាគារ / សាច់ប្រាក់ប្រឆាំងនឹងគណបក្សឬសម្រាប់ការផ្ទេរផ្ទៃក្នុង
 DocType: Shipping Rule,Valid for Countries,សុពលភាពសម្រាប់បណ្តាប្រទេស
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ចំនួនសរុបត្រូវបានចាត់ទុកថាសណ្តាប់ធ្នាប់
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,សូមបញ្ចូល &#39;ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ&#39; តម្លៃវាល
@@ -399,13 +402,13 @@
 DocType: Item Tax,Tax Rate,អត្រាអាករ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} បម្រុងទុកសម្រាប់បុគ្គលិក {1} សម្រាប់រយៈពេល {2} ទៅ {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ជ្រើសធាតុ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ជួរដេក # {0}: បាច់មិនមានត្រូវតែមានដូចគ្នា {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,បម្លែងទៅនឹងការមិនគ្រុប
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,បាច់ (ច្រើន) នៃវត្ថុមួយ។
 DocType: C-Form Invoice Detail,Invoice Date,វិក័យប័ត្រកាលបរិច្ឆេទ
 DocType: GL Entry,Debit Amount,ចំនួនឥណពន្ធ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,សូមមើលឯកសារភ្ជាប់
 DocType: Purchase Order,% Received,% បានទទួល
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,បង្កើតក្រុមនិស្សិត
@@ -434,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,សំណើរសម្រាប់សម្រង់
 DocType: Salary Slip Timesheet,Working Hours,ម៉ោងធ្វើការ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,បង្កើតអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,បង្កើតអតិថិជនថ្មី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,បង្កើតបញ្ជាទិញ
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,បង្កើតបញ្ជាទិញ
 ,Purchase Register,ទិញចុះឈ្មោះ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់ដែលអាចអនុវត្តបាន
@@ -479,7 +482,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ការកំណត់សកលសម្រាប់ដំណើរការផលិតទាំងអស់។
 DocType: Accounts Settings,Accounts Frozen Upto,រីករាយជាមួយនឹងទឹកកកគណនី
 DocType: SMS Log,Sent On,ដែលបានផ្ញើនៅថ្ងៃ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
 DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
 DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
@@ -500,6 +503,7 @@
 DocType: Packing Slip,From Package No.,ពីលេខកញ្ចប់
 DocType: Item Attribute,To Range,ដើម្បីជួរ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,មូលបត្រនិងប្រាក់បញ្ញើ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",មិនអាចផ្លាស់ប្តូវិធីសាស្រ្តក្នុងការវាយតម្លៃដូចដែលមានប្រតិបត្តិការប្រឆាំងនឹងធាតុមួយចំនួនដែលមិនមានការវាយតម្លៃវាជាវិធីសាស្រ្តរបស់ខ្លួន
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ចំនួនសរុបដែលបានបម្រុងទុកគឺស្លឹកដែលចាំបាច់
 DocType: Job Opening,Description of a Job Opening,ការពិពណ៌នាសង្ខេបនៃការបើកការងារ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
 DocType: Production Order,Additional Operating Cost,ចំណាយប្រតិបត្តិការបន្ថែម
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
 DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ទិញ
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,សូមកំណត់ថ្នាក់ទីសម្រាប់កម្រិតពន្លឺ 0%
 DocType: Sales Order,To Deliver,ដើម្បីរំដោះ
 DocType: Purchase Invoice Item,Item,ធាតុ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
 DocType: Journal Entry,Difference (Dr - Cr),ភាពខុសគ្នា (លោកវេជ្ជបណ្ឌិត - Cr)
 DocType: Account,Profit and Loss,ប្រាក់ចំណេញនិងការបាត់បង់
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
@@ -561,7 +565,7 @@
 DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
 DocType: Production Plan Item,Pending Qty,ដំណើ Qty
 DocType: Budget,Ignore,មិនអើពើ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} គឺមិនសកម្ម
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} គឺមិនសកម្ម
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ផ្ញើសារទៅកាន់លេខដូចខាងក្រោម: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,វិមាត្ររៀបចំការពិនិត្យសម្រាប់ការបោះពុម្ព
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ប្រាក់បៀវត្សរ៍ប័ណ្ណ
@@ -570,13 +574,13 @@
 DocType: Sales Invoice,Total Commission,គណៈកម្មាការសរុប
 DocType: Pricing Rule,Sales Partner,ដៃគូការលក់
 DocType: Buying Settings,Purchase Receipt Required,បង្កាន់ដៃត្រូវការទិញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,អត្រាការវាយតម្លៃជាការចាំបាច់ប្រសិនបើមានការបើកផ្សារហ៊ុនដែលបានបញ្ចូល
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,អត្រាការវាយតម្លៃជាការចាំបាច់ប្រសិនបើមានការបើកផ្សារហ៊ុនដែលបានបញ្ចូល
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,តម្លៃបង្គរ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
@@ -593,7 +597,7 @@
 DocType: Job Applicant,Resume Attachment,ឯកសារភ្ជាប់ប្រវត្តិរូប
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជនម្តងទៀត
 DocType: Leave Control Panel,Allocate,ការបម្រុងទុក
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,ត្រឡប់មកវិញការលក់
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,ត្រឡប់មកវិញការលក់
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ចំណាំ: ស្លឹកដែលបានបម្រុងទុកសរុប {0} មិនគួរត្រូវបានតិចជាងស្លឹកត្រូវបានអនុម័តរួចទៅហើយ {1} សម្រាប់រយៈពេលនេះ
 DocType: Announcement,Posted By,Posted by
 DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
@@ -603,7 +607,7 @@
 DocType: Quotation,Quotation To,សម្រង់ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,សូមកំណត់ក្រុមហ៊ុន
 DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
@@ -614,7 +618,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ការលក់វិក័យប័ត្រ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},សេចក្តីយោង &amp; ទេយោងកាលបរិច្ឆេទត្រូវបានទាមទារសម្រាប់ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ជ្រើសគណនីទូទាត់ដើម្បីធ្វើឱ្យធាតុរបស់ធនាគារ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",បង្កើតកំណត់ត្រាបុគ្គលិកដើម្បីគ្រប់គ្រងស្លឹកពាក្យបណ្តឹងការចំណាយនិងបញ្ជីបើកប្រាក់ខែ
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",បង្កើតកំណត់ត្រាបុគ្គលិកដើម្បីគ្រប់គ្រងស្លឹកពាក្យបណ្តឹងការចំណាយនិងបញ្ជីបើកប្រាក់ខែ
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,បន្ថែមទៅមូលដ្ឋានចំណេះដឹង
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ការសរសេរសំណើរ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ការដកហូតចូលការទូទាត់
@@ -655,8 +659,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ទំនាក់ទំនងជាមួយ Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,កម្មវិធីគ្រប់គ្រង
 DocType: Payment Entry,Payment From / To,ការទូទាត់ពី / ទៅ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ជួរកាលបរិច្ឆេទ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
 DocType: SMS Settings,Receiver Parameter,អ្នកទទួលប៉ារ៉ាម៉ែត្រ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;ដោយផ្អែកលើ &quot;និង&quot; ក្រុមតាម&#39; មិនអាចជាដូចគ្នា
@@ -666,7 +669,7 @@
 DocType: Issue,Resolution Date,ការដោះស្រាយកាលបរិច្ឆេទ
 DocType: Student Batch Name,Batch Name,ឈ្មោះបាច់
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet បង្កើត:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ចុះឈ្មោះ
 DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,នឹងបង្ហាញនិស្សិតដូចមានបង្ហាញក្នុងរបាយការណ៍ប្រចាំខែរបស់សិស្សចូលរួម
@@ -708,7 +711,7 @@
 DocType: Student Attendance,Student Attendance,ការចូលរួមរបស់សិស្ស
 DocType: Sales Invoice Timesheet,Time Sheet,តារាងពេលវេលា
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush វត្ថុធាតុដើមដែលមានមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,សូមបញ្ចូលសេចក្ដីលម្អិតធាតុ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,សូមបញ្ចូលសេចក្ដីលម្អិតធាតុ
 DocType: Interest,Interest,ការប្រាក់
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ការលក់ជាមុន
 DocType: Purchase Receipt,Other Details,ពត៌មានលំអិតផ្សេងទៀត
@@ -726,7 +729,7 @@
 ,Absent Student Report,របាយការណ៍សិស្សអវត្តមាន
 DocType: Email Digest,Next email will be sent on:,អ៊ីម៉ែលបន្ទាប់នឹងត្រូវបានផ្ញើនៅលើ:
 DocType: Offer Letter Term,Offer Letter Term,ផ្តល់ជូននូវលិខិតអាណត្តិ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ធាតុ {0} មិនបានរកឃើញ
 DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ក្រុមហ៊ុន {0} មិនមានទេ
@@ -735,7 +738,6 @@
 DocType: Serial No,Warranty Expiry Date,ការធានាកាលបរិច្ឆេទផុតកំណត់
 DocType: Material Request Item,Quantity and Warehouse,បរិមាណនិងឃ្លាំង
 DocType: Sales Invoice,Commission Rate (%),អត្រាប្រាក់កំរៃ (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារសម្រាប់ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,សូមជ្រើសកម្មវិធី
 DocType: Project,Estimated Cost,តំលៃ
 DocType: Purchase Order,Link to material requests,តំណភ្ជាប់ទៅនឹងសំណើសម្ភារៈ
@@ -753,7 +755,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Mode of Payment Account,Default Account,គណនីលំនាំដើម
 DocType: Payment Entry,Received Amount (Company Currency),ទទួលបានចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,សូមជ្រើសយកថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
 DocType: Production Order Operation,Planned End Time,ពេលវេលាដែលបានគ្រោងបញ្ចប់
 ,Sales Person Target Variance Item Group-Wise,ការលក់បុគ្គលធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
@@ -817,7 +819,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
 DocType: Request for Quotation Supplier,Send Email,ផ្ញើអ៊ីមែល
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,គ្មានសិទ្ធិ
 DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
@@ -830,7 +832,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,រកមិនឃើញបុគ្គលិក
 DocType: Supplier Quotation,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,និស្សិតក្រុមត្រូវបានធ្វើបច្ចុប្បន្នភាពរួចទៅហើយ។
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,និស្សិតក្រុមត្រូវបានធ្វើបច្ចុប្បន្នភាពរួចទៅហើយ។
 DocType: SMS Center,All Customer Contact,ទាំងអស់ទំនាក់ទំនងអតិថិជន
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,ផ្ទុកឡើងសមតុល្យភាគហ៊ុនតាមរយៈ CSV ។
 DocType: Warehouse,Tree Details,ដើមឈើលំអិត
@@ -841,8 +843,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ចំនួនវិក័យប័ត្រអប្បបរមា
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: មជ្ឈមណ្ឌលតម្លៃ {2} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: គណនី {2} មិនអាចជាក្រុមមួយ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ធាតុជួរដេក {idx}: {} {DOCNAME DOCTYPE} មិនមាននៅក្នុងខាងលើ &#39;{DOCTYPE}&#39; តុ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ធាតុជួរដេក {idx}: {} {DOCNAME DOCTYPE} មិនមាននៅក្នុងខាងលើ &#39;{DOCTYPE}&#39; តុ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,គ្មានភារកិច្ច
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលវិក័យប័ត្រដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឧ 05, 28 ល"
 DocType: Asset,Opening Accumulated Depreciation,រំលស់បង្គរបើក
@@ -858,7 +860,7 @@
 DocType: Bin,Moving Average Rate,ការផ្លាស់ប្តូរអត្រាការប្រាក់ជាមធ្យម
 DocType: Production Planning Tool,Select Items,ជ្រើសធាតុ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},ប្រឆាំងនឹង {0} {1} របស់លោក Bill ចុះថ្ងៃទី {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,កាលវិភាគការពិតណាស់
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,កាលវិភាគការពិតណាស់
 DocType: Maintenance Visit,Completion Status,ស្ថានភាពបញ្ចប់
 DocType: HR Settings,Enter retirement age in years,បញ្ចូលអាយុចូលនិវត្តន៍នៅក្នុងប៉ុន្មានឆ្នាំ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,គោលដៅឃ្លាំង
@@ -866,7 +868,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាតឱ្យមានការចែកចាយឬទទួលបានជាងរីករាយជាមួយនឹងភាគរយ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ក្រុមធាតុទាំងអស់
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ក្រុមធាតុទាំងអស់
 DocType: Process Payroll,Activity Log,សកម្មភាពកំណត់ហេតុ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
@@ -877,7 +879,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ដីកាបង្គាប់ឱ្យទូទាត់ការទិញ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ការព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;ការបើក&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ការបើកចំហរដើម្បីធ្វើ
 DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
@@ -893,7 +895,7 @@
 DocType: Item Reorder,Re-Order Qty,ដីកាសម្រេច Qty ឡើងវិញ
 DocType: Leave Block List Date,Leave Block List Date,ទុកឱ្យបញ្ជីប្លុកកាលបរិច្ឆេទ
 DocType: Pricing Rule,Price or Discount,ថ្លៃឬការបញ្ចុះតម្លៃ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ការចោទប្រកាន់អនុវត្តសរុបនៅក្នុងការទិញតារាងការទទួលធាតុត្រូវដូចគ្នាដែលជាពន្ធសរុបនិងការចោទប្រកាន់
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ការចោទប្រកាន់អនុវត្តសរុបនៅក្នុងការទិញតារាងការទទួលធាតុត្រូវដូចគ្នាដែលជាពន្ធសរុបនិងការចោទប្រកាន់
 DocType: Sales Team,Incentives,ការលើកទឹកចិត្ត
 DocType: SMS Log,Requested Numbers,លេខដែលបានស្នើ
 DocType: Production Planning Tool,Only Obtain Raw Materials,មានតែវត្ថុធាតុដើមទទួល
@@ -951,8 +953,7 @@
 DocType: Supplier,Default Payable Accounts,គណនីទូទាត់លំនាំដើម
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
 DocType: Fee Structure,Components,សមាសភាគ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
@@ -1004,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ជួរដេក {0}: ការទូទាត់ប្រឆាំងនឹងការលក់ / ការបញ្ជាទិញគួរតែងតែត្រូវបានសម្គាល់ជាមុន
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,គីមី
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,គណនីធនាគារ / សាច់ប្រាក់លំនាំដើមនឹងត្រូវបានធ្វើឱ្យទាន់សម័យដោយស្វ័យប្រវត្តិនៅពេលដែលប្រាក់ Journal Entry របៀបនេះត្រូវបានជ្រើស។
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ចន្លោះពេលសម្រាប់ថ្នាក់ទីក្រម {0} ស៊ីគ្នាជាមួយចន្លោះពេលរៀនថ្នាក់ទីសម្រាប់ថ្នាក់ផ្សេងទៀត។ សូមពិនិត្យមើលចន្លោះពេល {0} និង {1} និងព្យាយាមម្ដងទៀត
 DocType: BOM,Raw Material Cost(Company Currency),តម្លៃវត្ថុធាតុដើម (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ជួរដេក # {0}: អត្រាការប្រាក់មិនអាចច្រើនជាងអត្រាដែលបានប្រើនៅ {1} {2}
@@ -1017,7 +1016,7 @@
 DocType: BOM Website Item,BOM Website Item,ធាតុគេហទំព័រ Bom
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
 DocType: Timesheet Detail,Bill,វិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,សេត
 DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ជួរដេក {0}: Qty មិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅក្នុងប្រកាសពេលនៃធាតុ ({2} {3})
@@ -1031,7 +1030,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ប្រភេទការបញ្ជាទិញត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,បើក Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: Student Batch Name,Student Batch Name,ឈ្មោះបាច់សិស្ស
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
 DocType: Repayment Schedule,Balance Loan Amount,តុល្យភាពប្រាក់កម្ចីចំនួនទឹកប្រាក់
@@ -1051,10 +1050,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},សូមបញ្ជាក់ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} មិនអាចជាអវិជ្ជមាន
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,បញ្ចុះតំលៃ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,បញ្ចុះតំលៃ
 DocType: Asset,Total Number of Depreciations,ចំនួនសរុបនៃការធ្លាក់ថ្លៃ
 DocType: Sales Invoice Item,Rate With Margin,អត្រាជាមួយនឹងរឹម
 DocType: Workstation,Wages,ប្រាក់ឈ្នួល
@@ -1082,7 +1081,7 @@
 DocType: Lead,Organization Name,ឈ្មោះអង្គភាព
 DocType: Tax Rule,Shipping State,រដ្ឋការដឹកជញ្ជូន
 ,Projected Quantity as Source,បរិមាណដែលត្រូវទទួលទានបានព្យាករថាជាប្រភព
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,រួមបញ្ចូលធាតុដែលមិនមែនភាគហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ចំណាយការលក់
@@ -1090,7 +1089,7 @@
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,លេខកូដតំបន់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,លេខកូដតំបន់
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
 DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
@@ -1132,7 +1131,7 @@
 DocType: Sales Partner,Distributor,ចែកចាយ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ផលិតកម្មលំដាប់ {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
 ,Ordered Items To Be Billed,ធាតុបញ្ជាឱ្យនឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ពីជួរមានដើម្បីឱ្យមានតិចជាងដើម្បីជួរ
 DocType: Global Defaults,Global Defaults,លំនាំដើមជាសកល
@@ -1167,11 +1166,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបានលេខបាច់
 DocType: Stock Settings,Default Item Group,លំនាំដើមធាតុគ្រុប
 DocType: Employee Loan,Partially Disbursed,ផ្តល់ឱ្រយអតិថិជនដោយផ្នែក
-DocType: Grading Structure,Grading System Name,ប្រព័ន្ធដាក់ពិន្ទុឈ្មោះ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
 DocType: Account,Balance Sheet,តារាងតុល្យការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",របៀបក្នុងការទូទាត់ត្រូវបានមិនបានកំណត់រចនាសម្ព័ន្ធ។ សូមពិនិត្យមើលថាតើគណនីត្រូវបានកំណត់នៅលើរបៀបនៃការទូទាត់ឬនៅលើប្រវត្តិរូបម៉ាស៊ីនឆូតកាត។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",របៀបក្នុងការទូទាត់ត្រូវបានមិនបានកំណត់រចនាសម្ព័ន្ធ។ សូមពិនិត្យមើលថាតើគណនីត្រូវបានកំណត់នៅលើរបៀបនៃការទូទាត់ឬនៅលើប្រវត្តិរូបម៉ាស៊ីនឆូតកាត។
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,មនុស្សម្នាក់ដែលលក់របស់អ្នកនឹងទទួលបាននូវការរំលឹកមួយនៅលើកាលបរិច្ឆេទនេះដើម្បីទាក់ទងអតិថិជន
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ធាតុដូចគ្នាមិនអាចត្រូវបានបញ្ចូលច្រើនដង។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
@@ -1208,11 +1206,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ការងារធ្វើ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,សូមបញ្ជាក់គុណលក្ខណៈយ៉ាងហោចណាស់មួយនៅក្នុងតារាងលក្ខណៈ
 DocType: Announcement,All Students,និស្សិតទាំងអស់
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,មើលសៀវភៅ
 DocType: Grading Scale,Intervals,ចន្លោះពេល
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,លេខទូរស័ព្ទចល័តរបស់សិស្ស
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,នៅសល់នៃពិភពលោក
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ធាតុនេះ {0} មិនអាចមានបាច់
@@ -1252,8 +1250,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},មិនអនុញ្ញាតឱ្យកែគណនីកក {0}
 DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ការបញ្ជាទិញជួយអ្នកមានគម្រោងនិងតាមដាននៅលើការទិញរបស់អ្នក
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ការបញ្ជាទិញជួយអ្នកមានគម្រោងនិងតាមដាននៅលើការទិញរបស់អ្នក
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ខ្នាតតូច
@@ -1277,7 +1275,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
 DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
@@ -1294,7 +1292,7 @@
 DocType: Student Group Student,Group Roll Number,លេខវិលគ្រុប
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,សរុបនៃភារកិច្ចទាំងអស់គួរតែមានទម្ងន់ 1. សូមលៃតម្រូវត្រូវមានភារកិច្ចគម្រោងទម្ងន់ទាំងអស់ទៅតាម
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,ធាតុ {0} ត្រូវតែជាធាតុអនុចុះកិច្ចសន្យា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ឧបករណ៍រាជធានី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
@@ -1321,7 +1319,7 @@
 DocType: Depreciation Schedule,Journal Entry,ធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ធាតុនៅក្នុងការរីកចំរើន
 DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
-DocType: Grade Interval,Grade Code,កូដថ្នាក់ទី
+DocType: Grading Scale Interval,Grade Code,កូដថ្នាក់ទី
 DocType: POS Item Group,POS Item Group,គ្រុបធាតុម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
@@ -1337,7 +1335,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ផ្នែករឹង
 DocType: Sales Order,Recurring Upto,រីករាយជាមួយនឹងកើតឡើង
 DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ឯកសិទ្ធិចាកចេញ
 DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទផ្គត់ផ្គង់វិក័យប័ត្រ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,អ្នកត្រូវអនុញ្ញាតកន្រ្តកទំនិញ
@@ -1353,7 +1351,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,អាហារ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ជួរ Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,គ្មានការមើល
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,លោក Mark ការចូលរួម
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,លោក Mark ការចូលរួម
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},កាលវិភាគថែរក្សា {0} ដែលមានការប្រឆាំងនឹង {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,សិស្សចុះឈ្មោះ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},រូបិយប័ណ្ណនៃគណនីបិទត្រូវតែជា {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ផលបូកនៃចំនួនពិន្ទុសម្រាប់ការគ្រាប់បាល់បញ្ចូលទីទាំងអស់គួរតែ 100. វាជា {0}
@@ -1402,13 +1401,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,គំនូសតាងគណនី
 DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Detail,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
 DocType: Pricing Rule,"Higher the number, higher the priority","ខ្ពស់ជាងចំនួន, ខ្ពស់ជាងអាទិភាព"
 ,Purchase Invoice Trends,ទិញវិក័យប័ត្រនិន្នាការ
 DocType: Employee,Better Prospects,ទស្សនវិស័យល្អប្រសើរជាងមុន
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ជួរដេក # {0}: បាច់នេះ {1} មានតែ {2} qty ។ សូមជ្រើសក្រុមមួយផ្សេងទៀតដែលមាន {3} qty អាចប្រើបានឬបំបែកជួរដេកដែលបានចូលទៅក្នុងជួរដេកច្រើន, ដើម្បីរំដោះ / បញ្ហាពីជំនាន់ច្រើន"
 DocType: Vehicle,License Plate,ស្លាកលេខ
 DocType: Appraisal,Goals,គ្រាប់បាល់បញ្ចូលទី
 DocType: Warranty Claim,Warranty / AMC Status,ការធានា / ស្ថានភាព AMC
@@ -1426,7 +1426,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើគណនីគឺជាការកកធាតុត្រូវបានអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដាក់កម្រិត។
 DocType: Email Digest,Bank Balance,ធនាគារតុល្យភាព
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",ទម្រង់យ៉ូបបានទាមទារលក្ខណៈសម្បត្តិល
 DocType: Journal Entry Account,Account Balance,សមតុល្យគណនី
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
@@ -1437,7 +1437,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,"បង្ហាញសមតុល្យ, P &amp; L កាលពីឆ្នាំសារពើពន្ធរបស់មិនបិទ"
 DocType: Shipping Rule,Shipping Account,គណនីលើការដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: គណនី {2} អសកម្ម
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ធ្វើឱ្យការបញ្ជាទិញលក់ដើម្បីជួយអ្នកមានគម្រោងការងាររបស់អ្នកនិងផ្តល់នូវនៅលើពេលវេលា
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ធ្វើឱ្យការបញ្ជាទិញលក់ដើម្បីជួយអ្នកមានគម្រោងការងាររបស់អ្នកនិងផ្តល់នូវនៅលើពេលវេលា
 DocType: Quality Inspection,Readings,អាន
 DocType: Stock Entry,Total Additional Costs,ការចំណាយបន្ថែមទៀតសរុប
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1448,7 @@
 DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
 DocType: Asset Movement,Stock Manager,ភាគហ៊ុនប្រធានគ្រប់គ្រង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ឃ្លាំងប្រភពចាំបាច់សម្រាប់ជួរ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ការិយាល័យសំរាប់ជួល
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូលបានបរាជ័យ!
@@ -1474,7 +1474,7 @@
 DocType: Sales Invoice,Source,ប្រភព
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,បង្ហាញបានបិទ
 DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ទ្រព្យសម្បត្តិប្រភេទជាការចាំបាច់សម្រាប់ធាតុទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ទ្រព្យសម្បត្តិប្រភេទជាការចាំបាច់សម្រាប់ធាតុទ្រព្យសកម្មថេរ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},នេះ {0} ជម្លោះជាមួយ {1} សម្រាប់ {2} {3}
 DocType: Student Attendance Tool,Students HTML,សិស្សរបស់ HTML
@@ -1492,7 +1492,7 @@
 DocType: Student,Date of Leaving,កាលបរិច្ឆេទនៃការចាកចេញ
 DocType: Pricing Rule,For Price List,សម្រាប់តារាងតម្លៃ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ស្វែងរកប្រតិបត្តិ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,បង្កើតនាំទៅរក
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,បង្កើតនាំទៅរក
 DocType: Maintenance Schedule,Schedules,កាលវិភាគ
 DocType: Purchase Invoice Item,Net Amount,ចំនួនទឹកប្រាក់សុទ្ធ
 DocType: Purchase Order Item Supplied,BOM Detail No,ពត៌មានលំអិត Bom គ្មាន
@@ -1520,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,ការចុះឈ្មោះចូលរៀនកម្មវិធី
 DocType: Sales Invoice Item,Brand Name,ឈ្មោះម៉ាក
 DocType: Purchase Receipt,Transporter Details,សេចក្ដីលម្អិតដឹកជញ្ជូន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ប្រអប់
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ហាងទំនិញដែលអាចធ្វើបាន
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,អង្គការ
@@ -1553,7 +1553,7 @@
 DocType: Quality Inspection Reading,Reading 4,ការអានទី 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Bom លំនាំដើមសម្រាប់ {0} មិនត្រូវបានរកឃើញសម្រាប់គម្រោង {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ពាក្យបណ្តឹងសម្រាប់ការចំណាយរបស់ក្រុមហ៊ុន។
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",និស្សិតត្រូវបាននៅក្នុងបេះដូងនៃប្រព័ន្ធនេះបន្ថែមសិស្សទាំងអស់របស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",និស្សិតត្រូវបាននៅក្នុងបេះដូងនៃប្រព័ន្ធនេះបន្ថែមសិស្សទាំងអស់របស់អ្នក
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ជួរដេក # {0}: កាលបរិច្ឆេទបោសសំអាត {1} មិនអាចមានមុនពេលកាលបរិច្ឆេទមូលប្បទានប័ត្រ {2}
 DocType: Company,Default Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកលំនាំដើម
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ជួរដេក {0}: ពីពេលវេលានិងពេលវេលានៃ {1} ត្រូវបានត្រួតស៊ីគ្នាជាមួយ {2}
@@ -1565,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ផ្ញើការទូទាត់អ៊ីម៉ែល
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ភារកិច្ចថ្មី
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ចូរធ្វើសម្រង់
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ចូរធ្វើសម្រង់
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,របាយការណ៍ផ្សេងទៀត
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ការឈប់សម្រាកនៃប្រភេទ {0} មិនអាចមានយូរជាង {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការធ្វើផែនការប្រតិបត្ដិការសម្រាប់ការព្យាយាមរបស់ X នៅមុនថ្ងៃ។
 DocType: HR Settings,Stop Birthday Reminders,បញ្ឈប់ការរំលឹកខួបកំណើត
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
 DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ស្វែងរកធាតុ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,ស្វែងរកធាតុ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ចំនួនទឹកប្រាក់ដែលគេប្រើប្រាស់
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
 DocType: Assessment Plan,Grading Scale,ធ្វើមាត្រដ្ឋានពិន្ទុ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,បានបញ្ចប់រួចទៅហើយ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ស្នើសុំការទូទាត់រួចហើយ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
@@ -1616,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ប្រមូល
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
 DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,អ្នកមិនអាចលុបឆ្នាំសារពើពន្ធ {0} ។ ឆ្នាំសារពើពន្ធ {0} ត្រូវបានកំណត់ជាលំនាំដើមនៅក្នុងការកំណត់សកល
 DocType: Journal Entry,Entry Type,ប្រភេទធាតុ
 ,Customer Credit Balance,សមតុល្យឥណទានអតិថិជន
@@ -1656,7 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,កំពុងសិក្សានៅក្នុងវិទ្យាស្ថានដូចគ្នា
 DocType: Territory,Territory Manager,កម្មវិធីគ្រប់គ្រងទឹកដី
 DocType: Packed Item,To Warehouse (Optional),ទៅឃ្លាំង (ជាជម្រើស)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 DocType: Payment Entry,Paid Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបង់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Purchase Invoice,Additional Discount,បញ្ចុះតំលៃបន្ថែម
 DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
@@ -1666,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,មើលក្នុងកន្ត្រកទំនិញ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ចំណាយទីផ្សារ
 ,Item Shortage Report,របាយការណ៍កង្វះធាតុ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,សម្ភារៈស្នើសុំប្រើដើម្បីធ្វើឱ្យផ្សារហ៊ុននេះបានចូល
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,កាលបរិច្ឆេទគឺបន្ទាប់រំលស់ចាំបាច់សម្រាប់ទ្រព្យថ្មី
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,កាលបរិច្ឆេទគឺបន្ទាប់រំលស់ចាំបាច់សម្រាប់ទ្រព្យថ្មី
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ក្រុមដែលមានមូលដ្ឋាននៅជំនាន់ការពិតណាស់ការដាច់ដោយឡែកសម្រាប់គ្រប់
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,អង្គភាពតែមួយនៃធាតុមួយ។
 DocType: Fee Category,Fee Category,ចំណាត់ថ្នាក់ថ្លៃសេវា
@@ -1684,8 +1683,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: មជ្ឈមណ្ឌលតម្លៃត្រូវបានទាមទារសម្រាប់ &#39;ប្រាក់ចំណេញនិងការបាត់បង់&#39; គណនី {2} ។ សូមបង្កើតមជ្ឈមណ្ឌលតម្លៃលំនាំដើមសម្រាប់ក្រុមហ៊ុន។
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ទំនាក់ទំនងថ្មី
 DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
 DocType: Quality Inspection Reading,Reading 2,ការអាន 2
@@ -1712,20 +1710,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ការផ្សះផ្សា JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
 DocType: Purchase Invoice Item,Batch No,បាច់គ្មាន
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1} សម្រាប់កាលបរិច្ឆេទសំខាន់ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញការលក់ការទិញសណ្តាប់ធ្នាប់ជាច្រើនប្រឆាំងនឹងអតិថិជនរបស់មួយ
 DocType: Student Group Instructor,Student Group Instructor,ក្រុមនិស្សិតគ្រូបង្រៀន
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ទូរស័ព្ទដៃគ្មាន
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ដើមចម្បង
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,វ៉ារ្យ៉ង់
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ដើមចម្បង
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,វ៉ារ្យ៉ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
 DocType: Employee Attendance Tool,Employees HTML,និយោជិករបស់ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
 DocType: Employee,Leave Encashed?,ទុកឱ្យ Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាសក្នុងវាលពីគឺចាំបាច់
 DocType: Email Digest,Annual Expenses,ការចំណាយប្រចាំឆ្នាំ
 DocType: Item,Variants,វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
 DocType: SMS Center,Send To,បញ្ជូនទៅ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
@@ -1743,7 +1740,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,វាយតម្ល្រ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},គ្មានបានចូលស្ទួនសៀរៀលសម្រាប់ធាតុ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,លក្ខខណ្ឌមួយសម្រាប់វិធានការដឹកជញ្ជូនមួយ
-DocType: Grading Structure,Grading Intervals,ចន្លោះពេលការដាក់ពិន្ទុ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,សូមបញ្ចូល
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","មិនអាច overbill សម្រាប់ធាតុនៅ {0} {1} ជួរដេកច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យការវិក័យប័ត្រ, សូមកំណត់នៅក្នុងការកំណត់ការទិញ"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,សូមកំណត់តម្រងដែលមានមូលដ្ឋានលើធាតុឬឃ្លាំង
@@ -1756,16 +1752,17 @@
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ការទូទាត់
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,គ្រប់គ្រងការបញ្ជាទិញរបស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,គ្រប់គ្រងការបញ្ជាទិញរបស់អ្នក
 DocType: Production Order Operation,Actual Time and Cost,ពេលវេលាពិតប្រាកដនិងការចំណាយ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ស្នើសុំសម្ភារៈនៃអតិបរមា {0} អាចត្រូវបានធ្វើឡើងសម្រាប់ធាតុ {1} នឹងដីកាសម្រេចលក់ {2}
 DocType: Employee,Salutation,ពាក្យសួរសុខទុក្ខ
 DocType: Course,Course Abbreviation,អក្សរកាត់ការពិតណាស់
 DocType: Student Leave Application,Student Leave Application,កម្មវិធីទុកឱ្យសិស្ស
 DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},បុគ្គលិក {0} នៅថ្ងៃពាក់កណ្តាលនៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ម៉ោងធ្វើការសរុបមិនគួរត្រូវបានធំជាងម៉ោងធ្វើការអតិបរមា {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,នៅថ្ងៃទី
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ធាតុបាច់នៅក្នុងពេលនៃការលក់។
 DocType: Quotation Item,Actual Qty,ជាក់ស្តែ Qty
 DocType: Sales Invoice Item,References,ឯកសារយោង
@@ -1775,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នកបានបញ្ចូលធាតុស្ទួន។ សូមកែតម្រូវនិងព្យាយាមម្ដងទៀត។
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,រង
 DocType: Asset Movement,Asset Movement,ចលនាទ្រព្យសម្បត្តិ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,រទេះថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,រទេះថ្មី
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ធាតុ {0} គឺមិនមែនជាធាតុសៀរៀល
 DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
 DocType: Vehicle,Wheels,កង់
@@ -1807,9 +1804,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,មិនអនុញ្ញាតការបង្កើតនៃការពេលវេលាដែលនឹងដីកាកំណត់ហេតុផលិតកម្ម។ ប្រតិបត្ដិការនឹងមិនត្រូវបានតាមដានប្រឆាំងនឹងដីកាសម្រេចរបស់ផលិតកម្ម
 DocType: Student,Student Mobile Number,លេខទូរស័ព្ទរបស់សិស្ស
 DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,លេខសម្គាល់បាច់ជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,លេខសម្គាល់បាច់ជាការចាំបាច់
 DocType: Sales Person,Parent Sales Person,ឪពុកម្តាយរបស់បុគ្គលលក់
 DocType: Purchase Invoice,Recurring Invoice,វិក័យប័ត្រកើតឡើង
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ការគ្រប់គ្រងគម្រោង
@@ -1817,7 +1814,7 @@
 DocType: Budget,Fiscal Year,ឆ្នាំសារពើពន្ធ
 DocType: Vehicle Log,Fuel Price,តម្លៃប្រេងឥន្ធនៈ
 DocType: Budget,Budget,ថវិការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹង {0}, ដែលជាវាមិនមែនជាគណនីដែលមានប្រាក់ចំណូលឬការចំណាយ"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,សម្រេចបាន
 DocType: Student Admission,Application Form Route,ពាក្យស្នើសុំផ្លូវ
@@ -1847,7 +1844,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ចំនួនទឹកប្រាក់ {0} {1} បានកាត់ប្រឆាំងនឹង {2}
 DocType: Employee,Salary Information,ពត៌មានប្រាក់បៀវត្ស
 DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
 DocType: Website Item Group,Website Item Group,វេបសាយធាតុគ្រុប
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,ភារកិច្ចនិងពន្ធ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
@@ -1904,7 +1901,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ប្រាក់ចំណូលគយបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ត្រូវតែមានតួនាទីជា &quot;អ្នកអនុម័តការចំណាយ&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,គូ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
 DocType: Asset,Depreciation Schedule,កាលវិភាគរំលស់
 DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំងនឹងគណនី
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ថ្ងៃពាក់កណ្តាលកាលបរិច្ឆេទគួរត្រូវបានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
@@ -1921,13 +1918,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
 ,Quotation Trends,សម្រង់និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
 DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
 DocType: Purchase Order,Delivered,បានបញ្ជូន
 ,Vehicle Expenses,ចំណាយយានយន្ត
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
+DocType: Serial No,Invoice Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
 DocType: Purchase Receipt,Vehicle Number,ចំនួនរថយន្ត
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងវិក្កយបត្របញ្ឈប់ការ
 DocType: Employee Loan,Loan Amount,ចំនួនប្រាក់កម្ចី
@@ -1950,7 +1948,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ជាក្រុមការមិនគ្រុប
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,កីឡា
 DocType: Loan Type,Loan Name,ឈ្មោះសេវាឥណទាន
@@ -1961,6 +1959,7 @@
 ,Customer Acquisition and Loyalty,ការទិញរបស់អតិថិជននិងភាពស្មោះត្រង់
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ឃ្លាំងដែលជាកន្លែងដែលអ្នកត្រូវបានរក្សាឱ្យបាននូវភាគហ៊ុនរបស់ធាតុដែលបានច្រានចោល
 DocType: Production Order,Skip Material Transfer,រំលងសម្ភារៈផ្ទេរ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1} សម្រាប់កាលបរិច្ឆេទគន្លឹះ {2} ។ សូមបង្កើតកំណត់ត្រាប្តូររូបិយប័ណ្ណដោយដៃ
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,កាលពីឆ្នាំហិរញ្ញវត្ថុរបស់អ្នកនឹងបញ្ចប់នៅថ្ងៃ
 DocType: POS Profile,Price List,តារាងតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ឥឡូវនេះជាលំនាំដើមឆ្នាំសារពើពន្ធនេះ។ សូមធ្វើឱ្យកម្មវិធីរុករករបស់អ្នកសម្រាប់ការផ្លាស់ប្តូរមានប្រសិទ្ធិភាព។
@@ -1998,9 +1997,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,ធាតុ {0} ត្រូវបានត្រឡប់មកវិញរួចហើយ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ឆ្នាំសារពើពន្ធឆ្នាំ ** តំណាងឱ្យហិរញ្ញវត្ថុ។ ការបញ្ចូលគណនីទាំងអស់និងប្រតិបត្តិការដ៏ធំមួយផ្សេងទៀតត្រូវបានតាមដានការប្រឆាំងនឹងឆ្នាំសារពើពន្ធ ** ** ។
 DocType: Opportunity,Customer / Lead Address,អតិថិជន / អ្នកដឹកនាំការអាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
 DocType: Student Admission,Eligibility,សិទ្ធិទទួលបាន
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",ការនាំមុខជួយឱ្យអ្នកទទួលអាជីវកម្មការបន្ថែមទំនាក់ទំនងរបស់អ្នកទាំងអស់និងច្រើនទៀតតម្រុយរបស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",ការនាំមុខជួយឱ្យអ្នកទទួលអាជីវកម្មការបន្ថែមទំនាក់ទំនងរបស់អ្នកទាំងអស់និងច្រើនទៀតតម្រុយរបស់អ្នក
 DocType: Production Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
 DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
@@ -2039,7 +2038,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ជ្រើសក្រុមហ៊ុន ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
 DocType: Process Payroll,Fortnightly,ពីរសប្តាហ៍
 DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
@@ -2055,7 +2054,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,មិនអាចជ្រើសប្រភេទការចោទប្រកាន់ថាជា &quot;នៅលើចំនួនជួរដេកមុន &#39;ឬ&#39; នៅលើជួរដេកសរុបមុន&quot; សម្រាប់ជួរដេកដំបូង
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ធាតុកូនមិនគួរជាផលិតផលកញ្ចប់។ សូមយកធាតុ `{0}` និងរក្សាទុក
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,វិស័យធនាគារ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,បន្ថែម Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,បន្ថែម Timesheets
 DocType: Vehicle Service,Service Item,ធាតុសេវា
 DocType: Bank Guarantee,Bank Guarantee,ការធានាពីធនាគារ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,សូមចុចលើ &#39;បង្កើតកាលវិភាគ&#39; ដើម្បីទទួលបាននូវកាលវិភាគ
@@ -2103,8 +2102,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,តម្លៃនេះនឹងមិនត្រូវបានបង្ហាញទេប្រសិនបើបញ្ជីតម្លៃគឺមិនត្រូវបានកំណត់
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,សូមបញ្ជាក់ជាប្រទេសមួយសម្រាប់វិធានការដឹកជញ្ជូននេះឬពិនិត្យមើលការដឹកជញ្ជូននៅទូទាំងពិភពលោក
 DocType: Stock Entry,Total Incoming Value,តម្លៃចូលសរុប
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
 DocType: Offer Letter Term,Offer Term,ផ្តល់ជូននូវរយៈពេល
 DocType: Quality Inspection,Quality Manager,គ្រប់គ្រងគុណភាព
@@ -2137,14 +2136,14 @@
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,អាសយដ្ឋានថ្មី
 DocType: Quality Inspection,Sample Size,ទំហំគំរូ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,សូមបញ្ចូលឯកសារបង្កាន់ដៃ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,សូមបញ្ចូលឯកសារបង្កាន់ដៃ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',សូមបញ្ជាក់ត្រឹមត្រូវមួយ &quot;ពីសំណុំរឿងលេខ&quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈមណ្ឌលការចំណាយបន្ថែមទៀតអាចត្រូវបានធ្វើឡើងនៅក្រោមការក្រុមនោះទេប៉ុន្តែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 DocType: Project,External,ខាងក្រៅ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,អ្នកប្រើនិងសិទ្ធិ
 DocType: Vehicle Log,VLOG.,Vlogging ។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ការបញ្ជាទិញផលិតកម្មបានបង្កើត: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},ការបញ្ជាទិញផលិតកម្មបានបង្កើត: {0}
 DocType: Branch,Branch,សាខា
 DocType: Guardian,Mobile Number,លេខទូរសព្ទចល័ត
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ការបោះពុម្ពនិងម៉ាក
@@ -2153,7 +2152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,គ្មានសៀរៀល {0} មិនបានរកឃើញ
 DocType: Scheduling Tool,Student Batch,បាច់សិស្ស
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,អតិថិជនរបស់អ្នក
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ធ្វើឱ្យសិស្ស
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ធ្វើឱ្យសិស្ស
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},អ្នកបានត្រូវអញ្ជើញដើម្បីសហការគ្នាលើគម្រោងនេះ: {0}
 DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ដាក់ពាក្យឥឡូវនេះ
@@ -2176,8 +2175,9 @@
 DocType: SMS Log,Sent To,ដែលបានផ្ញើទៅ
 DocType: Payment Request,Make Sales Invoice,ធ្វើឱ្យការលក់វិក័យប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,កម្មវិធី
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ទំនាក់ទំនងក្រោយកាលបរិច្ឆេទមិនអាចមានក្នុងពេលកន្លងមក
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ទំនាក់ទំនងក្រោយកាលបរិច្ឆេទមិនអាចមានក្នុងពេលកន្លងមក
 DocType: Company,For Reference Only.,ឯកសារយោងប៉ុណ្ណោះ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,ជ្រើសបាច់គ្មាន
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},មិនត្រឹមត្រូវ {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,មុនចំនួនទឹកប្រាក់
@@ -2191,7 +2191,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,សំណុំរឿងលេខមិនអាចមាន 0
 DocType: Item,Show a slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ហាងលក់
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ហាងលក់
 DocType: Serial No,Delivery Time,ម៉ោងដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing ដោយផ្អែកលើការ
 DocType: Item,End of Life,ចុងបញ្ចប់នៃជីវិត
@@ -2206,8 +2206,8 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
@@ -2218,7 +2218,7 @@
 DocType: Budget Account,Budget Account,គណនីថវិកា
 DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",មិនអាចផ្លាស់ប្តូរូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនដោយសារតែមានប្រតិបតិ្តការដែលមានស្រាប់។ ប្រតិបត្ដិការត្រូវតែត្រូវបានលុបចោលការផ្លាស់ប្តូររូបិយប័ណ្ណលំនាំដើម។
-DocType: Grade Interval,Grade Description,ថ្នាក់ទីបរិយាយ
+DocType: Grading Scale Interval,Grade Description,ថ្នាក់ទីបរិយាយ
 DocType: Stock Entry,Purchase Receipt No,គ្មានបង្កាន់ដៃទិញ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ប្រាក់ Earnest បាន
 DocType: Process Payroll,Create Salary Slip,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
@@ -2256,7 +2256,7 @@
 DocType: Upload Attendance,Attendance To Date,ចូលរួមកាលបរិច្ឆេទ
 DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
 DocType: Payment Gateway Account,Payment Account,គណនីទូទាត់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីអ្នកទទួល
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ទូទាត់បិទ
 DocType: Offer Letter,Accepted,បានទទួលយក
@@ -2269,7 +2269,7 @@
 DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,វេទិកាអ្នកប្រើ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
 DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
@@ -2283,7 +2283,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌនិង Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ឈ្មោះរបស់វិទ្យាស្ថាននេះដែលអ្នកកំពុងកំណត់ប្រព័ន្ធនេះ។
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ធាតុគណនេយ្យកករហូតដល់កាលបរិច្ឆេទនេះគ្មាននរណាម្នាក់អាចធ្វើ / កែប្រែធាតុមួយលើកលែងតែជាតួនាទីដែលបានបញ្ជាក់ខាងក្រោម។
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ស្ថានភាពគម្រោង
 DocType: UOM,Check this to disallow fractions. (for Nos),ធីកប្រអប់នេះដើម្បីមិនអនុញ្ញាតឱ្យប្រភាគ។ (សម្រាប់ Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,លំដាប់ខាងក្រោមនេះត្រូវបានបង្កើតផលិតកម្ម:
@@ -2306,6 +2306,7 @@
 DocType: Email Digest,How frequently?,តើធ្វើដូចម្តេចឱ្យបានញឹកញាប់?
 DocType: Purchase Receipt,Get Current Stock,ទទួលបានភាគហ៊ុននាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,មែកធាងនៃលោក Bill នៃសម្ភារៈ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 DocType: Student,Joining Date,កាលបរិច្ឆេទការចូលរួម
 ,Employees working on a holiday,កម្មករនិយោជិតធ្វើការនៅលើថ្ងៃឈប់សម្រាកមួយ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,លោក Mark បច្ចុប្បន្ន
@@ -2386,7 +2387,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ផលិតកម្ម
 DocType: Guardian,Occupation,ការកាន់កាប់
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ជួរដេក {0}: ចាប់ផ្តើមកាលបរិច្ឆេទត្រូវតែមុនពេលដែលកាលបរិច្ឆេទបញ្ចប់
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ជួរដេក {0}: ចាប់ផ្តើមកាលបរិច្ឆេទត្រូវតែមុនពេលដែលកាលបរិច្ឆេទបញ្ចប់
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty)
 DocType: Sales Invoice,This Document,ឯកសារនេះ
 DocType: Installation Note Item,Installed Qty,ដែលបានដំឡើង Qty
@@ -2409,7 +2410,7 @@
 DocType: Notification Control,Sales Order Message,ការលក់លំដាប់សារ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",កំណត់តម្លៃលំនាំដើមដូចជាការក្រុមហ៊ុនរូបិយប័ណ្ណបច្ចុប្បន្នឆ្នាំសារពើពន្ធល
 DocType: Payment Entry,Payment Type,ប្រភេទការទូទាត់
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,សូមជ្រើសបាច់សម្រាប់ធាតុ {0} ។ មិនអាចរកក្រុមតែមួយដែលបំពេញតម្រូវការនេះ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,សូមជ្រើសបាច់សម្រាប់ធាតុ {0} ។ មិនអាចរកក្រុមតែមួយដែលបំពេញតម្រូវការនេះ
 DocType: Process Payroll,Select Employees,ជ្រើសបុគ្គលិក
 DocType: Opportunity,Potential Sales Deal,ឥឡូវនេះការលក់មានសក្តានុពល
 DocType: Payment Entry,Cheque/Reference Date,មូលប្បទានប័ត្រ / សេចក្តីយោងកាលបរិច្ឆេទ
@@ -2426,7 +2427,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ប្រវត្តិម៉ាស៊ីនឆូតកាតសកល {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់ក្រុមហ៊ុន {1}
 DocType: Purchase Order,Ref SQ,យោង SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ជំនួសធាតុ / Bom ក្នុង BOMs ទាំងអស់
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ឯកសារបង្កាន់ដៃត្រូវជូន
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ឯកសារបង្កាន់ដៃត្រូវជូន
 DocType: Purchase Invoice Item,Received Qty,ទទួលបានការ Qty
 DocType: Stock Entry Detail,Serial No / Batch,សៀរៀលគ្មាន / បាច់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,មិនបានបង់និងការមិនផ្តល់
@@ -2439,7 +2440,7 @@
 ,To Produce,ផលិត
 apps/erpnext/erpnext/config/hr.py +93,Payroll,បើកប្រាក់បៀវត្ស
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",ចំពោះជួរដេកនៅ {0} {1} ។ ដើម្បីរួមបញ្ចូល {2} នៅក្នុងអត្រាធាតុជួរដេក {3} ត្រូវតែត្រូវបានរួមបញ្ចូល
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ធ្វើឱ្យអ្នកប្រើប្រាស់
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ធ្វើឱ្យអ្នកប្រើប្រាស់
 DocType: Packing Slip,Identification of the package for the delivery (for print),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
 DocType: Bin,Reserved Quantity,បរិមាណបំរុងទុក
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,សូមបញ្ចូលអាសយដ្ឋានអ៊ីម៉ែលត្រឹមត្រូវ
@@ -2451,11 +2452,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ពុម្ពជនពិការមិនត្រូវពុម្ពលំនាំដើម
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ការដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,ការដឹកជញ្ជូន
 DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូមមើល &quot;អត្រានៃមូលដ្ឋាននៅលើសម្ភារៈ&quot; នៅក្នុងផ្នែកទីផ្សារ
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,មុន
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ជំនាន់របស់សិស្សជួយអ្នកតាមដានការចូលរួម, ការវាយតម្លៃនិងថ្លៃសម្រាប់សិស្សនិស្សិត"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ជំនាន់របស់សិស្សជួយអ្នកតាមដានការចូលរួម, ការវាយតម្លៃនិងថ្លៃសម្រាប់សិស្សនិស្សិត"
 DocType: Payment Entry,Total Allocated Amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប
 DocType: Item Reorder,Material Request Type,ប្រភេទស្នើសុំសម្ភារៈ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ភាពត្រឹមត្រូវទិនានុប្បវត្តិធាតុសម្រាប់ប្រាក់ខែពី {0} ទៅ {1}
@@ -2478,7 +2480,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,អាសយដ្ឋានទាំងអស់។
 DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
@@ -2488,6 +2490,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',នឹងផ្ញើអ៊ីមែលអំពីព្រឹត្តិការណ៍នេះឱ្យទៅបុគ្គលិកដែលមានស្ថានភាព &quot;ការបើកចំហ&quot;
 DocType: Task,Depends on Tasks,អាស្រ័យលើភារកិច្ច
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,គ្រប់គ្រងក្រុមផ្ទាល់ខ្លួនដើមឈើ។
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ឯកសារភ្ជាប់ត្រូវបានបង្ហាញដោយមិនអាចធ្វើឱ្យរទេះដើរទិញឥវ៉ាន់
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
 DocType: Leave Control Panel,Leave Control Panel,ទុកឱ្យផ្ទាំងបញ្ជា
@@ -2500,11 +2503,10 @@
 DocType: Sales Invoice,Debit To,ឥណពន្ធដើម្បី
 DocType: Delivery Note,Required only for sample item.,បានទាមទារសម្រាប់តែធាតុគំរូ។
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ហាងទំនិញ&gt; ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},គ្មានប័ណ្ណប្រាក់ខែបានរកឃើញរវាង {0} និង {1}
 ,Pending SO Items For Purchase Request,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,សិស្សចុះឈ្មោះចូលរៀន
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
 DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
@@ -2521,7 +2523,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ផលិតផលដែលមានលក្ខណៈពិសេសគេហទំព័រ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ក្រុមការវាយតំលៃទាំងអស់
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ឈ្មោះឃ្លាំងថ្មី
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),សរុប {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),សរុប {0} ({1})
 DocType: C-Form Invoice Detail,Territory,សណ្ធានដី
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
 DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
@@ -2539,7 +2541,7 @@
 DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
 ,S.O. No.,សូលេខ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},សូមបង្កើតអតិថិជនពីអ្នកដឹកនាំការ {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},សូមបង្កើតអតិថិជនពីអ្នកដឹកនាំការ {0}
 DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ទុកឱ្យកម្មវិធីដែលមានស្ថានភាពប៉ុណ្ណោះ &#39;ត្រូវបានអនុម័ត &quot;និង&quot; បដិសេធ &quot;អាចត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},និស្សិតឈ្មោះក្រុមគឺជាការចាំបាច់ក្នុងជួរ {0}
@@ -2619,7 +2621,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
 DocType: Vehicle Service,Engine Oil,ប្រេងម៉ាស៊ីន
 DocType: Sales Invoice,Sales Team1,Team1 ការលក់
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ធាតុ {0} មិនមាន
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ធាតុ {0} មិនមាន
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
 DocType: Employee Loan,Loan Details,សេចក្ដីលម្អិតប្រាក់កម្ចី
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ជួរដេក {0}: Qty បានបញ្ចប់ត្រូវតែធំជាងសូន្យ។
@@ -2683,7 +2685,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
 DocType: Assessment Result Tool,Result HTML,លទ្ធផលរបស់ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ផុតកំណត់នៅថ្ងៃទី
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,បន្ថែមសិស្ស
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,បន្ថែមសិស្ស
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},សូមជ្រើស {0}
 DocType: C-Form,C-Form No,ទម្រង់បែបបទគ្មាន C-
 DocType: BOM,Exploded_items,Exploded_items
@@ -2747,7 +2749,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ដែនកំណត់កាត់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,យ្រប
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,មួយរយៈសិក្សាជាមួយនេះ &quot;ឆ្នាំសិក្សា&quot; {0} និង &#39;ឈ្មោះរយៈពេល&#39; {1} រួចហើយ។ សូមកែប្រែធាតុទាំងនេះនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ដូចជាមានការប្រតិបតិ្តការដែលមានស្រាប់ប្រឆាំងនឹងធាតុ {0}, អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ដូចជាមានការប្រតិបតិ្តការដែលមានស្រាប់ប្រឆាំងនឹងធាតុ {0}, អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ {1}"
 DocType: UOM,Must be Whole Number,ត្រូវតែជាលេខទាំងមូល
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,សៀរៀលគ្មាន {0} មិនមាន
@@ -2790,7 +2792,7 @@
 DocType: Supplier,Last Day of the Next Month,ចុងក្រោយកាលពីថ្ងៃនៃខែបន្ទាប់
 DocType: Support Settings,Auto close Issue after 7 days,ដោយស្វ័យប្រវត្តិបន្ទាប់ពីបញ្ហានៅជិត 7 ថ្ងៃ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានបម្រុងទុកមុន {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ពាក្យសុំរបស់សិស្ស
 DocType: Asset Category Account,Accumulated Depreciation Account,គណនីរំលស់បង្គរ
 DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
@@ -2818,8 +2820,8 @@
 DocType: Asset,Item Code,ក្រមធាតុ
 DocType: Production Planning Tool,Create Production Orders,បង្កើតការបញ្ជាទិញផលិតកម្ម
 DocType: Serial No,Warranty / AMC Details,ការធានា / AMC ពត៌មានលំអិត
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
 DocType: Lead,Market Segment,ចំណែកទីផ្សារ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
@@ -2837,7 +2839,7 @@
 DocType: Production Planning Tool,Create Material Requests,បង្កើតសម្ភារៈសំណើ
 DocType: Employee Education,School/University,សាលា / សាកលវិទ្យាល័យ University
 DocType: Payment Request,Reference Details,សេចក្តីយោងលំអិត
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
 DocType: Sales Invoice Item,Available Qty at Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំង
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
 DocType: Asset,Double Declining Balance,ការធ្លាក់ចុះទ្វេដងតុល្យភាព
@@ -2858,19 +2860,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ចំនួនទឹកប្រាក់ដែលបានចំណាយមិនអាចមានប្រាក់កម្ចីចំនួនធំជាង {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ទិញចំនួនលំដាប់ដែលបានទាមទារសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,លំដាប់ផលិតកម្មមិនត្រូវបានបង្កើត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,លំដាប់ផលិតកម្មមិនត្រូវបានបង្កើត
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;ពីកាលបរិច្ឆេទ&quot; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},មិនអាចផ្លាស់ប្តូរស្ថានភាពជានិស្សិត {0} ត្រូវបានផ្សារភ្ជាប់ជាមួយនឹងកម្មវិធីនិស្សិត {1}
 DocType: Asset,Fully Depreciated,ធ្លាក់ថ្លៃយ៉ាងពេញលេញ
 ,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,វត្តមានដែលបានសម្គាល់ជា HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",ដកស្រង់សំណើដេញថ្លៃដែលអ្នកបានផ្ញើទៅឱ្យអតិថិជនរបស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",ដកស្រង់សំណើដេញថ្លៃដែលអ្នកបានផ្ញើទៅឱ្យអតិថិជនរបស់អ្នក
 DocType: Sales Order,Customer's Purchase Order,ទិញលំដាប់របស់អតិថិជន
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,សៀរៀលទេនិងបាច់ &amp; ‧;
 DocType: Warranty Claim,From Company,ពីក្រុមហ៊ុន
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ផលបូកនៃពិន្ទុវាយតំលៃត្រូវការដើម្បីឱ្យមាន {0} ។
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,សូមកំណត់ចំនួននៃរំលស់បានកក់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,សូមកំណត់ចំនួននៃរំលស់បានកក់
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,តំលៃឬ Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,នាទី
@@ -3000,7 +3002,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ក្រុមនិស្សិត
 DocType: Shopping Cart Settings,Quotation Series,សម្រង់កម្រងឯកសារ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ធាតុមួយមានឈ្មោះដូចគ្នា ({0}), សូមផ្លាស់ប្តូរឈ្មោះធាតុឬប្ដូរឈ្មោះក្រុមធាតុ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,សូមជ្រើសអតិថិជន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,សូមជ្រើសអតិថិជន
 DocType: C-Form,I,ខ្ញុំ
 DocType: Company,Asset Depreciation Cost Center,មជ្ឈមណ្ឌលតម្លៃរំលស់ទ្រព្យសម្បត្តិ
 DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
@@ -3019,19 +3021,18 @@
 DocType: Vehicle,Insurance Details,សេចក្ដីលម្អិតការធានារ៉ាប់រង
 DocType: Account,Payable,បង់
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,សូមបញ្ចូលរយៈពេលសងប្រាក់
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),កូនបំណុល ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),កូនបំណុល ({0})
 DocType: Pricing Rule,Margin,រឹម
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,អតិថិជនថ្មី
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,កាលបរិច្ឆេទបោសសំអាត
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
 DocType: Lead,Address Desc,អាសយដ្ឋាន DESC
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,គណបក្សជាការចាំបាច់
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ប្រធានបទឈ្មោះ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,យ៉ាងហោចណាស់មួយនៃការលក់ឬទិញត្រូវតែត្រូវបានជ្រើស &amp; ‧;
-DocType: Grading Structure,Grade Intervals,ចន្លោះពេលថ្នាក់ទី
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ជ្រើសធម្មជាតិនៃអាជីវកម្មរបស់អ្នក។
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ដែលជាកន្លែងដែលប្រតិបត្ដិការផលិតត្រូវបានអនុវត្ត។
 DocType: Asset Movement,Source Warehouse,ឃ្លាំងប្រភព
@@ -3060,6 +3061,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
 DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
 DocType: Delivery Note,Transporter Info,ពត៌មាន transporter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},សូមកំណត់លំនាំដើមនៅ {0} {1} ក្រុមហ៊ុន
 DocType: Cheque Print Template,Starting position from top edge,ការចាប់ផ្តើមតំណែងពីគែមកំពូល
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ក្រុមហ៊ុនផ្គត់ផ្គង់ដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង
@@ -3113,7 +3115,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,រៀបចំ Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ការងារបច្ចុប្បន្ន
 DocType: Company,Stock Adjustment Account,គណនីកែតម្រូវភាគហ៊ុន
-DocType: Journal Entry,Write Off,បិទការសរសេរ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,បិទការសរសេរ
 DocType: Timesheet Detail,Operation ID,លេខសម្គាល់ការប្រតិបត្ដិការ
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",អ្នកប្រើប្រព័ន្ធ (ចូល) លេខសម្គាល់។ ប្រសិនបើអ្នកបានកំណត់វានឹងក្លាយជាលំនាំដើមសម្រាប់ទម្រង់ធនធានមនុស្សទាំងអស់។
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ពី {1}
@@ -3124,8 +3126,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុនផ្គត់ផ្គង់បានផ្ដល់នូវការទៅឱ្យអតិថិជន
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# សំណុំបែបបទ / ធាតុ / {0}) គឺចេញពីស្តុក
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,កាលបរិច្ឆេទបន្ទាប់ត្រូវតែធំជាងកាលបរិច្ឆេទប្រកាស
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,នាំចូលទិន្នន័យនិងការនាំចេញ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ផ្សារភាគហ៊ុនមានការប្រឆាំងនឹងធាតុឃ្លាំង {0}, ហេតុនេះអ្នកមិនអាចឡើងវិញបានផ្តល់តម្លៃឬកែប្រែវា"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,គ្មានសិស្សនិស្សិតបានរកឃើញ
@@ -3137,14 +3139,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
 DocType: Program Enrollment,School House,សាលាផ្ទះ
 DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
 DocType: Company,Default Cash Account,គណនីសាច់ប្រាក់លំនាំដើម
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់សិស្សនេះ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,គ្មានសិស្សនៅក្នុង
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,បន្ថែមធាតុបន្ថែមឬទម្រង់ពេញលេញបើកចំហ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',សូមបញ្ចូល &#39;កាលបរិច្ឆេទដឹកជញ្ជូនរំពឹងទុក &quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ភក្ដិកំណត់ត្រាកំណត់ការដឹកជញ្ជូន {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
@@ -3191,9 +3194,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,មុនពេលការផ្សះផ្សាជាតិ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ដើម្បី {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ពន្ធនិងការចោទប្រកាន់បន្ថែម (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ជួរដេកពន្ធធាតុ {0} ត្រូវតែមានគណនីនៃប្រភេទពន្ធឬប្រាក់ចំណូលឬការចំណាយឬបន្ទុក
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ជួរដេកពន្ធធាតុ {0} ត្រូវតែមានគណនីនៃប្រភេទពន្ធឬប្រាក់ចំណូលឬការចំណាយឬបន្ទុក
 DocType: Sales Order,Partly Billed,ផ្សព្វផ្សាយមួយផ្នែក
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ធាតុ {0} ត្រូវតែជាទ្រព្យសកម្មមួយដែលមានកាលកំណត់ធាតុ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ធាតុ {0} ត្រូវតែជាទ្រព្យសកម្មមួយដែលមានកាលកំណត់ធាតុ
 DocType: Item,Default BOM,Bom លំនាំដើម
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,សូមប្រភេទឈ្មោះរបស់ក្រុមហ៊ុនដើម្បីបញ្ជាក់
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,សរុបឆ្នើម AMT
@@ -3216,7 +3219,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
 DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ហាត់ការ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ឈ្មោះអាសយដ្ឋាន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,ឈ្មោះអាសយដ្ឋាន
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
 DocType: Assessment Code,Assessment Code,ក្រមការវាយតំលៃ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ជាមូលដ្ឋាន
@@ -3241,7 +3244,7 @@
 DocType: Purchase Invoice,Print Language,បោះពុម្ពភាសា
 DocType: Salary Slip,Total Working Hours,ម៉ោងធ្វើការសរុប
 DocType: Stock Entry,Including items for sub assemblies,អនុដែលរួមមានធាតុសម្រាប់សភា
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ទឹកដីទាំងអស់
 DocType: Purchase Invoice,Items,ធាតុ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,និស្សិតត្រូវបានចុះឈ្មោះរួចហើយ។
@@ -3261,17 +3264,15 @@
 DocType: Issue,Opening Time,ម៉ោងបើក
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ពីនិងដើម្បីកាលបរិច្ឆេទដែលបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់ប្តូរទំនិញនិងមូលបត្រ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
 DocType: Assessment Plan,Supervisor Name,ឈ្មោះអ្នកគ្រប់គ្រង
 DocType: Program Enrollment Course,Program Enrollment Course,កម្មវិធីវគ្គបណ្តុះបណ្តាលចុះឈ្មោះ
 DocType: Program Enrollment Course,Program Enrollment Course,កម្មវិធីវគ្គបណ្តុះបណ្តាលចុះឈ្មោះ
-DocType: Grading Structure,Grading Structure,រចនាសម្ព័ន្ធការដាក់ពិន្ទុ
 DocType: Purchase Taxes and Charges,Valuation and Total,ការវាយតម្លៃនិងសរុប
 DocType: Tax Rule,Shipping City,ការដឹកជញ្ជូនក្នុងទីក្រុង
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ធាតុនេះគឺវ៉ារ្យ៉ង់មួយនៃ {0} (គំរូ) ។ គុណលក្ខណៈដែលនឹងត្រូវបានចម្លងពីទំព័រគំរូនេះទេលុះត្រា &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
 DocType: Notification Control,Customize the Notification,ប្ដូរតាមសេចក្តីជូនដំណឹងនេះ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,លំហូរសាច់ប្រាក់ពីការប្រតិបត្ដិការ
 DocType: Sales Invoice,Shipping Rule,វិធានការដឹកជញ្ជូន
@@ -3294,6 +3295,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំចំនួនតាមរយៈការចូលរួមស៊េរីសម្រាប់ការដំឡើង&gt; លេខស៊េរី
 DocType: Leave Control Panel,Carry Forward,អនុវត្តការទៅមុខ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,មជ្ឈមណ្ឌលប្រាក់ដែលមានស្រាប់ការចំណាយដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
 DocType: Department,Days for which Holidays are blocked for this department.,ថ្ងៃដែលថ្ងៃឈប់សម្រាកត្រូវបានបិទសម្រាប់នាយកដ្ឋាននេះ។
@@ -3322,7 +3324,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),សរុប (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,"ការកំសាន្ត, ការលំហែ"
 DocType: Quality Inspection,Item Serial No,គ្មានសៀរៀលធាតុ
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,បង្កើតកំណត់ត្រាបុគ្គលិក
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,បង្កើតកំណត់ត្រាបុគ្គលិក
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,បច្ចុប្បន្នសរុប
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,របាយការណ៍គណនី
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ហួរ
@@ -3337,8 +3339,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,នេះបន្ទាប់ពីការជំនួស Bom
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ចំណុចនៃការលក់
 DocType: Payment Entry,Received Amount,ទទួលបានចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","បង្កើតសម្រាប់បរិមាណពេញលេញ, មិនអើពើនឹងការបញ្ជាទិញរួចទៅហើយបរិមាណ"
 DocType: Account,Tax,ការបង់ពន្ធ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,មិនត្រូវបានសម្គាល់
@@ -3351,7 +3351,7 @@
 DocType: Batch,Source Document Name,ឈ្មោះឯកសារប្រភព
 DocType: Batch,Source Document Name,ឈ្មោះឯកសារប្រភព
 DocType: Job Opening,Job Title,ចំណងជើងការងារ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,បង្កើតអ្នកប្រើ
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,បង្កើតអ្នកប្រើ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ក្រាម
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,សូមចូលទស្សនារបាយការណ៍សម្រាប់ការហៅថែទាំ។
@@ -3363,8 +3363,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},គណនីក្នុងការចំណាយជាការចាំបាច់សម្រាប់ធាតុ {0}
 DocType: BOM,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,វិក័យប័ត្រ
 ,Sales Register,ការលក់ចុះឈ្មោះ
@@ -3375,16 +3375,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,គ្មានអតិថិជននៅឡើយទេ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,អាជ្ញាប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
 DocType: GL Entry,Against Voucher Type,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
 DocType: Item,Attributes,គុណលក្ខណៈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
 DocType: Student,Guardian Details,កាសែត Guardian លំអិត
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,លោក Mark វត្តមានសម្រាប់បុគ្គលិកច្រើន
@@ -3408,14 +3410,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ជួរដេក {0} # គណនីត្រូវតែមានប្រភេទ &quot;ទ្រព្យ&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ចេញ Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,កម្រងឯកសារចាំបាច់
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,កម្រងឯកសារចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,សេវាហិរញ្ញវត្ថុ
 DocType: Student Sibling,Student ID,លេខសម្គាល់របស់សិស្ស
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ប្រភេទនៃសកម្មភាពសម្រាប់កំណត់ហេតុម៉ោង
 DocType: Tax Rule,Sales,ការលក់
 DocType: Stock Entry Detail,Basic Amount,ចំនួនទឹកប្រាក់ជាមូលដ្ឋាន
 DocType: Training Event,Exam,ការប្រឡង
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
 DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
 DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
@@ -3448,7 +3450,7 @@
 DocType: Payment Entry,Account Paid From,គណនីបង់ពី
 DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខកូដធាតុវត្ថុធាតុដើម
 DocType: Journal Entry,Write Off Based On,បិទការសរសេរមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ធ្វើឱ្យការនាំមុខ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ធ្វើឱ្យការនាំមុខ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,បោះពុម្ពនិងការិយាល័យ
 DocType: Stock Settings,Show Barcode Field,បង្ហាញវាលលេខកូដ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
@@ -3464,6 +3466,7 @@
 DocType: Offer Letter,Awaiting Response,រង់ចាំការឆ្លើយតប
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ខាងលើ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,និយាយពីប្រសិនបើគណនីត្រូវបង់មិនស្តង់ដារ
 DocType: Salary Slip,Earning & Deduction,ការរកប្រាក់ចំណូលនិងការកាត់បនថយ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ស្រេចចិត្ត។ ការកំណត់នេះនឹងត្រូវបានប្រើដើម្បីត្រងនៅក្នុងប្រតិបត្តិការនានា។
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
@@ -3500,7 +3503,7 @@
 DocType: Program Enrollment Tool,Get Students From,ទទួលយកសិស្សពី
 DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,បោះពុម្ពផ្សាយធាតុលើវេបសាយ
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ក្រុមនិស្សិតរបស់អ្នកនៅក្នុងជំនាន់
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ក្រុមនិស្សិតរបស់អ្នកនៅក្នុងជំនាន់
 DocType: Authorization Rule,Authorization Rule,វិធានសេចក្តីអនុញ្ញាត
 DocType: Sales Invoice,Terms and Conditions Details,លក្ខខណ្ឌពត៌មានលំអិត
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ជាក់លាក់
@@ -3560,7 +3563,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,ការសាកល្បង
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,សមាសភាគប្រាក់ខែ
 DocType: Program Enrollment Tool,New Academic Year,ឆ្នាំសិក្សាថ្មី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ការវិលត្រឡប់ / ឥណទានចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,ការវិលត្រឡប់ / ឥណទានចំណាំ
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
 DocType: Production Order Item,Transferred Qty,ផ្ទេរ Qty
@@ -3601,6 +3604,7 @@
 ,Sales Funnel,ការប្រមូលផ្តុំការលក់
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 DocType: Project,Task Progress,វឌ្ឍនភាពភារកិច្ច
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,រទេះ
 ,Qty to Transfer,qty ដើម្បីផ្ទេរ
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ដកស្រង់ដើម្បីដឹកនាំឬអតិថិជន។
 DocType: Stock Settings,Role Allowed to edit frozen stock,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលភាគហ៊ុនទឹកកក
@@ -3634,7 +3638,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ប្រមូលថ្លៃ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
 DocType: Lead,Add to calendar on this date,បញ្ចូលទៅក្នុងប្រតិទិនស្តីពីកាលបរិច្ឆេទនេះ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ក្បួនសម្រាប់ការបន្ថែមការចំណាយលើការដឹកជញ្ជូន។
 DocType: Item,Opening Stock,ការបើកផ្សារហ៊ុន
@@ -3652,7 +3656,7 @@
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 DocType: Program Enrollment Tool,Enroll Students,ចុះឈ្មោះសិស្ស
 DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ស្តង់ដាលក់
@@ -3663,7 +3667,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងការលក់វិក័យប័ត្រ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ឈ្មោះគម្រោង
-DocType: Supplier,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
+DocType: Customer,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
 DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
 DocType: Production Order,Required Items,ធាតុដែលបានទាមទារ
 DocType: Stock Ledger Entry,Stock Value Difference,ភាពខុសគ្នាតម្លៃភាគហ៊ុន
@@ -3694,6 +3698,7 @@
 DocType: Item,Taxes,ពន្ធ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,បង់និងការមិនផ្តល់
 DocType: Project,Default Cost Center,មជ្ឈមណ្ឌលតម្លៃលំនាំដើម
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារសម្រាប់ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Bank Guarantee,End Date,កាលបរិច្ឆេទបញ្ចប់
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ប្រតិបត្តិការភាគហ៊ុន
 DocType: Budget,Budget Accounts,គណនីថវិកា
@@ -3758,7 +3763,7 @@
 DocType: Customer,Sales Partner and Commission,ការលក់ដៃគូនិងគណៈកម្មការ
 DocType: Employee Loan,Rate of Interest (%) / Year,អត្រានៃការប្រាក់ (%) / ឆ្នាំ
 ,Project Quantity,បរិមាណគម្រោង
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","សរុប {0} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចជាអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","សរុប {0} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចជាអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
 DocType: Opportunity,To Discuss,ដើម្បីពិភាក្សា
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} គ្រឿង {1} ត្រូវការជាចាំបាច់ក្នុង {2} ដើម្បីបញ្ចប់ការប្រតិបត្តិការនេះ។
 DocType: Loan Type,Rate of Interest (%) Yearly,អត្រានៃការប្រាក់ (%) ប្រចាំឆ្នាំ
@@ -3781,7 +3786,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,លោក Mark អវត្តមាន
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ជួរដេក {0}: រូបិយប័ណ្ណរបស់ Bom បាន # {1} គួរតែស្មើនឹងរូបិយប័ណ្ណដែលបានជ្រើស {2}
 DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Homepage,Tag Line,បន្ទាត់ស្លាក
 DocType: Fee Component,Fee Component,សមាសភាគថ្លៃសេវា
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,គ្រប់គ្រងកងនាវា
@@ -3798,7 +3803,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ឃ្លាំង {0} មិនមាន
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ចុះឈ្មោះសម្រាប់ហាប់ ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,ចំនួនភាគរយចែកចាយប្រចាំខែ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","រកមិនឃើញអត្រានៃការវាយតម្លៃសម្រាប់ធាតុដែលបាន {0}, ដែលត្រូវបានតម្រូវឱ្យធ្វើការបញ្ចូលគណនីសម្រាប់ {1} {2} ។ បើធាតុនេះត្រូវបានប្រតិបត្តិការជាធាតុគំរូមួយនៅក្នុង {1}, សូមនិយាយថានៅក្នុង {1} តារាងធាតុ។ បើមិនដូច្នោះទេសូមបង្កើតភាគហ៊ុនប្រតិបត្តិការចូលសម្រាប់អត្រាតម្លៃធាតុឬការនិយាយនៅក្នុងកំណត់ត្រាធាតុហើយបន្ទាប់មកព្យាយាម submiting / លុបចោលធាតុនេះ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,សមា្ភារៈបានបញ្ជូន% នៃការប្រឆាំងនឹងការផ្តល់ចំណាំនេះ
 DocType: Project,Customer Details,ពត៌មានលំអិតរបស់អតិថិជន
@@ -3815,7 +3820,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ការបញ្ជាទិញដែលបានដាក់ស្នើមិនអាចត្រូវបានលុប
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,គ្រប់គ្រងគុណភាព
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Employee Loan,Repay Fixed Amount per Period,សងចំនួនថេរក្នុងមួយរយៈពេល
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},សូមបញ្ចូលបរិមាណសម្រាប់ធាតុ {0}
 DocType: Employee External Work History,Employee External Work History,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
@@ -3842,7 +3847,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,លេខសម្គាល់អ៊ីមែលរបស់សិស្ស
 DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
 DocType: Tax Rule,Sales Tax Template,ទំព័រគំរូពន្ធលើការលក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
 DocType: Employee,Encashment Date,Encashment កាលបរិច្ឆេទ
 DocType: Training Event,Internet,អ៊ីនធើណែ
 DocType: Account,Stock Adjustment,ការលៃតម្រូវភាគហ៊ុន
@@ -3876,6 +3881,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ចេញផ្សាយឥណពន្ធចំណាំ
 DocType: Production Order,Warehouses,ឃ្លាំង
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ទ្រព្យសម្បត្តិមិនអាចត្រូវបានផ្ទេរ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ធាតុនេះគឺជាការបំរែបំរួលនៃ {0} (គំរូ) ។
 DocType: Workstation,per hour,ក្នុងមួយម៉ោង
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ការទិញ
 DocType: Announcement,Announcement,សេចក្តីប្រកាស
@@ -3891,7 +3897,7 @@
 DocType: Account,Receivable,អ្នកទទួល
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ជួរដេក # {0}: មិនត្រូវបានអនុញ្ញាតឱ្យផ្លាស់ប្តូរហាងទំនិញថាជាការទិញលំដាប់រួចហើយ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យដាក់ស្នើតិបត្តិការដែលលើសពីដែនកំណត់ឥណទានបានកំណត់។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
 DocType: Item,Material Issue,សម្ភារៈបញ្ហា
 DocType: Hub Settings,Seller Description,អ្នកលក់ការពិពណ៌នាសង្ខេប
@@ -3904,7 +3910,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
 DocType: Salary Detail,Component,សមាសភាគ
 DocType: Assessment Criteria,Assessment Criteria Group,ការវាយតម្លៃលក្ខណៈវិនិច្ឆ័យជាក្រុម
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},បើករំលស់បង្គរត្រូវតែតិចជាងស្មើទៅនឹង {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},បើករំលស់បង្គរត្រូវតែតិចជាងស្មើទៅនឹង {0}
 DocType: Warehouse,Warehouse Name,ឈ្មោះឃ្លាំង
 DocType: Naming Series,Select Transaction,ជ្រើសប្រតិបត្តិការ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,សូមបញ្ចូលអនុម័តតួនាទីឬការអនុម័តរបស់អ្នកប្រើប្រាស់
@@ -3939,7 +3945,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បីកំណត់ឆ្នាំសារពើពន្ធនេះជាលំនាំដើមសូមចុចលើ &quot;កំណត់ជាលំនាំដើម &#39;
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ចូលរួមជាមួយ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,កង្វះខាត Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
 DocType: Employee Loan,Repay from Salary,សងពីប្រាក់ខែ
 DocType: Leave Application,LAP/,ភ្លៅ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ស្នើសុំការទូទាត់ប្រឆាំងនឹង {0} {1} ចំនួន {2}
@@ -3957,7 +3963,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ការវាយតំលៃលទ្ធផលលំអិត
 DocType: Employee Education,Employee Education,បុគ្គលិកអប់រំ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ធាតុស្ទួនក្រុមបានរកឃើញក្នុងតារាងក្រុមធាតុ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
 DocType: Salary Slip,Net Pay,ប្រាក់ចំណេញសុទ្ធ
 DocType: Account,Account,គណនី
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,សៀរៀល {0} គ្មានត្រូវបានទទួលរួចហើយ
@@ -3966,7 +3972,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","ឃ្លាំង {0} គឺមិនត្រូវបានភ្ជាប់ទៅគណនីណាមួយ, សូមបង្កើត / ភ្ជាប់គណនីដែលត្រូវគ្នា (ទ្រព្យសម្បត្តិ) សម្រាប់ឃ្លាំង។"
 DocType: Purchase Invoice,Recurring Id,លេខសម្គាល់កើតឡើង
 DocType: Customer,Sales Team Details,ពត៌មានលំអិតការលក់ក្រុមការងារ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,លុបជារៀងរហូត?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,លុបជារៀងរហូត?
 DocType: Expense Claim,Total Claimed Amount,ចំនួនទឹកប្រាក់អះអាងសរុប
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ឱកាសក្នុងការមានសក្តានុពលសម្រាប់ការលក់។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},មិនត្រឹមត្រូវ {0}
@@ -3977,13 +3983,14 @@
 DocType: Warehouse,PIN,ម្ជុល
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ការរៀបចំរបស់អ្នកនៅក្នុង ERPNext សាលា
 DocType: Sales Invoice,Base Change Amount (Company Currency),មូលដ្ឋានផ្លាស់ប្តូរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
 DocType: Account,Chargeable,បន្ទុក
 DocType: Company,Change Abbreviation,ការផ្លាស់ប្តូរអក្សរកាត់
 DocType: Expense Claim Detail,Expense Date,ការចំណាយកាលបរិច្ឆេទ
 DocType: Item,Max Discount (%),អតិបរមាការបញ្ចុះតម្លៃ (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,ចំនួនទឹកប្រាក់លំដាប់ចុងក្រោយ
+DocType: Task,Is Milestone,តើការវិវឌ្ឍ
 DocType: Daily Work Summary,Email Sent To,អ៊ីម៉ែលដែលបានផ្ញើទៅ
 DocType: Budget,Warn,ព្រមាន
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
@@ -4016,11 +4023,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្កកដែលមានវ័យចំណាស់ Than` ភាគហ៊ុនគួរមានទំហំតូចជាងថ្ងៃ% d ។
 DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
 ,Project wise Stock Tracking,គម្រោងផ្សារហ៊ុនដែលមានប្រាជ្ញាតាមដាន
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},កាលវិភាគថែរក្សា {0} ដែលមានការប្រឆាំងនឹង {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),ជាក់ស្តែ Qty (នៅប្រភព / គោលដៅ)
 DocType: Item Customer Detail,Ref Code,យោងលេខកូដ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,កំណត់ត្រាបុគ្គលិក។
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
 DocType: HR Settings,Payroll Settings,ការកំណត់បើកប្រាក់បៀវត្ស
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,លំដាប់ទីកន្លែង
@@ -4043,7 +4049,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,មូលប្បទានប័ត្រនិងប្រាក់បញ្ញើបានជម្រះមិនត្រឹមត្រូវ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,គណនី {0}: អ្នកមិនអាចកំណត់ដោយខ្លួនវាជាគណនីឪពុកម្តាយ
 DocType: Purchase Invoice Item,Price List Rate,តម្លៃការវាយតម្លៃបញ្ជី
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,បង្កើតសម្រង់អតិថិជន
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,បង្កើតសម្រង់អតិថិជន
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",បង្ហាញតែការ &quot;នៅក្នុងផ្សារហ៊ុន»ឬ«មិនមែននៅក្នុងផ្សារ&quot; ដោយផ្អែកលើតម្លៃភាគហ៊ុនដែលអាចរកបាននៅក្នុងឃ្លាំងនេះ។
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),វិក័យប័ត្រនៃសម្ភារៈ (Bom)
 DocType: Item,Average time taken by the supplier to deliver,ពេលមធ្យមដែលថតដោយអ្នកផ្គត់ផ្គង់ដើម្បីរំដោះ
@@ -4065,7 +4071,7 @@
 DocType: Asset,Disposal Date,បោះចោលកាលបរិច្ឆេទ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",អ៊ីមែលនឹងត្រូវបានផ្ញើទៅបុគ្គលិកសកម្មអស់ពីក្រុមហ៊ុននេះនៅម៉ោងដែលបានផ្តល់ឱ្យប្រសិនបើពួកគេមិនមានថ្ងៃឈប់សម្រាក។ សេចក្ដីសង្ខេបនៃការឆ្លើយតបនឹងត្រូវបានផ្ញើនៅកណ្តាលអធ្រាត្រ។
 DocType: Employee Leave Approver,Employee Leave Approver,ទុកឱ្យការអនុម័តបុគ្គលិក
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,មតិការបណ្តុះបណ្តាល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ផលិតកម្មលំដាប់ {0} ត្រូវតែត្រូវបានដាក់ជូន
@@ -4073,7 +4079,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ពិតណាស់គឺចាំបាច់នៅក្នុងជួរដេក {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
 DocType: Supplier Quotation Item,Prevdoc DocType,ចង្អុលបង្ហាញ Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
 DocType: Batch,Parent Batch,បាច់មាតាបិតា
 DocType: Batch,Parent Batch,បាច់មាតាបិតា
 DocType: Cheque Print Template,Cheque Print Template,ទំព័រគំរូបោះពុម្ពមូលប្បទានប័ត្រ
@@ -4117,7 +4123,7 @@
 DocType: Item,Variant Based On,វ៉ារ្យង់ដែលមានមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage សរុបដែលបានផ្ដល់គួរតែទទួលបាន 100% ។ វាគឺជា {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
 DocType: Request for Quotation Item,Supplier Part No,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រឿងបន្លាស់គ្មាន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',មិនអាចកាត់ពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;Vaulation និងសរុប
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ទទួលបានពី
@@ -4127,7 +4133,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ពី {0} {1} សម្រាប់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ជួរដេក # {0}: កំណត់ផ្គត់ផ្គង់សម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ជួរដេក {0}: តម្លៃប៉ុន្មានម៉ោងត្រូវតែធំជាងសូន្យ។
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
 DocType: Issue,Content Type,ប្រភេទមាតិការ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,កុំព្យូទ័រ
 DocType: Item,List this Item in multiple groups on the website.,រាយធាតុនេះនៅក្នុងក្រុមជាច្រើននៅលើគេហទំព័រ។
@@ -4136,20 +4142,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើឬគណនីគណបក្សរូបិយប័ណ្ណទាំង comapany លំនាំដើមរូបិយប័ណ្ណរបស់
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើឬគណនីគណបក្សរូបិយប័ណ្ណទាំង comapany លំនាំដើមរូបិយប័ណ្ណរបស់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ទុកឱ្យ Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,តើធ្វើដូចម្ដេច?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ដើម្បីឃ្លាំង
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,សិស្សទាំងអស់ការចុះឈ្មោះចូលរៀន
 ,Average Commission Rate,គណៈកម្មការជាមធ្យមអត្រាការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
 DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
 DocType: School House,House Name,ឈ្មោះផ្ទះ
 DocType: Purchase Taxes and Charges,Account Head,នាយកគណនី
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ធ្វើឱ្យទាន់សម័យការចំណាយបន្ថែមទៀតដើម្បីគណនាការចំណាយចុះចតនៃធាតុ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,អគ្គិសនី
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,បន្ថែមនៅសល់នៃអង្គការរបស់អ្នកដែលជាអ្នកប្រើរបស់អ្នក។ អ្នកអាចបន្ថែមទៅក្នុងវិបផតថលអតិថិជនដែលអញ្ជើញរបស់អ្នកដោយបន្ថែមពួកគេពីការទំនាក់ទំនង
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,បន្ថែមនៅសល់នៃអង្គការរបស់អ្នកដែលជាអ្នកប្រើរបស់អ្នក។ អ្នកអាចបន្ថែមទៅក្នុងវិបផតថលអតិថិជនដែលអញ្ជើញរបស់អ្នកដោយបន្ថែមពួកគេពីការទំនាក់ទំនង
 DocType: Stock Entry,Total Value Difference (Out - In),ភាពខុសគ្នាតម្លៃសរុប (ចេញ - ក្នុង)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,ជួរដេក {0}: អត្រាប្តូរប្រាក់គឺជាការចាំបាច់
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},លេខសម្គាល់អ្នកប្រើដែលមិនបានកំណត់សម្រាប់បុគ្គលិក {0}
@@ -4158,7 +4164,7 @@
 DocType: Item,Customer Code,លេខកូដអតិថិជន
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,កាលបរិច្ឆេទការធានារ៉ាប់រងការចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទធានារ៉ាប់រងបញ្ចប់
@@ -4173,7 +4179,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},រយៈពេលចាប់ពីនិងរយៈពេលដើម្បីកាលបរិច្ឆេទចាំបាច់សម្រាប់កើតឡើង {0}
@@ -4186,7 +4192,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Sales Invoice Timesheet,Billing Hours,ម៉ោងវិក័យប័ត្រ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Bom លំនាំដើមសម្រាប់ {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ប៉ះធាតុដើម្បីបន្ថែមពួកវានៅទីនេះ
 DocType: Fees,Program Enrollment,កម្មវិធីការចុះឈ្មោះ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណតម្លៃដែលបានចុះចត
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},សូមកំណត់ {0}
@@ -4287,7 +4294,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ការលក់រាយលក់ដុំនិងចែកចាយ
 DocType: Issue,First Responded On,ជាលើកដំបូងបានឆ្លើយតបនៅលើ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,កាកបាទបញ្ជីដែលមានធាតុនៅក្នុងក្រុមជាច្រើនដែល
-DocType: Grade Interval,Grade Interval,ថ្នាក់ទីចន្លោះពេល
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ឆ្នាំចាប់ផ្តើមកាលបរិច្ឆេទសារពើពន្ធឆ្នាំសារពើពន្ធបញ្ចប់និងកាលបរិច្ឆេទត្រូវបានកំណត់រួចហើយនៅក្នុងឆ្នាំសារពើពន្ធ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,បោសសំអាតកាលបរិច្ឆេទធ្វើឱ្យទាន់សម័យ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,បាច់ពុះ
@@ -4296,6 +4302,7 @@
 DocType: Request for Quotation Supplier,Download PDF,ទាញយកជា PDF
 DocType: Production Order,Planned End Date,កាលបរិច្ឆេទបញ្ចប់ការគ្រោងទុក
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,ដែលជាកន្លែងដែលធាតុត្រូវបានរក្សាទុក។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ហាងទំនិញ&gt; ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Request for Quotation,Supplier Detail,ក្រុមហ៊ុនផ្គត់ផ្គង់លំអិត
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},កំហុសក្នុងការនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,ចំនួន invoiced
@@ -4340,7 +4347,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ការរៀបចំវែបសាយសាមញ្ញសម្រាប់អង្គការរបស់ខ្ញុំ
 DocType: Payment Reconciliation,Receivable / Payable Account,ទទួលគណនី / ចងការប្រាក់
 DocType: Delivery Note Item,Against Sales Order Item,ការប្រឆាំងនឹងការធាតុលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
 DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹងគណនីគ្រុប {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,សូមបញ្ចូលមជ្ឈមណ្ឌលចំណាយឪពុកម្តាយ
@@ -4400,7 +4407,7 @@
 ,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
 DocType: Purchase Order,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
 DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,កណ្តាលការចំណាយគឺត្រូវបានទាមទារដើម្បីកក់ពាក្យបណ្តឹងការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់បុគ្គលិកនេះ
@@ -4413,13 +4420,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់ការរបស់អ្នកប្រើពីការធ្វើឱ្យកម្មវិធីដែលបានចាកចេញនៅថ្ងៃបន្ទាប់។
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ចំនួនទឹកប្រាក់ការទិញ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},បរិមាណបរិមាណស្មើនឹងត្រូវ packed សម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 DocType: Production Order,Manufactured Qty,បានផលិត Qty
 DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណដែលត្រូវទទួលយក
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} {1} មិនមាន
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} {1} មិនមាន
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,លេខសម្គាល់របស់គម្រោង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ជួរដេកគ្មាន {0}: ចំនួនទឹកប្រាក់មិនអាចមានចំនួនច្រើនជាងការរង់ចាំការប្រឆាំងនឹងពាក្យបណ្តឹងការចំណាយទឹកប្រាក់ {1} ។ ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេចគឺ {2}
@@ -4428,15 +4435,17 @@
 DocType: Quality Inspection Reading,Reading 3,ការអានទី 3
 ,Hub,ហាប់
 DocType: GL Entry,Voucher Type,ប្រភេទកាតមានទឹកប្រាក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
 DocType: Employee Loan Application,Approved,បានអនុម័ត
 DocType: Pricing Rule,Price,តំលៃលក់
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
 DocType: Guardian,Guardian,កាសែត The Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ការវាយតម្លៃ {0} បានបង្កើតឡើងសម្រាប់បុគ្គលិក {1} នៅក្នុងជួរកាលបរិច្ឆេទដែលបានផ្ដល់
 DocType: Employee,Education,ការអប់រំ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
 DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,បានកែប្រែ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ស្រេចចិត្ត។ កំណត់រូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនប្រសិនបើមិនបានបញ្ជាក់។
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
 DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
@@ -4473,7 +4482,7 @@
 DocType: Hub Settings,Hub Settings,ការកំណត់ហាប់
 DocType: Project,Gross Margin %,រឹម% សរុបបាន
 DocType: BOM,With Operations,ជាមួយនឹងការប្រតិបត្ដិការ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ធាតុគណនេយ្យត្រូវបានគេធ្វើរួចទៅហើយនៅក្នុងរូបិយប័ណ្ណ {0} សម្រាប់ក្រុមហ៊ុន {1} ។ សូមជ្រើសគណនីដែលត្រូវទទួលឬបង់រូបិយប័ណ្ណ {0} ។
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ធាតុគណនេយ្យត្រូវបានគេធ្វើរួចទៅហើយនៅក្នុងរូបិយប័ណ្ណ {0} សម្រាប់ក្រុមហ៊ុន {1} ។ សូមជ្រើសគណនីដែលត្រូវទទួលឬបង់រូបិយប័ណ្ណ {0} ។
 DocType: Asset,Is Existing Asset,ទ្រព្យដែលមានស្រាប់ត្រូវបាន
 DocType: Salary Detail,Statistical Component,សមាសភាគស្ថិតិ
 DocType: Salary Detail,Statistical Component,សមាសភាគស្ថិតិ
@@ -4529,7 +4538,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ភ្ជាប់រូបសញ្ញា
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,កម្រិតភាគហ៊ុន
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",ប្រភេទការទូទាត់ត្រូវតែជាផ្នែកមួយនៃការទទួលបានការសងប្រាក់និងផ្ទេរប្រាក់បរទេស
 apps/erpnext/erpnext/config/selling.py +179,Analytics,វិធីវិភាគ
@@ -4542,6 +4551,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,ផលិតកម្មនៅលើថ្ងៃឈប់សម្រាកអនុញ្ញាតឱ្យ
 DocType: Sales Order,Customer's Purchase Order Date,របស់អតិថិជនទិញលំដាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,រាជធានីហ៊ុន
+DocType: Shopping Cart Settings,Show Public Attachments,បង្ហាញឯកសារភ្ជាប់សាធារណៈ
 DocType: Packing Slip,Package Weight Details,កញ្ចប់ព័ត៌មានលម្អិតទម្ងន់
 DocType: Payment Gateway Account,Payment Gateway Account,គណនីទូទាត់
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,បន្ទាប់ពីការបញ្ចប់ការទូទាត់ប្តូរទិសអ្នកប្រើទំព័រដែលបានជ្រើស។
@@ -4566,7 +4576,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំបង្ហាញនិមិត្តរូបដូចជា $ លណាមួយដែលជាប់នឹងរូបិយប័ណ្ណ។
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ធ្វើឱ្យបាច់សិស្ស
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ធ្វើឱ្យបាច់សិស្ស
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,ទទួលបានធាតុពី Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេលថ្ងៃ
@@ -4585,8 +4595,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាត
 DocType: GL Entry,Is Opening,តើការបើក
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណពន្ធមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំចំនួនតាមរយៈការចូលរួមស៊េរីសម្រាប់ការដំឡើង&gt; លេខស៊េរី
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំចំនួនតាមរយៈការចូលរួមស៊េរីសម្រាប់ការដំឡើង&gt; លេខស៊េរី
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,គណនី {0} មិនមាន
 DocType: Account,Cash,ជាសាច់ប្រាក់
 DocType: Employee,Short biography for website and other publications.,ប្រវត្ដិរូបខ្លីសម្រាប់គេហទំព័រនិងសៀវភៅផ្សេងទៀត។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 043a5df..182e0da 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,ಬ್ಯಾಚ್ ಐಟಂ ಅಂತ್ಯ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
 DocType: Academic Term,Academic Term,ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ವಸ್ತು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ಪ್ರಮಾಣ
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ಸೇವೆ ಖರ್ಚು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಗತ್ಯವಿದೆ
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ಜಾಹೀರಾತು
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ಅದೇ ಕಂಪನಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ದಾಖಲಿಸಿದರೆ
 DocType: Employee,Married,ವಿವಾಹಿತರು
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ಉತ್ಪನ್ನ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ಯಾವುದೇ ಐಟಂಗಳನ್ನು ಪಟ್ಟಿ
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ದಿನಸಿ
 DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
 DocType: Process Payroll,Make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ಮಾಸಿಕ ವಿತರಣೆ ** ನಿಮ್ಮ ವ್ಯವಹಾರದಲ್ಲಿ ಋತುಗಳು ಹೊಂದಿದ್ದರೆ ನೀವು ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಬಜೆಟ್ / ಟಾರ್ಗೆಟ್ ವಿತರಿಸಲು ನೆರವಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ಮಾಡಿರುವುದಿಲ್ಲ ಐಟಂಗಳನ್ನು ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,ಮಾಡಿರುವುದಿಲ್ಲ ಐಟಂಗಳನ್ನು ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Sales Invoice Item,Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ಉದಾಹರಣೆಗೆ &quot;ಪ್ರಾಥಮಿಕ ಶಾಲೆ&quot; ಅಥವಾ &quot;ವಿಶ್ವವಿದ್ಯಾಲಯ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ಸ್ಟಾಕ್ ವರದಿಗಳು
 DocType: Warehouse,Warehouse Detail,ವೇರ್ಹೌಸ್ ವಿವರ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ಟರ್ಮ್ ಎಂಡ್ ದಿನಾಂಕ ನಂತರ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಉದ್ದವಾಗಿರುವಂತಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ಸ್ಥಿರ ಆಸ್ತಿ&quot; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ಸ್ಥಿರ ಆಸ್ತಿ&quot; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Vehicle Service,Brake Oil,ಬ್ರೇಕ್ ಆಯಿಲ್
 DocType: Tax Rule,Tax Type,ಜನಪ್ರಿಯ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
 DocType: BOM,Item Image (if not slideshow),ಐಟಂ ಚಿತ್ರ (ಇಲ್ಲದಿದ್ದರೆ ಸ್ಲೈಡ್ಶೋ )
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ಗ್ರಾಹಕ ಅದೇ ಹೆಸರಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ಅವರ್ ದರ / 60) * ವಾಸ್ತವಿಕ ಆಪರೇಷನ್ ಟೈಮ್
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
 DocType: SMS Log,SMS Log,ಎಸ್ಎಂಎಸ್ ಲಾಗಿನ್
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ತಲುಪಿಸುವುದಾಗಿರುತ್ತದೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} ರಜೆ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಅಲ್ಲ
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,ಗ್ರೇಡ್
 DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈಗಾಗಲೇ ಬಿಒಎಮ್ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈಗಾಗಲೇ ಬಿಒಎಮ್ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
 DocType: Daily Work Summary,Daily Work Summary,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ
 DocType: Period Closing Voucher,Closing Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಕ್ಲೋಸಿಂಗ್
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಕಂಪನಿಯ ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,ಕಾಂಟ್ರಾ ಎಂಟ್ರಿ
 DocType: Journal Entry Account,Credit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್
 DocType: Delivery Note,Installation Status,ಅನುಸ್ಥಾಪನ ಸ್ಥಿತಿಯನ್ನು
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",ನೀವು ಹಾಜರಾತಿ ನವೀಕರಿಸಲು ಬಯಸುತ್ತೀರಾ? <br> ಪ್ರೆಸೆಂಟ್: {0} \ <br> ಆಬ್ಸೆಂಟ್: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ಅಕ್ಸೆಪ್ಟೆಡ್ + ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ ಐಟಂ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಇರಬೇಕು {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ಪೂರೈಕೆ ಕಚ್ಚಾ ವಸ್ತುಗಳ ಖರೀದಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ಪಾವತಿಯ ಕನಿಷ್ಟ ಒಂದು ಮಾದರಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ಪಾವತಿಯ ಕನಿಷ್ಟ ಒಂದು ಮಾದರಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ.
 DocType: Products Settings,Show Products as a List,ಪ್ರದರ್ಶನ ಉತ್ಪನ್ನಗಳು ಪಟ್ಟಿಯೆಂದು
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", ಟೆಂಪ್ಲೇಟು ಸೂಕ್ತ ಮಾಹಿತಿ ತುಂಬಲು ಮತ್ತು ಬದಲಾಯಿಸಲಾಗಿತ್ತು ಕಡತ ಲಗತ್ತಿಸಬಹುದು.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Appraisal Template Goal,KRA,ಕ್ರಾ
 DocType: Lead,Request Type,ವಿನಂತಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ನೌಕರರ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ನೌಕರರ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ಕಾರ್ಯಾಚರಣೆಗಳ ವಿವರಗಳು ನಡೆಸಿತು.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ನಿರ್ವಹಣೆ ಭೇಟಿ ಯೋಜನೆ .
 DocType: SMS Settings,Enter url parameter for message,ಸಂದೇಶವು URL ಪ್ಯಾರಾಮೀಟರ್ ಯನ್ನು
 DocType: POS Profile,Customer Groups,ಗ್ರಾಹಕ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ಹಣಕಾಸಿನ ಹೇಳಿಕೆಗಳು
 DocType: Guardian,Students,ವಿದ್ಯಾರ್ಥಿಗಳು
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ಬೆಲೆ ಮತ್ತು ರಿಯಾಯಿತಿ ಅಳವಡಿಸುವ ನಿಯಮಗಳು .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟದ ಜ ಇರಬೇಕು
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ಈ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸರಣಿ ಪಟ್ಟಿ
 DocType: Company,Default Payroll Payable Account,ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ಅಪ್ಡೇಟ್ ಇಮೇಲ್ ಗುಂಪು
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ಅಪ್ಡೇಟ್ ಇಮೇಲ್ ಗುಂಪು
 DocType: Sales Invoice,Is Opening Entry,ಎಂಟ್ರಿ ಆರಂಭ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ಅನ್ವಯಿಸಿದರೆ
 DocType: Course Schedule,Instructor Name,ಬೋಧಕ ಹೆಸರು
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ ವಿರುದ್ಧ
 ,Production Orders in Progress,ಪ್ರೋಗ್ರೆಸ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ಹಣಕಾಸು ನಿವ್ವಳ ನಗದು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
 DocType: Lead,Address & Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 DocType: Student Admission,Student Admission,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ಸ್ವಯಂಚಾಲಿತ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸೃಷ್ಟಿ ಮೇಲೆ ಈಮೇಲ್ ಸೂಚಿಸಿ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Payment Reconciliation Invoice,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ಮಾರಾಟ ಆಸ್ತಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
-DocType: Grade Interval,Min Score,ನಿಮಿಷ ಸ್ಕೋರ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Student Applicant,Admitted,ಒಪ್ಪಿಕೊಂಡರು
 DocType: Workstation,Rent Cost,ಬಾಡಿಗೆ ವೆಚ್ಚ
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ಆರ್ಡರ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ಪಕ್ಷದ ವಿರುದ್ಧ ಅಥವಾ ಆಂತರಿಕ ವರ್ಗಾವಣೆ ಬ್ಯಾಂಕ್ / ನಗದು ವ್ಯವಹಾರಗಳನ್ನು
 DocType: Shipping Rule,Valid for Countries,ದೇಶಗಳಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ಈ ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟು ಮತ್ತು ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಐಟಂ ಲಕ್ಷಣಗಳು ವೇರಿಯಂಟುಗಳನ್ನು ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ಈ ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟು ಮತ್ತು ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಐಟಂ ಲಕ್ಷಣಗಳು ವೇರಿಯಂಟುಗಳನ್ನು ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ಪರಿಗಣಿಸಲಾದ ಒಟ್ಟು ಆರ್ಡರ್
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ನಮೂದಿಸಿ fieldValue ' ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ '
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ಈಗಾಗಲೇ ನೌಕರರ ಹಂಚಿಕೆ {1} ಗೆ ಅವಧಿಯಲ್ಲಿ {2} ಫಾರ್ {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ಆಯ್ಕೆ ಐಟಂ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ಅ ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ಐಟಂ ಬ್ಯಾಚ್ ( ಬಹಳಷ್ಟು ) .
 DocType: C-Form Invoice Detail,Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: GL Entry,Debit Amount,ಡೆಬಿಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ರಚಿಸಿ
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,ಉದ್ಧರಣ ವಿನಂತಿ
 DocType: Salary Slip Timesheet,Working Hours,ದುಡಿಮೆಯು
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸರಣಿಯ ಆರಂಭಿಕ / ಪ್ರಸ್ತುತ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಬದಲಾಯಿಸಿ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲುಗೈ ಮುಂದುವರಿದರೆ, ಬಳಕೆದಾರರು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಕೈಯಾರೆ ಆದ್ಯತಾ ಸೆಟ್ ತಿಳಿಸಲಾಗುತ್ತದೆ."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ರಚಿಸಿ
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಆರೋಪಗಳನ್ನು
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ಎಲ್ಲಾ ಉತ್ಪಾದನಾ ಪ್ರಕ್ರಿಯೆಗಳು ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 DocType: Accounts Settings,Accounts Frozen Upto,ಘನೀಕೃತ ವರೆಗೆ ಖಾತೆಗಳು
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,ಪ್ಯಾಕೇಜ್ ನಂಬ್ರ
 DocType: Item Attribute,To Range,ಶ್ರೇಣಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಇದು ಹೊಂದಿಲ್ಲ ಕೆಲವು ಐಟಂಗಳನ್ನು ವಿರುದ್ಧ ವ್ಯವಹಾರ ಇರುವುದರಿಂದ ಆದ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಇಲ್ಲಿದೆ"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ಹಂಚಿಕೆ ಒಟ್ಟು ಎಲೆಗಳು ಕಡ್ಡಾಯ
 DocType: Job Opening,Description of a Job Opening,ಒಂದು ಉದ್ಯೋಗಾವಕಾಶದ ವಿವರಣೆ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ಇಂದು ಬಾಕಿ ಚಟುವಟಿಕೆಗಳನ್ನು
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
 DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ಖರೀದಿ
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ದಯವಿಟ್ಟು ಥ್ರೆಶ್ಹೋಲ್ಡ್ 0% ಗ್ರೇಡ್ ವ್ಯಾಖ್ಯಾನಿಸಲು
 DocType: Sales Order,To Deliver,ತಲುಪಿಸಲು
 DocType: Purchase Invoice Item,Item,ವಸ್ತು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 DocType: Production Plan Item,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Budget,Ignore,ಕಡೆಗಣಿಸು
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ಸಕ್ರಿಯವಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ಸಕ್ರಿಯವಾಗಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆಗಳನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತದೆ: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ಮುದ್ರಣ ಸೆಟಪ್ ಚೆಕ್ ಆಯಾಮಗಳು
 DocType: Salary Slip,Salary Slip Timesheet,ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,ಒಟ್ಟು ಆಯೋಗ
 DocType: Pricing Rule,Sales Partner,ಮಾರಾಟದ ಸಂಗಾತಿ
 DocType: Buying Settings,Purchase Receipt Required,ಅಗತ್ಯ ಖರೀದಿ ರಸೀತಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಪ್ರವೇಶಿಸಿತು ಮೌಲ್ಯಾಂಕನ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಪ್ರವೇಶಿಸಿತು ಮೌಲ್ಯಾಂಕನ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ಕ್ರೋಢಿಕೃತ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,ಪುನರಾರಂಭಿಸು ಲಗತ್ತು
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ಮತ್ತೆ ಗ್ರಾಹಕರ
 DocType: Leave Control Panel,Allocate,ಗೊತ್ತುಪಡಿಸು
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ಗಮನಿಸಿ: ಒಟ್ಟು ನಿಯೋಜಿತವಾದ ಎಲೆಗಳನ್ನು {0} ಈಗಾಗಲೇ ಅನುಮೋದನೆ ಎಲೆಗಳು ಕಡಿಮೆ ಮಾಡಬಾರದು {1} ಕಾಲ
 DocType: Announcement,Posted By,ಪೋಸ್ಟ್ ಮಾಡಿದವರು
 DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಲು ಆಯ್ಕೆ ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ಎಲೆಗಳು, ಖರ್ಚು ಹಕ್ಕು ಮತ್ತು ವೇತನದಾರರ ನಿರ್ವಹಿಸಲು ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ಎಲೆಗಳು, ಖರ್ಚು ಹಕ್ಕು ಮತ್ತು ವೇತನದಾರರ ನಿರ್ವಹಿಸಲು ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ಜ್ಞಾನ ನೆಲೆ ಸೇರಿಸಲು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ಪಾವತಿ ಎಂಟ್ರಿ ಡಿಡಕ್ಷನ್
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 ಸಂಬಂಧ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ವ್ಯವಸ್ಥಾಪಕ
 DocType: Payment Entry,Payment From / To,ಪಾವತಿ / ಹೋಗು
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ದಿನಾಂಕ ಶ್ರೇಣಿ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ಹೊಸ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ಪ್ರಸ್ತುತ ಬಾಕಿ ಮೊತ್ತದ ಕಡಿಮೆ. ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಕನಿಷ್ಠ ಎಂದು ಹೊಂದಿದೆ {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ಹೊಸ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ಪ್ರಸ್ತುತ ಬಾಕಿ ಮೊತ್ತದ ಕಡಿಮೆ. ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಕನಿಷ್ಠ ಎಂದು ಹೊಂದಿದೆ {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
 DocType: SMS Settings,Receiver Parameter,ಸ್ವೀಕರಿಸುವವರ ನಿಯತಾಂಕಗಳನ್ನು
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ಆಧರಿಸಿ ' ಮತ್ತು ' ಗುಂಪಿನ ' ಇರಲಾಗುವುದಿಲ್ಲ
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,ರೆಸಲ್ಯೂಶನ್ ದಿನಾಂಕ
 DocType: Student Batch Name,Batch Name,ಬ್ಯಾಚ್ ಹೆಸರು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ದಾಖಲಾಗಿ
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ವಿದ್ಯಾರ್ಥಿಗಳ ಮಾಸಿಕ ಅಟೆಂಡೆನ್ಸ್ ವರದಿ ಎಂದೇ ಪ್ರೆಸೆಂಟ್ ವಿದ್ಯಾರ್ಥಿ ತೋರಿಸುತ್ತದೆ
@@ -722,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,ವಿದ್ಯಾರ್ಥಿ ಅಟೆಂಡೆನ್ಸ್
 DocType: Sales Invoice Timesheet,Time Sheet,ವೇಳಾಚೀಟಿ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ಕಚ್ಚಾ ವಸ್ತುಗಳ ಆಧರಿಸಿದ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ಐಟಂ ವಿವರಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ಐಟಂ ವಿವರಗಳು ನಮೂದಿಸಿ
 DocType: Interest,Interest,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ಪೂರ್ವ ಮಾರಾಟದ
 DocType: Purchase Receipt,Other Details,ಇತರೆ ವಿವರಗಳು
@@ -740,7 +743,7 @@
 ,Absent Student Report,ಆಬ್ಸೆಂಟ್ ವಿದ್ಯಾರ್ಥಿ ವರದಿ
 DocType: Email Digest,Next email will be sent on:,ಮುಂದೆ ಇಮೇಲ್ ಮೇಲೆ ಕಳುಹಿಸಲಾಗುವುದು :
 DocType: Offer Letter Term,Offer Letter Term,ಪತ್ರ ಟರ್ಮ್ ಆಫರ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ಕಂಪನಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -749,8 +752,6 @@
 DocType: Serial No,Warranty Expiry Date,ಖಾತರಿ ಅಂತ್ಯ ದಿನಾಂಕ
 DocType: Material Request Item,Quantity and Warehouse,ಪ್ರಮಾಣ ಮತ್ತು ವೇರ್ಹೌಸ್
 DocType: Sales Invoice,Commission Rate (%),ಕಮಿಷನ್ ದರ ( % )
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಹೊಂದಿಸುವಿಕೆ&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಗಾಗಿ ಸರಣಿ ಹೆಸರಿಸುವ ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಹೊಂದಿಸುವಿಕೆ&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಗಾಗಿ ಸರಣಿ ಹೆಸರಿಸುವ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 DocType: Project,Estimated Cost,ಅಂದಾಜು ವೆಚ್ಚ
@@ -769,7 +770,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Mode of Payment Account,Default Account,ಡೀಫಾಲ್ಟ್ ಖಾತೆ
 DocType: Payment Entry,Received Amount (Company Currency),ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ಸಾಪ್ತಾಹಿಕ ದಿನ ಆಫ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Production Order Operation,Planned End Time,ಯೋಜಿತ ಎಂಡ್ ಟೈಮ್
 ,Sales Person Target Variance Item Group-Wise,ಮಾರಾಟಗಾರನ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
@@ -852,7 +853,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Request for Quotation Supplier,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ಯಾವುದೇ ಅನುಮತಿ
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
@@ -865,8 +866,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Supplier Quotation,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
 DocType: SMS Center,All Customer Contact,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV ಮೂಲಕ ಸ್ಟಾಕ್ ಸಮತೋಲನ ಅಪ್ಲೋಡ್ .
 DocType: Warehouse,Tree Details,ಟ್ರೀ ವಿವರಗಳು
@@ -877,8 +878,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ಕನಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ವೆಚ್ಚದ ಕೇಂದ್ರ {2} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ಖಾತೆ {2} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ಐಟಂ ರೋ {IDX}: {DOCTYPE} {DOCNAME} ಮೇಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ &#39;{DOCTYPE}&#39; ಟೇಬಲ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ಐಟಂ ರೋ {IDX}: {DOCTYPE} {DOCNAME} ಮೇಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ &#39;{DOCTYPE}&#39; ಟೇಬಲ್
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ಯಾವುದೇ ಕಾರ್ಯಗಳು
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸರಕುಪಟ್ಟಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 DocType: Asset,Opening Accumulated Depreciation,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ
@@ -894,7 +895,7 @@
 DocType: Bin,Moving Average Rate,ಮೂವಿಂಗ್ ಸರಾಸರಿ ದರ
 DocType: Production Planning Tool,Select Items,ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
 DocType: HR Settings,Enter retirement age in years,ವರ್ಷಗಳಲ್ಲಿ ನಿವೃತ್ತಿ ವಯಸ್ಸು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
@@ -902,7 +903,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Process Payroll,Activity Log,ಚಟುವಟಿಕೆ ಲಾಗ್
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ನಿವ್ವಳ ಲಾಭ / ನಷ್ಟ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
@@ -913,7 +914,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ಮಾಡಬೇಕಾದುದು ಓಪನ್
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
@@ -929,7 +930,7 @@
 DocType: Item Reorder,Re-Order Qty,ಮರು ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Leave Block List Date,Leave Block List Date,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
 DocType: Pricing Rule,Price or Discount,ಬೆಲೆ ಅಥವಾ ಡಿಸ್ಕೌಂಟ್
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ಖರೀದಿ ರಸೀತಿ ವಸ್ತುಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಒಟ್ಟು ಅನ್ವಯಿಸುವ ತೆರಿಗೆ ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಅದೇ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ಖರೀದಿ ರಸೀತಿ ವಸ್ತುಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಒಟ್ಟು ಅನ್ವಯಿಸುವ ತೆರಿಗೆ ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಅದೇ ಇರಬೇಕು
 DocType: Sales Team,Incentives,ಪ್ರೋತ್ಸಾಹ
 DocType: SMS Log,Requested Numbers,ಕೋರಿಕೆ ಸಂಖ್ಯೆಗಳು
 DocType: Production Planning Tool,Only Obtain Raw Materials,ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಮಾತ್ರ ಪಡೆದುಕೊಳ್ಳಿ
@@ -987,8 +988,7 @@
 DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Fee Structure,Components,ಘಟಕಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
@@ -1040,8 +1040,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ಈ ಕ್ರಮದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಬಳ ಜರ್ನಲ್ ಎಂಟ್ರಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ಗ್ರೇಡ್ ಕೋಡ್ ಮಧ್ಯಂತರಗಳು {0} ಇತರ ಶ್ರೇಣಿಗಳನ್ನು ಗ್ರೇಡ್ ಮಧ್ಯಂತರಗಳು ಅತಿಕ್ರಮಿಸುತ್ತದೆ. ಪರಿಶೀಲಿಸಿ ಅಂತರಗಳಲ್ಲಿ {0} ಮತ್ತು {1} ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ
 DocType: BOM,Raw Material Cost(Company Currency),ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ರೋ # {0}: ದರ ಪ್ರಮಾಣ ಬಳಸಲ್ಪಡುತ್ತಿದ್ದವು ಹೆಚ್ಚಿರಬಾರದು {1} {2}
@@ -1054,7 +1052,7 @@
 DocType: BOM Website Item,BOM Website Item,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಐಟಂ
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
 DocType: Timesheet Detail,Bill,ಬಿಲ್
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ಬಿಳಿ
 DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ರೋ {0}: ಫಾರ್ ಪ್ರಮಾಣ ಲಭ್ಯವಿಲ್ಲ {4} ಉಗ್ರಾಣದಲ್ಲಿ {1} ಪ್ರವೇಶ ಸಮಯದಲ್ಲಿ ಪೋಸ್ಟ್ ನಲ್ಲಿ ({2} {3})
@@ -1069,7 +1067,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ಆರ್ಡರ್ ಪ್ರಕಾರ ಒಂದು ಇರಬೇಕು {0}
 DocType: Lead,Next Contact Date,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ಆರಂಭಿಕ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Student Batch Name,Student Batch Name,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಹೆಸರು
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
 DocType: Repayment Schedule,Balance Loan Amount,ಬ್ಯಾಲೆನ್ಸ್ ಸಾಲದ ಪ್ರಮಾಣ
@@ -1089,10 +1087,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ದಯವಿಟ್ಟು ಸೂಚಿಸಿ ಒಂದು {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ರಿಯಾಯಿತಿ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ರಿಯಾಯಿತಿ
 DocType: Asset,Total Number of Depreciations,Depreciations ಒಟ್ಟು ಸಂಖ್ಯೆ
 DocType: Sales Invoice Item,Rate With Margin,ಮಾರ್ಜಿನ್ ಜೊತೆಗೆ ದರ
 DocType: Sales Invoice Item,Rate With Margin,ಮಾರ್ಜಿನ್ ಜೊತೆಗೆ ದರ
@@ -1121,7 +1119,7 @@
 DocType: Lead,Organization Name,ಸಂಸ್ಥೆ ಹೆಸರು
 DocType: Tax Rule,Shipping State,ಶಿಪ್ಪಿಂಗ್ ರಾಜ್ಯ
 ,Projected Quantity as Source,ಮೂಲ ಯೋಜಿತ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
 DocType: Employee,A-,ಎ
 DocType: Production Planning Tool,Include non-stock items,ನಾನ್ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾದ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
@@ -1129,7 +1127,7 @@
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ZIP ಕೋಡ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,ZIP ಕೋಡ್
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
@@ -1173,7 +1171,7 @@
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
 ,Ordered Items To Be Billed,ಖ್ಯಾತವಾದ ಐಟಂಗಳನ್ನು ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ರೇಂಜ್ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿದೆ ಹೆಚ್ಚಾಗಿ ಶ್ರೇಣಿಗೆ
 DocType: Global Defaults,Global Defaults,ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು
@@ -1208,11 +1206,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ದಯವಿಟ್ಟು ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಪಡೆಯಲು ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ
 DocType: Stock Settings,Default Item Group,ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗುಂಪು
 DocType: Employee Loan,Partially Disbursed,ಭಾಗಶಃ ಪಾವತಿಸಲಾಗುತ್ತದೆ
-DocType: Grading Structure,Grading System Name,ಶ್ರೇಯಾಂಕ ಪದ್ಧತಿಯ ಹೆಸರು
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ಪಾವತಿ ಮೋಡ್ ಸಂರಚಿತವಾಗಿರುವುದಿಲ್ಲ. ಖಾತೆ ಪಾವತಿ ವಿಧಾನ ಮೇಲೆ ಅಥವಾ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ದಯವಿಟ್ಟು ಪರಿಶೀಲಿಸಿ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ಪಾವತಿ ಮೋಡ್ ಸಂರಚಿತವಾಗಿರುವುದಿಲ್ಲ. ಖಾತೆ ಪಾವತಿ ವಿಧಾನ ಮೇಲೆ ಅಥವಾ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ದಯವಿಟ್ಟು ಪರಿಶೀಲಿಸಿ.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ನಿಮ್ಮ ಮಾರಾಟಗಾರ ಗ್ರಾಹಕ ಸಂಪರ್ಕಿಸಿ ಈ ದಿನಾಂಕದಂದು ನೆನಪಿಸುವ ಪಡೆಯುತ್ತಾನೆ
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
@@ -1251,11 +1248,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ಕೆಲಸ ನಡೆದಿದೆ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ಗುಣಲಕ್ಷಣಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ
 DocType: Announcement,All Students,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 DocType: Grading Scale,Intervals,ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ನಂ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
@@ -1296,8 +1293,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ಖರೀದಿ ಆದೇಶ ನೀವು ಯೋಜನೆ ಸಹಾಯ ಮತ್ತು ನಿಮ್ಮ ಖರೀದಿ ಮೇಲೆ ಅನುಸರಿಸಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ಖರೀದಿ ಆದೇಶ ನೀವು ಯೋಜನೆ ಸಹಾಯ ಮತ್ತು ನಿಮ್ಮ ಖರೀದಿ ಮೇಲೆ ಅನುಸರಿಸಿ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ಸಣ್ಣ
@@ -1321,7 +1318,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
 DocType: Student Applicant,AP,ಎಪಿ
 DocType: Purchase Invoice Item,BOM,ಬಿಒಎಮ್
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
@@ -1339,7 +1336,7 @@
 DocType: Student Group Student,Group Roll Number,ಗುಂಪು ರೋಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ಎಲ್ಲಾ ಕೆಲಸವನ್ನು ತೂಕ ಒಟ್ಟು ಇರಬೇಕು 1. ಪ್ರಕಾರವಾಗಿ ಎಲ್ಲ ಪ್ರಾಜೆಕ್ಟ್ ಕಾರ್ಯಗಳ ತೂಕ ಹೊಂದಿಸಿಕೊಳ್ಳಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ಸಲಕರಣಾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
@@ -1366,7 +1363,7 @@
 DocType: Depreciation Schedule,Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ಪ್ರಗತಿಯಲ್ಲಿದೆ ಐಟಂಗಳನ್ನು
 DocType: Workstation,Workstation Name,ಕಾರ್ಯಕ್ಷೇತ್ರ ಹೆಸರು
-DocType: Grade Interval,Grade Code,ಗ್ರೇಡ್ ಕೋಡ್
+DocType: Grading Scale Interval,Grade Code,ಗ್ರೇಡ್ ಕೋಡ್
 DocType: POS Item Group,POS Item Group,ಪಿಓಎಸ್ ಐಟಂ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
@@ -1383,7 +1380,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Sales Order,Recurring Upto,ಮರುಕಳಿಸುವ ವರೆಗೆ
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
 DocType: Purchase Invoice,Supplier Invoice Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,ನೀವು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ
@@ -1399,7 +1396,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ಆಹಾರ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ಏಜಿಂಗ್ ರೇಂಜ್ 3
 DocType: Maintenance Schedule Item,No of Visits,ಭೇಟಿ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,ಮಾರ್ಕ್ Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,ಮಾರ್ಕ್ Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ನೋಂದಾಯಿತ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ಎಲ್ಲಾ ಗುರಿಗಳನ್ನು ಅಂಕಗಳನ್ನು ಒಟ್ಟು ಮೊತ್ತ ಇದು 100 ಇರಬೇಕು {0}
@@ -1448,13 +1446,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Detail,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
 DocType: Pricing Rule,"Higher the number, higher the priority","ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆ, ಹೆಚ್ಚಿನ ಆದ್ಯತೆಯನ್ನು"
 ,Purchase Invoice Trends,ಸರಕುಪಟ್ಟಿ ಟ್ರೆಂಡ್ಸ್ ಖರೀದಿಸಿ
 DocType: Employee,Better Prospects,ಉತ್ತಮ ಜೀವನ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ರೋ # {0}: ಬ್ಯಾಚ್ {1} ಕೇವಲ {2} ಪ್ರಮಾಣ ಹೊಂದಿದೆ. ದಯವಿಟ್ಟು {3} ಪ್ರಮಾಣ ಲಭ್ಯವಿದೆ, ಇನ್ನೊಂದು ತಂಡ ಆಯ್ಕೆ ಅಥವಾ ಅನೇಕ ಬ್ಯಾಚ್ಗಳು ರಿಂದ ಸಮಸ್ಯೆಯನ್ನು ತಲುಪಿಸಲು /, ಅನೇಕ ಸಾಲುಗಳನ್ನು ಸಾಲು ಬೇರ್ಪಟ್ಟು"
 DocType: Vehicle,License Plate,ಪರವಾನಗಿ ಫಲಕ
 DocType: Appraisal,Goals,ಗುರಿಗಳು
 DocType: Warranty Claim,Warranty / AMC Status,ಖಾತರಿ / ಎಎಮ್ಸಿ ಸ್ಥಿತಿ
@@ -1473,7 +1472,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ನೌಕರರ ಸ್ವತಃ ವರದಿ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ಖಾತೆ ಹೆಪ್ಪುಗಟ್ಟಿರುವ ವೇಳೆ , ನಮೂದುಗಳನ್ನು ನಿರ್ಬಂಧಿತ ಬಳಕೆದಾರರಿಗೆ ಅವಕಾಶವಿರುತ್ತದೆ ."
 DocType: Email Digest,Bank Balance,ಬ್ಯಾಂಕ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು , ಅಗತ್ಯ ವಿದ್ಯಾರ್ಹತೆಗಳು , ಇತ್ಯಾದಿ"
 DocType: Journal Entry Account,Account Balance,ಖಾತೆ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
@@ -1484,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ಮುಚ್ಚಿಲ್ಲದ ಆರ್ಥಿಕ ವರ್ಷದ ಪಿ &amp; ಎಲ್ ಬ್ಯಾಲೆನ್ಸ್ ತೋರಿಸಿ
 DocType: Shipping Rule,Shipping Account,ಶಿಪ್ಪಿಂಗ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ಖಾತೆ {2} ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ಆನ್ ಬಾರಿ ತಲುಪಿಸಲು ನಿಮ್ಮ ಕೆಲಸ ಯೋಜನೆ ಸಹಾಯ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಮತ್ತು ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ಆನ್ ಬಾರಿ ತಲುಪಿಸಲು ನಿಮ್ಮ ಕೆಲಸ ಯೋಜನೆ ಸಹಾಯ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಮತ್ತು ಮಾಡಿ
 DocType: Quality Inspection,Readings,ರೀಡಿಂಗ್ಸ್
 DocType: Stock Entry,Total Additional Costs,ಒಟ್ಟು ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 DocType: Course Schedule,SH,ಎಸ್
@@ -1495,7 +1494,7 @@
 DocType: Shipping Rule Condition,To Value,ಮೌಲ್ಯ
 DocType: Asset Movement,Stock Manager,ಸ್ಟಾಕ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
@@ -1521,7 +1520,7 @@
 DocType: Sales Invoice,Source,ಮೂಲ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ಮುಚ್ಚಲಾಗಿದೆ ಶೋ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ಆಸ್ತಿ ವರ್ಗ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ಆಸ್ತಿ ವರ್ಗ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ಈ {0} ಸಂಘರ್ಷಗಳನ್ನು {1} ಫಾರ್ {2} {3}
 DocType: Student Attendance Tool,Students HTML,ವಿದ್ಯಾರ್ಥಿಗಳು ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -1539,7 +1538,7 @@
 DocType: Student,Date of Leaving,ಲೀವಿಂಗ್ ದಿನಾಂಕ
 DocType: Pricing Rule,For Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ಕಾರಣವಾಗುತ್ತದೆ ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ಕಾರಣವಾಗುತ್ತದೆ ರಚಿಸಿ
 DocType: Maintenance Schedule,Schedules,ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Purchase Invoice Item,Net Amount,ನೆಟ್ ಪ್ರಮಾಣ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ವಿವರ ಯಾವುದೇ
@@ -1567,7 +1566,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿಯ
 DocType: Sales Invoice Item,Brand Name,ಬ್ರಾಂಡ್ ಹೆಸರು
 DocType: Purchase Receipt,Transporter Details,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ಪೆಟ್ಟಿಗೆ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ಸಂಸ್ಥೆ
@@ -1601,7 +1600,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},ಫಾರ್ {0} ಪ್ರಾಜೆಕ್ಟ್ ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್ {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ವಿದ್ಯಾರ್ಥಿಗಳು ವ್ಯವಸ್ಥೆಯ ಹೃದಯ, ಎಲ್ಲಾ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ವಿದ್ಯಾರ್ಥಿಗಳು ವ್ಯವಸ್ಥೆಯ ಹೃದಯ, ಎಲ್ಲಾ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ರೋ # {0}: ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ {1} ಚೆಕ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Company,Default Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಡೀಫಾಲ್ಟ್
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ರೋ {0}: ಗೆ ಸಮಯ ಮತ್ತು ಸಮಯ {1} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ {2}
@@ -1613,20 +1612,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ಪಾವತಿ ಇಮೇಲ್ ಅನ್ನು ಮತ್ತೆ ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ಹೊಸ ಕೆಲಸವನ್ನು
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ಇತರ ವರದಿಗಳು
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ಹುಡುಕಾಟ ಐಟಂ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,ಹುಡುಕಾಟ ಐಟಂ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Assessment Plan,Grading Scale,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ಈಗಾಗಲೇ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
@@ -1664,7 +1663,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ಸಂಗ್ರಹಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಹಣಕಾಸಿನ ವರ್ಷದ {0}. ಹಣಕಾಸಿನ ವರ್ಷ {0} ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗಿದೆ
 DocType: Journal Entry,Entry Type,ಎಂಟ್ರಿ ಟೈಪ್
 ,Customer Credit Balance,ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್
@@ -1707,8 +1706,6 @@
 DocType: Student Sibling,Studying in Same Institute,ಅದೇ ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ವ್ಯಾಸಂಗ
 DocType: Territory,Territory Manager,ಪ್ರದೇಶ ಮ್ಯಾನೇಜರ್
 DocType: Packed Item,To Warehouse (Optional),ಮಳಿಗೆಗೆ (ಐಚ್ಛಿಕ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Payment Entry,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
@@ -1718,9 +1715,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ಕಾರ್ಟ್ ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ಈ ನೆಲದ ಎಂಟ್ರಿ ಮಾಡಲು ಬಳಸಲಾಗುತ್ತದೆ ವಿನಂತಿ ವಸ್ತು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಹೊಸ ಆಸ್ತಿ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಹೊಸ ಆಸ್ತಿ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ಪ್ರತಿ ಬ್ಯಾಚ್ ಪ್ರತ್ಯೇಕ ಕೋರ್ಸನ್ನು ಗುಂಪು
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ಪ್ರತಿ ಬ್ಯಾಚ್ ಪ್ರತ್ಯೇಕ ಕೋರ್ಸನ್ನು ಗುಂಪು
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ಐಟಂ ಏಕ ಘಟಕ .
@@ -1737,9 +1734,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: ವೆಚ್ಚದ ಕೇಂದ್ರ &#39;ಲಾಭ ಮತ್ತು ನಷ್ಟ&#39; ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {2}. ಕಂಪನಿ ಒಂದು ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚದ ಕೇಂದ್ರ ಸ್ಥಾಪಿಸಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ಹೊಸ ಸಂಪರ್ಕ
 DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ
 DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ
@@ -1766,21 +1761,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ಸಾಮರಸ್ಯ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 DocType: Purchase Invoice Item,Batch No,ಬ್ಯಾಚ್ ನಂ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ವಿನಿಮಯ ದರದ ಕಾಣಬರಲಿಲ್ಲ {0} ನಿಂದ {1} ಪ್ರಮುಖ ದಿನಾಂಕ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ಗ್ರಾಹಕರ ಖರೀದಿ ಆದೇಶದ ವಿರುದ್ಧ ಅನೇಕ ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಅವಕಾಶ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ಮೊಬೈಲ್ ಇಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ಮುಖ್ಯ
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ಭಿನ್ನ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ಭಿನ್ನ
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee Attendance Tool,Employees HTML,ನೌಕರರು ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Employee,Leave Encashed?,Encashed ಬಿಡಿ ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Email Digest,Annual Expenses,ವಾರ್ಷಿಕ ವೆಚ್ಚಗಳು
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
@@ -1800,7 +1794,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ರೀತಿಗೆ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ಒಂದು ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ಸ್ಥಿತಿ
-DocType: Grading Structure,Grading Intervals,ಗ್ರೇಡಿಂಗ್ ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ದಯವಿಟ್ಟು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಗಾಗಿ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. ಅತಿ ಬಿಲ್ಲಿಂಗ್ ಅನುಮತಿಸಲು, ಸೆಟ್ಟಿಂಗ್ಗಳು ಬೈಯಿಂಗ್ ಸೆಟ್ ಮಾಡಿ"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ಐಟಂ ಅಥವಾ ವೇರ್ಹೌಸ್ ಮೇಲೆ ಫಿಲ್ಟರ್ ಸೆಟ್ ಮಾಡಿ
@@ -1813,16 +1806,17 @@
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ಪಾವತಿ
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ನಿಮ್ಮ ಆದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ನಿಮ್ಮ ಆದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Production Order Operation,Actual Time and Cost,ನಿಜವಾದ ಸಮಯ ಮತ್ತು ವೆಚ್ಚ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ಗರಿಷ್ಠ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ಐಟಂ {1} {2} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Employee,Salutation,ವಂದನೆ
 DocType: Course,Course Abbreviation,ಕೋರ್ಸ್ ಸಂಕ್ಷೇಪಣ
 DocType: Student Leave Application,Student Leave Application,ವಿದ್ಯಾರ್ಥಿ ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ನೌಕರರ {0} ಮೇಲೆ ಅರ್ಧ ದಿನ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ಒಟ್ಟು ಕೆಲಸದ ಗರಿಷ್ಠ ಕೆಲಸದ ಹೆಚ್ಚು ಮಾಡಬಾರದು {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ಮೇಲೆ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ಮಾರಾಟದ ಸಮಯದಲ್ಲಿ ಐಟಂಗಳನ್ನು ಬಂಡಲ್.
 DocType: Quotation Item,Actual Qty,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Sales Invoice Item,References,ಉಲ್ಲೇಖಗಳು
@@ -1832,7 +1826,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ನೀವು ನಕಲಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿದ್ದೀರಿ. ನಿವಾರಿಸಿಕೊಳ್ಳಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ಜತೆಗೂಡಿದ
 DocType: Asset Movement,Asset Movement,ಆಸ್ತಿ ಮೂವ್ಮೆಂಟ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ಹೊಸ ಕಾರ್ಟ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,ಹೊಸ ಕಾರ್ಟ್
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ಐಟಂ {0} ಒಂದು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಅಲ್ಲ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
 DocType: Vehicle,Wheels,ವೀಲ್ಸ್
@@ -1864,10 +1858,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶದ ವಿರುದ್ಧ ಸಮಯ ದಾಖಲೆಗಳು ಸೃಷ್ಟಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. ಕಾರ್ಯಾಚರಣೆ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಟ್ರ್ಯಾಕ್ ಸಾಧ್ಯವಿಲ್ಲ ಹಾಗಿಲ್ಲ
 DocType: Student,Student Mobile Number,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟಗಾರ್ತಿ
 DocType: Purchase Invoice,Recurring Invoice,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ಯೋಜನೆಗಳ ವ್ಯವಸ್ಥಾಪಕ
@@ -1875,7 +1869,7 @@
 DocType: Budget,Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ
 DocType: Vehicle Log,Fuel Price,ಇಂಧನ ಬೆಲೆ
 DocType: Budget,Budget,ಮುಂಗಡಪತ್ರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",ಇದು ಆದಾಯ ಅಥವಾ ಖರ್ಚುವೆಚ್ಚ ಅಲ್ಲ ಎಂದು ಬಜೆಟ್ ವಿರುದ್ಧ {0} ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ಸಾಧಿಸಿದ
 DocType: Student Admission,Application Form Route,ಅಪ್ಲಿಕೇಶನ್ ಫಾರ್ಮ್ ಮಾರ್ಗ
@@ -1907,7 +1901,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ {2}
 DocType: Employee,Salary Information,ವೇತನ ಮಾಹಿತಿ
 DocType: Sales Person,Name and Employee ID,ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳ ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Website Item Group,Website Item Group,ಐಟಂ ಗ್ರೂಪ್ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
@@ -1966,7 +1960,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ಪುನರಾವರ್ತಿತ ಗ್ರಾಹಕ ಕಂದಾಯ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ಪಾತ್ರ 'ಖರ್ಚು ಅನುಮೋದಕ' ಆಗಿರಬೇಕು
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ಜೋಡಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
 DocType: Asset,Depreciation Schedule,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿ
 DocType: Bank Reconciliation Detail,Against Account,ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಇರಬೇಕು
@@ -1983,13 +1977,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
 DocType: Purchase Order,Delivered,ತಲುಪಿಸಲಾಗಿದೆ
 ,Vehicle Expenses,ವಾಹನ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
+DocType: Serial No,Invoice Details,ಇನ್ವಾಯ್ಸ್ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ ಸ್ಟಾಪ್ ಯಾವ ದಿನಾಂಕ
 DocType: Employee Loan,Loan Amount,ಸಾಲದ ಪ್ರಮಾಣ
@@ -2013,7 +2008,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ಅಲ್ಲದ ಗ್ರೂಪ್ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ಕ್ರೀಡೆ
 DocType: Loan Type,Loan Name,ಸಾಲ ಹೆಸರು
@@ -2025,6 +2020,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ನೀವು ತಿರಸ್ಕರಿಸಿದರು ಐಟಂಗಳ ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು ಅಲ್ಲಿ ವೇರ್ಹೌಸ್
 DocType: Production Order,Skip Material Transfer,ವಸ್ತು ಟ್ರಾನ್ಸ್ಫರ್ ತೆರಳಿ
 DocType: Production Order,Skip Material Transfer,ವಸ್ತು ಟ್ರಾನ್ಸ್ಫರ್ ತೆರಳಿ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ವಿನಿಮಯ ದರದ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ {0} ನಿಂದ {1} ಪ್ರಮುಖ ದಿನಾಂಕದಂದು {2}. ದಯವಿಟ್ಟು ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ ಕೈಯಾರೆ ರಚಿಸಲು
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ
 DocType: POS Profile,Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ಈಗ ಡೀಫಾಲ್ಟ್ ಹಣಕಾಸಿನ ವರ್ಷ ಆಗಿದೆ . ಕಾರ್ಯಗತವಾಗಲು ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ಬ್ರೌಸರ್ ರಿಫ್ರೆಶ್ ಮಾಡಿ .
@@ -2062,9 +2058,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ಹಣಕಾಸಿನ ವರ್ಷ ** ಒಂದು ಹಣಕಾಸು ವರ್ಷದ ಪ್ರತಿನಿಧಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಲೆಕ್ಕ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಇತರ ಪ್ರಮುಖ ವ್ಯವಹಾರಗಳ ** ** ಹಣಕಾಸಿನ ವರ್ಷ ವಿರುದ್ಧ ಕಂಡುಕೊಳ್ಳಲಾಯಿತು.
 DocType: Opportunity,Customer / Lead Address,ಗ್ರಾಹಕ / ಲೀಡ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
 DocType: Student Admission,Eligibility,ಅರ್ಹತಾ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ಕಾರಣವಾಗುತ್ತದೆ ನೀವು ಪಡೆಯಲು ವ್ಯಾಪಾರ, ನಿಮ್ಮ ತೀರಗಳು ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಮತ್ತು ಹೆಚ್ಚು ಸೇರಿಸಲು ಸಹಾಯ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ಕಾರಣವಾಗುತ್ತದೆ ನೀವು ಪಡೆಯಲು ವ್ಯಾಪಾರ, ನಿಮ್ಮ ತೀರಗಳು ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಮತ್ತು ಹೆಚ್ಚು ಸೇರಿಸಲು ಸಹಾಯ"
 DocType: Production Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
@@ -2105,7 +2101,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Process Payroll,Fortnightly,ಪಾಕ್ಷಿಕ
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
@@ -2121,7 +2117,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ಮೊದಲ ಸಾಲಿನ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ರಂದು ' ' ಹಿಂದಿನ ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ' ಅಥವಾ ಒಂದು ಬ್ಯಾಚ್ ರೀತಿಯ ಆಯ್ಕೆ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ಮಕ್ಕಳ ಐಟಂ ಒಂದು ಉತ್ಪನ್ನ ಬಂಡಲ್ ಮಾಡಬಾರದು. ದಯವಿಟ್ಟು ಐಟಂ ಅನ್ನು ತೆಗೆದುಹಾಕಿ `{0}` ಮತ್ತು ಉಳಿಸಲು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ಸೇರಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ಸೇರಿಸಿ
 DocType: Vehicle Service,Service Item,ಸೇವೆ ಐಟಂ
 DocType: Bank Guarantee,Bank Guarantee,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ
 DocType: Bank Guarantee,Bank Guarantee,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ
@@ -2171,8 +2167,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ದರ ಪಟ್ಟಿ ಹೊಂದಿಸದೆ ವೇಳೆ ಬೆಲೆಗಳು ತೋರಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ಈ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ದೇಶದ ಸೂಚಿಸಲು ಅಥವಾ ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು ಪರಿಶೀಲಿಸಿ
 DocType: Stock Entry,Total Incoming Value,ಒಟ್ಟು ಒಳಬರುವ ಮೌಲ್ಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Offer Letter Term,Offer Term,ಆಫರ್ ಟರ್ಮ್
 DocType: Quality Inspection,Quality Manager,ಗುಣಮಟ್ಟದ ಮ್ಯಾನೇಜರ್
@@ -2206,14 +2202,14 @@
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ಹೊಸ ವಿಳಾಸ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ದಯವಿಟ್ಟು ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ದಯವಿಟ್ಟು ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ಮಾನ್ಯ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು ' ಕೇಸ್ ನಂ ಗೆ . '
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Project,External,ಬಾಹ್ಯ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಗಿದೆ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಗಿದೆ: {0}
 DocType: Branch,Branch,ಶಾಖೆ
 DocType: Guardian,Mobile Number,ಮೊಬೈಲ್ ನಂಬರ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್
@@ -2222,7 +2218,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
 DocType: Scheduling Tool,Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ವಿದ್ಯಾರ್ಥಿ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ವಿದ್ಯಾರ್ಥಿ ಮಾಡಿ
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},ನೀವು ಯೋಜನೆಯ ಸಹಯೋಗಿಸಲು ಆಮಂತ್ರಿಸಲಾಗಿದೆ: {0}
 DocType: Leave Block List Date,Block Date,ಬ್ಲಾಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ಈಗ ಅನ್ವಯಿಸು
@@ -2246,8 +2242,9 @@
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
 DocType: Payment Request,Make Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ಸಾಫ್ಟ್
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ ಹಿಂದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ ಹಿಂದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Company,For Reference Only.,ಪರಾಮರ್ಶೆಗಾಗಿ ಮಾತ್ರ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,ಬ್ಯಾಚ್ ಆಯ್ಕೆ ಇಲ್ಲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣ
@@ -2261,7 +2258,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ಪ್ರಕರಣ ಸಂಖ್ಯೆ 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Show a slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಒಂದು ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ಸ್ಟೋರ್ಸ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ಸ್ಟೋರ್ಸ್
 DocType: Serial No,Delivery Time,ಡೆಲಿವರಿ ಟೈಮ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ರಂದು ಆಧರಿಸಿ ಏಜಿಂಗ್
 DocType: Item,End of Life,ಲೈಫ್ ಅಂತ್ಯ
@@ -2277,8 +2274,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಮೂಲಕ ಮಿತಿಗಿಂತ {0} {1} ಐಟಂ {4}. ನೀವು ಮಾಡುತ್ತಿದ್ದಾರೆ ಇನ್ನೊಂದು ಅದೇ ವಿರುದ್ಧ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
@@ -2289,7 +2286,7 @@
 DocType: Budget Account,Budget Account,ಬಜೆಟ್ ಖಾತೆ
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ಇರುವುದರಿಂದ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ . ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ರದ್ದು ಮಾಡಬೇಕು ."
-DocType: Grade Interval,Grade Description,ಗ್ರೇಡ್ ವಿವರಣೆ
+DocType: Grading Scale Interval,Grade Description,ಗ್ರೇಡ್ ವಿವರಣೆ
 DocType: Stock Entry,Purchase Receipt No,ಖರೀದಿ ರಸೀತಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ಅರ್ನೆಸ್ಟ್ ಮನಿ
 DocType: Process Payroll,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
@@ -2327,7 +2324,7 @@
 DocType: Upload Attendance,Attendance To Date,ದಿನಾಂಕ ಹಾಜರಿದ್ದ
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Gateway Account,Payment Account,ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Offer Letter,Accepted,Accepted
@@ -2341,7 +2338,7 @@
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ಬಳಕೆದಾರ ವೇದಿಕೆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee,Previous Work Experience,ಹಿಂದಿನ ಅನುಭವ
@@ -2355,7 +2352,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ಸಂಸ್ಥೆಯ ಹೆಸರು ಇದಕ್ಕಾಗಿ ನೀವು ಈ ವ್ಯವಸ್ಥೆಯ ಹೊಂದಿಸುವಾಗ.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ ಈ ದಿನಾಂಕ ಫ್ರೀಜ್ , ಯಾರೂ / ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ಪಾತ್ರವನ್ನು ಹೊರತುಪಡಿಸಿ ಪ್ರವೇಶ ಮಾರ್ಪಡಿಸಲು ಮಾಡಬಹುದು ."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಉತ್ಪಾದಿಸುವ ಮೊದಲು ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಉತ್ಪಾದಿಸುವ ಮೊದಲು ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ಸ್ಥಿತಿ
 DocType: UOM,Check this to disallow fractions. (for Nos),ಭಿನ್ನರಾಶಿಗಳನ್ನು ಅವಕಾಶ ಈ ಪರಿಶೀಲಿಸಿ . ( ಸೂಲ ಫಾರ್ )
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,ಕೆಳಗಿನ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಯಿತು:
@@ -2378,6 +2375,7 @@
 DocType: Email Digest,How frequently?,ಹೇಗೆ ಆಗಾಗ್ಗೆ ?
 DocType: Purchase Receipt,Get Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ವಸ್ತುಗಳ ಬಿಲ್ ಟ್ರೀ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Student,Joining Date,ಸೇರುವ ದಿನಾಂಕ
 ,Employees working on a holiday,ಒಂದು ರಜಾ ಕೆಲಸ ನೌಕರರು
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ಮಾರ್ಕ್ ಪ್ರೆಸೆಂಟ್
@@ -2479,7 +2477,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ಉತ್ಪಾದನೆ
 DocType: Guardian,Occupation,ಉದ್ಯೋಗ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ್ರಮಾಣ)
 DocType: Sales Invoice,This Document,ಈ ಡಾಕ್ಯುಮೆಂಟ್
 DocType: Installation Note Item,Installed Qty,ಅನುಸ್ಥಾಪಿಸಲಾದ ಪ್ರಮಾಣ
@@ -2502,8 +2500,8 @@
 DocType: Notification Control,Sales Order Message,ಮಾರಾಟದ ಆರ್ಡರ್ ಸಂದೇಶ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ಇತ್ಯಾದಿ ಕಂಪನಿ, ಕರೆನ್ಸಿ , ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ , ಹಾಗೆ ಹೊಂದಿಸಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು"
 DocType: Payment Entry,Payment Type,ಪಾವತಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
 DocType: Process Payroll,Select Employees,ಆಯ್ಕೆ ನೌಕರರು
 DocType: Opportunity,Potential Sales Deal,ಸಂಭಾವ್ಯ ಮಾರಾಟ ಡೀಲ್
 DocType: Payment Entry,Cheque/Reference Date,ಚೆಕ್ / ಉಲ್ಲೇಖ ದಿನಾಂಕ
@@ -2520,7 +2518,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ಈಗಾಗಲೇ ಕಂಪನಿ ದಾಖಲಿಸಿದವರು ಜಾಗತಿಕ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ {0} {1}
 DocType: Purchase Order,Ref SQ,ಉಲ್ಲೇಖ SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ಎಲ್ಲಾ BOMs ಐಟಂ / BOM ಬದಲಾಯಿಸಿ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಲ್ಲಿಸಬೇಕು
 DocType: Purchase Invoice Item,Received Qty,ಪ್ರಮಾಣ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 DocType: Stock Entry Detail,Serial No / Batch,ಯಾವುದೇ ಸೀರಿಯಲ್ / ಬ್ಯಾಚ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,ಮಾಡಿರುವುದಿಲ್ಲ ಪಾವತಿಸಿದ ಮತ್ತು ವಿತರಣೆ
@@ -2533,7 +2531,7 @@
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ವೇತನದಾರರ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ಸಾಲು {0} ನಲ್ಲಿ {1}. ಐಟಂ ದರ {2} ಸೇರಿವೆ, ಸಾಲುಗಳನ್ನು {3} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ಬಳಕೆದಾರ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ಬಳಕೆದಾರ ಮಾಡಿ
 DocType: Packing Slip,Identification of the package for the delivery (for print),( ಮುದ್ರಣ ) ವಿತರಣಾ ಪ್ಯಾಕೇಜ್ ಗುರುತಿನ
 DocType: Bin,Reserved Quantity,ರಿಸರ್ವ್ಡ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ದಯವಿಟ್ಟು ಮಾನ್ಯವಾದ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
@@ -2547,11 +2545,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಟೆಂಪ್ಲೇಟ್ ಡೀಫಾಲ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಇರಬಾರದು
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ಡೆಲಿವರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,ಡೆಲಿವರಿ
 DocType: Stock Reconciliation Item,Current Qty,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ವಿಭಾಗ ಕಾಸ್ಟಿಂಗ್ ರಲ್ಲಿ ""ಆಧರಿಸಿ ವಸ್ತುಗಳ ದರ "" ನೋಡಿ"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,ಹಿಂದಿನದು
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ಗಳು ನೀವು ವಿದ್ಯಾರ್ಥಿಗಳು ಹಾಜರಾತಿ, ಮೌಲ್ಯಮಾಪನಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ಗಳು ನೀವು ವಿದ್ಯಾರ್ಥಿಗಳು ಹಾಜರಾತಿ, ಮೌಲ್ಯಮಾಪನಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 DocType: Payment Entry,Total Allocated Amount,ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ
 DocType: Item Reorder,Material Request Type,ಮೆಟೀರಿಯಲ್ RequestType
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ನಿಂದ {0} ಗೆ ಸಂಬಳ Accural ಜರ್ನಲ್ ಎಂಟ್ರಿ {1}
@@ -2574,7 +2573,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
@@ -2584,6 +2583,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',ಸ್ಥಿತಿ ಕ್ರಿಯೆಯನ್ನು ಬಗ್ಗೆ ಒಂದು ಇಮೇಲ್ ಕಳುಹಿಸುತ್ತೇವೆ ನೌಕರರಿಗೆ &#39;ಮುಕ್ತ&#39;
 DocType: Task,Depends on Tasks,ಕಾರ್ಯಗಳು ಅವಲಂಬಿಸಿದೆ
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ಗ್ರಾಹಕ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಗ್ರೂಪ್ ಟ್ರೀ .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ಲಗತ್ತುಗಳು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸಕ್ರಿಯಗೊಳಿಸದೇ ತೋರಿಸಬಹುದು
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
 DocType: Leave Control Panel,Leave Control Panel,ಕಂಟ್ರೋಲ್ ಪ್ಯಾನಲ್ ಬಿಡಿ
@@ -2596,12 +2596,10 @@
 DocType: Sales Invoice,Debit To,ಡೆಬಿಟ್
 DocType: Delivery Note,Required only for sample item.,ಕೇವಲ ಮಾದರಿ ಐಟಂ ಅಗತ್ಯವಿದೆ .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ವ್ಯವಹಾರದ ನಂತರ ನಿಜವಾದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ವಿಧ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ವಿಧ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ಸಂಬಳ ಸ್ಲಿಪ್ ನಡುವಿನ ಭಾಗದಲ್ಲಿ {0} ಮತ್ತು {1}
 ,Pending SO Items For Purchase Request,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
@@ -2618,7 +2616,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ಮುಖಪುಟ ಉತ್ಪನ್ನ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ಹೊಸ ವೇರ್ಹೌಸ್ ಹೆಸರು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ಒಟ್ಟು {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ಒಟ್ಟು {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ಕ್ಷೇತ್ರ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
@@ -2636,7 +2634,7 @@
 DocType: Price List,Price List Master,ದರ ಪಟ್ಟಿ ಮಾಸ್ಟರ್
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ನೀವು ಸೆಟ್ ಮತ್ತು ಗುರಿಗಳನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಆ ಎಲ್ಲಾ ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅನೇಕ ** ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ** ವಿರುದ್ಧ ಟ್ಯಾಗ್ ಮಾಡಬಹುದು.
 ,S.O. No.,S.O. ನಂ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Price List,Applicable for Countries,ದೇಶಗಳು ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ಮಾತ್ರ ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ &#39;ಅಂಗೀಕಾರವಾದ&#39; ಮತ್ತು &#39;ತಿರಸ್ಕರಿಸಲಾಗಿದೆ&#39; ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
@@ -2729,7 +2727,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 DocType: Vehicle Service,Engine Oil,ಎಂಜಿನ್ ತೈಲ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
 DocType: Employee Loan,Loan Details,ಸಾಲ ವಿವರಗಳು
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿದೆ ಶೂನ್ಯ ಇರಬೇಕು.
@@ -2794,7 +2792,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಗುಂಪು ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Assessment Result Tool,Result HTML,ಪರಿಣಾಮವಾಗಿ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ರಂದು ಅವಧಿ ಮೀರುತ್ತದೆ
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form,C-Form No,ಸಿ ಫಾರ್ಮ್ ನಂ
 DocType: BOM,Exploded_items,Exploded_items
@@ -2859,7 +2857,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ಮಿತಿ ಕ್ರಾಸ್ಡ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ಈ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಶೈಕ್ಷಣಿಕ ಪದವನ್ನು {0} ಮತ್ತು &#39;ಟರ್ಮ್ ಹೆಸರು&#39; {1} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಈ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ಐಟಂ {0} ವಿರುದ್ಧದ ವ್ಯವಹಾರ ಇವೆ, ನೀವು ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ಐಟಂ {0} ವಿರುದ್ಧದ ವ್ಯವಹಾರ ಇವೆ, ನೀವು ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {1}"
 DocType: UOM,Must be Whole Number,ಹೋಲ್ ಸಂಖ್ಯೆ ಇರಬೇಕು
 DocType: Leave Control Panel,New Leaves Allocated (In Days),( ದಿನಗಳಲ್ಲಿ) ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -2903,7 +2901,7 @@
 DocType: Supplier,Last Day of the Next Month,ಮುಂದಿನ ತಿಂಗಳ ಕೊನೆಯ ದಿನ
 DocType: Support Settings,Auto close Issue after 7 days,7 ದಿನಗಳ ನಂತರ ಆಟೋ ನಿಕಟ ಸಂಚಿಕೆ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ಮೊದಲು ಹಂಚಿಕೆ ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {0}, ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರ
 DocType: Asset Category Account,Accumulated Depreciation Account,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಖಾತೆ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
@@ -2931,8 +2929,8 @@
 DocType: Asset,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Production Planning Tool,Create Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು
 DocType: Serial No,Warranty / AMC Details,ಖಾತರಿ / ಎಎಮ್ಸಿ ವಿವರಗಳು
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
@@ -2951,7 +2949,7 @@
 DocType: Production Planning Tool,Create Material Requests,CreateMaterial ವಿನಂತಿಗಳು
 DocType: Employee Education,School/University,ಸ್ಕೂಲ್ / ವಿಶ್ವವಿದ್ಯಾಲಯ
 DocType: Payment Request,Reference Details,ರೆಫರೆನ್ಸ್ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
 DocType: Sales Invoice Item,Available Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
 DocType: Asset,Double Declining Balance,ಡಬಲ್ ಕ್ಷೀಣಿಸಿದ ಬ್ಯಾಲೆನ್ಸ್
@@ -2972,19 +2970,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ಪಾವತಿಸಲಾಗುತ್ತದೆ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"ಇಂದ ದಿನಾಂಕ, ಗೆ ದಿನಾಂಕದ ಆಮೇಲೆ ಬರಬೇಕು"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
 DocType: Asset,Fully Depreciated,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್ ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ಉಲ್ಲೇಖಗಳು ಪ್ರಸ್ತಾಪಗಳನ್ನು, ನಿಮ್ಮ ಗ್ರಾಹಕರಿಗೆ ಕಳುಹಿಸಿದ್ದಾರೆ ಬಿಡ್ ಇವೆ"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ಉಲ್ಲೇಖಗಳು ಪ್ರಸ್ತಾಪಗಳನ್ನು, ನಿಮ್ಮ ಗ್ರಾಹಕರಿಗೆ ಕಳುಹಿಸಿದ್ದಾರೆ ಬಿಡ್ ಇವೆ"
 DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಅಂಕಗಳು ಮೊತ್ತ {0} ಎಂದು ಅಗತ್ಯವಿದೆ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಸೆಟ್ Depreciations ಸಂಖ್ಯೆ ಬುಕ್ಡ್
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಸೆಟ್ Depreciations ಸಂಖ್ಯೆ ಬುಕ್ಡ್
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ಮಿನಿಟ್
@@ -3115,7 +3113,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು
 DocType: Shopping Cart Settings,Quotation Series,ಉದ್ಧರಣ ಸರಣಿ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
 DocType: C-Form,I,ನಾನು
 DocType: Company,Asset Depreciation Cost Center,ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
@@ -3134,19 +3132,18 @@
 DocType: Vehicle,Insurance Details,ವಿಮೆ ವಿವರಗಳು
 DocType: Account,Payable,ಕೊಡಬೇಕಾದ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ದಯವಿಟ್ಟು ಮರುಪಾವತಿಯ ಅವಧಿಗಳು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ಸಾಲಗಾರರು ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ಸಾಲಗಾರರು ({0})
 DocType: Pricing Rule,Margin,ಕರೆ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ಹೊಸ ಗ್ರಾಹಕರು
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,ನಿವ್ವಳ ಲಾಭ%
 DocType: Appraisal Goal,Weightage (%),Weightage ( % )
 DocType: Bank Reconciliation Detail,Clearance Date,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
 DocType: Lead,Address Desc,DESC ವಿಳಾಸ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ಪಕ್ಷದ ಕಡ್ಡಾಯ
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ವಿಷಯ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,ಮಾರಾಟ ಅಥವಾ ಖರೀದಿ ಆಫ್ ಕನಿಷ್ಠ ಒಂದು ಆಯ್ಕೆ ಮಾಡಬೇಕು
-DocType: Grading Structure,Grade Intervals,ಗ್ರೇಡ್ ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ನಿಮ್ಮ ವ್ಯಾಪಾರ ಸ್ವರೂಪ ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ಉತ್ಪಾದನಾ ಕಾರ್ಯಗಳ ಅಲ್ಲಿ ನಿರ್ವಹಿಸುತ್ತಾರೆ.
 DocType: Asset Movement,Source Warehouse,ಮೂಲ ವೇರ್ಹೌಸ್
@@ -3175,6 +3172,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 DocType: Territory,Territory Targets,ಪ್ರದೇಶ ಗುರಿಗಳ
 DocType: Delivery Note,Transporter Info,ಸಾರಿಗೆ ಮಾಹಿತಿ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ {0} ಕಂಪನಿ ಸೆಟ್ {1}
 DocType: Cheque Print Template,Starting position from top edge,ಮೇಲಿನ ತುದಿಯಲ್ಲಿ ಸ್ಥಾನವನ್ನು ಆರಂಭಗೊಂಡು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ಅದೇ ಪೂರೈಕೆದಾರ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
@@ -3228,7 +3226,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ಪ್ರಸ್ತುತ ಉದ್ಯೋಗ ಅವಕಾಶಗಳನ್ನು
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
-DocType: Journal Entry,Write Off,ಆಫ್ ಬರೆಯಿರಿ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ಆಫ್ ಬರೆಯಿರಿ
 DocType: Timesheet Detail,Operation ID,ಆಪರೇಷನ್ ಐಡಿ
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ವ್ಯವಸ್ಥೆ ಬಳಕೆದಾರರು ( ಲಾಗಿನ್ ) id. ಹೊಂದಿಸಿದಲ್ಲಿ , ಎಲ್ಲಾ ಮಾನವ ಸಂಪನ್ಮೂಲ ರೂಪಗಳು ಡೀಫಾಲ್ಟ್ ಪರಿಣಮಿಸುತ್ತದೆ ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ಗೆ {1}
@@ -3239,8 +3237,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ಸರಬರಾಜುದಾರ ಗ್ರಾಹಕ ನೀಡುತ್ತದೆ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ಫಾರ್ಮ್ / ಐಟಂ / {0}) ಷೇರುಗಳ ಔಟ್
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,ಮುಂದಿನ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚು ಇರಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ಡೇಟಾ ಆಮದು ಮತ್ತು ರಫ್ತು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು, ವೇರ್ಹೌಸ್ {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ
@@ -3252,14 +3250,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Program Enrollment,School House,ಸ್ಕೂಲ್ ಹೌಸ್
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
 DocType: Company,Default Cash Account,ಡೀಫಾಲ್ಟ್ ನಗದು ಖಾತೆ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ಈ ವಿದ್ಯಾರ್ಥಿ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳ ರಲ್ಲಿ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ಹೆಚ್ಚಿನ ಐಟಂಗಳನ್ನು ಅಥವಾ ಮುಕ್ತ ಪೂರ್ಣ ರೂಪ ಸೇರಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
@@ -3306,9 +3305,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ಸಮನ್ವಯ ಮೊದಲು
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ಗೆ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
 DocType: Sales Order,Partly Billed,ಹೆಚ್ಚಾಗಿ ಖ್ಯಾತವಾದ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ಐಟಂ {0} ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ಐಟಂ {0} ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಇರಬೇಕು
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
@@ -3331,7 +3330,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
 DocType: Purchase Invoice Item,Rate,ದರ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ಆಂತರಿಕ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ವಿಳಾಸ ಹೆಸರು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,ವಿಳಾಸ ಹೆಸರು
 DocType: Stock Entry,From BOM,BOM ಗೆ
 DocType: Assessment Code,Assessment Code,ಅಸೆಸ್ಮೆಂಟ್ ಕೋಡ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ಮೂಲಭೂತ
@@ -3356,7 +3355,7 @@
 DocType: Purchase Invoice,Print Language,ಮುದ್ರಣ ಭಾಷಾ
 DocType: Salary Slip,Total Working Hours,ಒಟ್ಟು ವರ್ಕಿಂಗ್ ಅವರ್ಸ್
 DocType: Stock Entry,Including items for sub assemblies,ಉಪ ಅಸೆಂಬ್ಲಿಗಳಿಗೆ ಐಟಂಗಳನ್ನು ಸೇರಿದಂತೆ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
 DocType: Purchase Invoice,Items,ಐಟಂಗಳನ್ನು
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ವಿದ್ಯಾರ್ಥಿ ಈಗಾಗಲೇ ದಾಖಲಿಸಲಾಗಿದೆ.
@@ -3376,17 +3375,15 @@
 DocType: Issue,Opening Time,ಆರಂಭಿಕ ಸಮಯ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ಅಗತ್ಯವಿದೆ ದಿನಾಂಕ ಮತ್ತು ಮಾಡಲು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
 DocType: Assessment Plan,Supervisor Name,ಮೇಲ್ವಿಚಾರಕ ಹೆಸರು
 DocType: Program Enrollment Course,Program Enrollment Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಕೋರ್ಸ್
 DocType: Program Enrollment Course,Program Enrollment Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಕೋರ್ಸ್
-DocType: Grading Structure,Grading Structure,ಗ್ರೇಡಿಂಗ್ ರಚನೆ
 DocType: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
 DocType: Tax Rule,Shipping City,ಶಿಪ್ಪಿಂಗ್ ನಗರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಭೇದ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಲಕ್ಷಣಗಳು ಟೆಂಪ್ಲೇಟ್ ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Notification Control,Customize the Notification,ಅಧಿಸೂಚನೆ ಕಸ್ಟಮೈಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ಕಾರ್ಯಾಚರಣೆ ಕ್ಯಾಶ್ ಫ್ಲೋ
 DocType: Sales Invoice,Shipping Rule,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
@@ -3409,6 +3406,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಕ್ರಮಾಂಕಗಳನ್ನು ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
 DocType: Leave Control Panel,Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Department,Days for which Holidays are blocked for this department.,ಯಾವ ರಜಾದಿನಗಳಲ್ಲಿ ಡೇಸ್ ಈ ಇಲಾಖೆಗೆ ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ.
@@ -3437,7 +3435,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ಒಟ್ಟು (ಆಮ್ಟ್)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,ಲೆಕ್ಕಪರಿಶೋಧಕ ಹೇಳಿಕೆಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ಗಂಟೆ
@@ -3452,8 +3450,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,ಬದಲಿ ನಂತರ ಹೊಸ BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
 DocType: Payment Entry,Received Amount,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ಆದೇಶದ ಈಗಾಗಲೇ ಪ್ರಮಾಣ ಕಡೆಗಣಿಸಿ, ಪೂರ್ಣ ಪ್ರಮಾಣದ ರಚಿಸಿ"
 DocType: Account,Tax,ತೆರಿಗೆ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ಗುರುತು ಮಾಡದಿರುವ
@@ -3466,7 +3462,7 @@
 DocType: Batch,Source Document Name,ಮೂಲ ಡಾಕ್ಯುಮೆಂಟ್ ಹೆಸರು
 DocType: Batch,Source Document Name,ಮೂಲ ಡಾಕ್ಯುಮೆಂಟ್ ಹೆಸರು
 DocType: Job Opening,Job Title,ಕೆಲಸದ ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ಬಳಕೆದಾರರು ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ಬಳಕೆದಾರರು ರಚಿಸಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ಗ್ರಾಮ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ನಿರ್ವಹಣೆ ಕಾಲ್ ವರದಿ ಭೇಟಿ .
@@ -3478,8 +3474,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: BOM,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ರಸೀತಿ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
@@ -3490,16 +3486,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ಸಂಪಾದಿಸಲು ಏನೂ ಇಲ್ಲ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ಇನ್ನೂ ಯಾವುದೇ ಗ್ರಾಹಕರು!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ಪರವಾನಗಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ನೀವು ಆದ್ದರಿಂದ ಈ ಹಿಂದಿನ ಆರ್ಥಿಕ ವರ್ಷದ ಬಾಕಿ ಈ ಆರ್ಥಿಕ ವರ್ಷ ಬಿಟ್ಟು ಸೇರಿವೆ ಬಯಸಿದರೆ ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: GL Entry,Against Voucher Type,ಚೀಟಿ ಕೌಟುಂಬಿಕತೆ ವಿರುದ್ಧ
 DocType: Item,Attributes,ಗುಣಲಕ್ಷಣಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
 DocType: Student,Guardian Details,ಗಾರ್ಡಿಯನ್ ವಿವರಗಳು
 DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ಅನೇಕ ನೌಕರರು ಮಾರ್ಕ್ ಅಟೆಂಡೆನ್ಸ್
@@ -3524,14 +3522,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ರೋ {0} # ಖಾತೆ ರೀತಿಯ ಇರಬೇಕು &#39;ಸ್ಥಿರ ಸ್ವತ್ತು&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ಪ್ರಮಾಣ ಔಟ್
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ಒಂದು ಮಾರಾಟ ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕಾಚಾರ ನಿಯಮಗಳು
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
 DocType: Student Sibling,Student ID,ವಿದ್ಯಾರ್ಥಿ ಗುರುತು
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ಸಮಯ ದಾಖಲೆಗಳು ಚಟುವಟಿಕೆಗಳನ್ನು ವಿಧಗಳು
 DocType: Tax Rule,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
 DocType: Training Event,Exam,ಪರೀಕ್ಷೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,ಕೋಟಿ
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
@@ -3564,7 +3562,7 @@
 DocType: Payment Entry,Account Paid From,ಖಾತೆ ಪಾವತಿಸಿದ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ರಾ ಮೆಟೀರಿಯಲ್ ಐಟಂ ಕೋಡ್
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ಲೀಡ್ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ಲೀಡ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,ಮುದ್ರಣ ಮತ್ತು ಲೇಖನ ಸಾಮಗ್ರಿ
 DocType: Stock Settings,Show Barcode Field,ಶೋ ಬಾರ್ಕೋಡ್ ಫೀಲ್ಡ್
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
@@ -3580,6 +3578,7 @@
 DocType: Offer Letter,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ಮೇಲೆ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ಹೇಳಿರಿ ಅಲ್ಲದ ಪ್ರಮಾಣಿತ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ವೇಳೆ
 DocType: Salary Slip,Earning & Deduction,ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
@@ -3616,7 +3615,7 @@
 DocType: Program Enrollment Tool,Get Students From,ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Hub Settings,Seller Country,ಮಾರಾಟಗಾರ ಕಂಟ್ರಿ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಐಟಂಗಳನ್ನು ಪ್ರಕಟಿಸಿ
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ಹಂತಹಂತವಾಗಿ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಗ್ರೂಪ್
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ಹಂತಹಂತವಾಗಿ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಗ್ರೂಪ್
 DocType: Authorization Rule,Authorization Rule,ಅಧಿಕಾರ ರೂಲ್
 DocType: Sales Invoice,Terms and Conditions Details,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿವರಗಳು
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ವಿಶೇಷಣಗಳು
@@ -3676,7 +3675,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,ಪರೀಕ್ಷಣೆ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ಸಂಬಳ ಘಟಕಗಳು
 DocType: Program Enrollment Tool,New Academic Year,ಹೊಸ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ರಿಟರ್ನ್ / ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,ರಿಟರ್ನ್ / ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
 DocType: Production Order Item,Transferred Qty,ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಲಾಯಿತು
@@ -3717,6 +3716,7 @@
 ,Sales Funnel,ಮಾರಾಟ ಕೊಳವೆಯನ್ನು
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
 DocType: Project,Task Progress,ಟಾಸ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ಕಾರ್ಟ್
 ,Qty to Transfer,ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
@@ -3750,7 +3750,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ಶುಲ್ಕ ಸಂಗ್ರಹಿಸಿ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Lead,Add to calendar on this date,ಈ ದಿನಾಂಕದಂದು ಕ್ಯಾಲೆಂಡರ್ಗೆ ಸೇರಿಸು
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
 DocType: Item,Opening Stock,ಸ್ಟಾಕ್ ತೆರೆಯುವ
@@ -3769,7 +3769,7 @@
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ಉತ್ಪಾದನೆಗೆ ಬಿಡುಗಡೆ ಆರ್ಡರ್ಸ್ .
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Program Enrollment Tool,Enroll Students,ವಿದ್ಯಾರ್ಥಿಗಳು ದಾಖಲು
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
@@ -3780,7 +3780,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
-DocType: Supplier,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
+DocType: Customer,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
 DocType: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
 DocType: Production Order,Required Items,ಅಗತ್ಯ ವಸ್ತುಗಳ
 DocType: Stock Ledger Entry,Stock Value Difference,ಸ್ಟಾಕ್ ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ
@@ -3811,6 +3811,7 @@
 DocType: Item,Taxes,ತೆರಿಗೆಗಳು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,ಹಣ ಮತ್ತು ವಿತರಣೆ
 DocType: Project,Default Cost Center,ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ ಸೆಂಟರ್
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಹೊಂದಿಸುವಿಕೆ&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಗಾಗಿ ಸರಣಿ ಹೆಸರಿಸುವ ದಯವಿಟ್ಟು
 DocType: Bank Guarantee,End Date,ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್
 DocType: Budget,Budget Accounts,ಬಜೆಟ್ ಖಾತೆಗಳು
@@ -3875,7 +3876,7 @@
 DocType: Customer,Sales Partner and Commission,ಮಾರಾಟದ ಸಂಗಾತಿ ಮತ್ತು ಆಯೋಗದ
 DocType: Employee Loan,Rate of Interest (%) / Year,ಬಡ್ಡಿ (%) / ವರ್ಷದ ದರ
 ,Project Quantity,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು, ಶೂನ್ಯವಾಗಿರುತ್ತದೆ ನೀವು ರಂದು ಆಧರಿಸಿ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು, ಶೂನ್ಯವಾಗಿರುತ್ತದೆ ನೀವು ರಂದು ಆಧರಿಸಿ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು"
 DocType: Opportunity,To Discuss,ಡಿಸ್ಕಸ್
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ಘಟಕಗಳು {1} ನಲ್ಲಿ {2} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಅಗತ್ಯವಿದೆ.
 DocType: Loan Type,Rate of Interest (%) Yearly,ಬಡ್ಡಿ ದರ (%) ವಾರ್ಷಿಕ
@@ -3898,7 +3899,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ಮಾರ್ಕ್ ಆಬ್ಸೆಂಟ್
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ರೋ {0}: ಆಫ್ ಬಿಒಎಮ್ # ಕರೆನ್ಸಿ {1} ಆಯ್ಕೆ ಕರೆನ್ಸಿ ಸಮಾನ ಇರಬೇಕು {2}
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Homepage,Tag Line,ಟ್ಯಾಗ್ ಲೈನ್
 DocType: Fee Component,Fee Component,ಶುಲ್ಕ ಕಾಂಪೊನೆಂಟ್
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
@@ -3915,7 +3916,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ವೇರ್ಹೌಸ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext ಹಬ್ ನೋಂದಣಿ
 DocType: Monthly Distribution,Monthly Distribution Percentages,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ಮೌಲ್ಯಾಂಕನ ದರ ಲೆಕ್ಕಪತ್ರ ನಮೂದುಗಳನ್ನು ಮಾಡಲು ಅಗತ್ಯವಿದೆ ಇದು ಐಟಂ {0}, ಕಂಡುಬಂದಿಲ್ಲ {1} {2}. ಐಟಂ ಒಂದು ಮಾದರಿ ಐಟಂ ವಹಿವಾಟುಗಳನ್ನು ವೇಳೆ {1}, {1} ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಕುರಿತು ಮಾಹಿತಿ ನೀಡಿ. ಇಲ್ಲವಾದರೆ, ಐಟಂ ದಾಖಲೆಯಲ್ಲಿ ಐಟಂ ಅಥವಾ ಉಲ್ಲೇಖವನ್ನು ಮೌಲ್ಯಮಾಪನ ದರ ಒಳಬರುವ ಶೇರು ವಹಿವಾಟು ರಚಿಸಲು, ತದನಂತರ / submiting ಪ್ರಯತ್ನಿಸಿ ಈ ನಮೂದನ್ನು ರದ್ದು ಮಾಡಿ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ವಿತರಿಸಲಾಯಿತು ವಸ್ತುಗಳ %
 DocType: Project,Customer Details,ಗ್ರಾಹಕ ವಿವರಗಳು
@@ -3932,7 +3933,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ಸಲ್ಲಿಸಲಾಗಿದೆ ಆದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee Loan,Repay Fixed Amount per Period,ಅವಧಿಯ ಪ್ರತಿ ಸ್ಥಿರ ಪ್ರಮಾಣದ ಮರುಪಾವತಿ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
@@ -3959,7 +3960,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ವಿದ್ಯಾರ್ಥಿ ಈಮೇಲ್ ಅಡ್ರೆಸ್
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
 DocType: Tax Rule,Sales Tax Template,ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
 DocType: Employee,Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ
 DocType: Training Event,Internet,ಇಂಟರ್ನೆಟ್
 DocType: Account,Stock Adjustment,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ
@@ -3993,6 +3994,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ಡೆಬಿಟ್ ಚೀಟಿಯನ್ನು ನೀಡಲಾಗಿದೆ
 DocType: Production Order,Warehouses,ಗೋದಾಮುಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ಆಸ್ತಿ ವರ್ಗಾವಣೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಪ್ರಕಾರವಾಗಿದ್ದು.
 DocType: Workstation,per hour,ಗಂಟೆಗೆ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ಖರೀದಿ
 DocType: Announcement,Announcement,ಪ್ರಕಟಣೆ
@@ -4008,7 +4010,7 @@
 DocType: Account,Receivable,ಲಭ್ಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ರೋ # {0}: ಆರ್ಡರ್ ಖರೀದಿಸಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪೂರೈಕೆದಾರ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ಪಾತ್ರ ವ್ಯವಹಾರ ಸೆಟ್ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಮಾಡಲಿಲ್ಲ ಸಲ್ಲಿಸಲು ಅವಕಾಶ ನೀಡಲಿಲ್ಲ .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
 DocType: Item,Material Issue,ಮೆಟೀರಿಯಲ್ ಸಂಚಿಕೆ
 DocType: Hub Settings,Seller Description,ಮಾರಾಟಗಾರ ವಿವರಣೆ
@@ -4021,7 +4023,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ಆದೇಶ
 DocType: Salary Detail,Component,ಕಾಂಪೊನೆಂಟ್
 DocType: Assessment Criteria,Assessment Criteria Group,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಗ್ರೂಪ್
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ಪಾತ್ರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ಅಥವಾ ಬಳಕೆದಾರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ನಮೂದಿಸಿ
@@ -4056,7 +4058,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ಡೀಫಾಲ್ಟ್ ಎಂದು ಈ ಆರ್ಥಿಕ ವರ್ಷ ಹೊಂದಿಸಲು, ' ಪೂರ್ವನಿಯೋಜಿತವಾಗಿನಿಗದಿಪಡಿಸು ' ಕ್ಲಿಕ್"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ಸೇರಲು
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Employee Loan,Repay from Salary,ಸಂಬಳದಿಂದ ಬಂದ ಮರುಪಾವತಿ
 DocType: Leave Application,LAP/,ಲ್ಯಾಪ್ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ವಿರುದ್ಧ ಪಾವತಿ ಮನವಿ {0} {1} ಪ್ರಮಾಣದ {2}
@@ -4074,7 +4076,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ವಿವರ
 DocType: Employee Education,Employee Education,ನೌಕರರ ಶಿಕ್ಷಣ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ನಕಲು ಐಟಂ ಗುಂಪು ಐಟಂ ಗುಂಪು ಟೇಬಲ್ ಕಂಡುಬರುವ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
 DocType: Salary Slip,Net Pay,ನಿವ್ವಳ ವೇತನ
 DocType: Account,Account,ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -4083,7 +4085,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","ವೇರ್ಹೌಸ್ {0} ಯಾವುದೇ ಖಾತೆಗೆ ಲಿಂಕ್, ದಯವಿಟ್ಟು / ಲಿಂಕ್ ಗೋದಾಮಿನ ಅನುಗುಣವಾದ (ಆಸ್ತಿ) ಖಾತೆಯನ್ನು ರಚಿಸಲು."
 DocType: Purchase Invoice,Recurring Id,ಮರುಕಳಿಸುವ ಸಂ
 DocType: Customer,Sales Team Details,ಮಾರಾಟ ತಂಡದ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿ?
 DocType: Expense Claim,Total Claimed Amount,ಹಕ್ಕು ಪಡೆದ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ಮಾರಾಟ ಸಮರ್ಥ ಅವಕಾಶಗಳನ್ನು .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
@@ -4094,13 +4096,14 @@
 DocType: Warehouse,PIN,ಪಿನ್
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext ನಿಮ್ಮ ಸ್ಕೂಲ್ ಸೆಟಪ್
 DocType: Sales Invoice,Base Change Amount (Company Currency),ಬೇಸ್ ಬದಲಾಯಿಸಬಹುದು ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
 DocType: Account,Chargeable,ಪೂರಣಮಾಡಬಲ್ಲ
 DocType: Company,Change Abbreviation,ಬದಲಾವಣೆ ಸಂಕ್ಷೇಪಣ
 DocType: Expense Claim Detail,Expense Date,ಖರ್ಚು ದಿನಾಂಕ
 DocType: Item,Max Discount (%),ಮ್ಯಾಕ್ಸ್ ಡಿಸ್ಕೌಂಟ್ ( % )
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,ಕೊನೆಯ ಆರ್ಡರ್ ಪ್ರಮಾಣ
+DocType: Task,Is Milestone,ಮೈಲ್ಸ್ಟೋನ್ ಈಸ್
 DocType: Daily Work Summary,Email Sent To,ಇಮೇಲ್ ಕಳುಹಿಸಲಾಗಿದೆ
 DocType: Budget,Warn,ಎಚ್ಚರಿಕೆ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
@@ -4133,11 +4136,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
 DocType: Tax Rule,Purchase Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 ,Project wise Stock Tracking,ಪ್ರಾಜೆಕ್ಟ್ ಬುದ್ಧಿವಂತ ಸ್ಟಾಕ್ ಟ್ರ್ಯಾಕಿಂಗ್
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Stock Entry Detail,Actual Qty (at source/target),ನಿಜವಾದ ಪ್ರಮಾಣ ( ಮೂಲ / ಗುರಿ )
 DocType: Item Customer Detail,Ref Code,ಉಲ್ಲೇಖ ಕೋಡ್
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ನೌಕರರ ದಾಖಲೆಗಳು .
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
 DocType: HR Settings,Payroll Settings,ವೇತನದಾರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ಅಲ್ಲದ ಲಿಂಕ್ ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಪಾವತಿಗಳು ಫಲಿತಾಂಶ .
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ಪ್ಲೇಸ್ ಆರ್ಡರ್
@@ -4160,7 +4162,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,ಚೆಕ್ ಮತ್ತು ಠೇವಣಿಗಳ ತಪ್ಪಾಗಿ ತೆರವುಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate,ಬೆಲೆ ಪಟ್ಟಿ ದರ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ಗ್ರಾಹಕ ಉಲ್ಲೇಖಗಳು ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ಗ್ರಾಹಕ ಉಲ್ಲೇಖಗಳು ರಚಿಸಿ
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",""" ಸ್ಟಾಕ್ ರಲ್ಲಿ "" ತೋರಿಸು ಅಥವಾ "" ಅಲ್ಲ ಸ್ಟಾಕ್ "" ಈ ಉಗ್ರಾಣದಲ್ಲಿ ಲಭ್ಯವಿರುವ ಸ್ಟಾಕ್ ಆಧರಿಸಿ ."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,ಪೂರೈಕೆದಾರರಿಂದ ವಿಧವಾಗಿ ಸಮಯ ತಲುಪಿಸಲು
@@ -4182,7 +4184,7 @@
 DocType: Asset,Disposal Date,ವಿಲೇವಾರಿ ದಿನಾಂಕ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ಇಮೇಲ್ಗಳನ್ನು ಅವರು ರಜಾ ಹೊಂದಿಲ್ಲ ವೇಳೆ, ಗಂಟೆ ಕಂಪನಿಯ ಎಲ್ಲಾ ಸಕ್ರಿಯ ನೌಕರರು ಕಳುಹಿಸಲಾಗುವುದು. ಪ್ರತಿಕ್ರಿಯೆಗಳ ಸಾರಾಂಶ ಮಧ್ಯರಾತ್ರಿ ಕಳುಹಿಸಲಾಗುವುದು."
 DocType: Employee Leave Approver,Employee Leave Approver,ನೌಕರರ ಲೀವ್ ಅನುಮೋದಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ತರಬೇತಿ ಪ್ರತಿಕ್ರಿಯೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
@@ -4190,7 +4192,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ಕೋರ್ಸ್ ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
 DocType: Batch,Parent Batch,ಪೋಷಕ ಬ್ಯಾಚ್
 DocType: Batch,Parent Batch,ಪೋಷಕ ಬ್ಯಾಚ್
 DocType: Cheque Print Template,Cheque Print Template,ಚೆಕ್ ಪ್ರಿಂಟ್ ಟೆಂಪ್ಲೇಟು
@@ -4235,7 +4237,7 @@
 DocType: Item,Variant Based On,ಭಿನ್ನ ಬೇಸ್ಡ್ ರಂದು
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 DocType: Request for Quotation Item,Supplier Part No,ಸರಬರಾಜುದಾರ ಭಾಗ ಯಾವುದೇ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ವರ್ಗದಲ್ಲಿ &#39;ಮೌಲ್ಯಾಂಕನ&#39; ಅಥವಾ &#39;Vaulation ಮತ್ತು ಒಟ್ಟು&#39; ಆಗಿದೆ ಮಾಡಿದಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ಸ್ವೀಕರಿಸಿದ
@@ -4245,7 +4247,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ರೋ {0}: ಗಂಟೆಗಳು ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ ಹೆಚ್ಚು ಇರಬೇಕು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
@@ -4254,20 +4256,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 DocType: Payment Reconciliation,From Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಗೆ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ನಗದಾಗಿಸುವಿಕೆ ಬಿಡಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ಗೋದಾಮಿನ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Average Commission Rate,ಸರಾಸರಿ ಆಯೋಗದ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
 DocType: School House,House Name,ಹೌಸ್ ಹೆಸರು
 DocType: Purchase Taxes and Charges,Account Head,ಖಾತೆ ಹೆಡ್
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ಐಟಂಗಳ ಬಂದಿಳಿದ ವೆಚ್ಚ ಲೆಕ್ಕ ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ವಿದ್ಯುತ್ತಿನ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ನಿಮ್ಮ ಬಳಕೆದಾರರಿಗೆ ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಉಳಿದ ಸೇರಿಸಿ. ನೀವು ಸಂಪರ್ಕಗಳು ಅವುಗಳನ್ನು ಸೇರಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಪೋರ್ಟಲ್ ಗ್ರಾಹಕರಿಗೆ ಆಮಂತ್ರಿಸಲು ಸೇರಿಸಬಹುದು
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ನಿಮ್ಮ ಬಳಕೆದಾರರಿಗೆ ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಉಳಿದ ಸೇರಿಸಿ. ನೀವು ಸಂಪರ್ಕಗಳು ಅವುಗಳನ್ನು ಸೇರಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಪೋರ್ಟಲ್ ಗ್ರಾಹಕರಿಗೆ ಆಮಂತ್ರಿಸಲು ಸೇರಿಸಬಹುದು
 DocType: Stock Entry,Total Value Difference (Out - In),ಒಟ್ಟು ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ (ಔಟ್ - ರಲ್ಲಿ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ಬಳಕೆದಾರ ID ನೌಕರ ಸೆಟ್ {0}
@@ -4276,7 +4278,7 @@
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ವಿಮೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ ವಿಮಾ ಅಂತಿಮ ದಿನಾಂಕ ಕಡಿಮೆ ಇರಬೇಕು
@@ -4291,7 +4293,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
 DocType: Vehicle Log,Odometer,ದೂರಮಾಪಕ
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
@@ -4304,7 +4306,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Sales Invoice Timesheet,Billing Hours,ಬಿಲ್ಲಿಂಗ್ ಅವರ್ಸ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,ಫಾರ್ {0} ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ಅವುಗಳನ್ನು ಇಲ್ಲಿ ಸೇರಿಸಲು ಐಟಂಗಳನ್ನು ಟ್ಯಾಪ್
 DocType: Fees,Program Enrollment,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
@@ -4406,7 +4409,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
 DocType: Issue,First Responded On,ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಐಟಂ ಅಡ್ಡ ಪಟ್ಟಿ
-DocType: Grade Interval,Grade Interval,ಗ್ರೇಡ್ ಇಂಟರ್ವಲ್
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಈಗಾಗಲೇ ವಿತ್ತೀಯ ವರ್ಷದಲ್ಲಿ ಸೆಟ್ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ಒಡೆದ ಬ್ಯಾಚ್
@@ -4415,6 +4417,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF ಡೌನ್ಲೋಡ್
 DocType: Production Order,Planned End Date,ಯೋಜನೆ ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,ಐಟಂಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಅಲ್ಲಿ .
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ವಿಧ
 DocType: Request for Quotation,Supplier Detail,ಸರಬರಾಜುದಾರ ವಿವರ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ದೋಷ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
@@ -4460,7 +4463,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ಸೆಟಪ್ ನನ್ನ ಸಂಸ್ಥೆಗೆ ಒಂದು ಸರಳ ವೆಬ್ಸೈಟ್
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ಮೂಲ ವೆಚ್ಚ ಸೆಂಟರ್ ನಮೂದಿಸಿ
@@ -4520,7 +4523,7 @@
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
 DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಒಂದು ಖರ್ಚು ಹಕ್ಕು ಕಾಯ್ದಿರಿಸಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ಈ ನೌಕರರ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
@@ -4533,13 +4536,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ಕೆಳಗಿನ ದಿನಗಳಲ್ಲಿ ಲೀವ್ ಅಪ್ಲಿಕೇಶನ್ ಮಾಡುವ ಬಳಕೆದಾರರನ್ನು ನಿಲ್ಲಿಸಿ .
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ಖರೀದಿಯ ಮೊತ್ತ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Production Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ಪ್ರಾಜೆಕ್ಟ್ ಐಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
@@ -4548,15 +4551,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 ಓದುವಿಕೆ
 ,Hub,ಹಬ್
 DocType: GL Entry,Voucher Type,ಚೀಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee Loan Application,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
 DocType: Guardian,Guardian,ಗಾರ್ಡಿಯನ್
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ಅಪ್ರೇಸಲ್ {0} ನೌಕರ ದಾಖಲಿಸಿದವರು {1} givenName ದಿನಾಂಕ ವ್ಯಾಪ್ತಿಯಲ್ಲಿ
 DocType: Employee,Education,ಶಿಕ್ಷಣ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ಡೆಲ್
 DocType: Selling Settings,Campaign Naming By,ಅಭಿಯಾನ ಹೆಸರಿಸುವ
 DocType: Employee,Current Address Is,ಪ್ರಸ್ತುತ ವಿಳಾಸ ಈಸ್
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ಮಾರ್ಪಡಿಸಿದ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
@@ -4593,7 +4598,7 @@
 DocType: Hub Settings,Hub Settings,ಹಬ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Project,Gross Margin %,ಒಟ್ಟು ಅಂಚು %
 DocType: BOM,With Operations,ಕಾರ್ಯಾಚರಣೆ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
 DocType: Asset,Is Existing Asset,ಆಸ್ತಿ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಇದೆ
 DocType: Salary Detail,Statistical Component,ಸ್ಟ್ಯಾಟಿಸ್ಟಿಕಲ್ ಕಾಂಪೊನೆಂಟ್
 DocType: Salary Detail,Statistical Component,ಸ್ಟ್ಯಾಟಿಸ್ಟಿಕಲ್ ಕಾಂಪೊನೆಂಟ್
@@ -4649,7 +4654,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ಸ್ಟಾಕ್ ಲೆವೆಲ್ಸ್
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ಭಿನ್ನ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ಪಾವತಿ ಕೌಟುಂಬಿಕತೆ, ಸ್ವೀಕರಿಸಿ ಒಂದು ಇರಬೇಕು ಪೇ ಮತ್ತು ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
@@ -4662,6 +4667,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,ರಜಾ ದಿನಗಳಲ್ಲಿ ಪ್ರೊಡಕ್ಷನ್ ಅವಕಾಶ
 DocType: Sales Order,Customer's Purchase Order Date,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ಬಂಡವಾಳ
+DocType: Shopping Cart Settings,Show Public Attachments,ಸಾರ್ವಜನಿಕ ಲಗತ್ತುಗಳು ತೋರಿಸಿ
 DocType: Packing Slip,Package Weight Details,ಪ್ಯಾಕೇಜ್ ತೂಕ ವಿವರಗಳು
 DocType: Payment Gateway Account,Payment Gateway Account,ಪಾವತಿ ಗೇಟ್ವೇ ಖಾತೆ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ಪಾವತಿ ನಂತರ ಆಯ್ಕೆ ಪುಟ ಬಳಕೆದಾರ ಮರುನಿರ್ದೇಶನ.
@@ -4686,7 +4692,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ಮುಂದಿನ ಕರೆನ್ಸಿಗಳ $ ಇತ್ಯಾದಿ ಯಾವುದೇ ಸಂಕೇತ ತೋರಿಸುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಮಾಡಿ
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ಟೈಮ್ ಡೇಸ್ ಲೀಡ್
@@ -4705,8 +4711,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: GL Entry,Is Opening,ಆರಂಭ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಕ್ರಮಾಂಕಗಳನ್ನು ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಕ್ರಮಾಂಕಗಳನ್ನು ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Account,Cash,ನಗದು
 DocType: Employee,Short biography for website and other publications.,ವೆಬ್ಸೈಟ್ ಮತ್ತು ಇತರ ಪ್ರಕಟಣೆಗಳು ಕಿರು ಜೀವನಚರಿತ್ರೆ.
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 093cc1a..4f0e2ba 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,일괄 상품 만료 상태
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,은행 어음
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,쇼 변형
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,쇼 변형
 DocType: Academic Term,Academic Term,학술 용어
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,자료
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,수량
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,건강 관리
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),지급 지연 (일)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,서비스 비용
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,회계 연도는 {0} 필요
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,광고
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,같은 회사가 두 번 이상 입력
 DocType: Employee,Married,결혼 한
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},허용되지 {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},허용되지 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,에서 항목을 가져 오기
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네임 시스템 설정
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},제품 {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,나열된 항목이 없습니다.
 DocType: Payment Reconciliation,Reconcile,조정
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,식료품 점
 DocType: Quality Inspection Reading,Reading 1,읽기 1
 DocType: Process Payroll,Make Bank Entry,은행 입장 확인
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,연금 펀드
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
 DocType: SMS Center,All Sales Person,모든 판매 사람
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** 월간 배포 ** 당신이 당신의 사업에 계절성이있는 경우는 개월에 걸쳐 예산 / 대상을 배포하는 데 도움이됩니다.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,항목을 찾을 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,항목을 찾을 수 없습니다
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,급여 구조 누락
 DocType: Lead,Person Name,사람 이름
 DocType: Sales Invoice Item,Sales Invoice Item,판매 송장 상품
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","예를 들어, &quot;초등 학교&quot;또는 &quot;대학&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,재고 보고서
 DocType: Warehouse,Warehouse Detail,창고 세부 정보
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,계약 기간 종료 날짜 나중에 용어가 연결되는 학술 올해의 연말 날짜 초과 할 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 &quot;고정 자산&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 &quot;고정 자산&quot;"
 DocType: Vehicle Service,Brake Oil,브레이크 오일
 DocType: Tax Rule,Tax Type,세금의 종류
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
 DocType: BOM,Item Image (if not slideshow),상품의 이미지 (그렇지 않으면 슬라이드 쇼)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,고객은 같은 이름을 가진
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간  / 60) * 실제 작업 시간
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,선택 BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,선택 BOM
 DocType: SMS Log,SMS Log,SMS 로그
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,배달 항목의 비용
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0}의 휴가 날짜부터 현재까지 사이 아니다
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,학년
 DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: SMS Center,All Contact,모든 연락처
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,생산 주문이 이미 BOM 모든 항목에 대해 작성
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,생산 주문이 이미 BOM 모든 항목에 대해 작성
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,연봉
 DocType: Daily Work Summary,Daily Work Summary,매일 작업 요약
 DocType: Period Closing Voucher,Closing Fiscal Year,회계 연도 결산
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} 냉동입니다
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} 냉동입니다
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,계정의 차트를 만드는 기존 회사를 선택하세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,재고 비용
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,대상 창고 선택
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,콘트라 항목
 DocType: Journal Entry Account,Credit in Company Currency,회사 통화 신용
 DocType: Delivery Note,Installation Status,설치 상태
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",당신은 출석을 업데이트 하시겠습니까? <br> 현재 : {0} \ <br> 부재 {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},수락 + 거부 수량이 항목에 대한 수신 수량이 동일해야합니다 {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,공급 원료 구매
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,결제 적어도 하나의 모드는 POS 송장이 필요합니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,결제 적어도 하나의 모드는 POS 송장이 필요합니다.
 DocType: Products Settings,Show Products as a List,제품 표시 목록으로
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", 템플릿을 다운로드 적절한 데이터를 입력하고 수정 된 파일을 첨부합니다.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,감가 상각 항목 확인
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,요청 유형
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,직원을
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,직원을
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,방송
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,실행
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,작업의 세부 사항은 실시.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,유지 보수 방문을 계획합니다.
 DocType: SMS Settings,Enter url parameter for message,메시지의 URL 매개 변수를 입력
 DocType: POS Profile,Customer Groups,고객 그룹
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,재무 제표
 DocType: Guardian,Students,재학생
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,가격 및 할인을 적용하기위한 규칙.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,가격리스트는 구매 또는 판매에 적용해야합니다
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
 DocType: Naming Series,Series List for this Transaction,이 트랜잭션에 대한 시리즈 일람
 DocType: Company,Default Payroll Payable Account,기본 급여 지급 계정
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,업데이트 이메일 그룹
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,업데이트 이메일 그룹
 DocType: Sales Invoice,Is Opening Entry,개시 항목
 DocType: Customer Group,Mention if non-standard receivable account applicable,표준이 아닌 채권 계정 (해당되는 경우)
 DocType: Course Schedule,Instructor Name,강사 이름
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,견적서 항목에 대하여
 ,Production Orders in Progress,진행 중 생산 주문
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Financing의 순 현금
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
 DocType: Lead,Address & Contact,주소 및 연락처
 DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(시간 시트를 통해) 총 원가 계산 금액
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,은행 입장
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,허브에 게시
 DocType: Student Admission,Student Admission,학생 입학
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} 항목 취소
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 DocType: Item,Purchase Details,구매 상세 정보
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,자동 자료 요청의 생성에 이메일로 통보
 DocType: Journal Entry,Multi Currency,멀티 통화
 DocType: Payment Reconciliation Invoice,Invoice Type,송장 유형
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,상품 수령증
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,상품 수령증
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,판매 자산의 비용
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
-DocType: Grade Interval,Min Score,최소 점수
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
 DocType: Student Applicant,Admitted,인정
 DocType: Workstation,Rent Cost,임대 비용
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,주문 금액
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,자에 대하여 또는 내부 전송을위한 은행 / 현금 거래
 DocType: Shipping Rule,Valid for Countries,나라 유효한
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,이 항목은 템플릿과 거래에 사용할 수 없습니다.'카피'가 설정되어 있지 않는 항목 속성은 변형에 복사합니다
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,이 항목은 템플릿과 거래에 사용할 수 없습니다.'카피'가 설정되어 있지 않는 항목 속성은 변형에 복사합니다
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,고려 총 주문
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,필드 값을 '이달의 날 반복'을 입력하십시오
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,세율
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} 이미 직원에 할당 {1}에 기간 {2}에 대한 {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,항목 선택
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,비 그룹으로 변환
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,항목의 일괄처리 (lot).
 DocType: C-Form Invoice Detail,Invoice Date,송장의 날짜
 DocType: GL Entry,Debit Amount,직불 금액
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,학생 그룹 만들기
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,견적 요청
 DocType: Salary Slip Timesheet,Working Hours,근무 시간
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,기존 시리즈의 시작 / 현재의 순서 번호를 변경합니다.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,새로운 고객을 만들기
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,새로운 고객을 만들기
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","여러 가격의 규칙이 우선 계속되면, 사용자는 충돌을 해결하기 위해 수동으로 우선 순위를 설정하라는 메시지가 표시됩니다."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,구매 오더를 생성
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,구매 오더를 생성
 ,Purchase Register,회원에게 구매
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,적용 요금
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,모든 제조 공정에 대한 글로벌 설정.
 DocType: Accounts Settings,Accounts Frozen Upto,까지에게 동결계정
 DocType: SMS Log,Sent On,에 전송
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,휴일 마스터.
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,패키지 번호에서
 DocType: Item Attribute,To Range,범위
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,증권 및 예치금
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",자체 평가 방법이없는 일부 품목에 대한 거래가 있기 때문에 평가 방법을 변경할 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,할당 된 총 잎은 필수입니다
 DocType: Job Opening,Description of a Job Opening,구인에 대한 설명
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,오늘 보류 활동
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
 DocType: Production Order,Additional Operating Cost,추가 운영 비용
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,화장품
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,사다
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,임계 값 0 %의 등급을 정의하십시오.
 DocType: Sales Order,To Deliver,전달하기
 DocType: Purchase Invoice Item,Item,항목
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
 DocType: Account,Profit and Loss,이익과 손실
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,관리 하도급
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 DocType: Production Plan Item,Pending Qty,보류 수량
 DocType: Budget,Ignore,무시
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} 활성화되지 않습니다
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} 활성화되지 않습니다
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS는 다음 번호로 전송 : {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,인쇄 설정 확인 치수
 DocType: Salary Slip,Salary Slip Timesheet,급여 슬립 표
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,전체위원회
 DocType: Pricing Rule,Sales Partner,영업 파트너
 DocType: Buying Settings,Purchase Receipt Required,필수 구입 영수증
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,열기 재고 입력 한 경우 평가 비율은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,열기 재고 입력 한 경우 평가 비율은 필수입니다
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,송장 테이블에있는 레코드 없음
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,누적 값
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,확인 판매 주문
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,확인 판매 주문
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,이력서 첨부
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,반복 고객
 DocType: Leave Control Panel,Allocate,할당
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,판매로 돌아 가기
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,참고 : 총 할당 잎 {0} 이미 승인 나뭇잎 이상이어야한다 {1} 기간 동안
 DocType: Announcement,Posted By,에 의해 게시 됨
 DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,회사를 설정하십시오.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,회사를 설정하십시오.
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,판매 송장 표
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,선택 결제 계좌는 은행 항목을 만들려면
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","잎, 비용 청구 및 급여를 관리하는 직원 레코드를 작성"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","잎, 비용 청구 및 급여를 관리하는 직원 레코드를 작성"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,기술 자료 추가
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,제안서 작성
 DocType: Payment Entry Deduction,Payment Entry Deduction,결제 항목 공제
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2와의 관계
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,관리자
 DocType: Payment Entry,Payment From / To,/에서로 지불
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,날짜 범위
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},새로운 신용 한도는 고객의 현재 뛰어난 양 미만이다. 신용 한도이어야 수있다 {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},새로운 신용 한도는 고객의 현재 뛰어난 양 미만이다. 신용 한도이어야 수있다 {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
 DocType: SMS Settings,Receiver Parameter,수신기 매개 변수
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Based On'과  'Group By'는 달라야 합니다.
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,결의일
 DocType: Student Batch Name,Batch Name,배치 이름
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,작업 표 작성 :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,싸다
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,학생 월별 출석 보고서에서와 같이 현재 학생을 보여줍니다
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,학생의 출석
 DocType: Sales Invoice Timesheet,Time Sheet,시간 시트
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,백 플러시 원료 기반에
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,항목의 세부 사항을 입력하십시오
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,항목의 세부 사항을 입력하십시오
 DocType: Interest,Interest,관심
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,사전 판매
 DocType: Purchase Receipt,Other Details,기타 세부 사항
@@ -739,7 +742,7 @@
 ,Absent Student Report,결석 한 학생 보고서
 DocType: Email Digest,Next email will be sent on:,다음 이메일에 전송됩니다 :
 DocType: Offer Letter Term,Offer Letter Term,편지 기간을 제공
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,회사 {0} 존재하지 않습니다
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,보증 유효 기간
 DocType: Material Request Item,Quantity and Warehouse,수량 및 창고
 DocType: Sales Invoice,Commission Rate (%),위원회 비율 (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,프로그램을 선택하십시오.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,프로그램을 선택하십시오.
 DocType: Project,Estimated Cost,예상 비용
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} 재고 상품이 아닌
 DocType: Mode of Payment Account,Default Account,기본 계정
 DocType: Payment Entry,Received Amount (Company Currency),받은 금액 (회사 통화)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,매주 오프 날짜를 선택하세요
 DocType: Production Order Operation,Planned End Time,계획 종료 시간
 ,Sales Person Target Variance Item Group-Wise,영업 사원 대상 분산 상품 그룹 와이즈
@@ -851,7 +852,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Request for Quotation Supplier,Send Email,이메일 보내기
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,아무 권한이 없습니다
 DocType: Company,Default Bank Account,기본 은행 계좌
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
@@ -864,8 +865,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,검색된 직원이 없습니다
 DocType: Supplier Quotation,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
 DocType: SMS Center,All Customer Contact,모든 고객에게 연락
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV를 통해 재고의 균형을 업로드 할 수 있습니다.
 DocType: Warehouse,Tree Details,트리 세부 사항
@@ -876,8 +877,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,최소 송장 금액
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1} : 코스트 센터 {2} 회사에 속하지 않는 {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} 계정 {2} 그룹이 될 수 없습니다
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,항목 행 {IDX} {문서 타입} {DOCNAME} 위에 존재하지 않는 &#39;{문서 타입}&#39;테이블
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,항목 행 {IDX} {문서 타입} {DOCNAME} 위에 존재하지 않는 &#39;{문서 타입}&#39;테이블
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,어떤 작업을하지
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","자동 청구서는 05, 28 등의 예를 들어 생성되는 달의 날"
 DocType: Asset,Opening Accumulated Depreciation,감가 상각 누계액 열기
@@ -893,7 +894,7 @@
 DocType: Bin,Moving Average Rate,이동 평균 속도
 DocType: Production Planning Tool,Select Items,항목 선택
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,코스 일정
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,코스 일정
 DocType: Maintenance Visit,Completion Status,완료 상태
 DocType: HR Settings,Enter retirement age in years,년에 은퇴 연령을 입력
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,목표웨어 하우스
@@ -901,7 +902,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
 DocType: Stock Entry,STE-,스테
 DocType: Upload Attendance,Import Attendance,수입 출석
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,모든 상품 그룹
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,모든 상품 그룹
 DocType: Process Payroll,Activity Log,활동 로그
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,당기 순이익 / 손실
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
@@ -912,7 +913,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,지불하기 위해 구매
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;열기&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,수행하려면 열기
 DocType: Notification Control,Delivery Note Message,납품서 메시지
@@ -928,7 +929,7 @@
 DocType: Item Reorder,Re-Order Qty,다시 주문 수량
 DocType: Leave Block List Date,Leave Block List Date,차단 목록 날짜를 남겨
 DocType: Pricing Rule,Price or Discount,가격 또는 할인
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,구매 영수증 항목 테이블에 전체 적용 요금은 총 세금 및 요금과 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,구매 영수증 항목 테이블에 전체 적용 요금은 총 세금 및 요금과 동일해야합니다
 DocType: Sales Team,Incentives,장려책
 DocType: SMS Log,Requested Numbers,신청 번호
 DocType: Production Planning Tool,Only Obtain Raw Materials,만 원료를 얻
@@ -986,8 +987,7 @@
 DocType: Supplier,Default Payable Accounts,기본 미지급금
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Fee Structure,Components,구성 요소들
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
@@ -1039,8 +1039,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,화학
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,이 모드를 선택하면 기본 은행 / 현금 계정이 자동으로 급여 업무 일지 항목에 업데이트됩니다.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",등급 코드의 간격은 {0} 다른 학년 학년 간격과 겹칩니다. 확인하시기 바랍니다 간격 {0}과 {1} 다시 시도
 DocType: BOM,Raw Material Cost(Company Currency),원료 비용 (기업 통화)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},행 번호 {0} : 요율은 {1}에서 사용 된 요율보다 클 수 없습니다 {2}
@@ -1053,7 +1051,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM 웹 사이트 항목
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
 DocType: Timesheet Detail,Bill,계산서
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,화이트
 DocType: SMS Center,All Lead (Open),모든 납 (열기)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),행 {0}에 대한 수량을 사용할 수없는 {4}웨어 하우스의 {1} 항목의 시간을 게시에 ({2} {3})
@@ -1068,7 +1066,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},주문 유형 중 하나 여야합니다 {0}
 DocType: Lead,Next Contact Date,다음 접촉 날짜
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,열기 수량
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
 DocType: Student Batch Name,Student Batch Name,학생 배치 이름
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
 DocType: Repayment Schedule,Balance Loan Amount,잔액 대출 금액
@@ -1088,10 +1086,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},지정하여 주시기 바랍니다 {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} 음수가 될 수 없습니다
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,할인
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,할인
 DocType: Asset,Total Number of Depreciations,감가 상각의 총 수
 DocType: Sales Invoice Item,Rate With Margin,이익률
 DocType: Sales Invoice Item,Rate With Margin,이익률
@@ -1120,7 +1118,7 @@
 DocType: Lead,Organization Name,조직 이름
 DocType: Tax Rule,Shipping State,배송 상태
 ,Projected Quantity as Source,소스로 예상 수량
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
 DocType: Employee,A-,에이-
 DocType: Production Planning Tool,Include non-stock items,재고 항목을 포함
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,영업 비용
@@ -1128,7 +1126,7 @@
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,우편 번호
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,우편 번호
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},판매 주문 {0}를 {1}
 DocType: Opportunity,Contact Info,연락처 정보
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,재고 항목 만들기
@@ -1172,7 +1170,7 @@
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
 ,Ordered Items To Be Billed,청구 항목을 주문한
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,범위이어야한다보다는에게 범위
 DocType: Global Defaults,Global Defaults,글로벌 기본값
@@ -1207,11 +1205,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,배치 번호를 얻기 위해 상품 코드를 입력하세요
 DocType: Stock Settings,Default Item Group,기본 항목 그룹
 DocType: Employee Loan,Partially Disbursed,부분적으로 지급
-DocType: Grading Structure,Grading System Name,등급 시스템 이름
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,공급 업체 데이터베이스.
 DocType: Account,Balance Sheet,대차 대조표
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,귀하의 영업 사원은 고객에게 연락이 날짜에 알림을 얻을 것이다
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,동일 상품을 여러 번 입력 할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
@@ -1250,11 +1247,11 @@
 DocType: Maintenance Visit Purpose,Work Done,작업 완료
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,속성 테이블에서 하나 이상의 속성을 지정하십시오
 DocType: Announcement,All Students,모든 학생
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,보기 원장
 DocType: Grading Scale,Intervals,간격
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,학생 휴대 전화 번호
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
@@ -1295,8 +1292,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,구매 주문은 당신이 계획하는 데 도움이 당신의 구입에 후속
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,구매 주문은 당신이 계획하는 데 도움이 당신의 구입에 후속
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,작은
@@ -1320,7 +1317,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,싱크 마스터 데이터
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
@@ -1338,7 +1335,7 @@
 DocType: Student Group Student,Group Roll Number,그룹 롤 번호
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,모든 작업 가중치의 합계 1. 따라 모든 프로젝트 작업의 가중치를 조정하여주십시오해야한다
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,자본 장비
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
@@ -1365,7 +1362,7 @@
 DocType: Depreciation Schedule,Journal Entry,분개
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,진행중인 {0} 항목
 DocType: Workstation,Workstation Name,워크 스테이션 이름
-DocType: Grade Interval,Grade Code,등급 코드
+DocType: Grading Scale Interval,Grade Code,등급 코드
 DocType: POS Item Group,POS Item Group,POS 항목 그룹
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,다이제스트 이메일 :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
@@ -1382,7 +1379,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,하드웨어
 DocType: Sales Order,Recurring Upto,반복 개까지
 DocType: Attendance,HR Manager,HR 관리자
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,회사를 선택하세요
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,회사를 선택하세요
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,권한 허가
 DocType: Purchase Invoice,Supplier Invoice Date,공급 업체 송장 날짜
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,당신은 쇼핑 카트를 활성화해야
@@ -1398,7 +1395,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,음식
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,고령화 범위 3
 DocType: Maintenance Schedule Item,No of Visits,방문 없음
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,마크 출석율
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,마크 출석율
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},{1}에 대한 유지 관리 일정 {0}이 (가) 있습니다.
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,등록 학생
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},닫기 계정의 통화가 있어야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},모든 목표에 대한 포인트의 합은 그것이 100해야한다 {0}
@@ -1447,13 +1445,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,계정 차트
 DocType: Material Request,Terms and Conditions Content,약관 내용
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Detail,Depends on Leave Without Pay,무급 휴가에 따라 다름
 DocType: Pricing Rule,"Higher the number, higher the priority",숫자가 클수록 더 높은 우선 순위
 ,Purchase Invoice Trends,송장 동향을 구입
 DocType: Employee,Better Prospects,더 나은 전망
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",행 # {0} : 배치 {1}에는 {2} 개의 수량 만 있습니다. {3} 수량이있는 다른 배치를 선택하거나 행을 여러 행으로 분할하여 여러 배치에서 전달 / 발행하십시오.
 DocType: Vehicle,License Plate,차량 번호판
 DocType: Appraisal,Goals,목표
 DocType: Warranty Claim,Warranty / AMC Status,보증 / AMC 상태
@@ -1472,7 +1471,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,직원은 자신에게보고 할 수 없습니다.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","계정이 동결 된 경우, 항목은 제한된 사용자에게 허용됩니다."
 DocType: Email Digest,Bank Balance,은행 잔액
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","필요한 작업 프로필, 자격 등"
 DocType: Journal Entry Account,Account Balance,계정 잔액
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,거래에 대한 세금 규칙.
@@ -1483,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,닫히지 않은 회계 연도의 P &amp; L 잔액을보기
 DocType: Shipping Rule,Shipping Account,배송 계정
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} 계정 {2} 비활성
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,판매 주문이 당신의 일을 계획하는 데 도움과에 시간 제공 할 수 있도록
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,판매 주문이 당신의 일을 계획하는 데 도움과에 시간 제공 할 수 있도록
 DocType: Quality Inspection,Readings,읽기
 DocType: Stock Entry,Total Additional Costs,총 추가 비용
 DocType: Course Schedule,SH,SH
@@ -1494,7 +1493,7 @@
 DocType: Shipping Rule Condition,To Value,값
 DocType: Asset Movement,Stock Manager,재고 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,포장 명세서
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,포장 명세서
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,사무실 임대
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
@@ -1520,7 +1519,7 @@
 DocType: Sales Invoice,Source,소스
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,쇼 폐쇄
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,자산의 종류는 고정 자산 항목에 대해 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,자산의 종류는 고정 자산 항목에 대해 필수입니다
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,지불 테이블에있는 레코드 없음
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},이 {0} 충돌 {1}의 {2} {3}
 DocType: Student Attendance Tool,Students HTML,학생들 HTML
@@ -1538,7 +1537,7 @@
 DocType: Student,Date of Leaving,떠나는 날짜
 DocType: Pricing Rule,For Price List,가격 목록을 보려면
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,대표 조사
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,리드 만들기
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,리드 만들기
 DocType: Maintenance Schedule,Schedules,일정
 DocType: Purchase Invoice Item,Net Amount,순액
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM 세부 사항 없음
@@ -1566,7 +1565,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,프로그램 등록 계약
 DocType: Sales Invoice Item,Brand Name,브랜드 명
 DocType: Purchase Receipt,Transporter Details,수송기 상세
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,상자
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,가능한 공급 업체
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,조직
@@ -1600,7 +1599,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 읽기
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} 프로젝트 찾을 수 없습니다에 대한 기본 BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,회사 경비 주장한다.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","학생들은 시스템의 중심에, 모든 학생들이 추가된다"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","학생들은 시스템의 중심에, 모든 학생들이 추가된다"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},행 # {0} : 정리 날짜는 {1} 수표 날짜 전에 할 수 없습니다 {2}
 DocType: Company,Default Holiday List,휴일 목록 기본
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},행 {0}의 시간과 시간에서 {1}과 중첩된다 {2}
@@ -1612,20 +1611,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,지불 이메일을 다시 보내
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,새 작업
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,견적 확인
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,견적 확인
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,기타 보고서
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,사전에 X 일에 대한 작업을 계획 해보십시오.
 DocType: HR Settings,Stop Birthday Reminders,정지 생일 알림
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
 DocType: SMS Center,Receiver List,수신기 목록
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,검색 항목
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,검색 항목
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,소비 금액
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,현금의 순 변화
 DocType: Assessment Plan,Grading Scale,등급 규모
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,이미 완료
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},지불 요청이 이미 존재 {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
@@ -1663,7 +1662,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,수집
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,자산 이동 기록 {0} 작성
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,자산 이동 기록 {0} 작성
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,당신은 삭제할 수 없습니다 회계 연도 {0}. 회계 연도 {0} 전역 설정에서 기본값으로 설정
 DocType: Journal Entry,Entry Type,항목 유형
 ,Customer Credit Balance,고객 신용 잔액
@@ -1706,8 +1705,6 @@
 DocType: Student Sibling,Studying in Same Institute,같은 연구소에서 공부
 DocType: Territory,Territory Manager,지역 관리자
 DocType: Packed Item,To Warehouse (Optional),웨어 하우스 (선택 사항)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Payment Entry,Paid Amount (Company Currency),지불 금액 (회사 통화)
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
@@ -1717,9 +1714,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,쇼핑 카트에보기
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,자료 요청이 재고 항목을 확인하는 데 사용
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,다음 감가 상각 날짜는 새로운 자산에 대한 필수입니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,다음 감가 상각 날짜는 새로운 자산에 대한 필수입니다
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,모든 일괄 처리를위한 별도의 과정 기반 그룹
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,모든 일괄 처리를위한 별도의 과정 기반 그룹
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,항목의 하나의 단위.
@@ -1736,9 +1733,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,추신-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1} : 코스트 센터가 &#39;손익&#39;계정이 필요합니다 {2}. 회사의 기본 비용 센터를 설치하시기 바랍니다.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,새 연락처
 DocType: Territory,Parent Territory,상위 지역
 DocType: Quality Inspection Reading,Reading 2,2 읽기
@@ -1765,21 +1760,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,화해 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 DocType: Purchase Invoice Item,Batch No,배치 없음
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},환율을 찾을 수 없습니다 {0}에 {1} 키 날짜 {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,고객의 구매 주문에 대해 여러 판매 주문 허용
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 모바일 없음
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,주요 기능
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,변체
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,주요 기능
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,변체
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
 DocType: Employee Attendance Tool,Employees HTML,직원 HTML을
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
 DocType: Employee,Leave Encashed?,Encashed 남겨?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Email Digest,Annual Expenses,연간 비용
 DocType: Item,Variants,변종
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
@@ -1799,7 +1793,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,감정
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,배송 규칙의 조건
-DocType: Grading Structure,Grading Intervals,등급 간격
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,들어 오세요
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",행의 항목 {0}에 대한 overbill 수 없습니다 {1}보다 {2}. 과다 청구를 허용하려면 설정을 구매에서 설정하시기 바랍니다
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,상품 또는웨어 하우스를 기반으로 필터를 설정하십시오
@@ -1812,16 +1805,17 @@
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,지불
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,주문 관리
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,주문 관리
 DocType: Production Order Operation,Actual Time and Cost,실제 시간과 비용
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},최대의 자료 요청은 {0} 항목에 대한 {1}에 대해 수행 할 수있는 판매 주문 {2}
 DocType: Employee,Salutation,인사말
 DocType: Course,Course Abbreviation,코스 약어
 DocType: Student Leave Application,Student Leave Application,학생 휴가 신청
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},에 반나절에 직원 {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},총 근무 시간은 최대 근무 시간보다 더 안 {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,켜기
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,판매 상품을 동시에 번들.
 DocType: Quotation Item,Actual Qty,실제 수량
 DocType: Sales Invoice Item,References,참조
@@ -1831,7 +1825,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,중복 항목을 입력했습니다.조정하고 다시 시도하십시오.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,준
 DocType: Asset Movement,Asset Movement,자산 이동
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,새로운 장바구니
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,새로운 장바구니
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} 항목을 직렬화 된 상품이 없습니다
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
 DocType: Vehicle,Wheels,휠
@@ -1863,10 +1857,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,생산 오더에 대한 시간 로그의 생성을 사용하지 않습니다. 작업은 생산 오더에 대해 추적 할 수 없다
 DocType: Student,Student Mobile Number,학생 휴대 전화 번호
 DocType: Item,Has Variants,변형을 가지고
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
 DocType: Sales Person,Parent Sales Person,부모 판매 사람
 DocType: Purchase Invoice,Recurring Invoice,경상 송장
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,프로젝트 관리
@@ -1874,7 +1868,7 @@
 DocType: Budget,Fiscal Year,회계 연도
 DocType: Vehicle Log,Fuel Price,연료 가격
 DocType: Budget,Budget,예산
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",이 수입 또는 비용 계정이 아니다으로 예산이에 대해 {0}에 할당 할 수 없습니다
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,달성
 DocType: Student Admission,Application Form Route,신청서 경로
@@ -1906,7 +1900,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},금액은 {0} {1}에 대해 공제 {2}
 DocType: Employee,Salary Information,급여정보
 DocType: Sales Person,Name and Employee ID,이름 및 직원 ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
 DocType: Website Item Group,Website Item Group,웹 사이트 상품 그룹
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,관세 및 세금
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,참고 날짜를 입력 해주세요
@@ -1965,7 +1959,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,반복 고객 수익
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1})은 '지출 승인자'이어야 합니다.
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,페어링
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
 DocType: Asset,Depreciation Schedule,감가 상각 일정
 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,하프 데이 데이트 날짜부터 현재까지 사이에 있어야한다
@@ -1982,13 +1976,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
 DocType: Purchase Order,Delivered,배달
 ,Vehicle Expenses,차량 비용
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
+DocType: Serial No,Invoice Details,인보이스 세부 정보
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
 DocType: Purchase Receipt,Vehicle Number,차량 번호
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,반복 송장이 중단 될 일자
 DocType: Employee Loan,Loan Amount,대출금
@@ -2012,7 +2007,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,추가 할인 금액
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,약어는 비워둘수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,비 그룹에 그룹
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,스포츠
 DocType: Loan Type,Loan Name,대출 이름
@@ -2024,6 +2019,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,당신이 거부 된 품목의 재고를 유지하고 창고
 DocType: Production Order,Skip Material Transfer,자재 전송 건너 뛰기
 DocType: Production Order,Skip Material Transfer,자재 전송 건너 뛰기
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,주요 날짜 {2}에 대해 {0}에서 {1}까지의 환율을 찾을 수 없습니다. 통화 기록을 수동으로 작성하십시오.
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,재무 년에 종료
 DocType: POS Profile,Price List,가격리스트
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} 이제 기본 회계 연도이다.변경 내용을 적용하기 위해 브라우저를 새로 고침하십시오.
@@ -2061,9 +2057,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** 회계 연도는 ** 금융 년도 나타냅니다.모든 회계 항목 및 기타 주요 거래는 ** ** 회계 연도에 대해 추적됩니다.
 DocType: Opportunity,Customer / Lead Address,고객 / 리드 주소
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
 DocType: Student Admission,Eligibility,적임
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","리드는 당신이 사업은, 모든 연락처 등을 리드로 추가하는 데 도움"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","리드는 당신이 사업은, 모든 연락처 등을 리드로 추가하는 데 도움"
 DocType: Production Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
@@ -2102,7 +2098,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,회사를 선택 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Process Payroll,Fortnightly,이주일에 한번의
 DocType: Currency Exchange,From Currency,통화와
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
@@ -2118,7 +2114,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,첫 번째 행에 대한 '이전 행 전체에'이전 행에 금액 '또는로 충전 타입을 선택할 수 없습니다
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,하위 항목은 제품 번들이어야한다. 항목을 제거`{0}`와 저장하세요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,은행
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,작업 표를 추가
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,작업 표를 추가
 DocType: Vehicle Service,Service Item,서비스 항목
 DocType: Bank Guarantee,Bank Guarantee,은행 보증
 DocType: Bank Guarantee,Bank Guarantee,은행 보증
@@ -2168,8 +2164,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,가격리스트가 설정되지 않은 경우 가격이 표시되지
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,이 배송 규칙에 대한 국가를 지정하거나 전세계 배송을 확인하시기 바랍니다
 DocType: Stock Entry,Total Incoming Value,총 수신 값
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,직불 카드에 대한이 필요합니다
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,직불 카드에 대한이 필요합니다
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,구매 가격 목록
 DocType: Offer Letter Term,Offer Term,행사 기간
 DocType: Quality Inspection,Quality Manager,품질 관리자
@@ -2203,14 +2199,14 @@
 DocType: Opportunity,Lost Reason,분실 된 이유
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,새 주소
 DocType: Quality Inspection,Sample Size,표본 크기
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,수신 문서를 입력하세요
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,모든 상품은 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,수신 문서를 입력하세요
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,모든 상품은 이미 청구 된
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','사건 번호에서'유효 기간을 지정하십시오
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
 DocType: Project,External,외부
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,사용자 및 권한
 DocType: Vehicle Log,VLOG.,동영상 블로그.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},생산 오더 생성 : {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},생산 오더 생성 : {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,휴대 전화 번호
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,인쇄 및 브랜딩
@@ -2219,7 +2215,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,발견되지 일련 번호 {0}
 DocType: Scheduling Tool,Student Batch,학생 배치
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,고객
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,학생을
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,학생을
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},당신은 프로젝트 공동 작업에 초대되었습니다 : {0}
 DocType: Leave Block List Date,Block Date,블록 날짜
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,지금 적용
@@ -2241,8 +2237,9 @@
 DocType: SMS Log,Sent To,전송
 DocType: Payment Request,Make Sales Invoice,견적서에게 확인
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,소프트웨어
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,다음으로 연락 날짜는 과거가 될 수 없습니다
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,다음으로 연락 날짜는 과거가 될 수 없습니다
 DocType: Company,For Reference Only.,참조 용으로 만 사용됩니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,배치 번호 선택
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},잘못된 {0} : {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,사전의 양
@@ -2256,7 +2253,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,케이스 번호는 0이 될 수 없습니다
 DocType: Item,Show a slideshow at the top of the page,페이지의 상단에 슬라이드 쇼보기
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM을
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,상점
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,상점
 DocType: Serial No,Delivery Time,배달 시간
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,을 바탕으로 고령화
 DocType: Item,End of Life,수명 종료
@@ -2272,8 +2269,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,전송 자료
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,이 문서에 의해 제한을 초과 {0} {1} 항목 {4}. 당신은하고 있습니다 동일에 대한 또 다른 {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,저장 한 후 반복 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,선택 변화량 계정
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,저장 한 후 반복 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,선택 변화량 계정
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
@@ -2284,7 +2281,7 @@
 DocType: Budget Account,Budget Account,예산 계정
 DocType: Quality Inspection,Verified By,에 의해 확인
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","기존의 트랜잭션이 있기 때문에, 회사의 기본 통화를 변경할 수 없습니다.거래 기본 통화를 변경하려면 취소해야합니다."
-DocType: Grade Interval,Grade Description,등급 설명
+DocType: Grading Scale Interval,Grade Description,등급 설명
 DocType: Stock Entry,Purchase Receipt No,구입 영수증 없음
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,계약금
 DocType: Process Payroll,Create Salary Slip,급여 슬립을 만듭니다
@@ -2322,7 +2319,7 @@
 DocType: Upload Attendance,Attendance To Date,날짜 출석
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Gateway Account,Payment Account,결제 계정
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,진행하는 회사를 지정하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,진행하는 회사를 지정하십시오
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,채권에 순 변경
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,보상 오프
 DocType: Offer Letter,Accepted,허용
@@ -2336,7 +2333,7 @@
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,사용자 포럼
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
 DocType: Employee,Previous Work Experience,이전 작업 경험
@@ -2350,7 +2347,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,연구소의 이름은 당신이 시스템을 설정하고 있습니다.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","회계 항목이 날짜까지 동결, 아무도 / 아래 지정된 역할을 제외하고 항목을 수정하지 않을 수 있습니다."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,유지 보수 일정을 생성하기 전에 문서를 저장하십시오
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,유지 보수 일정을 생성하기 전에 문서를 저장하십시오
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,프로젝트 상태
 DocType: UOM,Check this to disallow fractions. (for Nos),분수를 허용하려면이 옵션을 선택합니다. (NOS의 경우)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,다음 생산 오더가 생성했다 :
@@ -2373,6 +2370,7 @@
 DocType: Email Digest,How frequently?,얼마나 자주?
 DocType: Purchase Receipt,Get Current Stock,현재 재고을보세요
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,재료 명세서 (BOM)의 나무
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Student,Joining Date,가입 날짜
 ,Employees working on a holiday,휴일에 일하는 직원
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,마크 선물
@@ -2473,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,생산
 DocType: Guardian,Occupation,직업
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),합계 (수량)
 DocType: Sales Invoice,This Document,이 문서
 DocType: Installation Note Item,Installed Qty,설치 수량
@@ -2496,8 +2494,8 @@
 DocType: Notification Control,Sales Order Message,판매 주문 메시지
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","기타 회사, 통화, 당해 사업 연도와 같은 기본값을 설정"
 DocType: Payment Entry,Payment Type,지불 유형
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
 DocType: Process Payroll,Select Employees,직원 선택
 DocType: Opportunity,Potential Sales Deal,잠재적 인 판매 거래
 DocType: Payment Entry,Cheque/Reference Date,수표 / 참조 날짜
@@ -2514,7 +2512,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},이미 회사를 위해 만든 글로벌 POS 프로필 {0} {1}
 DocType: Purchase Order,Ref SQ,참조 SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,모든 BOM에있는 부품 / BOM을 대체
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,영수증 문서를 제출해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,영수증 문서를 제출해야합니다
 DocType: Purchase Invoice Item,Received Qty,수량에게받은
 DocType: Stock Entry Detail,Serial No / Batch,일련 번호 / 배치
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,아니 지불하고 전달되지 않음
@@ -2527,7 +2525,7 @@
 ,To Produce,생산
 apps/erpnext/erpnext/config/hr.py +93,Payroll,급여
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",행에 대해 {0}에서 {1}. 상품 요금에 {2} 포함하려면 행은 {3}도 포함해야
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,사용자 확인
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,사용자 확인
 DocType: Packing Slip,Identification of the package for the delivery (for print),(프린트) 전달을위한 패키지의 식별
 DocType: Bin,Reserved Quantity,예약 주문
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,유효한 이메일 주소를 입력하십시오.
@@ -2541,11 +2539,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,장애인 템플릿은 기본 템플릿이 아니어야합니다
 DocType: Account,Income Account,수익 계정
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,배달
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,배달
 DocType: Stock Reconciliation Item,Current Qty,현재 수량
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","절 원가 계산의 ""에 근거를 자료의 평가""를 참조하십시오"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,예전
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","학생 배치는 학생에 대한 출석, 평가 및 비용을 추적하는 데 도움이"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","학생 배치는 학생에 대한 출석, 평가 및 비용을 추적하는 데 도움이"
 DocType: Payment Entry,Total Allocated Amount,총 할당 된 금액
 DocType: Item Reorder,Material Request Type,자료 요청 유형
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0}에에서 급여에 대한 Accural 분개 {1}
@@ -2568,7 +2567,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,트랙은 산업 유형에 의해 리드.
 DocType: Item Supplier,Item Supplier,부품 공급 업체
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,재고 설정
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
@@ -2578,6 +2577,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',상태 직원들에게 이벤트에 대한 이메일을 보내드립니다 &#39;열기&#39;
 DocType: Task,Depends on Tasks,작업에 따라 달라집니다
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,고객 그룹 트리를 관리 할 수 있습니다.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,장바구니를 사용하지 않고 첨부 파일을 표시 할 수 있습니다.
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,새로운 비용 센터의 이름
 DocType: Leave Control Panel,Leave Control Panel,제어판에게 남겨
@@ -2590,12 +2590,10 @@
 DocType: Sales Invoice,Debit To,To 직불
 DocType: Delivery Note,Required only for sample item.,단지 샘플 항목에 필요합니다.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,거래 후 실제 수량
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},사이 찾지 급여 슬립하지 {0}과 {1}
 ,Pending SO Items For Purchase Request,구매 요청에 대한 SO 항목 보류
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,학생 입학
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} 비활성화
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} 비활성화
 DocType: Supplier,Billing Currency,결제 통화
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,아주 큰
@@ -2612,7 +2610,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,홈페이지 주요 제품
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,모든 평가 그룹
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,새로운웨어 하우스 이름
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),총 {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),총 {0} ({1})
 DocType: C-Form Invoice Detail,Territory,국가
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
@@ -2630,7 +2628,7 @@
 DocType: Price List,Price List Master,가격 목록 마스터
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,당신이 설정 한 목표를 모니터링 할 수 있도록 모든 판매 트랜잭션은 여러 ** 판매 사람 **에 태그 할 수 있습니다.
 ,S.O. No.,SO 번호
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
 DocType: Price List,Applicable for Countries,국가에 대한 적용
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,만 제출할 수 있습니다 &#39;거부&#39; &#39;승인&#39;상태와 응용 프로그램을 남겨주세요
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},학생 그룹 이름은 행의 필수 {0}
@@ -2723,7 +2721,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,재고에 대한 회계 항목
 DocType: Vehicle Service,Engine Oil,엔진 오일
 DocType: Sales Invoice,Sales Team1,판매 Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
 DocType: Employee Loan,Loan Details,대출 세부 사항
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,행 {0} : 완성 된 수량은 0보다 커야합니다.
@@ -2788,7 +2786,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,기존 거래와 창고 그룹으로 변환 할 수 없습니다.
 DocType: Assessment Result Tool,Result HTML,결과 HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,에 만료
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,학생들 추가
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,학생들 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},선택하세요 {0}
 DocType: C-Form,C-Form No,C-양식 없음
 DocType: BOM,Exploded_items,Exploded_items
@@ -2853,7 +2851,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,한계를 넘어
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,벤처 캐피탈
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,이 &#39;학년&#39;과 학술 용어는 {0}과 &#39;기간 이름&#39;{1} 이미 존재합니다. 이 항목을 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","항목 {0}에 대한 기존의 트랜잭션이, 당신은의 값을 변경할 수 없습니다 {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","항목 {0}에 대한 기존의 트랜잭션이, 당신은의 값을 변경할 수 없습니다 {1}"
 DocType: UOM,Must be Whole Number,전체 숫자 여야합니다
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(일) 할당 된 새로운 잎
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,일련 번호 {0}이 (가) 없습니다
@@ -2897,7 +2895,7 @@
 DocType: Supplier,Last Day of the Next Month,다음 달의 마지막 날
 DocType: Support Settings,Auto close Issue after 7 days,칠일 후 자동으로 닫 문제
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","이전에 할당 할 수없는 남기기 {0}, 휴가 균형이 이미 반입 전달 미래 휴가 할당 기록되었습니다로 {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,학생 신청자
 DocType: Asset Category Account,Accumulated Depreciation Account,누적 감가 상각 계정
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
@@ -2925,8 +2923,8 @@
 DocType: Asset,Item Code,상품 코드
 DocType: Production Planning Tool,Create Production Orders,생산 오더를 생성
 DocType: Serial No,Warranty / AMC Details,보증 / AMC의 자세한 사항
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
 DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
@@ -2945,7 +2943,7 @@
 DocType: Production Planning Tool,Create Material Requests,자료 요청을 만듭니다
 DocType: Employee Education,School/University,학교 / 대학
 DocType: Payment Request,Reference Details,참조 세부 사항
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
 DocType: Sales Invoice Item,Available Qty at Warehouse,창고에서 사용 가능한 수량
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,청구 금액
 DocType: Asset,Double Declining Balance,이중 체감
@@ -2966,19 +2964,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},지급 금액은 대출 금액보다 클 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,생산 주문이 작성되지
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,생산 주문이 작성되지
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는  '마감일자' 이전이어야 합니다
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},학생으로 상태를 변경할 수 없습니다 {0} 학생 응용 프로그램과 연결되어 {1}
 DocType: Asset,Fully Depreciated,완전 상각
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,표시된 출석 HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","견적, 당신은 당신의 고객에게 보낸 입찰 제안서 있습니다"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","견적, 당신은 당신의 고객에게 보낸 입찰 제안서 있습니다"
 DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,일련 번호 및 배치
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,평가 기준의 점수의 합 {0} 할 필요가있다.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,감가 상각 수 예약을 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,감가 상각 수 예약을 설정하십시오
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,값 또는 수량
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,분
@@ -3109,7 +3107,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,학생 그룹
 DocType: Shopping Cart Settings,Quotation Series,견적 시리즈
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,고객을 선택하세요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,고객을 선택하세요
 DocType: C-Form,I,나는
 DocType: Company,Asset Depreciation Cost Center,자산 감가 상각 비용 센터
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
@@ -3128,19 +3126,18 @@
 DocType: Vehicle,Insurance Details,보험의 자세한 사항
 DocType: Account,Payable,지급
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,상환 기간을 입력하세요
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),채무자 ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),채무자 ({0})
 DocType: Pricing Rule,Margin,마진
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,신규 고객
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,매출 총 이익 %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,통관 날짜
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,총 구매 금액이 필수입니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,총 구매 금액이 필수입니다
 DocType: Lead,Address Desc,제품 설명에게 주소
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,파티는 필수입니다
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,항목 이름
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,판매 또는 구매의이어야 하나를 선택해야합니다
-DocType: Grading Structure,Grade Intervals,학년 간격
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,비즈니스의 성격을 선택합니다.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,제조 작업은 어디를 수행한다.
 DocType: Asset Movement,Source Warehouse,자료 창고
@@ -3169,6 +3166,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,월별 분포 비율
 DocType: Territory,Territory Targets,지역 대상
 DocType: Delivery Note,Transporter Info,트랜스 정보
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},회사의 기본 {0}을 설정하십시오 {1}
 DocType: Cheque Print Template,Starting position from top edge,위쪽 가장자리에서 시작 위치
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,동일한 공급자는 여러 번 입력 된
@@ -3222,7 +3220,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,재주문 수량
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,현재 채용
 DocType: Company,Stock Adjustment Account,재고 조정 계정
-DocType: Journal Entry,Write Off,탕치다
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,탕치다
 DocType: Timesheet Detail,Operation ID,작업 ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","시스템 사용자 (로그인) ID. 설정하면, 모든 HR 양식의 기본이 될 것입니다."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}에서 {1}
@@ -3233,8 +3231,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,공급자는 고객에게 제공
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# 양식 / 상품 / {0}) 품절
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,다음 날짜 게시 날짜보다 커야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,쇼 세금 해체
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,데이터 가져 오기 및 내보내기
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","재고 항목은 따라서 당신이 다시 할당하거나 수정할 수 없습니다, {0} 창고에 존재"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,어떤 학생들은 찾을 수 없음
@@ -3246,14 +3244,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
 DocType: Program Enrollment,School House,학교 하우스
 DocType: Serial No,Out of AMC,AMC의 아웃
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,견적을 선택하십시오
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,견적을 선택하십시오
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,유지 보수 방문을합니다
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,견적을 선택하십시오
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,견적을 선택하십시오
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,유지 보수 방문을합니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
 DocType: Company,Default Cash Account,기본 현금 계정
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,이이 학생의 출석을 기반으로
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,학생 없음
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,더 많은 항목 또는 완전 개방 형태로 추가
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
@@ -3300,9 +3299,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,계정조정전
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},에 {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),추가 세금 및 수수료 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
 DocType: Sales Order,Partly Billed,일부 청구
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,항목 {0} 고정 자산 항목이어야합니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,항목 {0} 고정 자산 항목이어야합니다
 DocType: Item,Default BOM,기본 BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,총 발행 AMT 사의
@@ -3325,7 +3324,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
 DocType: Purchase Invoice Item,Rate,비율
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,인턴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,주소 명
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,주소 명
 DocType: Stock Entry,From BOM,BOM에서
 DocType: Assessment Code,Assessment Code,평가 코드
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,기본
@@ -3350,7 +3349,7 @@
 DocType: Purchase Invoice,Print Language,인쇄 언어
 DocType: Salary Slip,Total Working Hours,총 근로 시간
 DocType: Stock Entry,Including items for sub assemblies,서브 어셈블리에 대한 항목을 포함
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,입력 값은 양수 여야합니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,입력 값은 양수 여야합니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,모든 국가
 DocType: Purchase Invoice,Items,아이템
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,학생이 이미 등록되어 있습니다.
@@ -3370,17 +3369,15 @@
 DocType: Issue,Opening Time,영업 시간
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,일자 및 끝
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
 DocType: Assessment Plan,Supervisor Name,관리자 이름
 DocType: Program Enrollment Course,Program Enrollment Course,프로그램 등록 과정
 DocType: Program Enrollment Course,Program Enrollment Course,프로그램 등록 과정
-DocType: Grading Structure,Grading Structure,등급 구조
 DocType: Purchase Taxes and Charges,Valuation and Total,평가 및 총
 DocType: Tax Rule,Shipping City,배송시
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,이 항목은 {0} (템플릿)의 변종이다.'카피'가 설정되어 있지 않는 속성은 템플릿에서 복사됩니다
 DocType: Notification Control,Customize the Notification,알림 사용자 지정
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,운영으로 인한 현금 흐름
 DocType: Sales Invoice,Shipping Rule,배송 규칙
@@ -3403,6 +3400,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,날짜를 열기 날짜를 닫기 전에해야
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 DocType: Leave Control Panel,Carry Forward,이월하다
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,기존의 트랜잭션 비용 센터 원장으로 변환 할 수 없습니다
 DocType: Department,Days for which Holidays are blocked for this department.,휴일이 부서 차단하는 일.
@@ -3431,7 +3429,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),총 AMT ()
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 DocType: Quality Inspection,Item Serial No,상품 시리얼 번호
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,직원 레코드 만들기
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,직원 레코드 만들기
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,전체 현재
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,회계 문
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,시간
@@ -3446,8 +3444,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,교체 후 새로운 BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,판매 시점
 DocType: Payment Entry,Received Amount,받은 금액
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네임 시스템 설정
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네임 시스템 설정
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",전체 수량에 대한 만들기 위해 이미 양을 무시
 DocType: Account,Tax,세금
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,표시되지
@@ -3460,7 +3456,7 @@
 DocType: Batch,Source Document Name,원본 문서 이름
 DocType: Batch,Source Document Name,원본 문서 이름
 DocType: Job Opening,Job Title,직책
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,사용자 만들기
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,사용자 만들기
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,그램
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,유지 보수 통화에 대해 보고서를 참조하십시오.
@@ -3472,8 +3468,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: BOM,Website Description,웹 사이트 설명
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,자본에 순 변경
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,영수증
 ,Sales Register,판매 등록
@@ -3484,16 +3480,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,편집 할 수있는 것은 아무 것도 없습니다.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,아직 고객 없음!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,현금 흐름표
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,특허
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,당신은 또한 이전 회계 연도의 균형이 회계 연도에 나뭇잎 포함 할 경우 이월를 선택하세요
 DocType: GL Entry,Against Voucher Type,바우처 형식에 대한
 DocType: Item,Attributes,속성
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,마지막 주문 날짜
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
 DocType: Student,Guardian Details,가디언의 자세한 사항
 DocType: C-Form,C-Form,C-양식
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,여러 직원 마크 출석
@@ -3518,14 +3516,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',행 {0} # 계정 유형이어야합니다 &#39;고정 자산&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,수량 아웃
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,판매 배송 금액을 계산하는 규칙
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,시리즈는 필수입니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,시리즈는 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,금융 서비스
 DocType: Student Sibling,Student ID,학생 아이디
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,시간 로그에 대한 활동의 종류
 DocType: Tax Rule,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
 DocType: Training Event,Exam,시험
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
 DocType: Tax Rule,Billing State,결제 주
@@ -3558,7 +3556,7 @@
 DocType: Payment Entry,Account Paid From,계정에서 유료
 DocType: Purchase Order Item Supplied,Raw Material Item Code,원료 상품 코드
 DocType: Journal Entry,Write Off Based On,에 의거 오프 쓰기
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,리드를 확인
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,리드를 확인
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,인쇄 및 문구
 DocType: Stock Settings,Show Barcode Field,쇼 바코드 필드
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,공급 업체 이메일 보내기
@@ -3574,6 +3572,7 @@
 DocType: Offer Letter,Awaiting Response,응답을 기다리는 중
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,위
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},잘못된 속성 {0} {1}
+DocType: Supplier,Mention if non-standard payable account,표준이 아닌 지불 계정에 대한 언급
 DocType: Salary Slip,Earning & Deduction,당기순이익/손실
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
@@ -3610,7 +3609,7 @@
 DocType: Program Enrollment Tool,Get Students From,학생들 가져 오기
 DocType: Hub Settings,Seller Country,판매자 나라
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,웹 사이트에 항목을 게시
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,일괄 그룹 학생
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,일괄 그룹 학생
 DocType: Authorization Rule,Authorization Rule,권한 부여 규칙
 DocType: Sales Invoice,Terms and Conditions Details,약관의 자세한 사항
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,사양
@@ -3670,7 +3669,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,근신
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,급여의 구성 요소
 DocType: Program Enrollment Tool,New Academic Year,새 학년
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,반품 / 신용 참고
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,반품 / 신용 참고
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,총 지불 금액
 DocType: Production Order Item,Transferred Qty,수량에게 전송
@@ -3711,6 +3710,7 @@
 ,Sales Funnel,판매 퍼넬
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,약자는 필수입니다
 DocType: Project,Task Progress,작업 진행
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,카트
 ,Qty to Transfer,전송하는 수량
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
@@ -3744,7 +3744,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,수수료를 수집
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
 DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,비용을 추가하는 규칙.
 DocType: Item,Opening Stock,열기 증권
@@ -3762,7 +3762,7 @@
 DocType: Customer,From Lead,리드에서
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,생산 발표 순서.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Program Enrollment Tool,Enroll Students,학생 등록
 DocType: Hub Settings,Name Token,이름 토큰
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,표준 판매
@@ -3773,7 +3773,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,프로젝트 이름
-DocType: Supplier,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
+DocType: Customer,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
 DocType: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
 DocType: Production Order,Required Items,필수 항목
 DocType: Stock Ledger Entry,Stock Value Difference,재고 가치의 차이
@@ -3804,6 +3804,7 @@
 DocType: Item,Taxes,세금
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,유료 및 전달되지 않음
 DocType: Project,Default Cost Center,기본 비용 센터
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Bank Guarantee,End Date,끝 날짜
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,재고 변동
 DocType: Budget,Budget Accounts,예산 계정
@@ -3868,7 +3869,7 @@
 DocType: Customer,Sales Partner and Commission,판매 파트너 및위원회
 DocType: Employee Loan,Rate of Interest (%) / Year,이자 (%) / 년의 속도
 ,Project Quantity,프로젝트 수량
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수있다, 제로"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수있다, 제로"
 DocType: Opportunity,To Discuss,토론하기
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} 단위 {1} {2}이 거래를 완료하는 필요.
 DocType: Loan Type,Rate of Interest (%) Yearly,이자의 비율 (%) 연간
@@ -3891,7 +3892,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,마크 결석
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},행 {0} 다음 BOM 번호의 통화 {1} 선택한 통화 같아야한다 {2}
 DocType: Journal Entry Account,Exchange Rate,환율
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 DocType: Homepage,Tag Line,태그 라인
 DocType: Fee Component,Fee Component,요금 구성 요소
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,함대 관리
@@ -3908,7 +3909,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,창고 {0}이 (가) 없습니다
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext 허브에 등록
 DocType: Monthly Distribution,Monthly Distribution Percentages,예산 월간 배분 백분율
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","평가 비율은 회계 항목을 수행하는 데 필요한 항목 {0} 찾을 수 없습니다 {1} {2}. 항목의 샘플 항목으로 거래되는 경우 {1}, {1} (으) 항목 테이블에서 그 언급 해주십시오. 그렇지 않으면, / 제출 중 노력이 항목을 취소 한 다음 항목 레코드의 항목이나 언급 평가 비율에 대한 들어오는 재고 트랜잭션을 생성하고십시오"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,이 납품서에 대해 배송자재 %
 DocType: Project,Customer Details,고객 상세 정보
@@ -3925,7 +3926,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,제출 된 주문은 삭제할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,품질 관리
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} 항목이 비활성화되었습니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} 항목이 비활성화되었습니다
 DocType: Employee Loan,Repay Fixed Amount per Period,기간 당 고정 금액을 상환
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
@@ -3952,7 +3953,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,학생 이메일 ID
 DocType: Employee,Notice (days),공지 사항 (일)
 DocType: Tax Rule,Sales Tax Template,판매 세 템플릿
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,송장을 저장하는 항목을 선택
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,송장을 저장하는 항목을 선택
 DocType: Employee,Encashment Date,현금화 날짜
 DocType: Training Event,Internet,인터넷
 DocType: Account,Stock Adjustment,재고 조정
@@ -3986,6 +3987,7 @@
 DocType: Purchase Invoice,Debit Note Issued,직불 주 발행
 DocType: Production Order,Warehouses,창고
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} 자산은 양도 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,이 아이템은 {0}의 변형입니다 (템플릿).
 DocType: Workstation,per hour,시간당
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,구매
 DocType: Announcement,Announcement,발표
@@ -4001,7 +4003,7 @@
 DocType: Account,Receivable,받을 수있는
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,행 번호 {0} : 구매 주문이 이미 존재로 공급 업체를 변경할 수 없습니다
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,설정 신용 한도를 초과하는 거래를 제출하도록 허용 역할.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,제조 할 항목을 선택합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,제조 할 항목을 선택합니다
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
 DocType: Item,Material Issue,소재 호
 DocType: Hub Settings,Seller Description,판매자 설명
@@ -4014,7 +4016,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,주문
 DocType: Salary Detail,Component,구성 요소
 DocType: Assessment Criteria,Assessment Criteria Group,평가 기준 그룹
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},감가 상각 누계액을 열면 동일 미만이어야합니다 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},감가 상각 누계액을 열면 동일 미만이어야합니다 {0}
 DocType: Warehouse,Warehouse Name,창고의 이름
 DocType: Naming Series,Select Transaction,거래 선택
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,역할을 승인 또는 사용을 승인 입력하십시오
@@ -4049,7 +4051,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",기본값으로이 회계 연도 설정하려면 '기본값으로 설정'을 클릭
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,어울리다
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Employee Loan,Repay from Salary,급여에서 상환
 DocType: Leave Application,LAP/,무릎/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},에 대한 지불을 요청 {0} {1} 금액에 대한 {2}
@@ -4067,7 +4069,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,평가 결과의 세부 사항
 DocType: Employee Education,Employee Education,직원 교육
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,항목 그룹 테이블에서 발견 중복 항목 그룹
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
 DocType: Salary Slip,Net Pay,실질 임금
 DocType: Account,Account,계정
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,일련 번호 {0}이 (가) 이미 수신 된
@@ -4076,7 +4078,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","창고 {0} 모든 계정에 연결되지 않고, /웨어 하우스에 대한 대응 (자산) 계정을 연결 작성하시기 바랍니다."
 DocType: Purchase Invoice,Recurring Id,경상 아이디
 DocType: Customer,Sales Team Details,판매 팀의 자세한 사항
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,영구적으로 삭제 하시겠습니까?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,영구적으로 삭제 하시겠습니까?
 DocType: Expense Claim,Total Claimed Amount,총 주장 금액
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,판매를위한 잠재적 인 기회.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},잘못된 {0}
@@ -4087,13 +4089,14 @@
 DocType: Warehouse,PIN,핀
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext에 설치 학교
 DocType: Sales Invoice,Base Change Amount (Company Currency),자료 변경 금액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,먼저 문서를 저장합니다.
 DocType: Account,Chargeable,청구
 DocType: Company,Change Abbreviation,변경 요약
 DocType: Expense Claim Detail,Expense Date,비용 날짜
 DocType: Item,Max Discount (%),최대 할인 (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,마지막 주문 금액
+DocType: Task,Is Milestone,마일스톤이다
 DocType: Daily Work Summary,Email Sent To,이메일로 발송
 DocType: Budget,Warn,경고
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
@@ -4126,11 +4129,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다.
 DocType: Tax Rule,Purchase Tax Template,세금 템플릿을 구입
 ,Project wise Stock Tracking,프로젝트 현명한 재고 추적
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},유지 보수 일정은 {0}에있는 {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),실제 수량 (소스 / 대상에서)
 DocType: Item Customer Detail,Ref Code,참조 코드
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,직원 기록.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
 DocType: HR Settings,Payroll Settings,급여 설정
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,연결되지 않은 청구서 지불을 일치시킵니다.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,장소 주문
@@ -4153,7 +4155,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,수표와 예금 잘못 삭제
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
 DocType: Purchase Invoice Item,Price List Rate,가격리스트 평가
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,고객 따옴표를 만들기
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,고객 따옴표를 만들기
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""재고""표시 또는 ""재고 부족""이 창고에 재고를 기반으로."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),재료 명세서 (BOM)
 DocType: Item,Average time taken by the supplier to deliver,공급 업체에 의해 촬영 평균 시간 제공하는
@@ -4175,7 +4177,7 @@
 DocType: Asset,Disposal Date,폐기 날짜
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","그들은 휴일이없는 경우 이메일은, 주어진 시간에 회사의 모든 Active 직원에 전송됩니다. 응답 요약 자정에 전송됩니다."
 DocType: Employee Leave Approver,Employee Leave Approver,직원 허가 승인자
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,교육 피드백
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
@@ -4183,7 +4185,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},코스 행의 필수 {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc의 문서 종류
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,가격 추가/편집
 DocType: Batch,Parent Batch,상위 일괄 처리
 DocType: Batch,Parent Batch,상위 일괄 처리
 DocType: Cheque Print Template,Cheque Print Template,수표 인쇄 템플릿
@@ -4228,7 +4230,7 @@
 DocType: Item,Variant Based On,변형 기반에
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,공급 업체
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
 DocType: Request for Quotation Item,Supplier Part No,공급 업체 부품 번호
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',카테고리는 &#39;평가&#39;또는 &#39;Vaulation과 전체&#39;에 대한 때 공제 할 수 없음
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,에서 수신
@@ -4238,7 +4240,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,행 {0} : 시간의 값은 0보다 커야합니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
 DocType: Issue,Content Type,컨텐츠 유형
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
@@ -4247,20 +4249,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
 DocType: Payment Reconciliation,From Invoice Date,송장 일로부터
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,결제 통화 중 기본의 comapany의 통화 또는 파티 계정 통화와 동일해야합니다
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,결제 통화 중 기본의 comapany의 통화 또는 파티 계정 통화와 동일해야합니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,현금화를 남겨
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,그것은 무엇을 하는가?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,창고
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,모든 학생 입학
 ,Average Commission Rate,평균위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
 DocType: School House,House Name,집 이름
 DocType: Purchase Taxes and Charges,Account Head,계정 헤드
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,상품의 도착 비용을 계산하기 위해 추가적인 비용을 업데이트
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,전기의
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,사용자로 조직의 나머지 부분을 추가합니다. 또한 연락처에서 추가하여 포털에 고객을 초대 추가 할 수 있습니다
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,사용자로 조직의 나머지 부분을 추가합니다. 또한 연락처에서 추가하여 포털에 고객을 초대 추가 할 수 있습니다
 DocType: Stock Entry,Total Value Difference (Out - In),총 가치 차이 (아웃 -에서)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},사용자 ID 직원에 대한 설정하지 {0}
@@ -4269,7 +4271,7 @@
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},생일 알림 {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,일 이후 마지막 주문
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
 DocType: Buying Settings,Naming Series,시리즈 이름 지정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,보험 시작일은 보험 종료일보다 작아야합니다
@@ -4284,7 +4286,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
 DocType: Vehicle Log,Odometer,주행 거리계
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
@@ -4297,7 +4299,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
 DocType: Sales Invoice Timesheet,Billing Hours,결제 시간
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0}를 찾을 수 없습니다에 대한 기본 BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,항목을 탭하여 여기에 추가하십시오.
 DocType: Fees,Program Enrollment,프로그램 등록
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},설정하십시오 {0}
@@ -4399,7 +4402,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,소매 및 도매
 DocType: Issue,First Responded On,첫 번째에 반응했다
 DocType: Website Item Group,Cross Listing of Item in multiple groups,여러 그룹에서 항목의 크로스 리스팅
-DocType: Grade Interval,Grade Interval,학년 간격
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},회계 연도의 시작 날짜 및 회계 연도 종료 날짜가 이미 회계 연도에 설정되어 {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,정리 날짜 업데이트
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,배치 분할
@@ -4408,6 +4410,7 @@
 DocType: Request for Quotation Supplier,Download PDF,다운로드 PDF
 DocType: Production Order,Planned End Date,계획 종료 날짜
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,항목이 저장되는 위치.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Request for Quotation,Supplier Detail,공급 업체 세부 정보
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},식 또는 조건에서 오류 : {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,송장에 청구 된 금액
@@ -4453,7 +4456,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,설정 내 조직에 대한 간단한 웹 사이트
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,부모의 비용 센터를 입력 해주십시오
@@ -4513,7 +4516,7 @@
 ,Items To Be Requested,요청 할 항목
 DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Company,Company Info,회사 소개
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,선택하거나 새로운 고객을 추가
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,선택하거나 새로운 고객을 추가
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,비용 센터 비용 청구를 예약 할 필요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,이이 직원의 출석을 기반으로
@@ -4526,13 +4529,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,다음과 같은 일에 허가 신청을하는 사용자가 중지합니다.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,구매 금액
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,종업원 급여
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Production Order,Manufactured Qty,제조 수량
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} : {1} 수행하지 존재
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} : {1} 수행하지 존재
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,고객에게 제기 지폐입니다.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
@@ -4541,15 +4544,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 읽기
 ,Hub,허브
 DocType: GL Entry,Voucher Type,바우처 유형
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Employee Loan Application,Approved,인가 된
 DocType: Pricing Rule,Price,가격
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
 DocType: Guardian,Guardian,보호자
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,평가 {0} {1} 지정된 날짜 범위에서 직원에 대해 생성
 DocType: Employee,Education,교육
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,델
 DocType: Selling Settings,Campaign Naming By,캠페인 이름 지정으로
 DocType: Employee,Current Address Is,현재 주소는
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,수정 된
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
@@ -4586,7 +4591,7 @@
 DocType: Hub Settings,Hub Settings,허브 설정
 DocType: Project,Gross Margin %,매출 총 이익률의 %
 DocType: BOM,With Operations,운영과
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
 DocType: Asset,Is Existing Asset,자산을 기존됩니다
 DocType: Salary Detail,Statistical Component,통계 구성 요소
 DocType: Salary Detail,Statistical Component,통계 구성 요소
@@ -4642,7 +4647,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,로고 첨부
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,재고 수준
 DocType: Customer,Commission Rate,위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,변형을 확인
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","결제 유형, 수신 중 하나가 될 지불하고 내부 전송합니다"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,분석
@@ -4655,6 +4660,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,휴일에 생산 허용
 DocType: Sales Order,Customer's Purchase Order Date,고객의 구매 주문 날짜
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,자본금
+DocType: Shopping Cart Settings,Show Public Attachments,공용 첨부 파일 표시
 DocType: Packing Slip,Package Weight Details,포장 무게 세부 정보
 DocType: Payment Gateway Account,Payment Gateway Account,지불 게이트웨이 계정
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,결제 완료 후 선택한 페이지로 사용자를 리디렉션.
@@ -4679,7 +4685,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,다음 통화 $ 등과 같은 모든 기호를 표시하지 마십시오.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,학생 배치 확인
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,학생 배치 확인
 DocType: Leave Type,Is Carry Forward,이월된다
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM에서 항목 가져 오기
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,시간 일 리드
@@ -4698,8 +4704,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: GL Entry,Is Opening,개시
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,계정 {0}이 (가) 없습니다
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 0d6d166..75d3366 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch babet Status Expiry
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,pêşnûmeya Bank
 DocType: Mode of Payment Account,Mode of Payment Account,Mode of Account Payment
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show Variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Variants
 DocType: Academic Term,Academic Term,Term (Ekadîmî)
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Mal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Jimarî
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Parastina saxlemîyê
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delay di peredana (Days)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Biha
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Sal malî {0} pêwîst e
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reqlam
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,"Di heman şirketê de ye ketin, ji carekê zêdetir"
 DocType: Employee,Married,Zewicî
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ji bo destûr ne {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ji bo destûr ne {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Get tomar ji
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tikaye Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No tomar di lîsteyê de
 DocType: Payment Reconciliation,Reconcile,li hev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,torpîl
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,Make Peyam Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,kalîyê
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Next Date Farhad. Nikarim li ber Date Purchase be
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next Date Farhad. Nikarim li ber Date Purchase be
 DocType: SMS Center,All Sales Person,Hemû Person Sales
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Belavkariya Ayda ** alîkariya te dike belavkirin Budçeya / Armanc seranser mehan Eger tu dzanî seasonality di karê xwe.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ne tumar hatin dîtin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Ne tumar hatin dîtin
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Missing Structure meaş
 DocType: Lead,Person Name,Navê kesê
 DocType: Sales Invoice Item,Sales Invoice Item,Babetê firotina bi fatûreyên
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",eg &quot;Dibistana Seretayî&quot; an &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reports Stock
 DocType: Warehouse,Warehouse Detail,Detail warehouse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},limit Credit hatiye dîtin ji bo mişterî re derbas {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},limit Credit hatiye dîtin ji bo mişterî re derbas {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,The Date Term End ne dikarin paşê ji Date Sal End of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ma Asset Fixed&quot; nikare bibe nedixwest, wek record Asset li dijî babete heye"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ma Asset Fixed&quot; nikare bibe nedixwest, wek record Asset li dijî babete heye"
 DocType: Vehicle Service,Brake Oil,Oil şikand
 DocType: Tax Rule,Tax Type,Type bacê
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Destûra te tune ku lê zêde bike an update entries berî {0}
 DocType: BOM,Item Image (if not slideshow),Wêne Babetê (eger Mîhrîcana ne)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,An Mişterî ya bi heman navî heye
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saet Rate / 60) * Time Actual Operation
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Hilbijêre BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Hilbijêre BOM
 DocType: SMS Log,SMS Log,SMS bike Têkeve Têkeve
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost ji Nawy Çiyan
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Cejna li ser {0} e di navbera From Date û To Date ne
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Sinif
 DocType: Sales Invoice Item,Delivered By Supplier,Teslîmî By Supplier
 DocType: SMS Center,All Contact,Hemû Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Production Order berê ve ji bo hemû tomar bi BOM tên afirandin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Production Order berê ve ji bo hemû tomar bi BOM tên afirandin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salary salane
 DocType: Daily Work Summary,Daily Work Summary,Nasname Work rojane
 DocType: Period Closing Voucher,Closing Fiscal Year,Girtina sala diravî
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} frozen e
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} frozen e
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Ji kerema xwe ve û taybet de Company ji bo afirandina Chart Dageriyê hilbijêre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Mesref Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Select Target Warehouse
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Peyam kontrayî
 DocType: Journal Entry Account,Credit in Company Currency,Credit li Company Exchange
 DocType: Delivery Note,Installation Status,Rewş installation
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ma tu dixwazî ji bo rojanekirina amadebûnê? <br> Present: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},"Qebûlkirin + Redkirin Qty, divê ji bo pêşwazî qasêsa wekhev de ji bo babet bê {0}"
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Madeyên Raw ji bo Purchase
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,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: Products Settings,Show Products as a List,Show Products wek List
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download Şablon, welat guncaw tije û pelê de hate guherandin ve girêbidin. Hemû dîrokên û karker combination di dema hilbijartî dê di şablon bên, bi records amadebûnê heyî"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Peyam Farhad.
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,request type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Make Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Make Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Birêverbirî
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details ji operasyonên hatiye lidarxistin.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan ji bo serdanên maintenance.
 DocType: SMS Settings,Enter url parameter for message,parametre url ji bo peyamek binivîse
 DocType: POS Profile,Customer Groups,Groups mişterî
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Rageyendrawekanî Financial
 DocType: Guardian,Students,xwendekarên
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Qaîdeyên ji bo hukm û sewqiyata û discount.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,"List Price, divê pêkanîn, ji bo Kirîna an Firotina be"
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},mîqdara Advance ne dikarin bibin mezintir {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lîsteya Series ji bo vê Transaction
 DocType: Company,Default Payroll Payable Account,Default maeş cîhde Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Ma Opening Peyam
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Behs, eger ne-standard account teleb pêkanîn,"
 DocType: Course Schedule,Instructor Name,Navê Instructor
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Li dijî Sales bi fatûreyên babetî
 ,Production Orders in Progress,Ordênên Production in Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Cash Net ji Fînansa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
 DocType: Lead,Address & Contact,Navnîşana &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lê zêde bike pelên feyde ji xerciyên berê
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Next Aksarayê {0} dê li ser tên afirandin {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Bi tevahî bi qurûşekî jî Mîqdar (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Specification babete Website
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Dev ji astengkirin
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Arşîva Bank
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yeksalî
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Babetê Stock Lihevkirinê
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Weşana Hub
 DocType: Student Admission,Student Admission,Admission Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Babetê {0} betal e
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Babetê {0} betal e
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Daxwaza maddî
 DocType: Bank Reconciliation,Update Clearance Date,Update Date Clearance
 DocType: Item,Purchase Details,Details kirîn
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notify by Email li ser çêkirina Daxwaza Material otomatîk
 DocType: Journal Entry,Multi Currency,Multi Exchange
 DocType: Payment Reconciliation Invoice,Invoice Type,bi fatûreyên Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Delivery Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Delivery Note
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Avakirina Baca
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost ji Asset Sold
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Peyam di peredana hatiye guherandin, piştî ku we paş de vekişiyaye. Ji kerema xwe re dîsa ew vekişîne."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
-DocType: Grade Interval,Min Score,Min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Nasname ji bo vê hefteyê û çalakiyên hîn
 DocType: Student Applicant,Admitted,xwe mikur
 DocType: Workstation,Rent Cost,Cost kirê
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Order Nirx
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,muamele Bank / Cash dijî partî an jî ji bo veguhestina navxweyî
 DocType: Shipping Rule,Valid for Countries,Pasport tenê ji bo welatên
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Em babete a Şablon e û dikare karê bê bikaranîn. xerîbkirin babete wê bê ser nav Guhertoyên kopîkirin, eger &#39;No ber Bigire&#39; Biryar e"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Em babete a Şablon e û dikare karê bê bikaranîn. xerîbkirin babete wê bê ser nav Guhertoyên kopîkirin, eger &#39;No ber Bigire&#39; Biryar e"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order çavlêkirina
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","teklîfê Employee (nimûne: CEO, Director û hwd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ji kerema xwe ve nirxa warê &#39;li ser Day of Month Dubare&#39; binivîse
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Rate bacê
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} berê ji bo karkirinê yên bi rêk û {1} ji bo dema {2} ji bo {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Hilbijêre babetî
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No divê eynî wek {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (gelek) ji vî babetî.
 DocType: C-Form Invoice Detail,Invoice Date,Date bi fatûreyên
 DocType: GL Entry,Debit Amount,Şêwaz Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Li wir bi tenê dikare 1 Account per Company di be {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Li wir bi tenê dikare 1 Account per Company di be {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Ji kerema xwe ve attachment bibînin
 DocType: Purchase Order,% Received,% pêşwazî
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Create komên xwendekaran
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Daxwaza ji bo Quotation
 DocType: Salary Slip Timesheet,Working Hours,dema xebatê
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Guhertina Guherandinên / hejmara cihekê niha ya series heyî.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Create a Mişterî ya nû
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Create a Mişterî ya nû
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ger Rules Pricing multiple berdewam bi ser keve, bikarhênerên pirsî danîna Priority bi destan ji bo çareserkirina pevçûnan."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Create Orders Purchase
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Create Orders Purchase
 ,Purchase Register,Buy Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Li dijî wan doz wergirtinê
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,settings Global ji bo hemû pêvajoyên bi aktîvîteyên.
 DocType: Accounts Settings,Accounts Frozen Upto,Hesabên Frozen Upto
 DocType: SMS Log,Sent On,şandin ser
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
 DocType: HR Settings,Employee record is created using selected field. ,record Employee bikaranîna hilbijartî tên afirandin e.
 DocType: Sales Order,Not Applicable,Rêveber
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Holiday.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Ji No. Package
 DocType: Item Attribute,To Range,to range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Birûmet û meden
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Can rêbaza nirxandina ku nayê guhertin, çawa ku muamele li dijî hin tomar ku ev ne li wir rêbaza nirxandinê ya xwe ye"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hemû pelên bi rêk û wêneke e
 DocType: Job Opening,Description of a Job Opening,Description of a Opening Job
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,çalakiyên hîn ji bo îro
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ji kerema xwe ve Warehouse ji bo ku Daxwaza Material wê werin zindî binivîse
 DocType: Production Order,Additional Operating Cost,Cost Operating Additional
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetics
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","To merge, milkên li jêr, divê ji bo hem tomar be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","To merge, milkên li jêr, divê ji bo hem tomar be"
 DocType: Shipping Rule,Net Weight,Loss net
 DocType: Employee,Emergency Phone,Phone Emergency
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kirrîn
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Tikaye pola bo Qeyrana 0% define
 DocType: Sales Order,To Deliver,Gihandin
 DocType: Purchase Invoice Item,Item,Şanî
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
 DocType: Journal Entry,Difference (Dr - Cr),Cudahiya (Dr - Kr)
 DocType: Account,Profit and Loss,Qezenc û Loss
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,birêvebirina îhaleya
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Installation Têbînî babetî
 DocType: Production Plan Item,Pending Qty,Pending Qty
 DocType: Budget,Ignore,Berçavnegirtin
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} e çalak ne
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} e çalak ne
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},"SMS şandin, da ku hejmarên jêr e: {0}"
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,aliyên check Setup ji bo çapkirinê
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet meaş Slip
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Total Komîsyona
 DocType: Pricing Rule,Sales Partner,Partner Sales
 DocType: Buying Settings,Purchase Receipt Required,Meqbûz kirînê pêwîst
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Rate Valuation diyarkirî ye, eger Opening Stock ketin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Rate Valuation diyarkirî ye, eger Opening Stock ketin"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No records dîtin li ser sifrê bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Ji kerema xwe ve yekem Company û Partiya Type hilbijêre
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financial / salê.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nirxên Accumulated
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Mixabin, Serial Nos bi yek bên"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Make Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Make Sales Order
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,ÃƒÆ Bi tevahî
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,Attachment resume
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,muşteriyan repeat
 DocType: Leave Control Panel,Allocate,Pardan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Return Sales
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Return Sales
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nîşe: Hemû pelên bi rêk û {0} ne pêwîst be kêmtir ji pelên jixwe pejirandin {1} ji bo dema
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Teslîmî destê Supplier (Drop Ship)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,quotation To
 DocType: Lead,Middle Income,Dahata Navîn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,butçe ne dikare bibe neyînî
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Xêra xwe li Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Xêra xwe li Company
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales bi fatûreyên timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Çavkanî No &amp; Date: Çavkanî pêwîst e ji bo {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Hilbijêre Account Payment ji bo Peyam Bank
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Qeydên a Karkeran, ji bo birêvebirina pelên, îdîaya k&#39;îsî û payroll"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Qeydên a Karkeran, ji bo birêvebirina pelên, îdîaya k&#39;îsî û payroll"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Add to Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Writing Pêşniyarek
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment dabirîna Peyam
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Peywendiya bi Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Rêvebir
 DocType: Payment Entry,Payment From / To,Payment From / To
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Date Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},limit credit New kêmtir ji yê mayî niha ji bo mişterî e. limit Credit heye Hindîstan be {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},limit credit New kêmtir ji yê mayî niha ji bo mişterî e. limit Credit heye Hindîstan be {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,babete heman hatiye bicihkirin çend caran.
 DocType: SMS Settings,Receiver Parameter,Receiver parametreyê
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;Li ser&#39; û &#39;Koma By&#39; nikare bibe heman
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,Date Resolution
 DocType: Student Batch Name,Batch Name,Navê batch
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Nivîsîn
 DocType: Selling Settings,Customer Naming By,Qada Mişterî By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ê ku xwendekarê ku di Student Beşdariyê Report Ayda Present nîşan
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,Beşdariyê Student
 DocType: Sales Invoice Timesheet,Time Sheet,Bîlançoya Time
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush madeyên xav ser
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ji kerema xwe ve hûragahiyan babete binivîse
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ji kerema xwe ve hûragahiyan babete binivîse
 DocType: Interest,Interest,Zem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,din Details
@@ -739,7 +742,7 @@
 ,Absent Student Report,Absent Report Student
 DocType: Email Digest,Next email will be sent on:,email Next dê li ser şand:
 DocType: Offer Letter Term,Offer Letter Term,Pêşkêşkirina Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Em babete Guhertoyên.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Em babete Guhertoyên.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Babetê {0} nehate dîtin
 DocType: Bin,Stock Value,Stock Nirx
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Company {0} tune
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,Mîsoger Date Expiry
 DocType: Material Request Item,Quantity and Warehouse,Quantity û Warehouse
 DocType: Sales Invoice,Commission Rate (%),Komîsyona Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Xêra xwe Bidin Series ji bo {0} bi rêya Setup&gt; Settings&gt; Navên Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Xêra xwe Bidin Series ji bo {0} bi rêya Setup&gt; Settings&gt; Navên Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Please select Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Please select Program
 DocType: Project,Estimated Cost,Cost texmînkirin
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} e a stock babet ne
 DocType: Mode of Payment Account,Default Account,Account Default
 DocType: Payment Entry,Received Amount (Company Currency),Pêşwaziya Mîqdar (Company Exchange)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead bê mîhenkirin eger derfetek e ji Lead kirin
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Lead bê mîhenkirin eger derfetek e ji Lead kirin
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ji kerema xwe re bi roj off heftane hilbijêre
 DocType: Production Order Operation,Planned End Time,Bi plan Time End
 ,Sales Person Target Variance Item Group-Wise,Person firotina Target Variance babetî Pula-Wise
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,List Price hilbijartî ne
 DocType: Employee,Family Background,Background Family
 DocType: Request for Quotation Supplier,Send Email,Send Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,No Destûr
 DocType: Company,Default Bank Account,Account Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Fîltre li ser bingeha Partîya, Partîya select yekem Type"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No karker dîtin
 DocType: Supplier Quotation,Stopped,rawestandin
 DocType: Item,If subcontracted to a vendor,Eger ji bo vendor subcontracted
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
 DocType: SMS Center,All Customer Contact,Hemû Mişterî Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload balance stock via CSV.
 DocType: Warehouse,Tree Details,Details dara
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Herî kêm Mîqdar bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Navenda Cost {2} ne ji Company girêdayî ne {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} dikarin bi a Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Babetê Row {IDX}: {doctype} {docname} nayê li jor de tune ne &#39;{doctype}&#39; sifrê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Babetê Row {IDX}: {doctype} {docname} nayê li jor de tune ne &#39;{doctype}&#39; sifrê
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No erkên
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dotira rojê ya meha ku li ser fatûra auto nimûne, 05, 28 û hwd. Jî wê bi giştî bê"
 DocType: Asset,Opening Accumulated Depreciation,Vekirina Farhad. Accumulated
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Nawy Hilbijêre
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} dijî Bill {1} dîroka {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Cedwela Kurs
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Cedwela Kurs
 DocType: Maintenance Visit,Completion Status,Rewş cebîr
 DocType: HR Settings,Enter retirement age in years,temenê teqawidîyê Enter di salên
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Warehouse target
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Destûrê bide ser teslîmkirina an jî meqbûza upto ev ji sedî
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Beşdariyê Import
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Hemû Groups babetî
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Hemû Groups babetî
 DocType: Process Payroll,Activity Log,Activity bike Têkeve Têkeve
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Profit Net / Loss
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,"Otomatîk helbestan, peyamek li ser sertewandina muamele."
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,"Bikirin, ji bo Payment"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,projeya Qty
 DocType: Sales Invoice,Payment Due Date,Payment Date ji ber
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Dergeh&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Delivery Têbînî Message
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Dev ji Lîsteya Block Date
 DocType: Pricing Rule,Price or Discount,Price an Discount
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Total doz li wergirtinê li Purchase Nawy Meqbûz sifrê divê eynî wek Total Bac, û doz li be"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Total doz li wergirtinê li Purchase Nawy Meqbûz sifrê divê eynî wek Total Bac, û doz li be"
 DocType: Sales Team,Incentives,aborîve
 DocType: SMS Log,Requested Numbers,Numbers xwestin
 DocType: Production Planning Tool,Only Obtain Raw Materials,Tenê Wergirtin Alav Raw
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,Default Accounts cîhde
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xebatkarê {0} e çalak ne an tune ne
 DocType: Fee Structure,Components,Components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Babetê Variants {0} ve
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Bikirin bi fatûreyên Advance
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Payment dijî Sales / Purchase Order, divê her tim wek krêdî nîşankirin bê"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Şîmyawî
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default account Bank / Cash wê were li Salary Peyam Journal ve dema ku ev moda hilbijartî ye.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",The bi navberan ji bo Code Ast {0} yek bi navberan ji sinifa bo din notên. Ji kerema xwe bi navberan {0} û {1} û careke din biceribîne
 DocType: BOM,Raw Material Cost(Company Currency),Raw Cost Material (Company Exchange)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Hemû tomar niha ji bo vê Production Order hatine veguhastin.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Rate ne dikarin bibin mezintir rêjeya bikaranîn di {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM babet Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload nameya serokê û logo xwe. (Tu ji wan paşê biguherîne).
 DocType: Timesheet Detail,Bill,Hesab
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Next Date Farhad wek date borî ketin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Next Date Farhad wek date borî ketin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Spî
 DocType: SMS Center,All Lead (Open),Hemû Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty ji bo amade ne {4} li warehouse {1} hate dem bi mesaj û ji entry ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},"Order Type, divê yek ji yên bê {0}"
 DocType: Lead,Next Contact Date,Next Contact Date
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,vekirina Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
 DocType: Student Batch Name,Student Batch Name,Xwendekarên Name Batch
 DocType: Holiday List,Holiday List Name,Navê Lîsteya Holiday
 DocType: Repayment Schedule,Balance Loan Amount,Balance Loan Mîqdar
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Ji kerema xwe binivîsin a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,tomar rakirin bi ti guhertinek di dorpêçê de an nirxê.
 DocType: Delivery Note,Delivery To,Delivery To
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
 DocType: Production Planning Tool,Get Sales Orders,Get Orders Sales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne dikare bibe neyînî
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Kêmkirinî
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Kêmkirinî
 DocType: Asset,Total Number of Depreciations,Hejmara giştî ya Depreciations
 DocType: Sales Invoice Item,Rate With Margin,Rate Bi Kenarê
 DocType: Sales Invoice Item,Rate With Margin,Rate Bi Kenarê
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,Navê rêxistina
 DocType: Tax Rule,Shipping State,Dewletê Shipping
 ,Projected Quantity as Source,Quantity projeya wek Source
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Babetê, divê bikaranîna &#39;Get Nawy ji Purchase Receipts&#39; button bê zêdekirin"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Babetê, divê bikaranîna &#39;Get Nawy ji Purchase Receipts&#39; button bê zêdekirin"
 DocType: Employee,A-,YEK-
 DocType: Production Planning Tool,Include non-stock items,Usa jî tomar non-stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Mesref Sales
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,Dijî
 DocType: Item,Default Selling Cost Center,Default Navenda Cost Selling
 DocType: Sales Partner,Implementation Partner,Partner Kiryariya
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kode ya postî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Kode ya postî
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} e {1}
 DocType: Opportunity,Contact Info,Têkilî
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock Arşîva
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Belavkirina
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Têxe selikê Rule Shipping
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Production Order {0} divê berî betalkirinê ev Sales Order were betalkirin
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Ji kerema xwe ve set &#39;Bisepîne Discount Additional Li ser&#39; &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Ji kerema xwe ve set &#39;Bisepîne Discount Additional Li ser&#39; &#39;
 ,Ordered Items To Be Billed,Nawy emir ye- Be
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Ji Range ev be ku kêmtir ji To Range
 DocType: Global Defaults,Global Defaults,Têrbûn Global
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Tikaye kodî babet bikeve to get Hejmara Batch
 DocType: Stock Settings,Default Item Group,Default babetî Pula
 DocType: Employee Loan,Partially Disbursed,Qismen dandin de
-DocType: Grading Structure,Grading System Name,Name System di pîvanê de
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,heye Supplier.
 DocType: Account,Balance Sheet,Bîlançoya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Navenda bihagiranîyê ji bo babet bi Code Babetê &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode tezmînatê nehatiye mîhenkirin. Ji kerema xwe, gelo account hatiye dîtin li ser Mode of Payments an li ser POS Profile danîn."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Navenda bihagiranîyê ji bo babet bi Code Babetê &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode tezmînatê nehatiye mîhenkirin. Ji kerema xwe, gelo account hatiye dîtin li ser Mode of Payments an li ser POS Profile danîn."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,kesê firotina we dê bîrxistineke li ser vê date get ku serî li mişterî
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,babete eynî ne dikarin ketin bê çend caran.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","bikarhênerên berfireh dikarin di bin Groups kirin, di heman demê de entries dikare li dijî non-Groups kirin"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,work Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Ji kerema xwe re bi kêmanî yek taybetmendiyê de li ser sifrê, taybetiyên xwe diyar bike"
 DocType: Announcement,All Students,Hemû xwendekarên
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,"Babetê {0}, divê babete non-stock be"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,"Babetê {0}, divê babete non-stock be"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,navberan
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Kevintirîn
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","An Pol babet bi heman navî heye, ji kerema xwe biguherînin navê babete an jî datayê biguherîne koma babete de"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","An Pol babet bi heman navî heye, ji kerema xwe biguherînin navê babete an jî datayê biguherîne koma babete de"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,"Na, xwendekarê Mobile"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Din ên cîhanê
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The babet {0} ne dikarin Batch hene
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},destûr ne ji bo weşînertiya frozen Account {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Outstanding hisab
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,emir kirînê alîkariya we û plankirina û li pey xwe li ser kirînên te
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,emir kirînê alîkariya we û plankirina û li pey xwe li ser kirînên te
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Bi giştî dikele, Doza / Transfer {0} li Daxwaza Material {1} \ ne dikarin bibin mezintir dorpêçê de xwestin {2} ji bo babet {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Biçûk
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Syncê Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Products an Services te
 DocType: Mode of Payment,Mode of Payment,Mode of Payment
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ev komeke babete root e û ne jî dikarim di dahatûyê de were.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Pol Hejmara Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Ji bo {0}, tenê bikarhênerên credit dikare li dijî entry debit din ve girêdayî"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bi tevahî ji hemû pîvan Erka divê bê nîşandan 1. kerema xwe pîvan ji hemû erkên Project eyar bikin li gorî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,"Babetê {0}, divê babete-bînrawe bi peyman be"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Teçxîzatên hatiye capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule Pricing is yekem li ser esasê hilbijartin &#39;Bisepîne Li ser&#39; qada, ku dikare bê Babetê, Babetê Pol an Brand."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Peyam di Journal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} tomar di pêşketina
 DocType: Workstation,Workstation Name,Navê Workstation
-DocType: Grade Interval,Grade Code,Code pola
+DocType: Grading Scale Interval,Grade Code,Code pola
 DocType: POS Item Group,POS Item Group,POS babetî Pula
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Car
 DocType: Sales Order,Recurring Upto,nişankirin Upto
 DocType: Attendance,HR Manager,Manager HR
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Ji kerema xwe re Company hilbijêre
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Ji kerema xwe re Company hilbijêre
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Supplier Date bi fatûreyên
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Divê tu ji bo çalakkirina Têxe selikê
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Xûrek
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,No ji Serdan
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Maintenance Cedwela {0} dijî heye {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,xwendekarê qeyîtkirine
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Pereyan ji Account Girtina divê {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum ji xalên ji bo hemû armancên divê bê 100. Ev e {0}
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Chart Dageriyê
 DocType: Material Request,Terms and Conditions Content,Şert û mercan Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,dikarin bibin mezintir 100 ne
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
 DocType: Maintenance Visit,Unscheduled,rayis
 DocType: Employee,Owned,Owned
 DocType: Salary Detail,Depends on Leave Without Pay,Dimîne li ser Leave Bê Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Bilind hejmara, bilind pêşanî"
 ,Purchase Invoice Trends,Bikirin Trends bi fatûreyên
 DocType: Employee,Better Prospects,baştir e
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: The hevîrê {1} tenê {2} qty. Tikaye Demîralp, ku {3} qty License de hilbijêre yan parçekirina row nav rêzên multiple, bi azadkirina / pirsa ji lekerên multiple"
 DocType: Vehicle,License Plate,License Plate
 DocType: Appraisal,Goals,armancên
 DocType: Warranty Claim,Warranty / AMC Status,Mîsoger / AMC Rewş
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Xebatkarê ne dikarin ji xwe re rapor.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Eger account bêhest e, entries bi bikarhênerên sînorkirin destûr."
 DocType: Email Digest,Bank Balance,Balance Bank
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Peyam Accounting ji bo {0}: {1} dikarin tenê li pereyan kir: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Peyam Accounting ji bo {0}: {1} dikarin tenê li pereyan kir: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","profile kar, bi dawîanîna pêwîst hwd."
 DocType: Journal Entry Account,Account Balance,Mêzîna Hesabê
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Rule Bacê ji bo muameleyên.
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Nîşan P &amp; hevsengiyên L sala diravî ya negirtî ya
 DocType: Shipping Rule,Shipping Account,Account Shipping
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} neçalak e
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Make Orders Sales ji bo alîkarîya te plana karê xwe û azad li ser-dem
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Make Orders Sales ji bo alîkarîya te plana karê xwe û azad li ser-dem
 DocType: Quality Inspection,Readings,bi xwendina
 DocType: Stock Entry,Total Additional Costs,Total Xercên din
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,to Nirx
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},warehouse Source bo row wêneke e {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Packing Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Packing Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,settings deryek Setup SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ser neket!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,Kanî
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show girtî
 DocType: Leave Type,Is Leave Without Pay,Ma Leave Bê Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Category bo em babete Asset Fixed wêneke e
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Category bo em babete Asset Fixed wêneke e
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No records dîtin li ser sifrê (DGD)
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ev {0} pevçûnên bi {1} ji bo {2} {3}
 DocType: Student Attendance Tool,Students HTML,xwendekarên HTML
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,Date of Leaving
 DocType: Pricing Rule,For Price List,Ji bo List Price
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Rêveber Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Create Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Create Leads
 DocType: Maintenance Schedule,Schedules,schedules
 DocType: Purchase Invoice Item,Net Amount,Şêwaz net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM No
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Enrollments Program
 DocType: Sales Invoice Item,Brand Name,Navê marka
 DocType: Purchase Receipt,Transporter Details,Details Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default warehouse bo em babete helbijartî pêwîst e
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Default warehouse bo em babete helbijartî pêwîst e
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Qûtîk
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Supplier gengaz
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Rêxistina
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM Default ji bo {0} ji bo Project dîtin ne {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Îdîaya ji bo şîrketa hisabê.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Xwendekarên bi li dilê sîstema, lê zêde bike hemû xwendekarên xwe"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Xwendekarên bi li dilê sîstema, lê zêde bike hemû xwendekarên xwe"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: date Clearance {1} ne berî Date Cheque be {2}
 DocType: Company,Default Holiday List,Default Lîsteya Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Ji Time û To Time of {1} bi gihîjte {2}
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dotira rojê (s) li ser ku hûn bi ji bo xatir hukm û cejnên in. Tu divê ji bo xatir ne.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ji nûve Payment Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,erka New
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Make Quotation
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Make Quotation
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,din Reports
 DocType: Dependent Task,Dependent Task,Task girêdayî
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},faktora Converter ji bo default Unit ji pîvanê divê 1 li row be {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},faktora Converter ji bo default Unit ji pîvanê divê 1 li row be {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave a type {0} nikare were êdî ji {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Try plan operasyonên ji bo rojên X di pêş.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday Reminders
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Ji kerema xwe ve Default payroll cîhde Account set li Company {0}
 DocType: SMS Center,Receiver List,Lîsteya Receiver
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Search babetî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Search babetî
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Şêwaz telef
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Change Net di Cash
 DocType: Assessment Plan,Grading Scale,pîvanê de
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,"Unit ji Measure {0} hatiye, ji carekê zêdetir li Converter Factor Table nivîsandin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,"Unit ji Measure {0} hatiye, ji carekê zêdetir li Converter Factor Table nivîsandin"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jixwe temam
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Daxwaza peredana ji berê ve heye {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost ji Nawy Issued
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Berhevkirin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Li dijî Supplier bi fatûreyên {0} dîroka {1}
 DocType: Customer,Default Price List,Default List Price
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Tu nikarî bibî Fiscal Sal {0}. Sal malî {0} wek default li Settings Global danîn
 DocType: Journal Entry,Entry Type,Type entry
 ,Customer Credit Balance,Balance Credit Mişterî
@@ -1686,8 +1685,6 @@
 DocType: Student Sibling,Studying in Same Institute,Xwendina di heman Enstîtuya
 DocType: Territory,Territory Manager,Manager axa
 DocType: Packed Item,To Warehouse (Optional),To Warehouse (Li gorî daxwazê)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babetî Pula&gt; Brand
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babetî Pula&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Pereyan (Company Exchange)
 DocType: Purchase Invoice,Additional Discount,Discount Additional
 DocType: Selling Settings,Selling Settings,Firoştina Settings
@@ -1697,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View li Têxe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Mesref marketing
 ,Item Shortage Report,Babetê Report pirsgirêka
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Loss de behsa, \ nJi kerema xwe behsa &quot;Loss UOM&quot; jî"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Loss de behsa, \ nJi kerema xwe behsa &quot;Loss UOM&quot; jî"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Daxwaza maddî tê bikaranîn ji bo ku ev Stock Peyam
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Next Date Farhad ji bo sermaye nû wêneke e
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Next Date Farhad ji bo sermaye nû wêneke e
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Cuda Bêguman Pol bingeha ji bo her Batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Cuda Bêguman Pol bingeha ji bo her Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,yekeya an Babetê.
@@ -1716,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Navenda Cost ji bo &#39;Profit û wendakirin&#39; account pêwîst e {2}. Ji kerema xwe ve set up a Navenda Cost default ji bo Company.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Pol Mişterî ya bi heman navî heye ji kerema xwe biguherînin navê Mişterî li an rename Pol Mişterî ya
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Mişterî Pol&gt; Herêma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Mişterî Pol&gt; Herêma
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Pol Mişterî ya bi heman navî heye ji kerema xwe biguherînin navê Mişterî li an rename Pol Mişterî ya
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,New Contact
 DocType: Territory,Parent Territory,Herêmê dê û bav
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1745,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Lihevkirin JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Jî gelek stûnên. Versiyon ji raporê û print ew bikaranîna serlêdana spreadsheet.
 DocType: Purchase Invoice Item,Batch No,batch No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nikare bibînin rate ji bo {0} ji bo {1} ji bo date key {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Destûrê bide multiple Orders Sales dijî Mişterî ya Purchase Order
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Ser
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Ser
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix ji bo ku hijmara series li ser danûstandinên xwe
 DocType: Employee Attendance Tool,Employees HTML,karmendên HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,"Default BOM ({0}), divê ji bo em babete an şablonê xwe çalak be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,"Default BOM ({0}), divê ji bo em babete an şablonê xwe çalak be"
 DocType: Employee,Leave Encashed?,Dev ji Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Derfeta ji qadê de bivênevê ye
 DocType: Email Digest,Annual Expenses,Mesref ya salane
 DocType: Item,Variants,Guhertoyên
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Make Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Make Purchase Order
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},e balance îzna bes ji bo Leave Type li wir ne {0}
 DocType: Payment Reconciliation Payment,Allocated amount,butçe
@@ -1779,7 +1773,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Şiroveyên
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Curenivîsên Serial No bo Babetê ketin {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A rewşa ji bo Rule Shipping
-DocType: Grading Structure,Grading Intervals,navberan de tunin
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ji kerema xwe re têkevin
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ne dikarin ji bo vî babetî {0} li row overbill {1} zêdetir {2}. To rê li ser-billing, ji kerema xwe danîn li Peydakirina Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Ji kerema xwe ve filter li ser Babetî an Warehouse danîn
@@ -1792,16 +1785,17 @@
 DocType: Authorization Control,Authorization Control,Control Authorization
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Redkirin Warehouse dijî babet red wêneke e {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Diravdanî
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Manage fermana xwe
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Manage fermana xwe
 DocType: Production Order Operation,Actual Time and Cost,Time û Cost rastî
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Daxwaza maddî yên herî zêde {0} de ji bo babet {1} dijî Sales Order kirin {2}
 DocType: Employee,Salutation,Silav
 DocType: Course,Course Abbreviation,Abbreviation Kurs
 DocType: Student Leave Application,Student Leave Application,Xwendekarên Leave Application
 DocType: Item,Will also apply for variants,jî wê ji bo Guhertoyên serî
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Xebatkarê {0} roja Half li ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Total dema xebatê ne, divê ji bilî dema xebatê max be mezintir {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Li
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,"tomar boxçe, li dema sale."
 DocType: Quotation Item,Actual Qty,rastî Qty
 DocType: Sales Invoice Item,References,Çavkanî
@@ -1811,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hûn ketin tomar lînkek kirine. Ji kerema xwe re çak û careke din biceribîne.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Şirîk
 DocType: Asset Movement,Asset Movement,Tevgera Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Têxe New
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Têxe New
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Babetê {0} e a babete weşandin ne
 DocType: SMS Center,Create Receiver List,Create Lîsteya Receiver
 DocType: Vehicle,Wheels,wheels
@@ -1843,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Modê de creation ji dem têketin dijî Orders Production. Operasyonên wê li hember Production Order ne bê Molla
 DocType: Student,Student Mobile Number,Xwendekarên Hejmara Mobile
 DocType: Item,Has Variants,has Variants
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name ji Belavkariya Ayda
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID wêneke e
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID wêneke e
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID wêneke e
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID wêneke e
 DocType: Sales Person,Parent Sales Person,Person bav Sales
 DocType: Purchase Invoice,Recurring Invoice,bi fatûreyên nûkirin
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,birêvebirina Projeyên
@@ -1854,7 +1848,7 @@
 DocType: Budget,Fiscal Year,sala diravî ya
 DocType: Vehicle Log,Fuel Price,sotemeniyê Price
 DocType: Budget,Budget,Sermîyan
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budceya dikare li hember {0} ne bên wezîfedarkirin, wek ku ev hesabê Hatinê an jî Expense ne"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,nebine
 DocType: Student Admission,Application Form Route,Forma serlêdana Route
@@ -1885,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Şêwaz {0} {1} dabirîn dijî {2}
 DocType: Employee,Salary Information,Information meaş
 DocType: Sales Person,Name and Employee ID,Name û Xebatkarê ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
 DocType: Website Item Group,Website Item Group,Website babetî Pula
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Erk û Baca
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse
@@ -1944,7 +1938,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Hatiniyên Mişterî Repeat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), divê rola &#39;Approver Expense&#39; heye"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Cot
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Select BOM û Qty bo Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Select BOM û Qty bo Production
 DocType: Asset,Depreciation Schedule,Cedwela Farhad.
 DocType: Bank Reconciliation Detail,Against Account,li dijî Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Nîv Date Day divê di navbera From Date û To Date be
@@ -1961,13 +1955,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
 ,Quotation Trends,Trends quotation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Babetê Pol di master babete bo em babete behsa ne {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
 DocType: Shipping Rule Condition,Shipping Amount,Şêwaz Shipping
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,hîn Mîqdar
 DocType: Purchase Invoice Item,Conversion Factor,Factor converter
 DocType: Purchase Order,Delivered,teslîmî
 ,Vehicle Expenses,Mesref Vehicle
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
+DocType: Serial No,Invoice Details,Details bi fatûreyên
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
 DocType: Purchase Receipt,Vehicle Number,Hejmara Vehicle
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Roja ku dubare fatûra bê dê bê rawestandin
 DocType: Employee Loan,Loan Amount,Şêwaz deyn
@@ -1991,7 +1986,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Şêwaz Discount Additional
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
 DocType: Leave Block List Allow,Leave Block List Allow,Dev ji Lîsteya Block Destûrê bide
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Kurte nikare bibe vala an space
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Kurte nikare bibe vala an space
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Pol to non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sports
 DocType: Loan Type,Loan Name,Navê deyn
@@ -2003,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse tu li ku derê bi parastina stock ji tomar red
 DocType: Production Order,Skip Material Transfer,Skip Transfer Material
 DocType: Production Order,Skip Material Transfer,Skip Transfer Material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nikare bibînin rate ji bo {0} ji bo {1} ji bo date key {2}. Ji kerema xwe re qeyda Exchange biafirîne bi destan
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,sala te ya aborî dawî li ser
 DocType: POS Profile,Price List,Lîsteya bihayan
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} e niha standard sala diravî. Ji kerema xwe (browser) xwe nû dikin ji bo vê guhertinê ji bandora.
@@ -2040,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Babetê {0} ji niha ve hatine vegerandin
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Sal ** temsîl Sal Financial. Re hemû ketanên hisêba û din muamele mezin bi dijî Sal Fiscal ** Molla **.
 DocType: Opportunity,Customer / Lead Address,Mişterî / Lead Address
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
 DocType: Student Admission,Eligibility,ku mafê
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Rêça te alîkarîya te bike business, lê zêde bike hemû têkiliyên xwe û zêdetir wek rêça te"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Rêça te alîkarîya te bike business, lê zêde bike hemû têkiliyên xwe û zêdetir wek rêça te"
 DocType: Production Order Operation,Actual Operation Time,Rastî Time Operation
 DocType: Authorization Rule,Applicable To (User),To de evin: (User)
 DocType: Purchase Taxes and Charges,Deduct,Jinavkişîn
@@ -2083,7 +2079,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Select Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Vala bihêlin, eger ji bo hemû beşên nirxandin"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Cure yên kar (daîmî, peymana, û hwd. Intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
 DocType: Process Payroll,Fortnightly,Livînê
 DocType: Currency Exchange,From Currency,ji Exchange
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ji kerema xwe ve butçe, Type bi fatûreyên û Number bi fatûreyên li Hindîstan û yek row hilbijêre"
@@ -2099,7 +2095,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Can type pere weke &#39;li ser Previous Mîqdar Row&#39; hilbijêre ne an &#39;li ser Previous Row Total&#39; ji bo rêza yekem
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Babetê zarok ne pêwîst be gurzek Product. Ji kerema xwe ve babete jê `{0}` û xilas bike
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,lê zêde bike timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,lê zêde bike timesheets
 DocType: Vehicle Service,Service Item,Babetê Service
 DocType: Bank Guarantee,Bank Guarantee,garantiyalênêrînê Bank
 DocType: Bank Guarantee,Bank Guarantee,garantiyalênêrînê Bank
@@ -2149,8 +2145,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Bihayê wê li banî tê ne bê eger List Price is set ne
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ji kerema xwe ve welatekî ji bo vê Rule Shipping diyar bike an jî Shipping Worldwide
 DocType: Stock Entry,Total Incoming Value,Total Nirx Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit To pêwîst e
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit To pêwîst e
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Buy List Price
 DocType: Offer Letter Term,Offer Term,Term Pêşnîyaza
 DocType: Quality Inspection,Quality Manager,Manager Quality
@@ -2184,14 +2180,14 @@
 DocType: Opportunity,Lost Reason,ji dest Sedem
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Address
 DocType: Quality Inspection,Sample Size,Size rate
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ji kerema xwe ve dokumênt Meqbûz binivîse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Hemû tomar niha ji fatore dîtin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ji kerema xwe ve dokumênt Meqbûz binivîse
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Hemû tomar niha ji fatore dîtin
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ji kerema xwe binivîsin derbasbar a &#39;Ji Case Na&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,navendên mesrefa berfireh dikarin di bin Groups made di heman demê de entries dikare li dijî non-Groups kirin
 DocType: Project,External,Xûkirînî
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Bikarhêner û Permissions
 DocType: Vehicle Log,VLOG.,Sjnaka.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordênên Production nû: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Ordênên Production nû: {0}
 DocType: Branch,Branch,Liq
 DocType: Guardian,Mobile Number,Hejmara Mobile
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing û Branding
@@ -2200,7 +2196,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nehate dîtin
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,muşteriyan te
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Make Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Make Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Hûn hatine vexwendin ji bo hevkariyê li ser vê projeyê: {0}
 DocType: Leave Block List Date,Block Date,Date block
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Apply Now
@@ -2224,8 +2220,9 @@
 DocType: SMS Log,Sent To,şandin To
 DocType: Payment Request,Make Sales Invoice,Make Sales bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next Contact Date ne di dema borî de be
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Contact Date ne di dema borî de be
 DocType: Company,For Reference Only.,For Reference Only.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Hilbijêre Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-direvin
 DocType: Sales Invoice Advance,Advance Amount,Advance Mîqdar
@@ -2239,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,"Case Na, nikare bibe 0"
 DocType: Item,Show a slideshow at the top of the page,Nîşan a slideshow li jor li ser vê rûpelê
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,dikeye
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,dikanên
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,dikanên
 DocType: Serial No,Delivery Time,Time Delivery
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing li ser bingeha
 DocType: Item,End of Life,End of Life
@@ -2255,8 +2252,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,transfer Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Hên operasyonên, mesrefa xebatê û bide Operation yekane no ji bo operasyonên xwe."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ev belge li ser sînor ji aliyê {0} {1} ji bo em babete {4}. Ma tu ji yekî din {3} li dijî heman {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Hilbijêre guhertina account mîqdara
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Hilbijêre guhertina account mîqdara
 DocType: Purchase Invoice,Price List Currency,List Price Exchange
 DocType: Naming Series,User must always select,Bikarhêner her tim divê hilbijêre
 DocType: Stock Settings,Allow Negative Stock,Destûrê bide Stock Negative
@@ -2267,7 +2264,7 @@
 DocType: Budget Account,Budget Account,Account budceya
 DocType: Quality Inspection,Verified By,Sîîrtê By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Can currency default şîrketê nayê guhertin, ji ber ku muamele heyî heye. Transactions bên îptal kirin, ji bo guhertina pereyan default."
-DocType: Grade Interval,Grade Description,Ast Description
+DocType: Grading Scale Interval,Grade Description,Ast Description
 DocType: Stock Entry,Purchase Receipt No,Meqbûz kirînê No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Money bi xîret
 DocType: Process Payroll,Create Salary Slip,Create Slip Salary
@@ -2305,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,Amadebûna To Date
 DocType: Warranty Claim,Raised By,rakir By
 DocType: Payment Gateway Account,Payment Account,Account Payment
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ji kerema xwe ve Company diyar bike ji bo berdewamiyê
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Ji kerema xwe ve Company diyar bike ji bo berdewamiyê
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Change Net li hesabê hilgirtinê
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,heger Off
 DocType: Offer Letter,Accepted,qebûlkirin
@@ -2319,7 +2316,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping Rule
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Bikarhêner
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Peyam di Journal Quick
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Tu dikarî rêjeya nayê guhertin, eger BOM agianst tu babete behsa"
 DocType: Employee,Previous Work Experience,Previous serê kurda
@@ -2333,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termên û Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,The name of peymangeha ji bo ku hûn bi avakirina vê sîstemê.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","entry Accounting ji vê dîrokê de sar up, kes nikare do / ya xeyrandin di entry ji bilî rola li jêr hatiye diyarkirin."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Ji kerema xwe ve belgeya ku berî bi afrandina schedule maintenance xilas bike
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ji kerema xwe ve belgeya ku berî bi afrandina schedule maintenance xilas bike
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Rewş Project
 DocType: UOM,Check this to disallow fractions. (for Nos),Vê kontrol bike li hevûdu fractions. (Ji bo Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,The Orders Production li jêr tên kirin:
@@ -2356,6 +2353,7 @@
 DocType: Email Digest,How frequently?,Çawa gelek caran?
 DocType: Purchase Receipt,Get Current Stock,Get Stock niha:
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill ji materyalên
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babetî Pula&gt; Brand
 DocType: Student,Joining Date,Dîroka tevlêbûnê
 ,Employees working on a holiday,Karmendên li ser dixebitin ku cejna
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Present Mark
@@ -2437,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Date Clearance behsa ne
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Çêkerî
 DocType: Guardian,Occupation,Sinet
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Destpêk Date divê berî End Date be
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Destpêk Date divê berî End Date be
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,Ev Document
 DocType: Installation Note Item,Installed Qty,sazkirin Qty
@@ -2460,8 +2458,8 @@
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nirxên Default wek Company, Exchange, niha: Sala diravî, û hwd."
 DocType: Payment Entry,Payment Type,Type Payment
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
 DocType: Process Payroll,Select Employees,Hilbijêre Karmendên
 DocType: Opportunity,Potential Sales Deal,Deal Sales Potential
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Date Reference
@@ -2478,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Profile POS Global {0} berê ji bo şîrketa tên afirandin {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Replace babet / BOM di hemû dikeye
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,belgeya wergirtina divê bê şandin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,belgeya wergirtina divê bê şandin
 DocType: Purchase Invoice Item,Received Qty,pêşwaziya Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Paid ne û Delivered ne
@@ -2491,7 +2489,7 @@
 ,To Produce,ji bo hilberîna
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Rêza yomîya
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Ji bo row {0} li {1}. To de {2} di rêjeya Babetê, rêzikan {3} jî, divê di nav de bê"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Make Bikarhêner
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Make Bikarhêner
 DocType: Packing Slip,Identification of the package for the delivery (for print),Diyarkirina pakêta ji bo gihandina (ji bo print)
 DocType: Bin,Reserved Quantity,Quantity reserved.
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Kerema xwe, navnîşana email derbasdar têkeve ji"
@@ -2505,11 +2503,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,şablonê seqet ne divê şablonê default
 DocType: Account,Income Account,Account hatina
 DocType: Payment Request,Amount in customer's currency,Şêwaz li currency mişterî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Şandinî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Şandinî
 DocType: Stock Reconciliation Item,Current Qty,Qty niha:
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Bibînin &quot;Rate ji materyalên li ser&quot; li qurûşekî jî Beþ
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Borî
 DocType: Appraisal Goal,Key Responsibility Area,Area Berpirsiyariya Key
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Lekerên Student alîkarîya we bişopîne hazirbûn, nirxandinên û xercên ji bo xwendekaran"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Lekerên Student alîkarîya we bişopîne hazirbûn, nirxandinên û xercên ji bo xwendekaran"
 DocType: Payment Entry,Total Allocated Amount,Temamê meblaxa veqetandin
 DocType: Item Reorder,Material Request Type,Maddî request type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Peyam di Journal Accural ji bo mûçeyên ji {0} ji bo {1}
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads by Type Industry.
 DocType: Item Supplier,Item Supplier,Supplier babetî
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Hemû Navnîşan.
 DocType: Company,Stock Settings,Settings Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Yedega tenê mimkun e, eger taybetiyên jêrîn heman in hem records in. E Group, Type Root, Company"
@@ -2542,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Dê an email di derbarê bûyerê de ji bo karmendên bi statûya bişîne &#39;Open&#39;
 DocType: Task,Depends on Tasks,Dimîne li ser Peywir
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage Mişterî Pol Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Attachments dikare bê derfet û Têxe selikê li banî tê
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Name Navenda Cost
 DocType: Leave Control Panel,Leave Control Panel,Dev ji Control Panel
@@ -2554,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,Debit To
 DocType: Delivery Note,Required only for sample item.,tenê ji bo em babete test pêwîst.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty rastî Piştî Transaction
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},No slip meaş dîtin di navbera {0} û {1}
 ,Pending SO Items For Purchase Request,Hîn SO Nawy Ji bo Daxwaza Purchase
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissions Student
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} neçalak e
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} neçalak e
 DocType: Supplier,Billing Currency,Billing Exchange
 DocType: Sales Invoice,SINV-RET-,SINV-direvin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2576,7 +2574,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Product Dawiyê
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Hemû Groups Nirxandina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Name Warehouse
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Herêm
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ji kerema xwe re tu ji serdanên pêwîst behsa
 DocType: Stock Settings,Default Valuation Method,Default Method Valuation
@@ -2594,7 +2592,7 @@
 DocType: Price List,Price List Master,Price List Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Hemû Transactions Sales dikare li dijî multiple Persons Sales ** ** tagged, da ku tu set û şopandina hedef."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Ji kerema Mişterî ji Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Ji kerema Mişterî ji Lead {0}
 DocType: Price List,Applicable for Countries,Wergirtinê ji bo welatên
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Tenê Applications bi statûya Leave &#39;status&#39; û &#39;Redkirin&#39; dikare were şandin
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Xwendekarên Navê babetî Pula li row wêneke e {0}
@@ -2675,7 +2673,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Peyam Accounting bo Stock
 DocType: Vehicle Service,Engine Oil,Oil engine
 DocType: Sales Invoice,Sales Team1,Team1 Sales
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Babetê {0} tune
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Babetê {0} tune
 DocType: Sales Invoice,Customer Address,Address mişterî
 DocType: Employee Loan,Loan Details,deyn Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Qediya Qty divê ji sifirê mezintir be.
@@ -2740,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Wargehan de bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
 DocType: Assessment Result Tool,Result HTML,Di encama HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ketin ser
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,lê zêde bike Xwendekarên
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,lê zêde bike Xwendekarên
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0} ji kerema xwe hilbijêre
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2805,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Sînora Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,An term akademîk bi vê &#39;Sala (Ekadîmî)&#39; {0} û &#39;Name Term&#39; {1} ji berê ve heye. Ji kerema xwe re van entries xeyrandin û careke din biceribîne.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","As in muamele heyî dijî babete {0} hene, tu bi nirxê biguherînin {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","As in muamele heyî dijî babete {0} hene, tu bi nirxê biguherînin {1}"
 DocType: UOM,Must be Whole Number,Divê Hejmara Whole
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Leaves New veqetandin (Di Days)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} tune
@@ -2849,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Last Day of the Month Next
 DocType: Support Settings,Auto close Issue after 7 days,Auto Doza nêzîkî piştî 7 rojan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave nikarim li ber terxan kirin {0}, wekî parsenga îzinê jixwe-hilgire hatiye şandin, di qeyda dabeşkirina îzna pêş {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Têbînî: Ji ber / Date: Çavkanî qat bi destûr rojan credit mişterî destê {0} roj (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Têbînî: Ji ber / Date: Çavkanî qat bi destûr rojan credit mişterî destê {0} roj (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Xwendekarên Applicant
 DocType: Asset Category Account,Accumulated Depreciation Account,Account Farhad. Accumulated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Arşîva
@@ -2877,8 +2875,8 @@
 DocType: Asset,Item Code,Code babetî
 DocType: Production Planning Tool,Create Production Orders,Create Orders Production
 DocType: Serial No,Warranty / AMC Details,Mîsoger / Details AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
 DocType: Journal Entry,User Remark,Remark Bikarhêner
 DocType: Lead,Market Segment,Segment Market
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Şêwaz pere ne dikarin bibin mezintir total mayî neyînî {0}
@@ -2897,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,Create Requests Material
 DocType: Employee Education,School/University,School / Zanîngeha
 DocType: Payment Request,Reference Details,Details Reference
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Nirx a bende Piştî Jiyana gerek kêmtir ji Gross Purchase Mîqdar be
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nirx a bende Piştî Jiyana gerek kêmtir ji Gross Purchase Mîqdar be
 DocType: Sales Invoice Item,Available Qty at Warehouse,Available Qty li Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Şêwaz billed
 DocType: Asset,Double Declining Balance,Double Balance Îro
@@ -2918,19 +2916,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account Cudahiya, divê hesabekî type Asset / mesulîyetê be, ji ber ku ev Stock Lihevkirinê an Peyam Opening e"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Şêwaz dandin de ne dikarin bibin mezintir Loan Mîqdar {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Bikirin siparîşê pêwîst ji bo vî babetî {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Production Order tên afirandin ne
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Production Order tên afirandin ne
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Ji Date&#39; Divê piştî &#39;To Date&#39; be
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Dikare biguhere status wek xwendekarê bi {0} bi serlêdana xwendekaran ve girêdayî {1}
 DocType: Asset,Fully Depreciated,bi temamî bicūkkirin
 ,Stock Projected Qty,Stock projeya Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Beşdariyê nîşankirin HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Quotations pêşniyarên in, bids ku hûn û mişterîyên xwe şandin"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Quotations pêşniyarên in, bids ku hûn û mişterîyên xwe şandin"
 DocType: Sales Order,Customer's Purchase Order,Mişterî ya Purchase Order
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No û Batch
 DocType: Warranty Claim,From Company,ji Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Sum ji Jimareke Krîterên Nirxandina divê {0} be.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Ji kerema xwe ve set Hejmara Depreciations civanan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ji kerema xwe ve set Hejmara Depreciations civanan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Nirx an Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,"Ordênên Productions dikarin ji bo ne, bêne zindî kirin:"
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Deqqe
@@ -3061,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Komeleya Xwendekarên
 DocType: Shopping Cart Settings,Quotation Series,quotation Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","An babete bi heman navî heye ({0}), ji kerema xwe biguherînin li ser navê koma babete an navê babete"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Ji kerema xwe ve mişterî hilbijêre
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Ji kerema xwe ve mişterî hilbijêre
 DocType: C-Form,I,ez
 DocType: Company,Asset Depreciation Cost Center,Asset Navenda Farhad. Cost
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3080,19 +3078,18 @@
 DocType: Vehicle,Insurance Details,Details sîgorta
 DocType: Account,Payable,Erzan
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ji kerema xwe ve Maweya vegerandinê binivîse
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Deyndarên ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Deyndarên ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,muşteriyan New
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Profit% Gross
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Date clearance
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Şêwaz Purchase Gross wêneke e
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Şêwaz Purchase Gross wêneke e
 DocType: Lead,Address Desc,adres Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partiya wêneke e
 DocType: Journal Entry,JV-,nájv-
 DocType: Topic,Topic Name,Navê topic
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Li Hindîstan û yek ji Selling an Buying divê bên hilbijartin
-DocType: Grading Structure,Grade Intervals,navberan pola
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,xwezaya business xwe hilbijêrin.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Li ku derê operasyonên bi aktîvîteyên bi çalakiyek hatiye lidarxistin.
 DocType: Asset Movement,Source Warehouse,Warehouse Source
@@ -3121,6 +3118,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Rêjeya Belavkariya mehane
 DocType: Territory,Territory Targets,Armanc axa
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Mişterî Pol&gt; Herêma
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Ji kerema xwe ve set default {0} li Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Guherandinên helwesta ji devê top
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,dabînkerê heman hatiye bicihkirin çend caran
@@ -3174,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,DIRTYHERTZ Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Openings Job niha:
 DocType: Company,Stock Adjustment Account,Account Adjustment Stock
-DocType: Journal Entry,Write Off,hewe Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,hewe Off
 DocType: Timesheet Detail,Operation ID,operasyona ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sîstema User (login) ID. Heke were avakirin, ew jî wê bibin standard ji bo hemû formên HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Ji {1}
@@ -3185,8 +3183,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Supplier xelas dike ji bo Mişterî
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (Form # / babet / {0}) e ji stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Date Next divê mezintir Mesaj Date be
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show bacê break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Date ji ber / Çavkanî ne dikarin piştî be {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Show bacê break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Date ji ber / Çavkanî ne dikarin piştî be {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import û Export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entries Stock li dijî Warehouse {0} hene, vê yekê hûn ne dikarin ji nû ve bê peywirdarkirin an xeyrandin ew"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No xwendekarên dîtin.Di
@@ -3198,14 +3196,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Ji kerema xwe ve Mesaj Date Beriya hilbijartina Partiya hilbijêre
 DocType: Program Enrollment,School House,House School
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Tikaye Quotations hilbijêre
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Tikaye Quotations hilbijêre
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Make Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ji kerema xwe re ji bo ku bikarhêner ku Sales Manager Master {0} rola xwedî têkilî bi
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Tikaye Quotations hilbijêre
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Tikaye Quotations hilbijêre
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ji kerema xwe re ji bo ku bikarhêner ku Sales Manager Master {0} rola xwedî têkilî bi
 DocType: Company,Default Cash Account,Account Cash Default
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ne Mişterî an Supplier) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ev li ser amadebûna vê Xwendekarên li
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,No Xwendekarên li
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lê zêde bike tomar zêdetir an form tije vekirî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Ji kerema xwe ve &#39;ya bende Date Delivery&#39; binivîse
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notes Delivery {0} divê berî betalkirinê ev Sales Order were betalkirin
@@ -3252,9 +3251,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,berî ku lihevhatina
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Bac û tawana Ev babete ji layê: (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Bacê babete {0} de divê hesabê type Bacê an Hatinê an jî Expense an Chargeable hene
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Bacê babete {0} de divê hesabê type Bacê an Hatinê an jî Expense an Chargeable hene
 DocType: Sales Order,Partly Billed,hinekî billed
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,"Babetê {0}, divê babete Asset Fixed be"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Babetê {0}, divê babete Asset Fixed be"
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Ji kerema xwe re-type navê şîrketa ku piştrast
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Outstanding Amt
@@ -3277,7 +3276,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,List Price Exchange Rate
 DocType: Purchase Invoice Item,Rate,Qûrs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Pizişka destpêker
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Address Name
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Address Name
 DocType: Stock Entry,From BOM,ji BOM
 DocType: Assessment Code,Assessment Code,Code nirxandina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Bingehîn
@@ -3302,7 +3301,7 @@
 DocType: Purchase Invoice,Print Language,Print Ziman
 DocType: Salary Slip,Total Working Hours,Total dema xebatê
 DocType: Stock Entry,Including items for sub assemblies,Di nav wan de tomar bo sub meclîsên
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Enter nirxa divê erênî be
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Enter nirxa divê erênî be
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Hemû Territories
 DocType: Purchase Invoice,Items,Nawy
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Xwendekarên jixwe digirin.
@@ -3322,17 +3321,15 @@
 DocType: Issue,Opening Time,Time vekirinê
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,From û To dîrokên pêwîst
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ewlehiya &amp; Borsayên Tirkiyeyê
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Calcolo li ser
 DocType: Delivery Note Item,From Warehouse,ji Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
 DocType: Assessment Plan,Supervisor Name,Navê Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program hejmartina Kurs
 DocType: Program Enrollment Course,Program Enrollment Course,Program hejmartina Kurs
-DocType: Grading Structure,Grading Structure,Beşên di pîvanê de
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuation û Total
 DocType: Tax Rule,Shipping City,Shipping City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Em babete guhertoya ji {0} (Şablon) e. Xerîbkirin, wê bê ser ji şablonê kopîkirin, eger &#39;No ber Bigire&#39; Biryar e"
 DocType: Notification Control,Customize the Notification,Sīroveyan agahdar bike
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flow Cash ji operasyonên
 DocType: Sales Invoice,Shipping Rule,Rule Shipping
@@ -3355,6 +3352,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No BOM default ji bo vî babetî heye {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Ji kerema xwe ve yekem Mesaj Date hilbijêre
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Vekirina Date divê berî Girtina Date be
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tikaye setup hijmara series ji bo beşdarbûna bi rêya Setup&gt; Nî Series
 DocType: Leave Control Panel,Carry Forward,çêşît Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Navenda Cost bi muamele heyî nikare bê guhartina ji bo ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Rojan de ji bo ku Holidays bi ji bo vê beşê astengkirin.
@@ -3383,7 +3381,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Music &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Babetê No Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,"Create a Karkeran, Records"
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,"Create a Karkeran, Records"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Rageyendrawekanî Accounting
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Seet
@@ -3398,8 +3396,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM nû piştî gotina
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,pêşwaziya Mîqdar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tikaye Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tikaye Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Create bo dikele, full, ji wişeyên dikele, jixwe li ser da"
 DocType: Account,Tax,Bac
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Marked ne
@@ -3412,7 +3408,7 @@
 DocType: Batch,Source Document Name,Source Name dokumênt
 DocType: Batch,Source Document Name,Source Name dokumênt
 DocType: Job Opening,Job Title,Manşeta şolê
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Create Users
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Create Users
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Xiram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,rapora ji bo banga parastina biçin.
@@ -3424,8 +3420,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},account Expense bo em babete wêneke e {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Change Net di Sebra min
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
 DocType: Serial No,AMC Expiry Date,AMC Expiry Date
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Meqbûz
 ,Sales Register,Sales Register
@@ -3436,16 +3432,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,e ku tu tişt ji bo weşînertiya hene.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Nasname ji bo vê mehê de û çalakiyên hîn
 DocType: Customer Group,Customer Group Name,Navê Mişterî Group
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No muşteriyan yet!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Daxûyanîya Flow Cash
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Îcaze
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ji kerema xwe ve çêşît Forward hilbijêre, eger hûn jî dixwazin ku di nav hevsengiyê sala diravî ya berî bernadin ji bo vê sala diravî ya"
 DocType: GL Entry,Against Voucher Type,Li dijî Type Vienna
 DocType: Item,Attributes,taybetmendiyên xwe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Ji kerema xwe re têkevin hewe Off Account
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} nayê ji şîrketa endamê ne {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Beşdariyê Mark ji bo karmendên multiple
@@ -3470,14 +3468,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Account divê ji type be &#39;Asset Fixed&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Qaîdeyên ji bo hesibandina mîqdara shipping ji bo firotina
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series wêneke e
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series wêneke e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,ID Student
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Cureyên çalakiyên ji bo Têketin Time
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,Şêwaz bingehîn
 DocType: Training Event,Exam,Bilbilên
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
 DocType: Leave Allocation,Unused leaves,pelên Unused
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Kr
 DocType: Tax Rule,Billing State,Dewletê Billing
@@ -3510,7 +3508,7 @@
 DocType: Payment Entry,Account Paid From,Hesabê From
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Code babetî
 DocType: Journal Entry,Write Off Based On,Hewe Off li ser
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Make Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Make Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print û Stationery
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Send Emails Supplier
@@ -3526,6 +3524,7 @@
 DocType: Offer Letter,Awaiting Response,li benda Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ser
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Qala eger ne-standard account cîhde
 DocType: Salary Slip,Earning & Deduction,Maaş &amp; dabirîna
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Bixwe. Vê mîhengê wê were bikaranîn ji bo palavtina karê cuda cuda.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Rate Valuation neyînî nayê ne bi destûr
@@ -3561,7 +3560,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get xwendekarên ji
 DocType: Hub Settings,Seller Country,Seller Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Weşana Nawy li ser Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Pol xwendekarên xwe li lekerên
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Pol xwendekarên xwe li lekerên
 DocType: Authorization Rule,Authorization Rule,Rule Authorization
 DocType: Sales Invoice,Terms and Conditions Details,Şert û mercan Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifications
@@ -3621,7 +3620,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Dema cerribandinê
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Components meaş
 DocType: Program Enrollment Tool,New Academic Year,New Year (Ekadîmî)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Têbînî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / Credit Têbînî
 DocType: Stock Settings,Auto insert Price List rate if missing,insert Auto List Price rêjeya eger wenda
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Temamê meblaxa Paid
 DocType: Production Order Item,Transferred Qty,veguhestin Qty
@@ -3662,6 +3661,7 @@
 ,Sales Funnel,govekeke Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abbreviation wêneke e
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Ereboka destan
 ,Qty to Transfer,Qty to Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes and Leads an muşteriyan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Yorumlar ji bo weşînertiya stock bêhest
@@ -3695,7 +3695,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,berhev Fees
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
 DocType: Lead,Add to calendar on this date,Lê zêde bike salnameya li ser vê date
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,"Qaîdeyên ji bo got, heqê şandinê."
 DocType: Item,Opening Stock,vekirina Stock
@@ -3713,7 +3713,7 @@
 DocType: Customer,From Lead,ji Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Emir ji bo hilberîna berdan.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Select Fiscal Sal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
 DocType: Program Enrollment Tool,Enroll Students,kul Xwendekarên
 DocType: Hub Settings,Name Token,Navê Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Selling Standard
@@ -3724,7 +3724,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} dijî Sales bi fatûreyên {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Navê Project
-DocType: Supplier,Mention if non-standard receivable account,"Behs, eger ne-standard account teleb"
+DocType: Customer,Mention if non-standard receivable account,"Behs, eger ne-standard account teleb"
 DocType: Journal Entry Account,If Income or Expense,Ger Hatinê an jî Expense
 DocType: Production Order,Required Items,Nawy pêwîst
 DocType: Stock Ledger Entry,Stock Value Difference,Cudahiya di Nirx Stock
@@ -3755,6 +3755,7 @@
 DocType: Item,Taxes,bacê
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Pere û bidana
 DocType: Project,Default Cost Center,Navenda Cost Default
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Xêra xwe Bidin Series ji bo {0} bi rêya Setup&gt; Settings&gt; Navên Series
 DocType: Bank Guarantee,End Date,Date End
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions Stock
 DocType: Budget,Budget Accounts,Accounts budceya
@@ -3819,7 +3820,7 @@
 DocType: Customer,Sales Partner and Commission,Partner Sales û Komîsyona
 DocType: Employee Loan,Rate of Interest (%) / Year,Rêjeya faîzên (%) / Sal
 ,Project Quantity,Quantity Project
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} ji bo hemû tomar sifir e, dibe ku ji te re pêwîst &#39;Li dijî wan doz li ser xwer&#39;a&#39; biguhere"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} ji bo hemû tomar sifir e, dibe ku ji te re pêwîst &#39;Li dijî wan doz li ser xwer&#39;a&#39; biguhere"
 DocType: Opportunity,To Discuss,birîn
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} yekîneyên {1} pêwîst in {2} ji bo temamkirina vê de mêjera.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rêjeya faîzên (%) Hit
@@ -3842,7 +3843,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Exchange ji BOM # di {1} de divê ji bo pereyê hilbijartin wekhev be {2}
 DocType: Journal Entry Account,Exchange Rate,Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Management ya Korsan
@@ -3859,7 +3860,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} tune
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Register Ji bo ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Sedaneya Belavkariya mehane
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,The em babete kilîk ne dikarin Batch hene
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,The em babete kilîk ne dikarin Batch hene
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","rêjeya Valuation ji bo babet {0}, ku pêwîst e ji bo ku ez entries, hesabgirê bo dîtin ne {1} {2}. Ger babete drust wek babete test li transacting li {1}, ji kerema xwe ve behsa ku di {1} sifrê Babetê. Na, ji kerema xwe mêjera stock höndör bo em babete an behsa rêjeya muhletan di qeyda Babetê hatî, û piştre hewl Submiting / betalkirinê ev entry"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Ji materyalên li dijî vê Delivery Têbînî teslîmî
 DocType: Project,Customer Details,Details mişterî
@@ -3876,7 +3877,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,emir Submitted nikare were jêbirin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","balance Account jixwe di Debit, hûn bi destûr ne ji bo danîna wek &#39;Credit&#39; &#39;Balance Must Be&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Management Quality
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Babetê {0} neçalakirin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Babetê {0} neçalakirin
 DocType: Employee Loan,Repay Fixed Amount per Period,Bergîdana yekûnê sabît Period
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ji kerema xwe ve dorpêçê de ji bo babet binivîse {0}
 DocType: Employee External Work History,Employee External Work History,Xebatkarê History Kar Derve
@@ -3903,7 +3904,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Xwendekarên ID Email
 DocType: Employee,Notice (days),Notice (rojan)
 DocType: Tax Rule,Sales Tax Template,Şablon firotina Bacê
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
 DocType: Employee,Encashment Date,Date Encashment
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Adjustment Stock
@@ -3937,6 +3938,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Têbînî Issued
 DocType: Production Order,Warehouses,wargehan de
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} sermaye ne bi dikarin bê veguhestin
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ev babet guhertoya ji {0} (Şablon) e.
 DocType: Workstation,per hour,Serî saetê
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,kirînê
 DocType: Announcement,Announcement,Daxûyanî
@@ -3952,7 +3954,7 @@
 DocType: Account,Receivable,teleb
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: destûr Not bo guherandina Supplier wek Purchase Order jixwe heye
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rola ku destûr ji bo pêşkêşkirina muamele ku di mideyeka sînorên credit danîn.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Select Nawy ji bo Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Select Nawy ji bo Manufacture
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
 DocType: Item,Material Issue,Doza maddî
 DocType: Hub Settings,Seller Description,Seller Description
@@ -3965,7 +3967,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,emir kir
 DocType: Salary Detail,Component,Perçe
 DocType: Assessment Criteria,Assessment Criteria Group,Şertên Nirxandina Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Vekirina Farhad. Accumulated gerek kêmtir ji bo ku bibe yeksan û {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Vekirina Farhad. Accumulated gerek kêmtir ji bo ku bibe yeksan û {0}
 DocType: Warehouse,Warehouse Name,Navê warehouse
 DocType: Naming Series,Select Transaction,Hilbijêre Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ji kerema xwe re têkevin Erêkirina Role an Erêkirina Bikarhêner
@@ -4000,7 +4002,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Ji bo danîna vê sala diravî wek Default, klîk le &#39;Set wek Default&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Bihevgirêdan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,kêmbûna Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
 DocType: Employee Loan,Repay from Salary,H&#39;eyfê ji Salary
 DocType: Leave Application,LAP/,HIMBÊZ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Ku daxwaz dikin tezmînat li dijî {0} {1} ji bo mîktarê {2}
@@ -4018,7 +4020,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Nirxandina Detail Encam
 DocType: Employee Education,Employee Education,Perwerde karker
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,koma babete hate dîtin li ser sifrê koma babete
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
 DocType: Salary Slip,Net Pay,Pay net
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} ji niha ve wergirtin
@@ -4027,7 +4029,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} ji bo her account ne girêdayî ye, ji kerema xwe ve biafirîne / berve destdayî (e) account ji bo kargehên mezin."
 DocType: Purchase Invoice,Recurring Id,nişankirin Id
 DocType: Customer,Sales Team Details,Details firotina Team
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Vemirandina mayînde?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Vemirandina mayînde?
 DocType: Expense Claim,Total Claimed Amount,Temamê meblaxa îdîa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,derfetên Potential ji bo firotina.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4038,13 +4040,14 @@
 DocType: Warehouse,PIN,DERZÎ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup Dibistana xwe li ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Mîqdar (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No entries hisêba ji bo wargehan de li jêr
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No entries hisêba ji bo wargehan de li jêr
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Save yekemîn belgeya.
 DocType: Account,Chargeable,Chargeable
 DocType: Company,Change Abbreviation,Change Abbreviation
 DocType: Expense Claim Detail,Expense Date,Date Expense
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Last Order Mîqdar
+DocType: Task,Is Milestone,e Milestone
 DocType: Daily Work Summary,Email Sent To,Email şandin
 DocType: Budget,Warn,Gazîgîhandin
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bęjeyek ji axaftinên din jî, hewldana wê xalê de, ku divê di qeydên here."
@@ -4077,11 +4080,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Cîran Cîran Freeze kevintir Than` divê kêmtir ji% d roj be.
 DocType: Tax Rule,Purchase Tax Template,Bikirin Şablon Bacê
 ,Project wise Stock Tracking,Project Tracking Stock zana
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Maintenance Cedwela {0} dijî heye {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qty rastî (di source / target)
 DocType: Item Customer Detail,Ref Code,Code Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,records Employee.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
 DocType: HR Settings,Payroll Settings,Settings payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Hev hisab ne-girêdayî û Payments.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,cihê Order
@@ -4104,7 +4106,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques û meden bi şaşî kenîştê
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Account {0}: Tu dikarî xwe wek account dê û bav bê peywirdarkirin ne
 DocType: Purchase Invoice Item,Price List Rate,Price List Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Create quotes mişterî
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Create quotes mişterî
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Nîşan bide &quot;In Stock&quot; an &quot;Not li Stock&quot; li ser bingeha stock di vê warehouse.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill ji Alav (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Dema averaj ji aliyê şîrketa elektrîkê ji bo gihandina
@@ -4126,7 +4128,7 @@
 DocType: Asset,Disposal Date,Date çespandina
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails wê ji bo hemû xebatkarên me Active ji şîrketa saet dayîn şandin, eger ew cejna tune ne. Nasname ji bersivên wê li nîvê şevê şandin."
 DocType: Employee Leave Approver,Employee Leave Approver,Xebatkarê Leave Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An entry DIRTYHERTZ berê ve ji bo vê warehouse heye {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An entry DIRTYHERTZ berê ve ji bo vê warehouse heye {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ne dikare ragihîne wek wenda, ji ber ku Quotation hatiye çêkirin."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Production Order {0} de divê bê şandin
@@ -4134,7 +4136,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Helbet li row wêneke e {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,To date nikarim li ber ji date be
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Lê zêde bike / Edit Prices
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Lê zêde bike / Edit Prices
 DocType: Batch,Parent Batch,Batch dê û bav
 DocType: Cheque Print Template,Cheque Print Template,Cheque Şablon bo çapkirinê
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Chart Navendên Cost
@@ -4178,7 +4180,7 @@
 DocType: Item,Variant Based On,Li ser varyanta
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage rêdan divê 100% be. Ev e {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Suppliers te
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ne dikarin set wek Lost wek Sales Order çêkirin.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ne dikarin set wek Lost wek Sales Order çêkirin.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Vaulation û Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,pêşwaziya From
@@ -4188,7 +4190,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Ji {0} ji bo {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier bo em babete {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: value Hours divê ji sifirê mezintir be.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komûter
 DocType: Item,List this Item in multiple groups on the website.,Lîsteya ev babet di koman li ser malpera me.
@@ -4197,20 +4199,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Tu bi destûr ne ji bo danîna nirxa Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Arşîva
 DocType: Payment Reconciliation,From Invoice Date,Ji fatûreyên Date
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"currency Billing, divê ji bo pereyan an account partiya currency yan jî standard comapany ya wekhev be"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"currency Billing, divê ji bo pereyan an account partiya currency yan jî standard comapany ya wekhev be"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Dev ji Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Çi bikim?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,to Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Hemû Admissions Student
 ,Average Commission Rate,Average Rate Komîsyona
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Has No Serial&#39; nikare bibe &#39;&#39; Erê &#39;&#39; ji bo non-stock babete
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Has No Serial&#39; nikare bibe &#39;&#39; Erê &#39;&#39; ji bo non-stock babete
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Amadebûna dikarin di dîrokên pêşeroja bo ne bên nîşankirin
 DocType: Pricing Rule,Pricing Rule Help,Rule Pricing Alîkarî
 DocType: School House,House Name,Navê House
 DocType: Purchase Taxes and Charges,Account Head,Serokê account
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Baştir bike mesrefên din jî ji bo hesabkirina mesrefên peya bûn ji tomar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Electrical
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Zêde ji yên din rêxistina xwe wek bikarhênerên xwe. Tu dikarî gazî muşteriyan bi portal xwe lê zêde bike by got, wan ji Têkilî"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Zêde ji yên din rêxistina xwe wek bikarhênerên xwe. Tu dikarî gazî muşteriyan bi portal xwe lê zêde bike by got, wan ji Têkilî"
 DocType: Stock Entry,Total Value Difference (Out - In),Cudahiya di Total Nirx (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate wêneke e
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID&#39;ya bikarhêner ji bo karkirinê set ne {0}
@@ -4219,7 +4221,7 @@
 DocType: Item,Customer Code,Code mişterî
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Reminder Birthday ji bo {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Rojan de ji sala Last Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
 DocType: Buying Settings,Naming Series,Series Bidin
 DocType: Leave Block List,Leave Block List Name,Dev ji Lîsteya Block Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Serî divê kêmtir ji date Insurance End be
@@ -4234,7 +4236,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip meaşê karmendekî {0} berê ji bo kaxeza dem tên afirandin {1}
 DocType: Vehicle Log,Odometer,Green
 DocType: Sales Order Item,Ordered Qty,emir kir Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Babetê {0} neçalak e
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Babetê {0} neçalak e
 DocType: Stock Settings,Stock Frozen Upto,Stock Upto Frozen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nade ti stock babete ne
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Dema From û dema To dîrokên diyarkirî ji bo dubare {0}
@@ -4247,7 +4249,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Hewe Off Mîqdar (Company Exchange)
 DocType: Sales Invoice Timesheet,Billing Hours,Saet Billing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM Default ji bo {0} nehate dîtin
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tap tomar ji wan re lê zêde bike here
 DocType: Fees,Program Enrollment,Program nivîsînî
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ji kerema xwe ve set {0}
@@ -4348,7 +4351,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,First Responded ser
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Xaça Listing of babetî di koman
-DocType: Grade Interval,Grade Interval,Ast Navber
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Malî Sal Date Start û malî Sal End Date bi xwe di sala diravî set {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Date Clearance ve
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
@@ -4357,6 +4359,7 @@
 DocType: Request for Quotation Supplier,Download PDF,download PDF
 DocType: Production Order,Planned End Date,Plankirin Date End
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Li ku derê tomar tên veşartin.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
 DocType: Request for Quotation,Supplier Detail,Detail Supplier
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Çewtî di formula an rewşa: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Şêwaz fatore
@@ -4402,7 +4405,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup a website sade ji bo rêxistina xwe
 DocType: Payment Reconciliation,Receivable / Payable Account,Teleb / cîhde Account
 DocType: Delivery Note Item,Against Sales Order Item,Li dijî Sales Order babetî
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
 DocType: Item,Default Warehouse,Default Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budceya dikare li hember Account Pol ne bibin xwediyê rêdan û {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ji kerema xwe ve navenda mesrefa bav binivîse
@@ -4462,7 +4465,7 @@
 ,Items To Be Requested,Nawy To bê xwestin
 DocType: Purchase Order,Get Last Purchase Rate,Get Last Purchase Rate
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Select an jî lê zêde bike mişterî nû
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Select an jî lê zêde bike mişterî nû
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,navenda Cost pêwîst e ji bo kitêba mesrefan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Sepanê ji Funds (Maldarî)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ev li ser amadebûna vê Xebatkara li
@@ -4475,13 +4478,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Dev ji bikarhêneran ji çêkirina Applications Leave li ser van rojan de.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Asta kirîn
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Supplier Quotation {0} tên afirandin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Qezenca kardarîyê
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},"dorpêçê de bi timamî, divê dorpêçê de ji bo babet {0} li row pêşya {1}"
 DocType: Production Order,Manufactured Qty,Manufactured Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Quantity qebûlkirin
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Ji kerema xwe ve set a default Lîsteya Holiday ji bo karkirinê {0} an Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nizane heye ne
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nizane heye ne
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Fatûrayên xwe rakir, ji bo muşteriyan."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Mîqdar ne mezintir Pending Mîqdar dijî {1} mesrefan. Hîn Mîqdar e {2}
@@ -4490,15 +4493,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,hub
 DocType: GL Entry,Voucher Type,fîşeke Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
 DocType: Employee Loan Application,Approved,pejirandin
 DocType: Pricing Rule,Price,Biha
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Xebatkarê hebekî li ser {0} bê mîhenkirin wek &#39;Çepê&#39;
 DocType: Guardian,Guardian,Wekîl
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} ji bo karkirinê yên tên afirandin {1} di R‧ezkirina dema daye
 DocType: Employee,Education,Zanyarî
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Qada kampanyaya By
 DocType: Employee,Current Address Is,Niha navnîşana e
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,de hate
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Bixwe. Sets currency default şîrketê, eger xwe dişinî ne."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,entries Accounting Kovara.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Qty li From Warehouse
@@ -4535,7 +4540,7 @@
 DocType: Hub Settings,Hub Settings,Settings hub
 DocType: Project,Gross Margin %,Kenarê% Gross
 DocType: BOM,With Operations,bi operasyonên
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries Accounting niha ve li currency kirin {0} ji bo şîrketa {1}. Ji kerema xwe re hesabekî teleb an cîhde bi pereyan hilbijêre {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries Accounting niha ve li currency kirin {0} ji bo şîrketa {1}. Ji kerema xwe re hesabekî teleb an cîhde bi pereyan hilbijêre {0}.
 DocType: Asset,Is Existing Asset,Ma karpêkirî Asset
 DocType: Salary Detail,Statistical Component,Component Îstatîstîkê
 DocType: Salary Detail,Statistical Component,Component Îstatîstîkê
@@ -4591,7 +4596,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,attach Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,di dereca Stock
 DocType: Customer,Commission Rate,Rate Komîsyona
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,sepanên Block xatir ji aliyê beşa.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Type pereyî, divê yek ji peyamek be, Pay û Şandina Hundirîn"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
@@ -4604,6 +4609,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Destûrê bide Production li ser Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Mişterî ya Purchase Order Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Nîşan Attachments Public
 DocType: Packing Slip,Package Weight Details,Package Details Loss
 DocType: Payment Gateway Account,Payment Gateway Account,Account Gateway Payment
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Piştî encamdayîna peredana beralî bike user ji bo rûpel hilbijartin.
@@ -4628,7 +4634,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nîşan nede ti sembola wek $ etc next to currencies.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Day Half)
 DocType: Supplier,Credit Days,Rojan Credit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Batch Student
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Batch Student
 DocType: Leave Type,Is Carry Forward,Ma çêşît Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Get Nawy ji BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Rê Time Rojan
@@ -4647,8 +4653,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Şêwaz ambargoyê
 DocType: GL Entry,Is Opening,e Opening
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debît entry dikarin bi ne bê lînkkirî a {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tikaye setup hijmara series ji bo beşdarbûna bi rêya Setup&gt; Nî Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tikaye setup hijmara series ji bo beşdarbûna bi rêya Setup&gt; Nî Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Account {0} tune
 DocType: Account,Cash,Perê pêşîn
 DocType: Employee,Short biography for website and other publications.,biography kurt de ji bo malpera û belavokên din.
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index cc5dec9..5ffa25e 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,ຊຸດສິນຄ້າສະຖານະຫມົດອາຍຸ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ຮ່າງຂອງທະນາຄານ
 DocType: Mode of Payment Account,Mode of Payment Account,ຮູບແບບຂອງບັນຊີຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ສະແດງໃຫ້ເຫັນທີ່ແຕກຕ່າງກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ສະແດງໃຫ້ເຫັນທີ່ແຕກຕ່າງກັນ
 DocType: Academic Term,Academic Term,ໄລຍະທາງວິຊາການ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ອຸປະກອນການ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ປະລິມານ
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ຮັກສາສຸຂະພາບ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ຄວາມຊັກຊ້າໃນການຈ່າຍເງິນ (ວັນ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ໃບເກັບເງິນ
 DocType: Maintenance Schedule Item,Periodicity,ໄລຍະເວລາ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ປີງົບປະມານ {0} ຈໍາເປັນຕ້ອງມີ
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ການໂຄສະນາ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ບໍລິສັດດຽວກັນແມ່ນເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Employee,Married,ການແຕ່ງງານ
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ບໍ່ອະນຸຍາດໃຫ້ສໍາລັບການ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ບໍ່ອະນຸຍາດໃຫ້ສໍາລັບການ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,ໄດ້ຮັບການລາຍການຈາກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ System ໃນຊັບພະຍາກອນມະນຸດ&gt; Settings HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ຜະລິດຕະພັນ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ບໍ່ມີລາຍະລະບຸໄວ້
 DocType: Payment Reconciliation,Reconcile,ທໍາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ຂາຍເຄື່ອງແຫ້ງ
 DocType: Quality Inspection Reading,Reading 1,ອ່ານ 1
 DocType: Process Payroll,Make Bank Entry,ເຮັດໃຫ້ການເຂົ້າທະນາຄານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ກອງທຶນບໍານານ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
 DocType: SMS Center,All Sales Person,ທັງຫມົດຄົນຂາຍ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ການແຜ່ກະຈາຍລາຍເດືອນ ** ຈະຊ່ວຍໃຫ້ທ່ານການແຈກຢາຍງົບປະມານ / ເປົ້າຫມາຍໃນທົ່ວເດືອນຖ້າຫາກວ່າທ່ານມີຕາມລະດູໃນທຸລະກິດຂອງທ່ານ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ບໍ່ພົບລາຍການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,ບໍ່ພົບລາຍການ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
 DocType: Lead,Person Name,ຊື່ບຸກຄົນ
 DocType: Sales Invoice Item,Sales Invoice Item,ສິນຄ້າລາຄາ Invoice
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ຕົວຢ່າງ: &quot;ໂຮງຮຽນປະຖົມ&quot; ຫຼື &quot;ວິທະຍາໄລ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ບົດລາຍງານ Stock
 DocType: Warehouse,Warehouse Detail,ຂໍ້ມູນ Warehouse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ວັນທີໄລຍະສຸດທ້າຍບໍ່ສາມາດຈະຕໍ່ມາກ່ວາປີທີ່ສິ້ນສຸດຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ແມ່ນຊັບສິນຄົງທີ່&quot; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ແມ່ນຊັບສິນຄົງທີ່&quot; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
 DocType: Vehicle Service,Brake Oil,ນ້ໍາມັນຫ້າມລໍ້
 DocType: Tax Rule,Tax Type,ປະເພດອາກອນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ເພີ່ມຫຼືການປັບປຸງການອອກສຽງກ່ອນ {0}
 DocType: BOM,Item Image (if not slideshow),ລາຍການຮູບພາບ (ຖ້າຫາກວ່າບໍ່ໂຊ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ການລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ຊົ່ວໂມງອັດຕາ / 60) * ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ເລືອກ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,ເລືອກ BOM
 DocType: SMS Log,SMS Log,SMS ເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ຄ່າໃຊ້ຈ່າຍຂອງການສົ່ງ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ວັນພັກໃນ {0} ບໍ່ແມ່ນລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Grade
 DocType: Sales Invoice Item,Delivered By Supplier,ສົ່ງໂດຍຜູ້ສະຫນອງ
 DocType: SMS Center,All Contact,ທັງຫມົດຕິດຕໍ່
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ໃບສັ່ງຜະລິດສ້າງແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ໃບສັ່ງຜະລິດສ້າງແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ເງິນເດືອນປະຈໍາປີ
 DocType: Daily Work Summary,Daily Work Summary,Summary ວຽກປະຈໍາວັນ
 DocType: Period Closing Voucher,Closing Fiscal Year,ປິດປີງົບປະມານ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,ກະລຸນາເລືອກບໍລິສັດທີ່ມີຢູ່ສໍາລັບການສ້າງຕາຕະລາງຂອງການບັນຊີ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ຄ່າໃຊ້ຈ່າຍ Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,ການປ່ອຍສິນເຊື່ອໃນບໍລິສັດສະກຸນເງິນ
 DocType: Delivery Note,Installation Status,ສະຖານະການຕິດຕັ້ງ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",ທ່ານຕ້ອງການທີ່ຈະປັບປຸງການເຂົ້າຮຽນ? <br> ປະຈຸບັນ: {0} \ <br> ບໍ່ມີ: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ ທີ່ໄດ້ຮັບການປະຕິເສດຈໍານວນຕ້ອງເທົ່າກັບປະລິມານທີ່ໄດ້ຮັບສໍາລັບລາຍການ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ວັດສະດຸສະຫນອງວັດຖຸດິບສໍາຫລັບການຊື້
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ຢ່າງຫນ້ອຍຫນຶ່ງຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນສໍາລັບໃບເກັບເງິນ POS.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ຢ່າງຫນ້ອຍຫນຶ່ງຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນສໍາລັບໃບເກັບເງິນ POS.
 DocType: Products Settings,Show Products as a List,ສະແດງໃຫ້ເຫັນຜະລິດຕະພັນເປັນຊີ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ດາວນ໌ໂຫລດແມ່ແບບ, ໃຫ້ຕື່ມຂໍ້ມູນທີ່ເຫມາະສົມແລະຕິດແຟ້ມທີ່ແກ້ໄຂໄດ້. ທັງຫມົດກໍານົດວັນທີແລະພະນັກງານປະສົມປະສານໃນໄລຍະເວລາທີ່ເລືອກຈະມາໃນແມ່ແບບ, ມີການບັນທຶກການເຂົ້າຮຽນທີ່ມີຢູ່ແລ້ວ"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ເຮັດໃຫ້ການເຂົ້າຄ່າເສື່ອມລາຄາ
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ຄໍາຮ້ອງຂໍປະເພດ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ເຮັດໃຫ້ພະນັກງານ
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ເຮັດໃຫ້ພະນັກງານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ກະຈາຍສຽງ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ການປະຕິບັດ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ລາຍລະອຽດຂອງການດໍາເນີນງານປະຕິບັດ.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ແຜນການສໍາລັບການໄປຢ້ຽມຢາມບໍາລຸງຮັກສາ.
 DocType: SMS Settings,Enter url parameter for message,ກະລຸນາໃສ່ພາລາມິເຕີ url ສໍາລັບຂໍ້ຄວາມ
 DocType: POS Profile,Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ງົບການເງິນ
 DocType: Guardian,Students,ນັກສຶກສາ
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ກົດລະບຽບສໍາລັບການຍື່ນຄໍາຮ້ອງຂໍລາຄາແລະພິເສດ.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ລາຄາຈະຕ້ອງສາມາດນໍາໃຊ້ສໍາລັບການຊື້ຫຼືການຂາຍ
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ຈໍານວນເງິນລ່ວງຫນ້າບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ບັນຊີໄລຍະສໍາລັບການນີ້
 DocType: Company,Default Payroll Payable Account,Default Payroll Account Payable
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Group Email ການປັບປຸງ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Group Email ການປັບປຸງ
 DocType: Sales Invoice,Is Opening Entry,ຄືການເປີດ Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້ສາມາດນໍາໃຊ້
 DocType: Course Schedule,Instructor Name,ຊື່ instructor
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,ຕໍ່ຕ້ານການຂາຍໃບແຈ້ງຫນີ້ສິນຄ້າ
 ,Production Orders in Progress,ໃບສັ່ງຜະລິດໃນຄວາມຄືບຫນ້າ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ເງິນສົດສຸດທິຈາກການເງິນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
 DocType: Lead,Address & Contact,ທີ່ຢູ່ຕິດຕໍ່
 DocType: Leave Allocation,Add unused leaves from previous allocations,ຕື່ມການໃບທີ່ບໍ່ໄດ້ໃຊ້ຈາກການຈັດສັນທີ່ຜ່ານມາ
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Recurring ຕໍ່ໄປ {0} ຈະໄດ້ຮັບການສ້າງຕັ້ງຂື້ນໃນ {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ມູນຄ່າທັງຫມົດຈໍານວນເງິນ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
 DocType: Item Website Specification,Item Website Specification,ຂໍ້ມູນຈໍາເພາະລາຍການເວັບໄຊທ໌
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ອອກຈາກສະກັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ການອອກສຽງທະນາຄານ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ປະຈໍາປີ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Reconciliation Item
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,ເຜີຍແຜ່ໃນ Hub
 DocType: Student Admission,Student Admission,ຮັບສະຫມັກນັກສຶກສາ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ຂໍອຸປະກອນການ
 DocType: Bank Reconciliation,Update Clearance Date,ວັນທີ່ປັບປຸງການເກັບກູ້
 DocType: Item,Purchase Details,ລາຍລະອຽດການຊື້
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ແຈ້ງໂດຍ Email ກ່ຽວກັບການສ້າງຂອງຄໍາຮ້ອງຂໍອຸປະກອນອັດຕະໂນມັດ
 DocType: Journal Entry,Multi Currency,ສະກຸນເງິນຫຼາຍ
 DocType: Payment Reconciliation Invoice,Invoice Type,ປະເພດໃບເກັບເງິນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ການສົ່ງເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,ການສົ່ງເງິນ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ການຕັ້ງຄ່າພາສີອາກອນ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ຄ່າໃຊ້ຈ່າຍຂອງຊັບສິນຂາຍ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Entry ການຊໍາລະເງິນໄດ້ຮັບການແກ້ໄຂພາຍຫຼັງທີ່ທ່ານໄດ້ດຶງມັນ. ກະລຸນາດຶງມັນອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
-DocType: Grade Interval,Min Score,ຄະແນນຕ່ໍາສຸດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ສະຫຼຸບສັງລວມສໍາລັບອາທິດນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Student Applicant,Admitted,ຍອມຮັບຢ່າງຈິງ
 DocType: Workstation,Rent Cost,ເຊົ່າທຶນ
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ມູນຄ່າການສັ່ງຊື້
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ເຮັດທຸລະກໍາທະນາຄານ / ເງິນສົດຕໍ່ຕ້ານພັກຫຼືສໍາລັບການຍົກຍ້າຍພາຍໃນ
 DocType: Shipping Rule,Valid for Countries,ຖືກຕ້ອງສໍາລັບປະເທດ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ລາຍການນີ້ແມ່ນແມ່ແບບແລະບໍ່ສາມາດຖືກນໍາໃຊ້ໃນການຄ້າຂາຍ. ຄຸນລັກສະນະລາຍການຈະໄດ້ຮັບການຄັດລອກໄປເຂົ້າໄປໃນ variants ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ລາຍການນີ້ແມ່ນແມ່ແບບແລະບໍ່ສາມາດຖືກນໍາໃຊ້ໃນການຄ້າຂາຍ. ຄຸນລັກສະນະລາຍການຈະໄດ້ຮັບການຄັດລອກໄປເຂົ້າໄປໃນ variants ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ຄໍາສັ່ງທັງຫມົດພິຈາລະນາ
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ການອອກແບບຂອງພະນັກງານ (ຕົວຢ່າງ CEO, ຜູ້ອໍານວຍການແລະອື່ນໆ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ກະລຸນາໃສ່ &#39;ຊ້ໍາໃນວັນປະຈໍາເດືອນມູນຄ່າພາກສະຫນາມ
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,ອັດຕາພາສີ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ຈັດສັນແລ້ວສໍາລັບພະນັກງານ {1} ສໍາລັບໄລຍະເວລາ {2} ກັບ {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ເລືອກລາຍການ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"ຕິດຕໍ່ກັນ, {0}: Batch ບໍ່ຕ້ອງເຊັ່ນດຽວກັນກັບ {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ປ່ຽນກັບທີ່ບໍ່ແມ່ນ Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (ຫຼາຍ) ຂອງສິນຄ້າ.
 DocType: C-Form Invoice Detail,Invoice Date,ວັນທີ່ໃບເກັບເງິນ
 DocType: GL Entry,Debit Amount,ຈໍານວນເງິນເດບິດ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,ກະລຸນາເບິ່ງການຕິດ
 DocType: Purchase Order,% Received,% ທີ່ໄດ້ຮັບ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ສ້າງກຸ່ມນັກສຶກສາ
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
 DocType: Salary Slip Timesheet,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ການປ່ຽນແປງ / ຈໍານວນລໍາດັບການເລີ່ມຕົ້ນໃນປັດຈຸບັນຂອງໄລຍະການທີ່ມີຢູ່ແລ້ວ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ຖ້າຫາກວ່າກົດລະບຽບການຕັ້ງລາຄາທີ່ຫຼາກຫຼາຍສືບຕໍ່ໄຊຊະນະ, ຜູ້ໃຊ້ໄດ້ຮ້ອງຂໍໃຫ້ກໍານົດບຸລິມະສິດດ້ວຍຕົນເອງເພື່ອແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງ."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ສ້າງໃບສັ່ງຊື້
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ສ້າງໃບສັ່ງຊື້
 ,Purchase Register,ລົງທະບຽນການຊື້
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ຄ່າບໍລິການສາມາດນໍາໃຊ້
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ການຕັ້ງຄ່າທົ່ວໂລກສໍາລັບຂະບວນການຜະລິດທັງຫມົດ.
 DocType: Accounts Settings,Accounts Frozen Upto,ບັນຊີ Frozen ເກີນ
 DocType: SMS Log,Sent On,ສົ່ງກ່ຽວກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: HR Settings,Employee record is created using selected field. ,ການບັນທຶກຂອງພະນັກງານແມ່ນການສ້າງຕັ້ງການນໍາໃຊ້ພາກສະຫນາມການຄັດເລືອກ.
 DocType: Sales Order,Not Applicable,ບໍ່ສາມາດໃຊ້
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ຕົ້ນສະບັບວັນພັກ.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,ຈາກ Package ສະບັບເລກທີ
 DocType: Item Attribute,To Range,ການຊ່ວງ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ຫລັກຊັບແລະເງິນຝາກ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ບໍ່ສາມາດມີການປ່ຽນແປງວິທີການປະເມີນມູນຄ່າ, ເນື່ອງຈາກວ່າມີທຸລະກໍາກັບບາງລາຍການທີ່ບໍ່ມີມັນເປັນວິທີການປະເມີນມູນຄ່າຂອງຕົນເອງ"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ໃບທັງຫມົດການຈັດສັນແມ່ນການບັງຄັບ
 DocType: Job Opening,Description of a Job Opening,ລາຍລະອຽດຂອງການໃຊ້ວຽກ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ກິດຈະກໍາທີ່ຍັງຄ້າງສໍາລັບມື້ນີ້
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ກະລຸນາໃສ່ Warehouse ສໍາລັບການທີ່ວັດສະດຸການຈອງຈະໄດ້ຮັບການຍົກຂຶ້ນມາ
 DocType: Production Order,Additional Operating Cost,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ເຄື່ອງສໍາອາງ
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
 DocType: Shipping Rule,Net Weight,ນໍ້າຫນັກສຸດທິ
 DocType: Employee,Emergency Phone,ໂທລະສັບສຸກເສີນ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ຊື້
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ກະລຸນາອະທິບາຍຊັ້ນສໍາລັບ Threshold 0%
 DocType: Sales Order,To Deliver,ການສົ່ງ
 DocType: Purchase Invoice Item,Item,ລາຍການ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
 DocType: Journal Entry,Difference (Dr - Cr),ຄວາມແຕກຕ່າງກັນ (Dr - Cr)
 DocType: Account,Profit and Loss,ກໍາໄລແລະຂາດທຶນ
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ການຄຸ້ມຄອງການ Subcontracting
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,ການຕິດຕັ້ງຫມາຍເຫດລາຍການ
 DocType: Production Plan Item,Pending Qty,ຢູ່ລະຫວ່າງການຈໍານວນ
 DocType: Budget,Ignore,ບໍ່ສົນໃຈ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ບໍ່ເຮັດວຽກ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ບໍ່ເຮັດວຽກ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS ສົ່ງໄປຈໍານວນດັ່ງຕໍ່ໄປນີ້: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ຂະຫນາດການຕິດຕັ້ງການກວດສໍາລັບການພິມ
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ເງິນເດືອນ Slip
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,ຄະນະກໍາມະການທັງຫມົດ
 DocType: Pricing Rule,Sales Partner,Partner ຂາຍ
 DocType: Buying Settings,Purchase Receipt Required,ຊື້ຮັບທີ່ກໍານົດໄວ້
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ອັດຕາມູນຄ່າເປັນການບັງຄັບຖ້າຫາກວ່າການເປີດກວ້າງການຕະຫຼາດເຂົ້າໄປ
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ອັດຕາມູນຄ່າເປັນການບັງຄັບຖ້າຫາກວ່າການເປີດກວ້າງການຕະຫຼາດເຂົ້າໄປ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ບໍ່ມີພົບເຫັນຢູ່ໃນຕາຕະລາງການບັນທຶກການໃບເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ກະລຸນາເລືອກບໍລິສັດແລະພັກປະເພດທໍາອິດ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ທາງດ້ານການເງິນ / ການບັນຊີປີ.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ຄ່າສະສົມ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ຂໍອະໄພ, Serial Nos ບໍ່ສາມາດລວມ"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
 DocType: Project Task,Project Task,ໂຄງການ Task
 ,Lead Id,Id ນໍາ
 DocType: C-Form Invoice Detail,Grand Total,ລວມທັງຫມົດ
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,ຊີວະປະຫວັດ Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ລູກຄ້າຊ້ໍາ
 DocType: Leave Control Panel,Allocate,ຈັດສັນ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Return ຂາຍ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Return ຂາຍ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ຫມາຍເຫດ: ໃບຈັດສັນທັງຫມົດ {0} ບໍ່ຄວນຈະຫນ້ອຍກ່ວາໃບອະນຸມັດແລ້ວ {1} ສໍາລັບໄລຍະເວລາ
 DocType: Announcement,Posted By,ຈັດພີມມາໂດຍ
 DocType: Item,Delivered by Supplier (Drop Ship),ນໍາສະເຫນີໂດຍຜູ້ຜະລິດ (Drop ການຂົນສົ່ງ)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,ສະເຫນີລາຄາການ
 DocType: Lead,Middle Income,ລາຍໄດ້ປານກາງ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ເປີດ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ຂາຍ Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ກະສານອ້າງອີງບໍ່ມີວັນແລະເວລາກະສານອ້າງອີງຕ້ອງການສໍາລັບ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ເລືອກບັນຊີຊໍາລະເງິນເພື່ອເຮັດໃຫ້ການອອກສຽງທະນາຄານ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ສ້າງການບັນທຶກຂອງພະນັກວຽກໃນການຄຸ້ມຄອງໃບ, ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍແລະການຈ່າຍເງິນເດືອນ"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ສ້າງການບັນທຶກຂອງພະນັກວຽກໃນການຄຸ້ມຄອງໃບ, ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍແລະການຈ່າຍເງິນເດືອນ"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ຕື່ມການກັບຖານຄວາມຮູ້ຂອງ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ຂຽນບົດສະເຫນີ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ການຫັກ Entry ການຊໍາລະເງິນ
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ຄວາມສໍາພັນກັບ Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ຜູ້ຈັດການ
 DocType: Payment Entry,Payment From / To,ການຊໍາລະເງິນຈາກ / ໄປ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Range ວັນທີ່
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໃຫມ່ແມ່ນຫນ້ອຍກວ່າຈໍານວນເງິນທີ່ຍັງຄ້າງຄາໃນປະຈຸບັນສໍາລັບລູກຄ້າ. ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອຈະຕ້ອງມີ atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໃຫມ່ແມ່ນຫນ້ອຍກວ່າຈໍານວນເງິນທີ່ຍັງຄ້າງຄາໃນປະຈຸບັນສໍາລັບລູກຄ້າ. ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອຈະຕ້ອງມີ atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ລາຍການດຽວກັນໄດ້ຮັບການປ້ອນເວລາຫຼາຍ.
 DocType: SMS Settings,Receiver Parameter,ຮັບພາລາມິເຕີ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;ອ້າງອິງກ່ຽວກັບ&#39; ແລະ &#39;Group ໂດຍ&#39; ບໍ່ສາມາດຈະເປັນຄືກັນ
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,ວັນທີ່ສະຫມັກການແກ້ໄຂ
 DocType: Student Batch Name,Batch Name,ຊື່ batch
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ສ້າງ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ລົງທະບຽນ
 DocType: Selling Settings,Customer Naming By,ຊື່ລູກຄ້າໂດຍ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ຈະສະແດງໃຫ້ເຫັນນັກຮຽນເປັນປັດຈຸບັນໃນບົດລາຍງານການເຂົ້າຮ່ວມລາຍເດືອນນັກສຶກສາ
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,ຜູ້ເຂົ້າຮ່ວມນັກສຶກສາ
 DocType: Sales Invoice Timesheet,Time Sheet,ທີ່ໃຊ້ເວລາ Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,ວັດຖຸດິບ Backflush ຖານກ່ຽວກັບ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ກະລຸນາໃສ່ລາຍລະອຽດລາຍການ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ກະລຸນາໃສ່ລາຍລະອຽດລາຍການ
 DocType: Interest,Interest,ທີ່ຫນ້າສົນໃຈ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,ລາຍລະອຽດອື່ນໆ
@@ -739,7 +742,7 @@
 ,Absent Student Report,ບົດລາຍງານນັກສຶກສາບໍ່
 DocType: Email Digest,Next email will be sent on:,email ຕໍ່ໄປຈະຖືກສົ່ງໄປຕາມ:
 DocType: Offer Letter Term,Offer Letter Term,ສະເຫນີຈົດຫມາຍໄລຍະ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ລາຍການມີ variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ລາຍການມີ variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ບໍ່ພົບລາຍການ {0}
 DocType: Bin,Stock Value,ມູນຄ່າຫຼັກຊັບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ບໍລິສັດ {0} ບໍ່ມີ
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,ການຮັບປະກັນວັນທີ່ຫມົດອາຍຸ
 DocType: Material Request Item,Quantity and Warehouse,ປະລິມານແລະຄັງສິນຄ້າ
 DocType: Sales Invoice,Commission Rate (%),ຄະນະກໍາມະອັດຕາ (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງການຕັ້ງຊື່ Series ໃນລາຄາ {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງການຕັ້ງຊື່ Series ໃນລາຄາ {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ກະລຸນາເລືອກໂຄງການ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ກະລຸນາເລືອກໂຄງການ
 DocType: Project,Estimated Cost,ຕົ້ນທຶນຄາດຄະເນ
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Mode of Payment Account,Default Account,ບັນຊີມາດຕະຖານ
 DocType: Payment Entry,Received Amount (Company Currency),ໄດ້ຮັບຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ກະລຸນາເລືອກວັນໄປປະຈໍາອາທິດ
 DocType: Production Order Operation,Planned End Time,ການວາງແຜນທີ່ໃຊ້ເວລາສຸດທ້າຍ
 ,Sales Person Target Variance Item Group-Wise,"Sales Person ເປົ້າຫມາຍຕ່າງ Item Group, ສະຫລາດ"
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,ບັນຊີລາຄາບໍ່ໄດ້ເລືອກ
 DocType: Employee,Family Background,ຄວາມເປັນມາຂອງຄອບຄົວ
 DocType: Request for Quotation Supplier,Send Email,ການສົ່ງອີເມວ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ບໍ່ມີການອະນຸຍາດ
 DocType: Company,Default Bank Account,ມາດຕະຖານບັນຊີທະນາຄານ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","ການກັ່ນຕອງໂດຍອີງໃສ່ພັກ, ເລືອກເອົາພັກປະເພດທໍາອິດ"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ພະນັກງານທີ່ບໍ່ມີພົບເຫັນ
 DocType: Supplier Quotation,Stopped,ຢຸດເຊົາການ
 DocType: Item,If subcontracted to a vendor,ຖ້າຫາກວ່າເຫມົາຊ່ວງກັບຜູ້ຂາຍ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
 DocType: SMS Center,All Customer Contact,ທັງຫມົດຕິດຕໍ່ລູກຄ້າ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,ອັບຍອດຫຸ້ນຜ່ານ csv.
 DocType: Warehouse,Tree Details,ລາຍລະອຽດເປັນໄມ້ຢືນຕົ້ນ
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ຈໍານວນໃບເກັບເງິນຂັ້ນຕ່ໍາ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ສູນຕົ້ນທຶນ {2} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} ບໍ່ສາມາດເປັນກຸ່ມ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ລາຍການຕິດຕໍ່ກັນ {idx}: {doctype} {docname} ບໍ່ມີຢູ່ໃນຂ້າງເທິງ &#39;{doctype}&#39; ຕາຕະລາງ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ລາຍການຕິດຕໍ່ກັນ {idx}: {doctype} {docname} ບໍ່ມີຢູ່ໃນຂ້າງເທິງ &#39;{doctype}&#39; ຕາຕະລາງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ມີວຽກງານທີ່
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ມື້ຂອງເດືອນທີ່ໃບເກັບເງິນອັດຕະໂນມັດຈະໄດ້ຮັບການຜະລິດເຊັ່ນ: 05, 28 ແລະອື່ນໆ"
 DocType: Asset,Opening Accumulated Depreciation,ເປີດຄ່າເສື່ອມລາຄາສະສົມ
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,ການເຄື່ອນຍ້າຍອັດຕາສະເລ່ຍ
 DocType: Production Planning Tool,Select Items,ເລືອກລາຍການ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ກັບບັນຊີລາຍການ {1} ວັນ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,ກະດານຂ່າວ
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,ກະດານຂ່າວ
 DocType: Maintenance Visit,Completion Status,ສະຖານະສໍາເລັດ
 DocType: HR Settings,Enter retirement age in years,ກະລຸນາໃສ່ອາຍຸບໍານານໃນປີ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Warehouse ເປົ້າຫມາຍ
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ອະນຸຍາດໃຫ້ໃນໄລຍະການຈັດສົ່ງຫຼືໄດ້ຮັບບໍ່ເກີນຮ້ອຍນີ້
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ການນໍາເຂົ້າເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
 DocType: Process Payroll,Activity Log,ກິດຈະກໍາເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ກໍາໄຮ / ການສູນເສຍ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ປະກອບອັດຕະໂນມັດຂໍ້ຄວາມກ່ຽວກັບການຍື່ນສະເຫນີຂອງກິດຈະກໍາ.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ການສັ່ງຊື້ກັບການຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ຄາດຈໍານວນ
 DocType: Sales Invoice,Payment Due Date,ການຊໍາລະເງິນກໍາຫນົດ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;ເປີດ &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ເປີດການເຮັດ
 DocType: Notification Control,Delivery Note Message,ການສົ່ງເງິນເຖິງຂໍ້ຄວາມ
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re: ຄໍາສັ່ງຈໍານວນ
 DocType: Leave Block List Date,Leave Block List Date,ອອກຈາກ Block ຊີວັນ
 DocType: Pricing Rule,Price or Discount,ລາຄາຫຼືສ່ວນລົດ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ຄ່າໃຊ້ຈ່າຍທັງຫມົດໃນການຊື້ຕາຕະລາງໃບລາຍການຈະຕ້ອງເຊັ່ນດຽວກັນກັບພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ຄ່າໃຊ້ຈ່າຍທັງຫມົດໃນການຊື້ຕາຕະລາງໃບລາຍການຈະຕ້ອງເຊັ່ນດຽວກັນກັບພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
 DocType: Sales Team,Incentives,ສິ່ງຈູງໃຈ
 DocType: SMS Log,Requested Numbers,ຈໍານວນການຮ້ອງຂໍ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ໄດ້ຮັບພຽງແຕ່ວັດຖຸດິບ
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,ມາດຕະຖານບັນຊີເຈົ້າຫນີ້
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
 DocType: Fee Structure,Components,ອົງປະກອບ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
 DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ຊື້ Invoice Advance
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ຕິດຕໍ່ກັນ {0}: ການຊໍາລະເງິນກັບ Sales / ການສັ່ງຊື້ສະເຫມີໄປຄວນຈະໄດ້ຮັບການຫມາຍເປັນການລ່ວງຫນ້າ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ສານເຄມີ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ມາດຕະຖານບັນຊີທະນາຄານ / ເງິນສົດຈະໄດ້ຮັບການປັບປຸງອັດຕະໂນມັດໃນເງິນເດືອນ Journal Entry ໃນເວລາທີ່ຮູບແບບນີ້ແມ່ນການຄັດເລືອກ.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ໄລຍະສໍາລັບການລະຫັດ Grade {0} ມີການຊໍ້າຊ້ອນທີ່ມີໄລຍະການຮຽນສໍາລັບຊັ້ນຮຽນອື່ນໆ. ກະລຸນາກວດສອບໄລຍະ {0} ແລະ {1} ແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ
 DocType: BOM,Raw Material Cost(Company Currency),ຕົ້ນທຶນວັດຖຸດິບ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ລາຍການທັງຫມົດໄດ້ຮັບການຍົກຍ້າຍສໍາລັບໃບສັ່ງຜະລິດນີ້.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ແຖວ # {0}: ອັດຕາບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາອັດຕາທີ່ໃຊ້ໃນ {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Item ເວັບໄຊທ໌
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ອັບຫົວຈົດຫມາຍສະບັບແລະສັນຍາລັກຂອງທ່ານ. (ທ່ານສາມາດແກ້ໄຂໃຫ້ເຂົາເຈົ້າຕໍ່ມາ).
 DocType: Timesheet Detail,Bill,ບັນຊີລາຍການ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ສີຂາວ
 DocType: SMS Center,All Lead (Open),Lead ທັງຫມົດ (ເປີດ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ຕິດຕໍ່ກັນ {0}: ຈໍານວນບໍ່ສາມາດໃຊ້ສໍາລັບການ {4} ໃນສາງ {1} ທີ່ປຊຊກິນທີ່ໃຊ້ເວລາຂອງການເຂົ້າມາ ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ປະເພດຕ້ອງໄດ້ຮັບການຫນຶ່ງຂອງ {0}
 DocType: Lead,Next Contact Date,ຖັດໄປວັນທີ່
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ເປີດຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 DocType: Student Batch Name,Student Batch Name,ຊື່ນັກ Batch
 DocType: Holiday List,Holiday List Name,ລາຍຊື່ຂອງວັນພັກ
 DocType: Repayment Schedule,Balance Loan Amount,ການດຸ່ນດ່ຽງຈໍານວນເງິນກູ້
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ກະລຸນາລະບຸ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ລາຍການໂຍກຍ້າຍອອກມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າບໍ່ມີ.
 DocType: Delivery Note,Delivery To,ການຈັດສົ່ງກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
 DocType: Production Planning Tool,Get Sales Orders,ໄດ້ຮັບໃບສັ່ງຂາຍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ບໍ່ສາມາດຈະກະທົບທາງລົບ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ສ່ວນລົດ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ສ່ວນລົດ
 DocType: Asset,Total Number of Depreciations,ຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
 DocType: Sales Invoice Item,Rate With Margin,ອັດຕາດ້ວຍ Margin
 DocType: Sales Invoice Item,Rate With Margin,ອັດຕາດ້ວຍ Margin
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,ຊື່ອົງການຈັດຕັ້ງ
 DocType: Tax Rule,Shipping State,State Shipping
 ,Projected Quantity as Source,ຄາດປະລິມານເປັນແຫລ່ງກໍາເນີດ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມການນໍາໃຊ້ &#39;ຮັບສິນຄ້າຈາກຊື້ຮັບ&#39; ປຸ່ມ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມການນໍາໃຊ້ &#39;ຮັບສິນຄ້າຈາກຊື້ຮັບ&#39; ປຸ່ມ
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,ປະກອບມີລາຍການລາຍການທີ່ບໍ່ແມ່ນຫຼັກຊັບ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ຄ່າໃຊ້ຈ່າຍຂາຍ
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,ຕໍ່
 DocType: Item,Default Selling Cost Center,ມາດຕະຖານສູນຕົ້ນທຶນຂາຍ
 DocType: Sales Partner,Implementation Partner,Partner ການປະຕິບັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ລະຫັດໄປສະນີ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,ລະຫັດໄປສະນີ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
 DocType: Opportunity,Contact Info,ຂໍ້ມູນຕິດຕໍ່
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ເຮັດໃຫ້ການອອກສຽງ Stock
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,ຈໍາຫນ່າຍ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ການຄ້າໂຄງຮ່າງກົດລະບຽບ Shipping
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ສັ່ງຊື້ສິນຄ້າ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',ກະລຸນາຕັ້ງ &#39;ສະຫມັກຕໍາສ່ວນລົດເພີ່ມເຕີມກ່ຽວກັບ&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',ກະລຸນາຕັ້ງ &#39;ສະຫມັກຕໍາສ່ວນລົດເພີ່ມເຕີມກ່ຽວກັບ&#39;
 ,Ordered Items To Be Billed,ລາຍການຄໍາສັ່ງຈະ billed
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ຈາກລະດັບທີ່ຈະຫນ້ອຍມີກ່ວາເພື່ອ Range
 DocType: Global Defaults,Global Defaults,ຄ່າເລີ່ມຕົ້ນຂອງໂລກ
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບຈໍານວນ Batch
 DocType: Stock Settings,Default Item Group,ກຸ່ມສິນຄ້າມາດຕະຖານ
 DocType: Employee Loan,Partially Disbursed,ຈ່າຍບາງສ່ວນ
-DocType: Grading Structure,Grading System Name,ຊື່ການຈັດລໍາດັບລະບົບ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ຖານຂໍ້ມູນຜູ້ສະຫນອງ.
 DocType: Account,Balance Sheet,ງົບດຸນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ຄົນຂາຍຂອງທ່ານຈະໄດ້ຮັບການເຕືອນໃນວັນນີ້ຈະຕິດຕໍ່ຫາລູກຄ້າ
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ລາຍການແມ່ນບໍ່ສາມາດເຂົ້າໄປໃນເວລາຫຼາຍ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ບັນຊີເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ການກຸ່ມ, ແຕ່ການອອກສຽງສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ວຽກເຮັດ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ກະລຸນາລະບຸຢູ່ໃນຢ່າງຫນ້ອຍຫນຶ່ງໃຫ້ເຫດຜົນໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: Announcement,All Students,ນັກສຶກສາທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,ໄລຍະ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ທໍາອິດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","ເປັນກຸ່ມສິນຄ້າລາຄາທີ່ມີຊື່ດຽວກັນ, ກະລຸນາມີການປ່ຽນແປງຊື່ສິນຄ້າຫລືປ່ຽນຊື່ກຸ່ມລາຍການ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","ເປັນກຸ່ມສິນຄ້າລາຄາທີ່ມີຊື່ດຽວກັນ, ກະລຸນາມີການປ່ຽນແປງຊື່ສິນຄ້າຫລືປ່ຽນຊື່ກຸ່ມລາຍການ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ເລກນັກສຶກສາໂທລະສັບມືຖື
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ສ່ວນທີ່ເຫຼືອຂອງໂລກ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ລາຍການ {0} ບໍ່ສາມາດມີ Batch
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ບໍ່ອະນຸຍາດໃຫ້ແກ້ໄຂບັນຊີ frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,ໄດ້ຮັບໃບແຈ້ງຫນີ້ທີ່ຍັງຄ້າງຄາ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ສັ່ງຊື້ຊ່ວຍໃຫ້ທ່ານວາງແຜນແລະປະຕິບັດຕາມເຖິງກ່ຽວກັບການຊື້ຂອງທ່ານ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ສັ່ງຊື້ຊ່ວຍໃຫ້ທ່ານວາງແຜນແລະປະຕິບັດຕາມເຖິງກ່ຽວກັບການຊື້ຂອງທ່ານ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ປະລິມານທີ່ຈົດທະບຽນ / ການຖ່າຍໂອນທັງຫມົດ {0} ໃນວັດສະດຸການຈອງ {1} \ ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານການຮ້ອງຂໍ {2} ສໍາລັບລາຍການ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ຂະຫນາດນ້ອຍ
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານ
 DocType: Mode of Payment,Mode of Payment,ຮູບແບບການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ນີ້ເປັນກຸ່ມລາຍການຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Group ຈໍານວນມ້ວນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ພຽງແຕ່ລະເງິນກູ້ຢືມສາມາດໄດ້ຮັບການເຊື່ອມຕໍ່ເຂົ້າເດບິດອື່ນ"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ຈໍານວນທັງຫມົດຂອງທັງຫມົດນ້ໍາວຽກງານຄວນຈະ 1. ກະລຸນາປັບປຸງນ້ໍາຂອງວຽກງານໂຄງການທັງຫມົດຕາມຄວາມເຫມາະສົມ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,ລາຍການ {0} ຈະຕ້ອງເປັນອະນຸສັນຍາລາຍການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ອຸປະກອນນະຄອນຫຼວງ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກຄັດເລືອກທໍາອິດໂດຍອີງໃສ່ &#39;ສະຫມັກຕໍາກ່ຽວກັບ&#39; ພາກສະຫນາມ, ທີ່ສາມາດຈະມີລາຍການ, ກຸ່ມສິນຄ້າຫຼືຍີ່ຫໍ້."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,ວາລະສານການອອກສຽງ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ລາຍການມີຄວາມຄືບຫນ້າ
 DocType: Workstation,Workstation Name,ຊື່ Workstation
-DocType: Grade Interval,Grade Code,ລະຫັດ Grade
+DocType: Grading Scale Interval,Grade Code,ລະຫັດ Grade
 DocType: POS Item Group,POS Item Group,ກຸ່ມສິນຄ້າ POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ອີເມວສໍາຄັນ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ອຸປະກອນ
 DocType: Sales Order,Recurring Upto,Recurring ເກີນ
 DocType: Attendance,HR Manager,Manager HR
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ສິດທິພິເສດອອກຈາກ
 DocType: Purchase Invoice,Supplier Invoice Date,ຜູ້ສະຫນອງວັນໃບກໍາກັບ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,ທ່ານຕ້ອງການເພື່ອເຮັດໃຫ້ໂຄງຮ່າງການຊື້
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ສະບຽງອາຫານ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,ບໍ່ມີການລົງໂທດ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},ຕາຕະລາງການບໍາລຸງຮັກ {0} ມີຢູ່ຕ້ານ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ນັກສຶກສາລົງທະບຽນຮຽນ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ສະກຸນເງິນຂອງບັນຊີປິດຈະຕ້ອງ {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ຜົນບວກຂອງຈຸດສໍາລັບເປົ້າຫມາຍທັງຫມົດຄວນຈະເປັນ 100 ມັນເປັນ {0}
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ຕາຕະລາງຂອງການບັນຊີ
 DocType: Material Request,Terms and Conditions Content,ຂໍ້ກໍານົດແລະເງື່ອນໄຂເນື້ອໃນ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Maintenance Visit,Unscheduled,ນອກເຫນືອຈາກ
 DocType: Employee,Owned,ເປັນເຈົ້າຂອງ
 DocType: Salary Detail,Depends on Leave Without Pay,ຂຶ້ນຢູ່ກັບອອກໂດຍບໍ່ມີການຈ່າຍ
 DocType: Pricing Rule,"Higher the number, higher the priority","ສູງກວ່າຕົວເລກທີ່, ທີ່ສູງກວ່າບູລິມະສິດ"
 ,Purchase Invoice Trends,ຊື້ແນວໂນ້ມ Invoice
 DocType: Employee,Better Prospects,ອະນາຄົດທີ່ດີກວ່າ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ແຖວ # {0}: ການ batch {1} ມີພຽງແຕ່ {2} ຈໍານວນ. ກະລຸນາເລືອກ batch ທີ່ມີ {3} ຈໍານວນສາມາດໃຊ້ໄດ້ອີກຫລືແຍກແຖວເປັນແຖວເກັດທີ່ຢູ່ຫຼາຍ, ເພື່ອສົ່ງ / ບັນຫາຈາກຂະບວນການທີ່ຫຼາກຫຼາຍ"
 DocType: Vehicle,License Plate,ແຜ່ນໃບອະນຸຍາດ
 DocType: Appraisal,Goals,ເປົ້າຫມາຍ
 DocType: Warranty Claim,Warranty / AMC Status,ການຮັບປະກັນ / AMC ສະຖານະ
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ພະນັກງານບໍ່ສາມາດລາຍງານໃຫ້ຕົນເອງ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ຖ້າຫາກວ່າບັນຊີແມ່ນ frozen, entries ກໍາລັງອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້ຈໍາກັດ."
 DocType: Email Digest,Bank Balance,ທະນາຄານ Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","profile ວຽກເຮັດງານທໍາ, ຄຸນນະວຸດທິທີ່ຕ້ອງການແລະອື່ນໆ"
 DocType: Journal Entry Account,Account Balance,ດຸນບັນຊີ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ກົດລະບຽບອາກອນສໍາລັບທຸລະກໍາ.
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ສະແດງໃຫ້ເຫັນ P &amp; ຍອດ L ປີງົບປະມານ unclosed ຂອງ
 DocType: Shipping Rule,Shipping Account,ບັນຊີ Shipping
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ແມ່ນ inactive
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ເຮັດໃຫ້ຄໍາສັ່ງການຂາຍຈະຊ່ວຍໃຫ້ທ່ານວາງແຜນການເຮັດວຽກຂອງທ່ານແລະໃຫ້ສຸດທີ່ໃຊ້ເວລາ
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ເຮັດໃຫ້ຄໍາສັ່ງການຂາຍຈະຊ່ວຍໃຫ້ທ່ານວາງແຜນການເຮັດວຽກຂອງທ່ານແລະໃຫ້ສຸດທີ່ໃຊ້ເວລາ
 DocType: Quality Inspection,Readings,ອ່ານ
 DocType: Stock Entry,Total Additional Costs,ທັງຫມົດຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,ກັບມູນຄ່າ
 DocType: Asset Movement,Stock Manager,Manager Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ຄັງສິນຄ້າທີ່ມາເປັນການບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ບັນຈຸ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,ບັນຈຸ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ຫ້ອງການໃຫ້ເຊົ່າ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ການຕັ້ງຄ່າປະຕູການຕິດຕັ້ງ SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ການນໍາເຂົ້າບໍ່ສາມາດ!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,ແຫຼ່ງຂໍ້ມູນ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ສະແດງໃຫ້ເຫັນປິດ
 DocType: Leave Type,Is Leave Without Pay,ແມ່ນອອກຈາກໂດຍບໍ່ມີການຈ່າຍ
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ປະເພດຊັບສິນທີ່ເປັນການບັງຄັບສໍາລັບລາຍການຊັບສິນຄົງທີ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ປະເພດຊັບສິນທີ່ເປັນການບັງຄັບສໍາລັບລາຍການຊັບສິນຄົງທີ່
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ບໍ່ມີພົບເຫັນຢູ່ໃນຕາຕະລາງການຊໍາລະເງິນການບັນທຶກການ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ນີ້ {0} ຄວາມຂັດແຍ້ງກັບ {1} ສໍາລັບ {2} {3}
 DocType: Student Attendance Tool,Students HTML,ນັກສຶກສາ HTML
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,ວັນທີຂອງການຊຶ່ງເຮັດໃຫ້
 DocType: Pricing Rule,For Price List,ສໍາລັບລາຄາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ຄົ້ນຫາການບໍລິຫານ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ສ້າງ Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ສ້າງ Leads
 DocType: Maintenance Schedule,Schedules,ຕາຕະລາງ
 DocType: Purchase Invoice Item,Net Amount,ຈໍານວນສຸດທິ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ຂໍ້ມູນທີ່ບໍ່ມີ
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,ການລົງທະບຽນໂຄງການ
 DocType: Sales Invoice Item,Brand Name,ຊື່ຍີ່ຫໍ້
 DocType: Purchase Receipt,Transporter Details,ລາຍລະອຽດການຂົນສົ່ງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ອົງການຈັດຕັ້ງ
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,ອ່ານ 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM Default ສໍາລັບ {0} ບໍ່ພົບ Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ຮຽກຮ້ອງສໍາລັບຄ່າໃຊ້ຈ່າຍຂອງບໍລິສັດ.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ນັກສຶກສາແມ່ນຢູ່ໃນຫົວໃຈຂອງລະບົບການ, ເພີ່ມນັກສຶກສາຂອງທ່ານທັງຫມົດ"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ນັກສຶກສາແມ່ນຢູ່ໃນຫົວໃຈຂອງລະບົບການ, ເພີ່ມນັກສຶກສາຂອງທ່ານທັງຫມົດ"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"ຕິດຕໍ່ກັນ, {0}: ວັນ Clearance {1} ບໍ່ສາມາດກ່ອນທີ່ວັນ Cheque {2}"
 DocType: Company,Default Holiday List,ມາດຕະຖານບັນຊີ Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະການໃຊ້ເວລາຂອງ {1} ແມ່ນ overlapping ກັບ {2}
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,resend ການຊໍາລະເງິນ Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ວຽກງານໃຫມ່
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ບົດລາຍງານອື່ນ ໆ
 DocType: Dependent Task,Dependent Task,Task ຂຶ້ນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ອອກຈາກການປະເພດ {0} ບໍ່ສາມາດຈະຕໍ່ໄປອີກແລ້ວກ່ວາ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ພະຍາຍາມການວາງແຜນການດໍາເນີນງານສໍາລັບມື້ X ໃນການລ່ວງຫນ້າ.
 DocType: HR Settings,Stop Birthday Reminders,ຢຸດວັນເດືອນປີເກີດເຕືອນ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານ Payroll Account Payable ໃນບໍລິສັດ {0}
 DocType: SMS Center,Receiver List,ບັນຊີຮັບ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ຄົ້ນຫາສິນຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,ຄົ້ນຫາສິນຄ້າ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ຈໍານວນການບໍລິໂພກ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ການປ່ຽນແປງສຸດທິໃນເງິນສົດ
 DocType: Assessment Plan,Grading Scale,ຂະຫນາດການຈັດລໍາດັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ຫນ່ວຍບໍລິການຂອງການ {0} ໄດ້ຮັບເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງໃນການສົນທະນາປັດໄຈຕາຕະລາງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ຫນ່ວຍບໍລິການຂອງການ {0} ໄດ້ຮັບເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງໃນການສົນທະນາປັດໄຈຕາຕະລາງ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ສໍາເລັດແລ້ວ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ຄໍາຂໍຊໍາລະຢູ່ແລ້ວ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ຄ່າໃຊ້ຈ່າຍຂອງລາຍການອອກ
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ເກັບກໍາ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
 DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ທ່ານບໍ່ສາມາດລົບປະຈໍາປີ {0}. ປີງົບປະມານ {0} ກໍານົດເປັນມາດຕະຖານໃນການຕັ້ງຄ່າ Global
 DocType: Journal Entry,Entry Type,ປະເພດເຂົ້າ
 ,Customer Credit Balance,ຍອດສິນເຊື່ອລູກຄ້າ
@@ -1686,8 +1685,6 @@
 DocType: Student Sibling,Studying in Same Institute,ການສຶກສາໃນສະຖາບັນດຽວກັນ
 DocType: Territory,Territory Manager,ຜູ້ຈັດການອານາເຂດ
 DocType: Packed Item,To Warehouse (Optional),ການຄັງສິນຄ້າ (ຖ້າຕ້ອງການ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Payment Entry,Paid Amount (Company Currency),ການຊໍາລະເງິນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Purchase Invoice,Additional Discount,ສ່ວນລົດເພີ່ມເຕີມ
 DocType: Selling Settings,Selling Settings,ຂາຍ Settings
@@ -1697,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ເບິ່ງໃນໂຄງຮ່າງການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ຄ່າໃຊ້ຈ່າຍການຕະຫຼາດ
 ,Item Shortage Report,ບົດລາຍງານການຂາດແຄນສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ຂໍອຸປະກອນການນໍາໃຊ້ເພື່ອເຮັດໃຫ້ການອອກສຽງ Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາເປັນການບັງຄັບສໍາລັບຊັບສິນໃຫມ່
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາເປັນການບັງຄັບສໍາລັບຊັບສິນໃຫມ່
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Group ແຍກຕາມແນ່ນອນສໍາລັບທຸກຊຸດ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Group ແຍກຕາມແນ່ນອນສໍາລັບທຸກຊຸດ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ຫນ່ວຍບໍລິການດຽວຂອງສິນຄ້າ.
@@ -1716,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: ສູນຕົ້ນທຶນທີ່ຕ້ອງການສໍາລັບການ &#39;ກໍາໄຮຂາດທຶນບັນຊີ {2}. ກະລຸນາສ້າງຕັ້ງຂຶ້ນເປັນສູນຕົ້ນທຶນມາດຕະຖານສໍາລັບການບໍລິສັດ.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A ກຸ່ມລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນກະລຸນາມີການປ່ຽນແປງຊື່ລູກຄ້າຫຼືປ່ຽນຊື່ກຸ່ມລູກຄ້າ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; ອານາເຂດ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; ອານາເຂດ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A ກຸ່ມລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນກະລຸນາມີການປ່ຽນແປງຊື່ລູກຄ້າຫຼືປ່ຽນຊື່ກຸ່ມລູກຄ້າ
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ຕິດຕໍ່ໃຫມ່
 DocType: Territory,Parent Territory,ອານາເຂດຂອງພໍ່ແມ່
 DocType: Quality Inspection Reading,Reading 2,ອ່ານ 2
@@ -1745,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,reconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ຄໍລໍາຈໍານວນຫຼາຍເກີນໄປ. ສົ່ງອອກບົດລາຍງານແລະພິມການນໍາໃຊ້ຄໍາຮ້ອງສະຫມັກລາງໄດ້.
 DocType: Purchase Invoice Item,Batch No,ຊຸດບໍ່ມີ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ບໍ່ສາມາດຊອກຫາອັດຕາແລກປ່ຽນ {0} ກັບ {1} ສໍາລັບວັນທີທີ່ສໍາຄັນ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ອະນຸຍາດໃຫ້ຂາຍສິນຄ້າຫລາຍຕໍ່ການສັ່ງຊື້ຂອງລູກຄ້າເປັນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ຕົ້ນຕໍ
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ຕົ້ນຕໍ
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,ຕັ້ງຄໍານໍາຫນ້າສໍາລັບການຈໍານວນໄລຍະກ່ຽວກັບການໂອນຂອງທ່ານ
 DocType: Employee Attendance Tool,Employees HTML,ພະນັກງານ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ມາດຕະຖານ BOM ({0}) ຕ້ອງມີການເຄື່ອນໄຫວສໍາລັບລາຍການນີ້ຫຼືແມ່ຂອງຕົນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ມາດຕະຖານ BOM ({0}) ຕ້ອງມີການເຄື່ອນໄຫວສໍາລັບລາຍການນີ້ຫຼືແມ່ຂອງຕົນ
 DocType: Employee,Leave Encashed?,ອອກຈາກ Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ໂອກາດຈາກພາກສະຫນາມເປັນການບັງຄັບ
 DocType: Email Digest,Annual Expenses,ຄ່າໃຊ້ຈ່າຍປະຈໍາປີ
 DocType: Item,Variants,variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
 DocType: SMS Center,Send To,ສົ່ງເຖິງ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ຈໍານວນເງິນທີ່ຈັດສັນ
@@ -1779,7 +1773,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ການປະເມີນຜົນ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ຊ້ໍາບໍ່ມີ Serial ເຂົ້າສໍາລັບລາຍການ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A ເງື່ອນໄຂສໍາລັບລະບຽບການຈັດສົ່ງສິນຄ້າ
-DocType: Grading Structure,Grading Intervals,ໄລຍະການຈັດລໍາດັບ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ກະລຸນາໃສ່
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ບໍ່ສາມາດ overbill ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1} ຫຼາຍກ່ວາ {2}. ການອະນຸຍາດໃຫ້ຫຼາຍກວ່າ, ໃບບິນ, ກະລຸນາເກັບໄວ້ໃນຊື້ Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ກະລຸນາທີ່ກໍານົດໄວ້ການກັ່ນຕອງໂດຍອີງໃສ່ລາຍການຫຼື Warehouse
@@ -1792,16 +1785,17 @@
 DocType: Authorization Control,Authorization Control,ການຄວບຄຸມການອະນຸຍາດ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດ Warehouse ເປັນການບັງຄັບຕໍ່ຕ້ານສິນຄ້າປະຕິເສດ {1}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ການຊໍາລະເງິນ
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ການຄຸ້ມຄອງຄໍາສັ່ງຂອງທ່ານ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ການຄຸ້ມຄອງຄໍາສັ່ງຂອງທ່ານ
 DocType: Production Order Operation,Actual Time and Cost,ທີ່ໃຊ້ເວລາແລະຄ່າໃຊ້ຈ່າຍຕົວຈິງ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ຂໍອຸປະກອນການສູງສຸດ {0} ສາມາດເຮັດໄດ້ສໍາລັບລາຍການ {1} ຕໍ່ຂາຍສິນຄ້າ {2}
 DocType: Employee,Salutation,ຄໍາຂຶ້ນຕົ້ນ
 DocType: Course,Course Abbreviation,ຊື່ຫຍໍ້ຂອງລາຍວິຊາ
 DocType: Student Leave Application,Student Leave Application,ຄໍາຮ້ອງສະຫມັກອອກຈາກນັກສຶກສາ
 DocType: Item,Will also apply for variants,ຍັງຈະນໍາໃຊ້ສໍາລັບການ variants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} ວັນເຄິ່ງຫນຶ່ງໃນ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ຊົ່ວໂມງການເຮັດວຽກທັງຫມົດບໍ່ຄວນຈະມີຫຼາຍກ່ວາຊົ່ວໂມງເຮັດວຽກສູງສຸດ {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ກ່ຽວກັບ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ລາຍການມັດທີ່ໃຊ້ເວລາຂອງການຂາຍ.
 DocType: Quotation Item,Actual Qty,ຕົວຈິງຈໍານວນ
 DocType: Sales Invoice Item,References,ເອກະສານ
@@ -1811,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ທ່ານໄດ້ເຂົ້າໄປລາຍການລາຍການທີ່ຊ້ໍາ. ກະລຸນາແກ້ໄຂແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ສະມາຄົມ
 DocType: Asset Movement,Asset Movement,ການເຄື່ອນໄຫວຊັບສິນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ໂຄງຮ່າງການໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,ໂຄງຮ່າງການໃຫມ່
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ລາຍການ {0} ບໍ່ແມ່ນລາຍການຕໍ່ເນື່ອງ
 DocType: SMS Center,Create Receiver List,ສ້າງບັນຊີຮັບ
 DocType: Vehicle,Wheels,ຂັບລົດ
@@ -1843,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ປິດການໃຊ້ວຽກການສ້າງຂໍ້ມູນບັນທຶກທີ່ໃຊ້ເວລາຕໍ່ໃບສັ່ງຜະລິດ. ການດໍາເນີນງານຈະບໍ່ໄດ້ຮັບການຕິດຕາມຕໍ່ສັ່ງຊື້ສິນຄ້າ
 DocType: Student,Student Mobile Number,ຈໍານວນໂທລະສັບມືຖືນັກສຶກສາ
 DocType: Item,Has Variants,ມີ Variants
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ຊື່ຂອງການແຜ່ກະຈາຍລາຍເດືອນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
 DocType: Sales Person,Parent Sales Person,ບຸກຄົນຜູ້ປົກຄອງ Sales
 DocType: Purchase Invoice,Recurring Invoice,ໃບເກັບເງິນທີ່ເກີດຂຶ້ນ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ການຄຸ້ມຄອງການໂຄງການ
@@ -1854,7 +1848,7 @@
 DocType: Budget,Fiscal Year,ປີງົບປະມານ
 DocType: Vehicle Log,Fuel Price,ລາຄານໍ້າມັນເຊື້ອໄຟ
 DocType: Budget,Budget,ງົບປະມານ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ຕ້ານ {0}, ຍ້ອນວ່າມັນບໍ່ແມ່ນເປັນບັນຊີລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ໄດ້ບັນລຸຜົນ
 DocType: Student Admission,Application Form Route,ຄໍາຮ້ອງສະຫມັກແບບຟອມການເສັ້ນທາງ
@@ -1885,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ຈໍານວນ {0} {1} ຫັກຕໍ່ {2}
 DocType: Employee,Salary Information,ຂໍ້ມູນເງິນເດືອນ
 DocType: Sales Person,Name and Employee ID,ຊື່ແລະລະຫັດພະນັກງານ
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
 DocType: Website Item Group,Website Item Group,ກຸ່ມສິນຄ້າເວັບໄຊທ໌
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,ຫນ້າທີ່ແລະພາສີອາກອນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ກະລຸນາໃສ່ວັນທີເອກະສານ
@@ -1944,7 +1938,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ລາຍການລູກຄ້າຊ້ໍາ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ຄ່າໃຊ້ຈ່າຍການອະນຸມັດ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ຄູ່
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
 DocType: Asset,Depreciation Schedule,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
 DocType: Bank Reconciliation Detail,Against Account,ຕໍ່ບັນຊີ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີ່ຄວນຈະມີລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
@@ -1961,13 +1955,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
 ,Quotation Trends,ແນວໂນ້ມວົງຢືມ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າບໍ່ໄດ້ກ່າວເຖິງໃນຕົ້ນສະບັບລາຍການສໍາລັບການ item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
 DocType: Shipping Rule Condition,Shipping Amount,ການຂົນສົ່ງຈໍານວນເງິນ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ທີ່ຍັງຄ້າງຈໍານວນ
 DocType: Purchase Invoice Item,Conversion Factor,ປັດໄຈການປ່ຽນແປງ
 DocType: Purchase Order,Delivered,ສົ່ງ
 ,Vehicle Expenses,ຄ່າໃຊ້ຈ່າຍຍານພາຫະນະ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
+DocType: Serial No,Invoice Details,ລາຍລະອຽດໃບແຈ້ງຫນີ້
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
 DocType: Purchase Receipt,Vehicle Number,ຈໍານວນຍານພາຫະນະ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ວັນທີ່ໃບເກັບເງິນທີ່ເກີດຂຶ້ນຈະໄດ້ຮັບການຢຸດເຊົາການ
 DocType: Employee Loan,Loan Amount,ຈໍານວນເງິນກູ້ຢືມເງິນ
@@ -1991,7 +1986,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,ເພີ່ມເຕີມຈໍານວນສ່ວນລົດ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
 DocType: Leave Block List Allow,Leave Block List Allow,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ກິລາ
 DocType: Loan Type,Loan Name,ຊື່ການກູ້ຢືມເງິນ
@@ -2003,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse ບ່ອນທີ່ທ່ານກໍາລັງຮັກສາຫຼັກຊັບຂອງລາຍການຖືກປະຕິເສດ
 DocType: Production Order,Skip Material Transfer,ຂ້າມການວັດສະດຸໂອນ
 DocType: Production Order,Skip Material Transfer,ຂ້າມການວັດສະດຸໂອນ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ບໍ່ສາມາດຊອກຫາອັດຕາແລກປ່ຽນໃນລາຄາ {0} ກັບ {1} ສໍາລັບວັນທີທີ່ສໍາຄັນ {2}. ກະລຸນາສ້າງບັນທຶກຕາແລກປ່ຽນເງິນດ້ວຍຕົນເອງ
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ປີທາງດ້ານການເງິນຂອງທ່ານສິ້ນສຸດລົງໃນ
 DocType: POS Profile,Price List,ລາຍການລາຄາ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ແມ່ນໃນປັດຈຸບັນເລີ່ມຕົ້ນປີງົບປະມານ. ກະລຸນາໂຫຼດຫນ້າຈໍຄືນຂອງຕົວທ່ອງເວັບຂອງທ່ານສໍາລັບການປ່ຽນແປງທີ່ຈະມີຜົນກະທົບ.
@@ -2040,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,ລາຍການ {0} ໄດ້ຖືກສົ່ງຄືນແລ້ວ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ປີງົບປະມານ ** ເປັນຕົວແທນເປັນປີການເງິນ. entries ບັນຊີທັງຫມົດແລະເຮັດທຸລະກໍາທີ່ສໍາຄັນອື່ນໆມີການຕິດຕາມຕໍ່ປີງົບປະມານ ** **.
 DocType: Opportunity,Customer / Lead Address,ລູກຄ້າ / ທີ່ຢູ່ນໍາ
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
 DocType: Student Admission,Eligibility,ມີສິດໄດ້ຮັບ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ນໍາໄປສູ່ການຊ່ວຍເຫຼືອທີ່ທ່ານໄດ້ຮັບທຸລະກິດ, ເພີ່ມການຕິດຕໍ່ທັງຫມົດຂອງທ່ານແລະຫຼາຍເປັນຜູ້ນໍາພາຂອງທ່ານ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ນໍາໄປສູ່ການຊ່ວຍເຫຼືອທີ່ທ່ານໄດ້ຮັບທຸລະກິດ, ເພີ່ມການຕິດຕໍ່ທັງຫມົດຂອງທ່ານແລະຫຼາຍເປັນຜູ້ນໍາພາຂອງທ່ານ"
 DocType: Production Order Operation,Actual Operation Time,ທີ່ແທ້ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 DocType: Authorization Rule,Applicable To (User),ສາມາດນໍາໃຊ້ໄປ (User)
 DocType: Purchase Taxes and Charges,Deduct,ຫັກ
@@ -2083,7 +2079,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ເລືອກບໍລິສັດ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການພະແນກການທັງຫມົດ
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
 DocType: Process Payroll,Fortnightly,ສອງອາທິດ
 DocType: Currency Exchange,From Currency,ຈາກສະກຸນເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ກະລຸນາເລືອກນວນການຈັດສັນ, ປະເພດໃບເກັບເງິນແລະຈໍານວນໃບເກັບເງິນໃນ atleast ຫນຶ່ງຕິດຕໍ່ກັນ"
@@ -2099,7 +2095,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ບໍ່ສາມາດເລືອກເອົາປະເພດຄ່າໃຊ້ຈ່າຍເປັນຈໍານວນເງິນຕິດຕໍ່ກັນກ່ອນຫນ້ານີ້ &#39;ຫລື&#39; ໃນທີ່ຜ່ານມາຕິດຕໍ່ກັນທັງຫມົດສໍາລັບການຕິດຕໍ່ກັນຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item ບໍ່ຄວນຈະເປັນມັດຜະລິດຕະພັນ. ກະລຸນາເອົາລາຍ `{0}` ແລະຊ່ວຍປະຢັດ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ທະນາຄານ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,ຕື່ມການ Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,ຕື່ມການ Timesheets
 DocType: Vehicle Service,Service Item,ສິນຄ້າການບໍລິການ
 DocType: Bank Guarantee,Bank Guarantee,ຮັບປະກັນທະນາຄານ
 DocType: Bank Guarantee,Bank Guarantee,ຮັບປະກັນທະນາຄານ
@@ -2149,8 +2145,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ລາຄາຈະບໍ່ໄດ້ຮັບການສະແດງໃຫ້ເຫັນວ່າລາຄາບໍ່ໄດ້ຕັ້ງ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ກະລຸນາລະບຸປະເທດສໍາລັບກົດລະບຽບດັ່ງກ່າວນີ້ຫຼືກວດເບິ່ງເຮືອໃນທົ່ວໂລກ
 DocType: Stock Entry,Total Incoming Value,ມູນຄ່າຂາເຂົ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ລາຄາຊື້
 DocType: Offer Letter Term,Offer Term,ຄໍາສະເຫນີ
 DocType: Quality Inspection,Quality Manager,ຜູ້ຈັດການຄຸນະພາບ
@@ -2184,14 +2180,14 @@
 DocType: Opportunity,Lost Reason,ລືມເຫດຜົນ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ທີ່ຢູ່ໃຫມ່
 DocType: Quality Inspection,Sample Size,ຂະຫນາດຕົວຢ່າງ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ກະລຸນາໃສ່ເອກະສານຮັບ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ລາຍການທັງຫມົດໄດ້ຮັບການອະນຸແລ້ວ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ກະລຸນາໃສ່ເອກະສານຮັບ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ລາຍການທັງຫມົດໄດ້ຮັບການອະນຸແລ້ວ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ກະລຸນາລະບຸທີ່ຖືກຕ້ອງ &#39;ຈາກກໍລະນີສະບັບເລກທີ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ສູນຕົ້ນທຶນເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ Groups ແຕ່ລາຍະການສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups
 DocType: Project,External,ພາຍນອກ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ຜູ້ຊົມໃຊ້ແລະການອະນຸຍາດ
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ໃບສັ່ງຜະລິດຂຽນເມື່ອ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},ໃບສັ່ງຜະລິດຂຽນເມື່ອ: {0}
 DocType: Branch,Branch,ສາຂາ
 DocType: Guardian,Mobile Number,ເບີໂທລະສັບ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ການພິມແລະຍີ່ຫໍ້
@@ -2200,7 +2196,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ບໍ່ໄດ້ພົບເຫັນ
 DocType: Scheduling Tool,Student Batch,Batch ນັກສຶກສາ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ລູກຄ້າຂອງທ່ານ
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ເຮັດໃຫ້ນັກສຶກສາ
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ເຮັດໃຫ້ນັກສຶກສາ
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},ທ່ານໄດ້ຖືກເຊື້ອເຊີນເພື່ອເຮັດວຽກຮ່ວມກັນກ່ຽວກັບໂຄງການ: {0}
 DocType: Leave Block List Date,Block Date,Block ວັນທີ່
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ສະຫມັກວຽກນີ້
@@ -2224,8 +2220,9 @@
 DocType: SMS Log,Sent To,ຖືກສົ່ງໄປ
 DocType: Payment Request,Make Sales Invoice,ເຮັດໃຫ້ຍອດຂາຍ Invoice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ຊອບແວ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ຖັດໄປວັນທີບໍ່ສາມາດຈະຢູ່ໃນໄລຍະຜ່ານມາ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ຖັດໄປວັນທີບໍ່ສາມາດຈະຢູ່ໃນໄລຍະຜ່ານມາ
 DocType: Company,For Reference Only.,ສໍາລັບການກະສານອ້າງອີງເທົ່ານັ້ນ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,ເລືອກຊຸດ No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ບໍ່ຖືກຕ້ອງ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,"PINV, RET-"
 DocType: Sales Invoice Advance,Advance Amount,ລ່ວງຫນ້າຈໍານວນເງິນ
@@ -2239,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ກໍລະນີສະບັບເລກທີບໍ່ສາມາດຈະເປັນ 0
 DocType: Item,Show a slideshow at the top of the page,ສະແດງໃຫ້ເຫັນ slideshow ເປັນຢູ່ປາຍສຸດຂອງຫນ້າ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,ແອບເປີ້ນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ຮ້ານຄ້າ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ຮ້ານຄ້າ
 DocType: Serial No,Delivery Time,ເວລາຂົນສົ່ງ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ຜູ້ສູງອາຍຸຈາກຈໍານວນກ່ຽວກັບ
 DocType: Item,End of Life,ໃນຕອນທ້າຍຂອງການມີຊີວິດ
@@ -2255,8 +2252,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ລະບຸການດໍາເນີນງານ, ຄ່າໃຊ້ຈ່າຍປະຕິບັດແລະໃຫ້ການດໍາເນີນງານເປັນເອກະລັກທີ່ບໍ່ມີການປະຕິບັດງານຂອງທ່ານ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ເອກະສານນີ້ແມ່ນໃນໄລຍະຂອບເຂດຈໍາກັດໂດຍ {0} {1} ສໍາລັບ item {4}. ທ່ານກໍາລັງເຮັດໃຫ້ຄົນອື່ນ {3} ຕໍ່ຕ້ານດຽວກັນ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
 DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
 DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
 DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ລົບ Stock
@@ -2267,7 +2264,7 @@
 DocType: Budget Account,Budget Account,ບັນຊີງົບປະມານ
 DocType: Quality Inspection,Verified By,ການຢັ້ງຢືນໂດຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ບໍ່ສາມາດມີການປ່ຽນແປງສະກຸນເງິນເລີ່ມຂອງບໍລິສັດ, ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວ. ເຮັດທຸລະກໍາຕ້ອງໄດ້ຮັບການຍົກເລີກການປ່ຽນແປງສະກຸນເງິນໄວ້ໃນຕອນຕົ້ນ."
-DocType: Grade Interval,Grade Description,Grade ລາຍລະອຽດ
+DocType: Grading Scale Interval,Grade Description,Grade ລາຍລະອຽດ
 DocType: Stock Entry,Purchase Receipt No,ຊື້ໃບບໍ່ມີ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ເງິນ earnest
 DocType: Process Payroll,Create Salary Slip,ສ້າງຄວາມຜິດພາດພຽງເງິນເດືອນ
@@ -2305,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,ຜູ້ເຂົ້າຮ່ວມເຖິງວັນທີ່
 DocType: Warranty Claim,Raised By,ຍົກຂຶ້ນມາໂດຍ
 DocType: Payment Gateway Account,Payment Account,ບັນຊີຊໍາລະເງິນ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ການປ່ຽນແປງສຸດທິໃນບັນຊີລູກຫນີ້
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ການຊົດເຊີຍ Off
 DocType: Offer Letter,Accepted,ຮັບການຍອມຮັບ
@@ -2319,7 +2316,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping ກົດລະບຽບ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ໄວອະນຸທິນ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງອັດຕາການຖ້າຫາກວ່າ BOM ທີ່ໄດ້ກ່າວມາ agianst ລາຍການໃດ
 DocType: Employee,Previous Work Experience,ຕໍາແຫນ່ງທີ່ເຄີຍເຮັດຜ່ານມາ
@@ -2333,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ຂໍ້ກໍານົດແລະ Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ຊື່ຂອງສະຖາບັນສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ເຂົ້າບັນຊີ frozen ເຖິງວັນນີ້, ບໍ່ມີໃຜສາມາດເຮັດໄດ້ / ປັບປຸງແກ້ໄຂການເຂົ້າຍົກເວັ້ນພາລະບົດບາດທີ່ລະບຸໄວ້ຂ້າງລຸ່ມນີ້."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,ກະລຸນາຊ່ວຍປະຢັດເອກະສານກ່ອນການສ້າງຕາຕະລາງການບໍາລຸງຮັກສາ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ກະລຸນາຊ່ວຍປະຢັດເອກະສານກ່ອນການສ້າງຕາຕະລາງການບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ສະຖານະການ
 DocType: UOM,Check this to disallow fractions. (for Nos),ກວດສອບນີ້ຈະບໍ່ອະນຸຍາດແຕ່ສ່ວນຫນຶ່ງ. (ສໍາລັບພວກເຮົາ)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,ໄດ້ໃບສັ່ງຜະລິດຕໍ່ໄປນີ້ໄດ້ຮັບການສ້າງຕັ້ງ:
@@ -2356,6 +2353,7 @@
 DocType: Email Digest,How frequently?,ວິທີເລື້ອຍໆ?
 DocType: Purchase Receipt,Get Current Stock,ໄດ້ຮັບການ Stock ປັດຈຸບັນ
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ເປັນໄມ້ຢືນຕົ້ນຂອງບັນຊີລາຍການຂອງວັດສະດຸ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Student,Joining Date,ເຂົ້າຮ່ວມວັນທີ່
 ,Employees working on a holiday,ພະນັກງານເຮັດວຽກກ່ຽວກັບວັນພັກ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ເຄື່ອງຫມາຍປັດຈຸບັນ
@@ -2437,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ການເກັບກູ້ Date ບໍ່ໄດ້ກ່າວເຖິງ
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ການຜະລິດ
 DocType: Guardian,Occupation,ອາຊີບ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ຕິດຕໍ່ກັນ {0}: ວັນທີ່ເລີ່ມຕ້ອງມີກ່ອນວັນທີ່ສິ້ນສຸດ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ຕິດຕໍ່ກັນ {0}: ວັນທີ່ເລີ່ມຕ້ອງມີກ່ອນວັນທີ່ສິ້ນສຸດ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ທັງຫມົດ (ຈໍານວນ)
 DocType: Sales Invoice,This Document,ເອກະສານນີ້
 DocType: Installation Note Item,Installed Qty,ການຕິດຕັ້ງຈໍານວນ
@@ -2460,8 +2458,8 @@
 DocType: Notification Control,Sales Order Message,Message ຂາຍສິນຄ້າ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ກໍານົດມູນຄ່າມາດຕະຖານຄືບໍລິສັດ, ສະກຸນເງິນ, ປັດຈຸບັນປີງົບປະມານ, ແລະອື່ນໆ"
 DocType: Payment Entry,Payment Type,ປະເພດການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
 DocType: Process Payroll,Select Employees,ເລືອກພະນັກງານ
 DocType: Opportunity,Potential Sales Deal,Deal Sales ທ່າແຮງ
 DocType: Payment Entry,Cheque/Reference Date,ກະແສລາຍວັນ / ວັນທີ່ເອກະສານ
@@ -2478,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ຂໍ້ມູນ POS Global {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບບໍລິສັດ {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ທົດແທນສິນຄ້າ / BOM ໃນແອບເປີ້ນທັງຫມົດ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ເອກະສານໄດ້ຮັບຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ເອກະສານໄດ້ຮັບຕ້ອງໄດ້ຮັບການສົ່ງ
 DocType: Purchase Invoice Item,Received Qty,ໄດ້ຮັບຈໍານວນ
 DocType: Stock Entry Detail,Serial No / Batch,ບໍ່ມີ Serial / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,ບໍ່ໄດ້ຈ່າຍແລະບໍ່ສົ່ງ
@@ -2491,7 +2489,7 @@
 ,To Produce,ກັບຜະລິດຕະພັນ
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນ {1}. ເພື່ອປະກອບມີ {2} ໃນອັດຕາການສິນຄ້າ, ແຖວເກັດທີ່ຢູ່ {3} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ເຮັດໃຫ້ຜູ້ໃຊ້
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ເຮັດໃຫ້ຜູ້ໃຊ້
 DocType: Packing Slip,Identification of the package for the delivery (for print),ການກໍານົດຂອງຊຸດສໍາລັບການຈັດສົ່ງ (ສໍາລັບການພິມ)
 DocType: Bin,Reserved Quantity,ຈໍານວນສະຫງວນ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ກະລຸນາໃສ່ທີ່ຢູ່ອີເມວທີ່ຖືກຕ້ອງ
@@ -2505,11 +2503,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ແມ່ແບບຄົນພິການຈະຕ້ອງບໍ່ແມ່ແບບມາດຕະຖານ
 DocType: Account,Income Account,ບັນຊີລາຍໄດ້
 DocType: Payment Request,Amount in customer's currency,ຈໍານວນເງິນໃນສະກຸນເງິນຂອງລູກຄ້າ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,ສົ່ງ
 DocType: Stock Reconciliation Item,Current Qty,ຈໍານວນໃນປັດຈຸບັນ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ເບິ່ງ &quot;ອັດຕາການວັດສະດຸພື້ນຖານກ່ຽວກັບ&quot; ໃນມາຕາ Costing
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,ຄວາມຮັບຜິດຊອບທີ່ສໍາຄັນ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ສໍາຫລັບຂະບວນນັກສຶກສາຊ່ວຍໃຫ້ທ່ານຕິດຕາມການເຂົ້າຮຽນ, ການປະເມີນຜົນແລະຄ່າທໍານຽມສໍາລັບນັກສຶກສາ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ສໍາຫລັບຂະບວນນັກສຶກສາຊ່ວຍໃຫ້ທ່ານຕິດຕາມການເຂົ້າຮຽນ, ການປະເມີນຜົນແລະຄ່າທໍານຽມສໍາລັບນັກສຶກສາ"
 DocType: Payment Entry,Total Allocated Amount,ນວນການຈັດສັນທັງຫມົດ
 DocType: Item Reorder,Material Request Type,ອຸປະກອນການຮ້ອງຂໍປະເພດ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ຖືກຕ້ອງອະນຸເງິນເດືອນຈາກ {0} ກັບ {1}
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ການຕິດຕາມຊີ້ນໍາໂດຍປະເພດອຸດສາຫະກໍາ.
 DocType: Item Supplier,Item Supplier,ຜູ້ຜະລິດລາຍການ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ທີ່ຢູ່ທັງຫມົດ.
 DocType: Company,Stock Settings,ການຕັ້ງຄ່າ Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ການລວມເປັນໄປໄດ້ພຽງແຕ່ຖ້າຫາກວ່າມີຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ແມ່ນອັນດຽວກັນໃນການບັນທຶກການທັງສອງ. ເປັນກຸ່ມ, ປະເພດຮາກ, ບໍລິສັດ"
@@ -2542,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',ຈະສົ່ງອີເມວກ່ຽວກັບກໍລະນີທີ່ພະນັກງານທີ່ມີສະຖານະພາບ &quot;ເປີດ &#39;
 DocType: Task,Depends on Tasks,ຂຶ້ນຢູ່ກັບວຽກ
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ການຄຸ້ມຄອງການເປັນໄມ້ຢືນຕົ້ນກຸ່ມລູກຄ້າ.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ໄຟລ໌ແນບສາມາດໄດ້ຮັບການສະແດງໃຫ້ເຫັນໂດຍບໍ່ມີການເຮັດໃຫ້ບັດຊື້ສິນຄ້າ
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ໃຫມ່ສູນຕົ້ນທຶນຊື່
 DocType: Leave Control Panel,Leave Control Panel,ອອກຈາກກະດານຄວບຄຸມ
@@ -2554,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,ເດບິດໄປ
 DocType: Delivery Note,Required only for sample item.,ຕ້ອງການສໍາລັບລາຍການຕົວຢ່າງ.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ຈໍານວນຕົວຈິງຫຼັງຈາກການ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; ປະເພດຜະລິດ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; ປະເພດຜະລິດ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ບໍ່ມີຄວາມຜິດພາດພຽງເງິນເດືອນພົບໃນລະຫວ່າງ {0} ແລະ {1}
 ,Pending SO Items For Purchase Request,ທີ່ຍັງຄ້າງ SO ລາຍການສໍາລັບການຈອງຊື້
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ຮັບສະຫມັກນັກສຶກສາ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
 DocType: Supplier,Billing Currency,ສະກຸນເງິນ Billing
 DocType: Sales Invoice,SINV-RET-,"SINV, RET-"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ຂະຫນາດໃຫຍ່ພິເສດ
@@ -2576,7 +2574,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ຫນ້າທໍາອິດຜະລິດຕະພັນທີ່ແນະນໍາ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ທັງຫມົດກຸ່ມການປະເມີນຜົນ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ຊື່ Warehouse ໃຫມ່
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ທັງຫມົດ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ທັງຫມົດ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ອານາເຂດຂອງ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ກະລຸນາທີ່ບໍ່ມີການໄປຢ້ຽມຢາມທີ່ຕ້ອງການ
 DocType: Stock Settings,Default Valuation Method,ວິທີການປະເມີນມູນຄ່າໃນຕອນຕົ້ນ
@@ -2594,7 +2592,7 @@
 DocType: Price List,Price List Master,ລາຄາຕົ້ນສະບັບ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ທັງຫມົດຂອງທຸລະກໍາສາມາດຕິດແທຕໍ່ຫລາຍຄົນຂາຍ ** ** ດັ່ງນັ້ນທ່ານສາມາດກໍານົດແລະຕິດຕາມກວດກາເປົ້າຫມາຍ.
 ,S.O. No.,ດັ່ງນັ້ນສະບັບເລກທີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ກະລຸນາສ້າງລູກຄ້າຈາກ Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ກະລຸນາສ້າງລູກຄ້າຈາກ Lead {0}
 DocType: Price List,Applicable for Countries,ສາມາດນໍາໃຊ້ສໍາລັບປະເທດ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ອອກພຽງແຕ່ຄໍາຮ້ອງສະຫມັກທີ່ມີສະຖານະພາບ &#39;ອະນຸມັດ&#39; ແລະ &#39;ປະຕິເສດ&#39; ສາມາດໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ນັກສຶກສາ Group Name ເປັນຂໍ້ບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
@@ -2675,7 +2673,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Entry ບັນຊີສໍາລັບ Stock
 DocType: Vehicle Service,Engine Oil,ນ້ໍາມັນເຄື່ອງຈັກ
 DocType: Sales Invoice,Sales Team1,Team1 ຂາຍ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ລາຍການ {0} ບໍ່ມີ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ລາຍການ {0} ບໍ່ມີ
 DocType: Sales Invoice,Customer Address,ທີ່ຢູ່ຂອງລູກຄ້າ
 DocType: Employee Loan,Loan Details,ລາຍລະອຽດການກູ້ຢືມເງິນ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນຕ້ອງໄດ້ຫຼາຍກ່ວາສູນ.
@@ -2740,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
 DocType: Assessment Result Tool,Result HTML,ຜົນ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ທີ່ຫມົດອາຍຸ
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ຕື່ມການນັກສຶກສາ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ຕື່ມການນັກສຶກສາ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},ກະລຸນາເລືອກ {0}
 DocType: C-Form,C-Form No,C ແບບຟອມ No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2805,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ຂອບເຂດຈໍາກັດອົງການກາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ການຮ່ວມລົງທຶນ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ເປັນໄລຍະທາງວິຊາການກັບນີ້ປີທາງວິຊາການ &#39;{0} ແລະ&#39; ໄລຍະຊື່ &#39;{1} ມີຢູ່ແລ້ວ. ກະລຸນາປັບປຸງແກ້ໄຂການອອກສຽງເຫຼົ່ານີ້ແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວຕໍ່ item {0}, ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງມູນຄ່າຂອງ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວຕໍ່ item {0}, ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງມູນຄ່າຂອງ {1}"
 DocType: UOM,Must be Whole Number,ຕ້ອງເປັນຈໍານວນທັງຫມົດ
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ໃບໃຫມ່ຈັດສັນ (ໃນວັນ)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} ບໍ່ມີ
@@ -2849,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,ວັນສຸດທ້າຍຂອງເດືອນຖັດໄປ
 DocType: Support Settings,Auto close Issue after 7 days,Auto ໃກ້ Issue ພາຍໃນ 7 ມື້
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ອອກຈາກບໍ່ສາມາດໄດ້ຮັບການຈັດສັນກ່ອນ {0}, ເປັນການດຸ່ນດ່ຽງອອກໄດ້ແລ້ວປະຕິບັດ, ສົ່ງໃນການບັນທຶກການຈັດສັນອອກໃນອະນາຄົດ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ສະຫມັກນັກສຶກສາ
 DocType: Asset Category Account,Accumulated Depreciation Account,ບັນຊີຄ່າເສື່ອມລາຄາສະສົມ
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
@@ -2877,8 +2875,8 @@
 DocType: Asset,Item Code,ລະຫັດສິນຄ້າ
 DocType: Production Planning Tool,Create Production Orders,ສ້າງໃບສັ່ງຜະລິດ
 DocType: Serial No,Warranty / AMC Details,ການຮັບປະກັນ / ລາຍລະອຽດ AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
 DocType: Journal Entry,User Remark,User ຂໍ້ສັງເກດ
 DocType: Lead,Market Segment,ສ່ວນຕະຫຼາດ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
@@ -2897,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,ສ້າງການຮ້ອງຂໍການວັດສະດຸ
 DocType: Employee Education,School/University,ໂຮງຮຽນ / ວິທະຍາໄລ
 DocType: Payment Request,Reference Details,ລາຍລະອຽດກະສານອ້າງອີງ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງຫນ້ອຍກ່ວາລວມຍອດການຊື້ຈໍານວນ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງຫນ້ອຍກ່ວາລວມຍອດການຊື້ຈໍານວນ
 DocType: Sales Invoice Item,Available Qty at Warehouse,ມີຈໍານວນຢູ່ໃນສາງ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ຈໍານວນເງິນເກັບ
 DocType: Asset,Double Declining Balance,ດຸນຫລຸດ Double
@@ -2918,19 +2916,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ຈ່າຍຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເງິນກູ້ຈໍານວນ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ຊື້ຈໍານວນຄໍາສັ່ງທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ຜະລິດພັນທີ່ບໍ່ໄດ້ສ້າງ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,ຜະລິດພັນທີ່ບໍ່ໄດ້ສ້າງ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ຈາກວັນທີ່ສະຫມັກ&#39; ຈະຕ້ອງຫລັງຈາກທີ່ໄປວັນ &#39;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະພາບເປັນນັກສຶກສາ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາຮ້ອງສະຫມັກນັກສຶກສາ {1}
 DocType: Asset,Fully Depreciated,ຄ່າເສື່ອມລາຄາຢ່າງເຕັມສ່ວນ
 ,Stock Projected Qty,Stock ປະມານການຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ການຊື້ຂາຍແມ່ນການສະເຫນີ, ສະເຫນີລາຄາທີ່ທ່ານໄດ້ຖືກສົ່ງໄປໃຫ້ກັບລູກຄ້າຂອງທ່ານ"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ການຊື້ຂາຍແມ່ນການສະເຫນີ, ສະເຫນີລາຄາທີ່ທ່ານໄດ້ຖືກສົ່ງໄປໃຫ້ກັບລູກຄ້າຂອງທ່ານ"
 DocType: Sales Order,Customer's Purchase Order,ການສັ່ງຊື້ຂອງລູກຄ້າ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ບໍ່ມີ Serial ແລະ Batch
 DocType: Warranty Claim,From Company,ຈາກບໍລິສັດ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ຜົນບວກຂອງຄະແນນຂອງເງື່ອນໄຂການປະເມີນຜົນທີ່ຕ້ອງການຈະ {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ກະລຸນາທີ່ກໍານົດໄວ້ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ກະລຸນາທີ່ກໍານົດໄວ້ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ມູນຄ່າຫຼືຈໍານວນ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາສໍາລັບການ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ນາທີ
@@ -3061,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ກຸ່ມນັກສຶກສາ
 DocType: Shopping Cart Settings,Quotation Series,ວົງຢືມ Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ລາຍການລາຄາທີ່ມີຊື່ດຽວກັນ ({0}), ກະລຸນາມີການປ່ຽນແປງຊື່ກຸ່ມສິນຄ້າຫລືປ່ຽນຊື່ລາຍການ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
 DocType: C-Form,I,ຂ້າພະເຈົ້າ
 DocType: Company,Asset Depreciation Cost Center,Asset Center ຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
 DocType: Sales Order Item,Sales Order Date,ວັນທີ່ສະຫມັກໃບສັ່ງຂາຍ
@@ -3080,19 +3078,18 @@
 DocType: Vehicle,Insurance Details,ລາຍລະອຽດການປະກັນໄພ
 DocType: Account,Payable,ຈ່າຍ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ກະລຸນາໃສ່ໄລຍະເວລາຊໍາລະຄືນ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ລູກຫນີ້ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ລູກຫນີ້ ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,ກໍາໄຮ% Gross
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ວັນເກັບກູ້ລະເບີດ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ການຊື້ທັງຫມົດເປັນການບັງຄັບ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ການຊື້ທັງຫມົດເປັນການບັງຄັບ
 DocType: Lead,Address Desc,ທີ່ຢູ່ Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ພັກເປັນການບັງຄັບ
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ຊື່ກະທູ້
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,atleast ຫນຶ່ງຂອງການຂາຍຫຼືຊື້ຕ້ອງໄດ້ຮັບການຄັດເລືອກ
-DocType: Grading Structure,Grade Intervals,ໄລຍະການຮຽນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ເລືອກລັກສະນະຂອງທຸລະກິດຂອງທ່ານ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ບ່ອນທີ່ການດໍາເນີນງານການຜະລິດກໍາລັງດໍາເນີນ.
 DocType: Asset Movement,Source Warehouse,Warehouse Source
@@ -3121,6 +3118,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ເປີເຊັນຂອງການແຜ່ກະຈາຍປະຈໍາເດືອນ
 DocType: Territory,Territory Targets,ຄາດຫມາຍຕົ້ນຕໍອານາເຂດ
 DocType: Delivery Note,Transporter Info,ຂໍ້ມູນການຂົນສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; ອານາເຂດ
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ໃນຕອນຕົ້ນ {0} ໃນບໍລິສັດ {1}
 DocType: Cheque Print Template,Starting position from top edge,ຈຸດເລີ່ມຕົ້ນຈາກແຂບເທິງ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ຄ້າຄົນດຽວກັນໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
@@ -3174,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ລໍາດັບຈໍານວນ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ເປີດຮັບສະຫມັກໃນປະຈຸບັນ
 DocType: Company,Stock Adjustment Account,ບັນຊີການປັບ Stock
-DocType: Journal Entry,Write Off,ຂຽນ Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ຂຽນ Off
 DocType: Timesheet Detail,Operation ID,ການດໍາເນີນງານ ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ຜູ້ໃຊ້ລະບົບ (ເຂົ້າສູ່ລະບົບ) ID. ຖ້າຫາກວ່າກໍານົດໄວ້, ມັນຈະກາຍເປັນມາດຕະຖານສໍາລັບຮູບແບບ HR ທັງຫມົດ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ຈາກ {1}
@@ -3185,8 +3183,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ຜູ້ຈັດຈໍາຫນ່າຍໃຫ້ກັບລູກຄ້າ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (ແບບຟອມ # / Item / {0}) ເປັນ out of stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,ວັນຖັດໄປຈະຕ້ອງຫຼາຍກ່ວາປະກາດວັນທີ່
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ກໍາຫນົດ / Reference ບໍ່ສາມາດໄດ້ຮັບຫຼັງຈາກ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ກໍາຫນົດ / Reference ບໍ່ສາມາດໄດ້ຮັບຫຼັງຈາກ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ນໍາເຂົ້າຂໍ້ມູນແລະສົ່ງອອກ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entries Stock ມີຕໍ່ Warehouse {0}, ເພາະສະນັ້ນທ່ານບໍ່ສາມາດມີການກໍາຫນົດຫຼືປັບປຸງແກ້ໄຂມັນ"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ບໍ່ພົບຂໍ້ມູນນັກສຶກສາ
@@ -3198,14 +3196,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
 DocType: Program Enrollment,School House,ໂຮງຮຽນບ້ານ
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
 DocType: Company,Default Cash Account,ມາດຕະຖານບັນຊີເງິນສົດ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ບໍລິສັດ (ໄດ້ລູກຄ້າຫລືຜູ້ຜະລິດ) ຕົ້ນສະບັບ.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງນັກສຶກສານີ້
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,No ນັກສຶກສາໃນ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ເພີ່ມລາຍການເພີ່ມເຕີມຫຼືເຕັມຮູບແບບເປີດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',ກະລຸນາໃສ່ &#39;ວັນທີຄາດວ່າສົ່ງ&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ການຈັດສົ່ງ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
@@ -3252,9 +3251,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ກ່ອນທີ່ຈະ reconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ເພື່ອ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ພາສີອາກອນແລະຄ່າບໍລິການເພີ່ມ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row ພາສີລາຍ {0} ຕ້ອງມີບັນຊີຂອງສ່ວຍສາອາກອນປະເພດຫຼືລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍຫຼື Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row ພາສີລາຍ {0} ຕ້ອງມີບັນຊີຂອງສ່ວຍສາອາກອນປະເພດຫຼືລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍຫຼື Chargeable
 DocType: Sales Order,Partly Billed,ບິນສ່ວນຫນຶ່ງແມ່ນ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຊັບສິນຄົງທີ່
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຊັບສິນຄົງທີ່
 DocType: Item,Default BOM,ມາດຕະຖານ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ກະລຸນາປະເພດຊື່ບໍລິສັດຢືນຢັນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ທັງຫມົດ Amt ເດັ່ນ
@@ -3277,7 +3276,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ລາຄາອັດຕາແລກປ່ຽນບັນຊີ
 DocType: Purchase Invoice Item,Rate,ອັດຕາການ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ລິງທີ່ກ່ຽວຂ້ອງ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,ລິງທີ່ກ່ຽວຂ້ອງ
 DocType: Stock Entry,From BOM,ຈາກ BOM
 DocType: Assessment Code,Assessment Code,ລະຫັດການປະເມີນຜົນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ພື້ນຖານ
@@ -3302,7 +3301,7 @@
 DocType: Purchase Invoice,Print Language,ພິມພາສາ
 DocType: Salary Slip,Total Working Hours,ທັງຫມົດຊົ່ວໂມງເຮັດວຽກ
 DocType: Stock Entry,Including items for sub assemblies,ລວມທັງລາຍການສໍາລັບການສະພາແຫ່ງຍ່ອຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ອານາເຂດທັງຫມົດ
 DocType: Purchase Invoice,Items,ລາຍການ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ນັກສຶກສາແມ່ນໄດ້ລົງທະບຽນແລ້ວ.
@@ -3322,17 +3321,15 @@
 DocType: Issue,Opening Time,ທີ່ໃຊ້ເວລາເປີດ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ຈາກແລະໄປວັນທີ່ຄຸນຕ້ອງ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ຫຼັກຊັບແລະການແລກປ່ຽນສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ຄິດໄລ່ພື້ນຖານກ່ຽວກັບ
 DocType: Delivery Note Item,From Warehouse,ຈາກ Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
 DocType: Assessment Plan,Supervisor Name,ຊື່ Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,ຂອງລາຍວິຊາການເຂົ້າໂຮງຮຽນໂຄງການ
 DocType: Program Enrollment Course,Program Enrollment Course,ຂອງລາຍວິຊາການເຂົ້າໂຮງຮຽນໂຄງການ
-DocType: Grading Structure,Grading Structure,ໂຄງປະກອບການຈັດລໍາດັບ
 DocType: Purchase Taxes and Charges,Valuation and Total,ປະເມີນມູນຄ່າແລະຈໍານວນ
 DocType: Tax Rule,Shipping City,Shipping City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ລາຍການນີ້ແມ່ນແຕກຕ່າງຈາກ {0} (Template). ຄຸນລັກສະນະຈະໄດ້ຮັບການຄັດລອກໄປຈາກແມ່ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
 DocType: Notification Control,Customize the Notification,ປັບແຈ້ງການ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ກະແສເງິນສົດຈາກການດໍາເນີນວຽກ
 DocType: Sales Invoice,Shipping Rule,ກົດລະບຽບການຂົນສົ່ງ
@@ -3355,6 +3352,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},ບໍ່ມີມາດຕະຖານ BOM ຢູ່ສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ປະກາດຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ເປີດວັນທີ່ຄວນເປັນກ່ອນທີ່ຈະປິດວັນທີ່
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງນໍ້າເບີຊຸດສໍາລັບຜູ້ເຂົ້າຮ່ວມໂດຍຜ່ານການຕິດຕັ້ງ&gt; Numbering Series
 DocType: Leave Control Panel,Carry Forward,ປະຕິບັດໄປຂ້າງຫນ້າ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ
 DocType: Department,Days for which Holidays are blocked for this department.,ວັນທີ່ວັນພັກແມ່ນຖືກສະກັດສໍາລັບພະແນກນີ້.
@@ -3383,7 +3381,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ທັງຫມົດ (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ຄວາມບັນເທີງແລະສັນທະນາການ
 DocType: Quality Inspection,Item Serial No,ລາຍການບໍ່ມີ Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ສ້າງການບັນທຶກຂອງພະນັກວຽກ
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ສ້າງການບັນທຶກຂອງພະນັກວຽກ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ປັດຈຸບັນທັງຫມົດ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,ການບັນຊີ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ຊົ່ວໂມງ
@@ -3398,8 +3396,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM ໃຫມ່ຫຼັງຈາກທົດແທນ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ຈຸດຂອງການຂາຍ
 DocType: Payment Entry,Received Amount,ຈໍານວນເງິນທີ່ໄດ້ຮັບ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ System ໃນຊັບພະຍາກອນມະນຸດ&gt; Settings HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ System ໃນຊັບພະຍາກອນມະນຸດ&gt; Settings HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ສ້າງສໍາລັບປະລິມານຢ່າງເຕັມທີ່, ບໍ່ສົນໃຈປະລິມານແລ້ວກ່ຽວກັບຄໍາສັ່ງ"
 DocType: Account,Tax,ພາສີ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ບໍ່ໄດ້ຫມາຍ
@@ -3412,7 +3408,7 @@
 DocType: Batch,Source Document Name,ແຫຼ່ງຂໍ້ມູນຊື່ Document
 DocType: Batch,Source Document Name,ແຫຼ່ງຂໍ້ມູນຊື່ Document
 DocType: Job Opening,Job Title,ຕໍາແຫນ່ງ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ສ້າງຜູ້ໃຊ້
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ສ້າງຜູ້ໃຊ້
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ກໍາ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ປະລິມານການຜະລິດຕ້ອງໄດ້ຫຼາຍກ່ວາ 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ໄປຢ້ຽມຢາມບົດລາຍງານສໍາລັບການໂທບໍາລຸງຮັກສາ.
@@ -3424,8 +3420,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ບັນຊີຄ່າໃຊ້ຈ່າຍເປັນການບັງຄັບສໍາລັບ item {0}
 DocType: BOM,Website Description,ລາຍລະອຽດເວັບໄຊທ໌
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ການປ່ຽນແປງສຸດທິໃນການລົງທຶນ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
 DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ຮັບ
 ,Sales Register,ລົງທະບຽນການຂາຍ
@@ -3436,16 +3432,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ມີບໍ່ມີຫຍັງທີ່ຈະແກ້ໄຂແມ່ນ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ສະຫຼຸບສັງລວມສໍາລັບເດືອນນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Customer Group,Customer Group Name,ຊື່ກຸ່ມລູກຄ້າ
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No ລູກຄ້າທັນ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ໃບອະນຸຍາດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ກະລຸນາເລືອກປະຕິບັດຕໍ່ຖ້າຫາກວ່າທ່ານຍັງຕ້ອງການທີ່ຈະປະກອບມີຍອດເຫຼືອເດືອນກ່ອນປີງົບປະມານຂອງໃບປີງົບປະມານນີ້
 DocType: GL Entry,Against Voucher Type,ຕໍ່ຕ້ານປະເພດ Voucher
 DocType: Item,Attributes,ຄຸນລັກສະນະ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,ກະລຸນາໃສ່ການຕັດບັນຊີ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ຄັ້ງສຸດທ້າຍວັນ Order
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ບັນຊີ {0} ບໍ່ໄດ້ເປັນບໍລິສັດ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
 DocType: Student,Guardian Details,ລາຍລະອຽດຜູ້ປົກຄອງ
 DocType: C-Form,C-Form,"C, ແບບຟອມການ"
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ຫຼາກຫຼາຍ
@@ -3470,14 +3468,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ຕິດຕໍ່ກັນ {0} # ບັນຊີຈະຕ້ອງການປະເພດ &#39;ສິນຊັບຖາວອນ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ອອກຈໍານວນ
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ກົດລະບຽບການຄິດໄລ່ຈໍານວນການຂົນສົ່ງສໍາລັບການຂາຍ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series ເປັນການບັງຄັບ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series ເປັນການບັງຄັບ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ການບໍລິການທາງດ້ານການເງິນ
 DocType: Student Sibling,Student ID,ID ນັກສຶກສາ
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ປະເພດຂອງກິດຈະກໍາສໍາລັບການທີ່ໃຊ້ເວລາບັນທຶກ
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,ຈໍານວນພື້ນຖານ
 DocType: Training Event,Exam,ການສອບເສັງ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
 DocType: Leave Allocation,Unused leaves,ໃບທີ່ບໍ່ໄດ້ໃຊ້
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,State Billing
@@ -3510,7 +3508,7 @@
 DocType: Payment Entry,Account Paid From,ບັນຊີຊໍາລະເງິນຈາກ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ວັດຖຸດິບລະຫັດສິນຄ້າ
 DocType: Journal Entry,Write Off Based On,ຂຽນ Off ຖານກ່ຽວກັບ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ເຮັດໃຫ້ຕະກົ່ວ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ເຮັດໃຫ້ຕະກົ່ວ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print ແລະເຄື່ອງຮັບໃຊ້ຫ້ອງ
 DocType: Stock Settings,Show Barcode Field,ສະແດງໃຫ້ເຫັນພາກສະຫນາມ Barcode
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ສົ່ງອີເມວ Supplier
@@ -3526,6 +3524,7 @@
 DocType: Offer Letter,Awaiting Response,ລັງລໍຖ້າການຕອບໂຕ້
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ຂ້າງເທິງ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ກ່າວເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີທີ່ຕ້ອງຈ່າຍ
 DocType: Salary Slip,Earning & Deduction,ທີ່ໄດ້ຮັບແລະການຫັກ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ຖ້າຕ້ອງການ. ການຕັ້ງຄ່ານີ້ຈະໄດ້ຮັບການນໍາໃຊ້ການກັ່ນຕອງໃນການຄ້າຂາຍຕ່າງໆ.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ອັດຕາການປະເມີນຄ່າທາງລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
@@ -3562,7 +3561,7 @@
 DocType: Program Enrollment Tool,Get Students From,ໄດ້ຮັບນັກສຶກສາຈາກ
 DocType: Hub Settings,Seller Country,ຜູ້ຂາຍປະເທດ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ເຜີຍແຜ່ລາຍການກ່ຽວກັບເວັບໄຊທ໌
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ກຸ່ມນັກສຶກສາຂອງທ່ານໃນຂະບວນການ
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ກຸ່ມນັກສຶກສາຂອງທ່ານໃນຂະບວນການ
 DocType: Authorization Rule,Authorization Rule,ກົດລະບຽບການອະນຸຍາດ
 DocType: Sales Invoice,Terms and Conditions Details,ຂໍ້ກໍານົດແລະເງື່ອນໄຂລາຍລະອຽດ
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ຂໍ້ມູນຈໍາເພາະ
@@ -3622,7 +3621,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,ການທົດລອງ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ອົງປະກອບເງິນເດືອນ
 DocType: Program Enrollment Tool,New Academic Year,ປີທາງວິຊາການໃຫມ່
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,ໃສ່ອັດຕະໂນມັດອັດຕາລາຄາຖ້າຫາກວ່າຫາຍສາບສູນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ຈໍານວນເງິນທີ່ຊໍາລະທັງຫມົດ
 DocType: Production Order Item,Transferred Qty,ການຍົກຍ້າຍຈໍານວນ
@@ -3663,6 +3662,7 @@
 ,Sales Funnel,ຊ່ອງທາງການຂາຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ຊື່ຫຍໍ້ເປັນການບັງຄັບ
 DocType: Project,Task Progress,ຄວາມຄືບຫນ້າວຽກງານ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ໂຄງຮ່າງການ
 ,Qty to Transfer,ຈໍານວນການໂອນ
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ໃຫ້ຄໍາປຶກສາຈະນໍາໄປສູ່ຫຼືລູກຄ້າ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ພາລະບົດບາດອະນຸຍາດໃຫ້ແກ້ໄຂຫຸ້ນ frozen
@@ -3696,7 +3696,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ເກັບຄ່າທໍານຽມ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
 DocType: Lead,Add to calendar on this date,ຕື່ມການກັບປະຕິທິນໃນວັນນີ້
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ກົດລະບຽບສໍາລັບການເພີ່ມຄ່າໃຊ້ຈ່າຍໃນການຂົນສົ່ງ.
 DocType: Item,Opening Stock,ເປີດ Stock
@@ -3714,7 +3714,7 @@
 DocType: Customer,From Lead,ຈາກ Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ຄໍາສັ່ງປ່ອຍອອກມາເມື່ອສໍາລັບການຜະລິດ.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ເລືອກປີງົບປະມານ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
 DocType: Program Enrollment Tool,Enroll Students,ລົງທະບຽນນັກສຶກສາ
 DocType: Hub Settings,Name Token,ຊື່ Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ຂາຍມາດຕະຖານ
@@ -3725,7 +3725,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} ກັບການຂາຍທີ່ເຊັນ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ຊື່ໂຄງການ
-DocType: Supplier,Mention if non-standard receivable account,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້
+DocType: Customer,Mention if non-standard receivable account,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້
 DocType: Journal Entry Account,If Income or Expense,ຖ້າຫາກລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ
 DocType: Production Order,Required Items,ລາຍການທີ່ກໍານົດໄວ້
 DocType: Stock Ledger Entry,Stock Value Difference,ຄວາມແຕກຕ່າງມູນຄ່າຫຼັກຊັບ
@@ -3756,6 +3756,7 @@
 DocType: Item,Taxes,ພາສີອາກອນ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,ການຊໍາລະເງິນແລະບໍ່ໄດ້ສົ່ງ
 DocType: Project,Default Cost Center,ສູນຕົ້ນທຶນມາດຕະຖານ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງການຕັ້ງຊື່ Series ໃນລາຄາ {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 DocType: Bank Guarantee,End Date,ວັນທີ່ສິ້ນສຸດ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ທຸລະກໍາຫຼັກຊັບ
 DocType: Budget,Budget Accounts,ບັນຊີງົບປະມານ
@@ -3820,7 +3821,7 @@
 DocType: Customer,Sales Partner and Commission,Partner ຂາຍແລະຄະນະກໍາມະ
 DocType: Employee Loan,Rate of Interest (%) / Year,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) / ປີ
 ,Project Quantity,ຈໍານວນໂຄງການ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",ທັງຫມົດ {0} ສໍາລັບລາຍການທັງຫມົດເປັນສູນອາດຈະເປັນທີ່ທ່ານຄວນຈະມີການປ່ຽນແປງ &#39;ແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",ທັງຫມົດ {0} ສໍາລັບລາຍການທັງຫມົດເປັນສູນອາດຈະເປັນທີ່ທ່ານຄວນຈະມີການປ່ຽນແປງ &#39;ແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ&#39;
 DocType: Opportunity,To Discuss,ເພື່ອປຶກສາຫາລື
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ຫົວຫນ່ວຍຂອງ {1} ທີ່ຈໍາເປັນໃນ {2} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
 DocType: Loan Type,Rate of Interest (%) Yearly,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) ປະຈໍາປີ
@@ -3843,7 +3844,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ເຄື່ອງຫມາຍຂາດ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ຕິດຕໍ່ກັນ {0}: ສະກຸນເງິນຂອງ BOM: {1} ຄວນຈະເທົ່າກັບສະກຸນເງິນການຄັດເລືອກ {2}
 DocType: Journal Entry Account,Exchange Rate,ອັດຕາແລກປ່ຽນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,ຄ່າບໍລິການສ່ວນປະກອບ
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ການຈັດການ Fleet
@@ -3860,7 +3861,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} ບໍ່ມີ
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ລົງທະບຽນສໍາລັບ ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,ອັດຕາສ່ວນການແຜ່ກະຈາຍປະຈໍາເດືອນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,ການລາຍການທີ່ເລືອກບໍ່ສາມາດມີ Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ການລາຍການທີ່ເລືອກບໍ່ສາມາດມີ Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ອັດຕາການປະເມີນມູນຄ່າບໍ່ໄດ້ພົບເຫັນສໍາລັບລາຍການ {0}, ຊຶ່ງຈໍາເປັນຕ້ອງເຮັດແນວໃດການອອກສຽງການບັນຊີສໍາລັບ {1} {2}. ຖ້າຫາກວ່າລາຍການແມ່ນ transacting ເປັນລາຍການຕົວຢ່າງໃນ {1}, ກະລຸນາລະບຸວ່າໃນ {1} ຕາຕະລາງລາຍການ. ຖ້າບໍ່ດັ່ງນັ້ນ, ກະລຸນາສ້າງທຸລະກໍາຫຼັກຊັບເຂົ້າມາສໍາລັບລາຍການຫຼືການກ່າວເຖິງອັດຕາການປະເມີນມູນຄ່າສິນຄ້າບັນທຶກ, ແລະຫຼັງຈາກນັ້ນພະຍາຍາມ submiting / ຍົກເລີກພານີ້"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ຂອງອຸປະກອນການສົ່ງຕໍ່ສົ່ງນີ້ຫມາຍເຫດ
 DocType: Project,Customer Details,ລາຍລະອຽດຂອງລູກຄ້າ
@@ -3877,7 +3878,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ຄໍາສັ່ງສົ່ງບໍ່ສາມາດລຶບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ການດຸ່ນດ່ຽງບັນຊີແລ້ວໃນເດບິດ, ທ່ານຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ກໍານົດ &#39;ສົມຕ້ອງໄດ້ຮັບ&#39; ເປັນ &#39;Credit&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,ການບໍລິຫານຄຸນະພາບ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ລາຍການ {0} ໄດ້ຖືກປິດ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ລາຍການ {0} ໄດ້ຖືກປິດ
 DocType: Employee Loan,Repay Fixed Amount per Period,ຈ່າຍຄືນຈໍານວນເງິນທີ່ມີກໍານົດໄລຍະເວລາຕໍ່
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ກະລຸນາໃສ່ປະລິມານສໍາລັບລາຍການ {0}
 DocType: Employee External Work History,Employee External Work History,ພະນັກງານປະຫວັດການເຮັດ External
@@ -3904,7 +3905,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ID Email ນັກສຶກສາ
 DocType: Employee,Notice (days),ຫນັງສືແຈ້ງການ (ວັນ)
 DocType: Tax Rule,Sales Tax Template,ແມ່ແບບພາສີການຂາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
 DocType: Employee,Encashment Date,ວັນທີ່ສະຫມັກ Encashment
 DocType: Training Event,Internet,ອິນເຕີເນັດ
 DocType: Account,Stock Adjustment,ການປັບ Stock
@@ -3938,6 +3939,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note ອອກ
 DocType: Production Order,Warehouses,ຄັງສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການໂອນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ລາຍການນີ້ເປັນຂໍ້ແຕກຕ່າງຂອງ {0} (Template).
 DocType: Workstation,per hour,ຕໍ່ຊົ່ວໂມງ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ຈັດຊື້
 DocType: Announcement,Announcement,ປະກາດ
@@ -3953,7 +3955,7 @@
 DocType: Account,Receivable,ຮັບ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"ຕິດຕໍ່ກັນ, {0}: ບໍ່ອະນຸຍາດໃຫ້ມີການປ່ຽນແປງຜູ້ຜະລິດເປັນການສັ່ງຊື້ຢູ່ແລ້ວ"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ພາລະບົດບາດທີ່ຖືກອະນຸຍາດໃຫ້ສົ່ງການທີ່ເກີນຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອທີ່ກໍານົດໄວ້.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
 DocType: Item,Material Issue,ສະບັບອຸປະກອນການ
 DocType: Hub Settings,Seller Description,ຜູ້ຂາຍລາຍລະອຽດ
@@ -3966,7 +3968,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ຄໍາສັ່ງ
 DocType: Salary Detail,Component,ອົງປະກອບ
 DocType: Assessment Criteria,Assessment Criteria Group,Group ເງື່ອນໄຂການປະເມີນຜົນ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ເປີດຄ່າເສື່ອມລາຄາສະສົມຕ້ອງຫນ້ອຍກ່ວາເທົ່າກັບ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ເປີດຄ່າເສື່ອມລາຄາສະສົມຕ້ອງຫນ້ອຍກ່ວາເທົ່າກັບ {0}
 DocType: Warehouse,Warehouse Name,ຊື່ Warehouse
 DocType: Naming Series,Select Transaction,ເລືອກເຮັດທຸລະກໍາ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ກະລຸນາໃສ່ອະນຸມັດການພາລະບົດບາດຫຼືອະນຸມັດຜູ້ໃຊ້
@@ -4001,7 +4003,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ການຕັ້ງຄ່ານີ້ປີງົບປະມານເປັນຄ່າເລີ່ມຕົ້ນ, ໃຫ້ຄລິກໃສ່ &#39;ກໍານົດເປັນມາດຕະຖານ&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ການຂາດແຄນຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
 DocType: Employee Loan,Repay from Salary,ຕອບບຸນແທນຄຸນຈາກເງິນເດືອນ
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ຂໍຊໍາລະເງິນກັບ {0} {1} ສໍາລັບຈໍານວນເງິນທີ່ {2}
@@ -4019,7 +4021,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ການປະເມີນຜົນຂໍ້ມູນຜົນການຄົ້ນຫາ
 DocType: Employee Education,Employee Education,ການສຶກສາພະນັກງານ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ກຸ່ມລາຍການຊ້ໍາກັນພົບເຫັນຢູ່ໃນຕາຕະລາງກຸ່ມລາຍການ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
 DocType: Salary Slip,Net Pay,ຈ່າຍສຸດທິ
 DocType: Account,Account,ບັນຊີ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} ໄດ້ຮັບແລ້ວ
@@ -4028,7 +4030,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} ບໍ່ໄດ້ເຊື່ອມໂຍງກັບບັນຊີໃດກໍ່ຕາມ, ກະລຸນາສ້າງ / ການເຊື່ອມຕໍ່ທີ່ສອດຄ້ອງກັນ (ຊັບສິນ) ບັນຊີສໍາລັບການສາງໄດ້."
 DocType: Purchase Invoice,Recurring Id,Id Recurring
 DocType: Customer,Sales Team Details,ລາຍລະອຽດ Team Sales
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ລຶບຢ່າງຖາວອນ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,ລຶບຢ່າງຖາວອນ?
 DocType: Expense Claim,Total Claimed Amount,ຈໍານວນທັງຫມົດອ້າງວ່າ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ກາລະໂອກາດທີ່ອາດມີສໍາລັບການຂາຍ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ບໍ່ຖືກຕ້ອງ {0}
@@ -4039,13 +4041,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ຕິດຕັ້ງໂຮງຮຽນຂອງທ່ານໃນ ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),ຖານການປ່ຽນແປງຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ບໍ່ມີການຈົດບັນຊີສໍາລັບການສາງດັ່ງຕໍ່ໄປນີ້
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ບໍ່ມີການຈົດບັນຊີສໍາລັບການສາງດັ່ງຕໍ່ໄປນີ້
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ຊ່ວຍປະຢັດເອກະສານທໍາອິດ.
 DocType: Account,Chargeable,ຄ່າບໍລິການ
 DocType: Company,Change Abbreviation,ການປ່ຽນແປງສະບັບຫຍໍ້
 DocType: Expense Claim Detail,Expense Date,ວັນທີ່ສະຫມັກຄ່າໃຊ້ຈ່າຍ
 DocType: Item,Max Discount (%),ນ້ໍາສ່ວນລົດ (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,ຈໍານວນຄໍາສັ່ງຫຼ້າສຸດ
+DocType: Task,Is Milestone,ແມ່ນເຫດການສໍາຄັນ
 DocType: Daily Work Summary,Email Sent To,ສົ່ງອີເມວການ
 DocType: Budget,Warn,ເຕືອນ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ໃດຂໍ້ສັງເກດອື່ນໆ, ຄວາມພະຍາຍາມສັງເກດວ່າຄວນຈະຢູ່ໃນບັນທຶກດັ່ງກ່າວ."
@@ -4078,11 +4081,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze ຫຸ້ນເກົ່າ Than` ຄວນຈະເປັນຂະຫນາດນ້ອຍກ່ວາ% d ມື້.
 DocType: Tax Rule,Purchase Tax Template,ຊື້ແມ່ແບບພາສີ
 ,Project wise Stock Tracking,ໂຄງການຕິດຕາມສະຫລາດ Stock
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ຕາຕະລາງການບໍາລຸງຮັກສາ {0} ມີຢູ່ຕໍ່ {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),ຕົວຈິງຈໍານວນ (ທີ່ມາ / ເປົ້າຫມາຍ)
 DocType: Item Customer Detail,Ref Code,ລະຫັດກະສານອ້າງອີງ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ການບັນທຶກຂອງພະນັກງານ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
 DocType: HR Settings,Payroll Settings,ການຕັ້ງຄ່າ Payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,"ຄໍາວ່າໃບແຈ້ງຫນີ້ທີ່ບໍ່ແມ່ນ, ການເຊື່ອມຕໍ່ແລະການຊໍາລະເງິນ."
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ສັ່ງຊື້
@@ -4105,7 +4107,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,ເຊັກແລະເງິນຝາກການເກັບກູ້ບໍ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ບັນຊີ {0}: ທ່ານບໍ່ສາມາດກໍາຫນົດຕົວຂອງມັນເອງເປັນບັນຊີຂອງພໍ່ແມ່
 DocType: Purchase Invoice Item,Price List Rate,ລາຄາອັດຕາ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ສ້າງລູກຄ້າ
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ສ້າງລູກຄ້າ
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",ສະແດງໃຫ້ເຫັນ &quot;ຢູ່ໃນສະຕັອກ&quot; ຫຼື &quot;ບໍ່ໄດ້ຢູ່ໃນ Stock&quot; ໂດຍອີງໃສ່ຫຼັກຊັບທີ່ມີຢູ່ໃນສາງນີ້.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ບັນຊີລາຍການຂອງວັດສະດຸ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,ທີ່ໃຊ້ເວລາສະເລ່ຍປະຕິບັດໂດຍຜູ້ປະກອບການເພື່ອໃຫ້
@@ -4127,7 +4129,7 @@
 DocType: Asset,Disposal Date,ວັນທີ່ຈໍາຫນ່າຍ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ອີເມວຈະຖືກສົ່ງໄປຫາພະນັກງານກິດຈະກໍາຂອງບໍລິສັດຢູ່ໃນຊົ່ວໂມງດັ່ງກ່າວ, ຖ້າຫາກວ່າພວກເຂົາເຈົ້າບໍ່ມີວັນພັກ. ສະຫຼຸບສັງລວມຂອງການຕອບສະຫນອງຈະໄດ້ຮັບການສົ່ງໄປຢູ່ໃນເວລາທ່ຽງຄືນ."
 DocType: Employee Leave Approver,Employee Leave Approver,ພະນັກງານອອກຈາກອະນຸມັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ບໍ່ສາມາດປະກາດເປັນການສູນເສຍ, ເນື່ອງຈາກວ່າສະເຫນີລາຄາໄດ້ຖືກເຮັດໃຫ້."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ການຝຶກອົບຮົມຜົນຕອບຮັບ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ສັ່ງຊື້ສິນຄ້າ {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
@@ -4135,7 +4137,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ຂອງລາຍວິຊາແມ່ນບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ວັນທີບໍ່ສາມາດຈະກ່ອນທີ່ຈະຈາກວັນທີ່
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
 DocType: Batch,Parent Batch,ຊຸດຂອງພໍ່ແມ່
 DocType: Batch,Parent Batch,ຊຸດຂອງພໍ່ແມ່
 DocType: Cheque Print Template,Cheque Print Template,ແມ່ແບບພິມກະແສລາຍວັນ
@@ -4180,7 +4182,7 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage ທັງຫມົດໄດ້ຮັບມອບຫມາຍຄວນຈະເປັນ 100%. ມັນເປັນ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ຜູ້ສະຫນອງຂອງທ່ານ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດກໍານົດເປັນການສູນເສຍທີ່ເປັນຄໍາສັ່ງຂາຍແມ່ນ.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດກໍານົດເປັນການສູນເສຍທີ່ເປັນຄໍາສັ່ງຂາຍແມ່ນ.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;Vaulation ແລະລວມ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ໄດ້ຮັບຈາກ
@@ -4190,7 +4192,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ຈາກ {0} ສໍາລັບ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},"ຕິດຕໍ່ກັນ, {0} ຕັ້ງຄ່າການຜະລິດສໍາລັບການ item {1}"
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ມູນຄ່າຊົ່ວໂມງຕ້ອງມີຄ່າຫລາຍກ່ວາສູນ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {0} ຕິດກັບ Item {1} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {0} ຕິດກັບ Item {1} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
 DocType: Issue,Content Type,ປະເພດເນື້ອຫາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ຄອມພິວເຕີ
 DocType: Item,List this Item in multiple groups on the website.,ລາຍຊື່ສິນຄ້ານີ້ຢູ່ໃນກຸ່ມຫຼາກຫຼາຍກ່ຽວກັບເວັບໄຊທ໌.
@@ -4199,20 +4201,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ຕັ້ງຄ່າ Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,ໄດ້ຮັບ Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,ຈາກ Invoice ວັນທີ່
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ສະກຸນເງິນໃບບິນຈະຕ້ອງເທົ່າທຽມກັນກັບສະກຸນເງິນຫຼືບັນຊີຝ່າຍບໍ່ວ່າຈະ comapany ໃນຕອນຕົ້ນຂອງສະກຸນເງິນ
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ສະກຸນເງິນໃບບິນຈະຕ້ອງເທົ່າທຽມກັນກັບສະກຸນເງິນຫຼືບັນຊີຝ່າຍບໍ່ວ່າຈະ comapany ໃນຕອນຕົ້ນຂອງສະກຸນເງິນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ອອກຈາກ Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ມັນຈະເປັນແນວໃດເຮັດແນວໃດ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ການຄັງສິນຄ້າ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ທັງຫມົດ Admissions ນັກສຶກສາ
 ,Average Commission Rate,ສະເລ່ຍອັດຕາຄະນະກໍາມະ
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດໄດ້ຮັບການຫມາຍໄວ້ສໍາລັບກໍານົດວັນທີໃນອະນາຄົດ
 DocType: Pricing Rule,Pricing Rule Help,ລາຄາກົດລະບຽບຊ່ວຍເຫລືອ
 DocType: School House,House Name,ຊື່ບ້ານ
 DocType: Purchase Taxes and Charges,Account Head,ຫົວຫນ້າບັນຊີ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ປັບປຸງຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມທີ່ຈະຄິດໄລ່ຄ່າໃຊ້ຈ່າຍລູກຈ້າງຂອງລາຍການລາຍການ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ໄຟຟ້າ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ຕື່ມສ່ວນທີ່ເຫຼືອຂອງອົງການຈັດຕັ້ງຂອງທ່ານເປັນຜູ້ຊົມໃຊ້ຂອງທ່ານ. ນອກນັ້ນທ່ານຍັງສາມາດເພີ່ມເຊື້ອເຊີນລູກຄ້າກັບປະຕູຂອງທ່ານໂດຍການເພີ່ມໃຫ້ເຂົາເຈົ້າຈາກການຕິດຕໍ່
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ຕື່ມສ່ວນທີ່ເຫຼືອຂອງອົງການຈັດຕັ້ງຂອງທ່ານເປັນຜູ້ຊົມໃຊ້ຂອງທ່ານ. ນອກນັ້ນທ່ານຍັງສາມາດເພີ່ມເຊື້ອເຊີນລູກຄ້າກັບປະຕູຂອງທ່ານໂດຍການເພີ່ມໃຫ້ເຂົາເຈົ້າຈາກການຕິດຕໍ່
 DocType: Stock Entry,Total Value Difference (Out - In),ມູນຄ່າຄວາມແຕກຕ່າງ (Out - ໃນ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,ຕິດຕໍ່ກັນ {0}: ອັດຕາແລກປ່ຽນເປັນການບັງຄັບ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID ບໍ່ກໍານົດສໍາລັບພະນັກງານ {0}
@@ -4221,7 +4223,7 @@
 DocType: Item,Customer Code,ລະຫັດລູກຄ້າ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ເຕືອນວັນເດືອນປີເກີດສໍາລັບ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ວັນນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 DocType: Buying Settings,Naming Series,ການຕັ້ງຊື່ Series
 DocType: Leave Block List,Leave Block List Name,ອອກຈາກຊື່ Block ຊີ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ວັນປະກັນໄພ Start ຄວນຈະມີຫນ້ອຍກ່ວາວັນການປະກັນໄພ End
@@ -4236,7 +4238,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
 DocType: Vehicle Log,Odometer,ໄມ
 DocType: Sales Order Item,Ordered Qty,ຄໍາສັ່ງຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen ເກີນ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ໄລຍະເວລາຈາກແລະໄລຍະເວລາມາຮອດປະຈຸບັງຄັບສໍາລັບທີ່ເກີດຂຶ້ນ {0}
@@ -4249,7 +4251,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ຂຽນ Off ຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Sales Invoice Timesheet,Billing Hours,ຊົ່ວໂມງໃນການເກັບເງິນ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM ມາດຕະຖານສໍາລັບການ {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ແຕະລາຍການຈະເພີ່ມໃຫ້ເຂົາເຈົ້າຢູ່ທີ່ນີ້
 DocType: Fees,Program Enrollment,ໂຄງການລົງທະບຽນ
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher ມູນຄ່າທີ່ດິນ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ກະລຸນາຕັ້ງ {0}
@@ -4350,7 +4353,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ຂາຍຍ່ອຍແລະຂາຍສົ່ງ
 DocType: Issue,First Responded On,ຄັ້ງທໍາອິດຕອບຫຼ້າສຸດໂດຍ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross ລາຍການລາຍການໃນຫລາຍກຸ່ມ
-DocType: Grade Interval,Grade Interval,Grade ໄລຍະຫ່າງ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ງົບປະມານປີເລີ່ມວັນແລະງົບປະມານປີສຸດທ້າຍວັນທີ່ກໍານົດໄວ້ແລ້ວໃນປີງົບປະມານ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ການເກັບກູ້ວັນທີ່ປັບປຸງ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ຊຸດ Split
@@ -4359,6 +4361,7 @@
 DocType: Request for Quotation Supplier,Download PDF,ດາວໂຫລດ PDF
 DocType: Production Order,Planned End Date,ການວາງແຜນວັນທີ່ສິ້ນສຸດ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,ບ່ອນທີ່ລາຍການເກັບຮັກສາໄວ້.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; ປະເພດຜະລິດ
 DocType: Request for Quotation,Supplier Detail,ຂໍ້ມູນຈໍາຫນ່າຍ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},ຄວາມຜິດພາດໃນສູດຫຼືສະພາບ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,ຈໍານວນອະນຸ
@@ -4404,7 +4407,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ການຕິດຕັ້ງເວັບໄຊທ໌ງ່າຍດາຍສໍາລັບອົງການຈັດຕັ້ງຂອງຂ້າພະເຈົ້າ
 DocType: Payment Reconciliation,Receivable / Payable Account,Receivable / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,ຕໍ່ສັ່ງຂາຍສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
 DocType: Item,Default Warehouse,ມາດຕະຖານ Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ບັນຊີ Group {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ກະລຸນາເຂົ້າໄປໃນສູນຄ່າໃຊ້ຈ່າຍຂອງພໍ່ແມ່
@@ -4464,7 +4467,7 @@
 ,Items To Be Requested,ລາຍການທີ່ຈະໄດ້ຮັບການຮ້ອງຂໍ
 DocType: Purchase Order,Get Last Purchase Rate,ໄດ້ຮັບຫຼ້າສຸດອັດຕາການຊື້
 DocType: Company,Company Info,ຂໍ້ມູນບໍລິສັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ສູນຕົ້ນທຶນທີ່ຈໍາເປັນຕ້ອງເຂົ້າເອີ້ນຮ້ອງຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ຄໍາຮ້ອງສະຫມັກຂອງກອງທຶນ (ຊັບສິນ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງພະນັກງານນີ້
@@ -4477,13 +4480,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ຢຸດເຊົາການຜູ້ໃຊ້ຈາກການເຮັດໃຫ້ຄໍາຮ້ອງສະຫມັກອອກຈາກໃນມື້ດັ່ງຕໍ່ໄປນີ້.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ການຊື້
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ສະເຫນີລາຄາຜູ້ຜະລິດ {0} ສ້າງ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},ປະລິມານບັນຈຸຕ້ອງເທົ່າກັບປະລິມານສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
 DocType: Production Order,Manufactured Qty,ຜະລິດຕະພັນຈໍານວນ
 DocType: Purchase Receipt Item,Accepted Quantity,ຈໍານວນທີ່ໄດ້ຮັບການ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ບໍ່ໄດ້ຢູ່
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ບໍ່ໄດ້ຢູ່
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ໃບບິນຄ່າໄດ້ຍົກຂຶ້ນມາໃຫ້ກັບລູກຄ້າ.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id ໂຄງການ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ຕິດຕໍ່ກັນບໍ່ໄດ້ຊື້ {0}: ຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ Pending ຈໍານວນຕໍ່ຄ່າໃຊ້ຈ່າຍ {1} ການຮຽກຮ້ອງ. ທີ່ຍັງຄ້າງຈໍານວນເງິນເປັນ {2}
@@ -4492,15 +4495,17 @@
 DocType: Quality Inspection Reading,Reading 3,ອ່ານ 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,ປະເພດ Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
 DocType: Employee Loan Application,Approved,ການອະນຸມັດ
 DocType: Pricing Rule,Price,ລາຄາ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',ພະນັກງານສະບາຍໃຈໃນ {0} ຕ້ອງໄດ້ຮັບການສ້າງຕັ້ງເປັນ &#39;ຊ້າຍ&#39;
 DocType: Guardian,Guardian,ຜູ້ປົກຄອງ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ການປະເມີນ {0} ສ້າງຕັ້ງສໍາລັບພະນັກງານ {1} ໃນຊ່ວງວັນທີ່ໄດ້ຮັບ
 DocType: Employee,Education,ການສຶກສາ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,ຊື່ແຄມເປນໂດຍ
 DocType: Employee,Current Address Is,ທີ່ຢູ່ປັດຈຸບັນແມ່ນ
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ດັດແກ້
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ຖ້າຕ້ອງການ. ກໍານົດກຸນເງິນເລີ່ມຕົ້ນຂອງບໍລິສັດ, ຖ້າຫາກວ່າບໍ່ໄດ້ລະບຸ."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,entries ວາລະສານການບັນຊີ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,ມີຈໍານວນທີ່ຈາກ Warehouse
@@ -4537,7 +4542,7 @@
 DocType: Hub Settings,Hub Settings,ການຕັ້ງຄ່າ Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,ກັບການປະຕິບັດ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries ບັນຊີໄດ້ຮັບການເຮັດໃຫ້ຢູ່ໃນສະກຸນເງິນ {0} ສໍາລັບບໍລິສັດ {1}. ກະລຸນາເລືອກບັນຊີລູກຫນີ້ຫລືເຈົ້າຫນີ້ທີ່ມີສະກຸນເງິນ {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries ບັນຊີໄດ້ຮັບການເຮັດໃຫ້ຢູ່ໃນສະກຸນເງິນ {0} ສໍາລັບບໍລິສັດ {1}. ກະລຸນາເລືອກບັນຊີລູກຫນີ້ຫລືເຈົ້າຫນີ້ທີ່ມີສະກຸນເງິນ {0}.
 DocType: Asset,Is Existing Asset,ແມ່ນທີ່ມີຢູ່ Asset
 DocType: Salary Detail,Statistical Component,Component ສະຖິຕິ
 DocType: Salary Detail,Statistical Component,Component ສະຖິຕິ
@@ -4593,7 +4598,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ຄັດຕິດ Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ລະດັບ Stock
 DocType: Customer,Commission Rate,ອັດຕາຄະນະກໍາມະ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ເຮັດໃຫ້ Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ເຮັດໃຫ້ Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ຄໍາຮ້ອງສະຫມັກ Block ໃບໂດຍພະແນກ.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ປະເພດການຈ່າຍເງິນຕ້ອງເປັນຫນຶ່ງໃນໄດ້ຮັບການ, ການຊໍາລະເງິນແລະພາຍໃນການຖ່າຍໂອນ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ການວິເຄາະ
@@ -4606,6 +4611,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,ອະນຸຍາດໃຫ້ຜະລິດໃນວັນຢຸດ
 DocType: Sales Order,Customer's Purchase Order Date,ຂອງລູກຄ້າສັ່ງຊື້ວັນທີ່
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ນະຄອນຫຼວງ Stock
+DocType: Shopping Cart Settings,Show Public Attachments,ສະແດງ Attachments ສາທາລະນະ
 DocType: Packing Slip,Package Weight Details,Package Details ນ້ໍາຫນັກ
 DocType: Payment Gateway Account,Payment Gateway Account,ການຊໍາລະເງິນບັນຊີ Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ຫຼັງຈາກສໍາເລັດການຊໍາລະເງິນໂອນຜູ້ໃຊ້ຫນ້າທີ່ເລືອກ.
@@ -4630,7 +4636,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ບໍ່ສະແດງໃຫ້ເຫັນສັນຍາລັກເຊັ່ນ: $ etc ໃດຕໍ່ກັບສະກຸນເງິນ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ຄຶ່ງວັນ)
 DocType: Supplier,Credit Days,Days ການປ່ອຍສິນເຊື່ອ
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ເຮັດໃຫ້ກຸ່ມນັກສຶກສາ
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ເຮັດໃຫ້ກຸ່ມນັກສຶກສາ
 DocType: Leave Type,Is Carry Forward,ແມ່ນປະຕິບັດຕໍ່
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ນໍາໄປສູ່ການທີ່ໃຊ້ເວລາວັນ
@@ -4649,8 +4655,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ຈໍານວນເງິນທີ່ຖືກເກືອດຫ້າມ
 DocType: GL Entry,Is Opening,ເປັນການເປີດກວ້າງການ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າເດບິດບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງນໍ້າເບີຊຸດສໍາລັບຜູ້ເຂົ້າຮ່ວມໂດຍຜ່ານການຕິດຕັ້ງ&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງນໍ້າເບີຊຸດສໍາລັບຜູ້ເຂົ້າຮ່ວມໂດຍຜ່ານການຕິດຕັ້ງ&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,ບັນຊີ {0} ບໍ່ມີ
 DocType: Account,Cash,ເງິນສົດ
 DocType: Employee,Short biography for website and other publications.,biography ສັ້ນສໍາລັບເວັບໄຊທ໌ແລະສິ່ງພິມອື່ນໆ.
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 51dbeb2..99a318a 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Serija punktas Galiojimo Būsena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,bankas projektas
 DocType: Mode of Payment Account,Mode of Payment Account,mokėjimo sąskaitos režimas
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Rodyti Variantai
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Rodyti Variantai
 DocType: Academic Term,Academic Term,akademinė terminas
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,medžiaga
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,kiekis
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sveikatos apsauga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delsimas mokėjimo (dienomis)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Paslaugų išlaidų
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,faktūra
 DocType: Maintenance Schedule Item,Periodicity,periodiškumas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Finansiniai metai {0} reikalingas
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,reklaminis
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pati bendrovė yra įrašytas daugiau nei vieną kartą
 DocType: Employee,Married,Vedęs
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Neleidžiama {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Neleidžiama {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Gauk elementus iš
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatymas Darbuotojų vardų sistemos žmogiškųjų išteklių&gt; HR Nustatymai
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prekės {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nėra išvardytus punktus
 DocType: Payment Reconciliation,Reconcile,suderinti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Parduotuvė
 DocType: Quality Inspection Reading,Reading 1,Skaitymas 1
 DocType: Process Payroll,Make Bank Entry,Padaryti Bank įrašą
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensijų fondai
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Kitas Nusidėvėjimas data negali būti prieš perkant data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Kitas Nusidėvėjimas data negali būti prieš perkant data
 DocType: SMS Center,All Sales Person,Visi pardavimo asmuo
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mėnesio pasiskirstymas ** Jums padės platinti biudžeto / target visoje mėnesius, jei turite sezoniškumą savo verslą."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nerasta daiktai
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nerasta daiktai
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Darbo užmokesčio struktūrą Trūksta
 DocType: Lead,Person Name,"asmens vardas, pavardė"
 DocType: Sales Invoice Item,Sales Invoice Item,Pardavimų sąskaita faktūra punktas
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",pvz &quot;pradinė mokykla&quot; arba &quot;Universitetas&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Akcijų ataskaitos
 DocType: Warehouse,Warehouse Detail,Sandėlių detalės
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Kadencijos pabaigos data negali būti vėlesnė nei metų pabaigoje mokslo metų data, iki kurios terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ar Ilgalaikio turto&quot; negali būti nepažymėta, kaip Turto įrašas egzistuoja nuo elemento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ar Ilgalaikio turto&quot; negali būti nepažymėta, kaip Turto įrašas egzistuoja nuo elemento"
 DocType: Vehicle Service,Brake Oil,stabdžių Nafta
 DocType: Tax Rule,Tax Type,mokesčių tipas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jūs nesate įgaliotas pridėti ar atnaujinti įrašus prieš {0}
 DocType: BOM,Item Image (if not slideshow),Prekė vaizdas (jei ne skaidrių)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Klientų egzistuoja to paties pavadinimo
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valandą greičiu / 60) * Tikrasis veikimo laikas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Pasirinkite BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Pasirinkite BOM
 DocType: SMS Log,SMS Log,SMS Prisijungti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Išlaidos pristatyto objekto
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Atostogų į {0} yra ne tarp Nuo datos ir iki šiol
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,klasė
 DocType: Sales Invoice Item,Delivered By Supplier,Paskelbta tiekėjo
 DocType: SMS Center,All Contact,visi Susisiekite
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Gamybos Užsakyti jau sukurtas visų daiktų su BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Gamybos Užsakyti jau sukurtas visų daiktų su BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Metinis atlyginimas
 DocType: Daily Work Summary,Daily Work Summary,Dienos darbo santrauka
 DocType: Period Closing Voucher,Closing Fiscal Year,Uždarius finansinius metus
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} yra sušaldyti
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} yra sušaldyti
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Prašome pasirinkti veikiančią bendrovę kurti sąskaitų planą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Akcijų išlaidos
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pasirinkite Target sandėlis
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,contra įrašas
 DocType: Journal Entry Account,Credit in Company Currency,Kredito įmonėje Valiuta
 DocType: Delivery Note,Installation Status,Įrengimas būsena
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Norite atnaujinti lankomumą? <br> Dovana: {0} \ <br> Nėra: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Priimamos + Atmesta Kiekis turi būti lygi Gauta kiekio punktui {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Tiekimo Žaliavos pirkimas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Bent vienas režimas mokėjimo reikalingas POS sąskaitą.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Bent vienas režimas mokėjimo reikalingas POS sąskaitą.
 DocType: Products Settings,Show Products as a List,Rodyti produktus sąraše
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Atsisiųskite šabloną, užpildykite reikiamus duomenis ir pridėti naują failą. Visos datos ir darbuotojas kombinacija Pasirinkto laikotarpio ateis šabloną, su esamais lankomumo įrašų"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Padaryti nusidėvėjimo įrašą
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,prašymas tipas
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Padaryti Darbuotojas
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Padaryti Darbuotojas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,transliavimas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,vykdymas
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Išsami informacija apie atliktas operacijas.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planas techninės priežiūros apsilankymų.
 DocType: SMS Settings,Enter url parameter for message,Įveskite URL parametrą pranešimą
 DocType: POS Profile,Customer Groups,klientų Grupės
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finansinės ataskaitos
 DocType: Guardian,Students,studentai
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Taikymo taisyklės kainodaros ir nuolaida.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Kainų sąrašas turi būti taikoma perkant ar parduodant
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Avanso suma gali būti ne didesnė kaip {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija sąrašas šio sandorio
 DocType: Company,Default Payroll Payable Account,Numatytasis darbo užmokesčio mokamas paskyra
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Atnaujinti paštas grupė
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Atnaujinti paštas grupė
 DocType: Sales Invoice,Is Opening Entry,Ar atidarymas įrašą
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Nurodyk, jei nestandartinis gautinos sąskaitos taikoma"
 DocType: Course Schedule,Instructor Name,instruktorius Vardas
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Prieš Pardavimų sąskaitos punktas
 ,Production Orders in Progress,Gamybos užsakymai Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Grynieji pinigų srautai iš finansavimo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
 DocType: Lead,Address & Contact,Adresas ir kontaktai
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridėti nepanaudotas lapus iš ankstesnių paskirstymų
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Kitas Pasikartojančios {0} bus sukurta {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Iš viso Sąnaudų suma (per Time lapas)
 DocType: Item Website Specification,Item Website Specification,Prekė svetainė Specifikacija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Palikite Užblokuoti
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Prekė {0} pasiekė savo gyvenimo pabaigos apie {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Prekė {0} pasiekė savo gyvenimo pabaigos apie {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Banko įrašai
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,metinis
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Akcijų Susitaikymas punktas
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Skelbia Hub
 DocType: Student Admission,Student Admission,Studentų Priėmimas
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Prekė {0} atšaukiamas
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Prekė {0} atšaukiamas
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,medžiaga Prašymas
 DocType: Bank Reconciliation,Update Clearance Date,Atnaujinti Sąskaitų data
 DocType: Item,Purchase Details,pirkimo informacija
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Praneškite elektroniniu paštu steigti automatinio Medžiaga Užsisakyti
 DocType: Journal Entry,Multi Currency,Daugiafunkciniai Valiuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Sąskaitos faktūros tipas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Važtaraštis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Važtaraštis
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Įsteigti Mokesčiai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kaina Parduota turto
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Mokėjimo Įrašas buvo pakeistas po to, kai ištraukė ją. Prašome traukti jį dar kartą."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
-DocType: Grade Interval,Min Score,min balas
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Santrauka šią savaitę ir laukiant veikla
 DocType: Student Applicant,Admitted,pripažino
 DocType: Workstation,Rent Cost,nuomos kaina
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Užsakyti Vertė
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bankas / Grynųjų pinigų operacijos nuo šalies arba dėl vidinio pervedimo
 DocType: Shipping Rule,Valid for Countries,Galioja šalių
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Šis punktas yra šablonų ir negali būti naudojamas sandoriams. Elemento atributai bus nukopijuoti į variantai nebent &quot;Ne Kopijuoti&quot; yra nustatytas
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Šis punktas yra šablonų ir negali būti naudojamas sandoriams. Elemento atributai bus nukopijuoti į variantai nebent &quot;Ne Kopijuoti&quot; yra nustatytas
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Viso Užsakyti Laikomas
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Darbuotojų žymėjimas (pvz Vadovas, direktorius ir tt)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Prašome įvesti &quot;Pakartokite Mėnesio diena&quot; lauko reikšmę
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Mokesčio tarifas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau skirta darbuotojo {1} laikotarpiui {2} į {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Pasirinkite punktas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Eilutės # {0}: Serijos Nr turi būti toks pat, kaip {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konvertuoti į ne grupės
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (daug) elemento.
 DocType: C-Form Invoice Detail,Invoice Date,Sąskaitos data
 DocType: GL Entry,Debit Amount,debeto suma
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Gali būti tik 1 sąskaita už Bendrovės {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Gali būti tik 1 sąskaita už Bendrovės {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Žiūrėkite priedą
 DocType: Purchase Order,% Received,% vartojo
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Sukurti studentų grupių
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Užklausimas
 DocType: Salary Slip Timesheet,Working Hours,Darbo valandos
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Pakeisti pradinį / trumpalaikiai eilės numerį esamo serijos.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Sukurti naują klientų
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Sukurti naują klientų
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jei ir toliau vyrauja daug kainodaros taisyklės, vartotojai, prašoma, kad prioritetas rankiniu būdu išspręsti konfliktą."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Sukurti Pirkimų užsakymus
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Sukurti Pirkimų užsakymus
 ,Purchase Register,pirkimo Registruotis
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Taikomi Mokesčiai
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global nustatymai visus gamybos procesus.
 DocType: Accounts Settings,Accounts Frozen Upto,Sąskaitos Šaldyti upto
 DocType: SMS Log,Sent On,išsiųstas
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
 DocType: HR Settings,Employee record is created using selected field. ,Darbuotojų įrašas sukurtas naudojant pasirinktą lauką.
 DocType: Sales Order,Not Applicable,Netaikoma
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Atostogų meistras.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Nuo paketas Nr
 DocType: Item Attribute,To Range,Norėdami Diapazonas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vertybiniai popieriai ir užstatai
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nepavyksta pakeisti vertinimo metodą, nes yra sandoriai prieš kai daiktų kuri neturi tai savo vertinimo metodas"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,skiriamos viso lapai yra privalomi
 DocType: Job Opening,Description of a Job Opening,Aprašymas apie Darbo skelbimai
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kol veikla šiandien
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prašome įvesti sandėlis, kuris bus iškeltas Medžiaga Prašymas"
 DocType: Production Order,Additional Operating Cost,Papildoma eksploatavimo išlaidos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Sujungti, šie savybės turi būti tokios pačios tiek daiktų"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Sujungti, šie savybės turi būti tokios pačios tiek daiktų"
 DocType: Shipping Rule,Net Weight,Grynas svoris
 DocType: Employee,Emergency Phone,avarinis telefonas
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,nupirkti
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Prašome apibrėžti kokybės už slenksčio 0%
 DocType: Sales Order,To Deliver,Pristatyti
 DocType: Purchase Invoice Item,Item,punktas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Skirtumas (dr - Cr)
 DocType: Account,Profit and Loss,Pelnas ir nuostoliai
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,valdymas Subranga
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Įrengimas Pastaba Prekė
 DocType: Production Plan Item,Pending Qty,Kol Kiekis
 DocType: Budget,Ignore,ignoruoti
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} is not active
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} is not active
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS siunčiami šiais numeriais: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Sąranka patikrinti matmenys spausdinti
 DocType: Salary Slip,Salary Slip Timesheet,Pajamos Kuponas Lapą
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Iš viso Komisija
 DocType: Pricing Rule,Sales Partner,Partneriai pardavimo
 DocType: Buying Settings,Purchase Receipt Required,Pirkimo kvito Reikalinga
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Vertinimo rodiklis yra privalomas, jei atidarymas sandėlyje įvesta"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Vertinimo rodiklis yra privalomas, jei atidarymas sandėlyje įvesta"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,rasti sąskaitos faktūros lentelės Nėra įrašų
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Prašome pasirinkti bendrovė ir šalies tipo pirmas
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finansų / apskaitos metus.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,sukauptos vertybės
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atsiprašome, Eilės Nr negali būti sujungtos"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Padaryti pardavimo užsakymų
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Padaryti pardavimo užsakymų
 DocType: Project Task,Project Task,Projektų Užduotis
 ,Lead Id,Švinas ID
 DocType: C-Form Invoice Detail,Grand Total,Bendra suma
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,Gyvenimo Priedas
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Pakartokite Klientai
 DocType: Leave Control Panel,Allocate,paskirstyti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,pardavimų Grįžti
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,pardavimų Grįžti
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Pastaba: Iš viso skiriami lapai {0} turi būti ne mažesnis nei jau patvirtintų lapų {1} laikotarpiui
 DocType: Announcement,Posted By,Paskelbtas
 DocType: Item,Delivered by Supplier (Drop Ship),Paskelbta tiekėjo (Drop Ship)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,citatos
 DocType: Lead,Middle Income,vidutines pajamas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Anga (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Paskirti suma negali būti neigiama
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Prašome nurodyti Bendrovei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Prašome nurodyti Bendrovei
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pardavimų sąskaita faktūra Lapą
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nuorodos Nr &amp; nuoroda data reikalingas {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Pasirinkite mokėjimo sąskaitos, kad bankų įėjimo"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Sukurti darbuotojams įrašus valdyti lapai, išlaidų paraiškos ir darbo užmokesčio"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Sukurti darbuotojams įrašus valdyti lapai, išlaidų paraiškos ir darbo užmokesčio"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Pridėti į žinių bazės
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pasiūlymas rašymas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Mokėjimo Įėjimo išskaičiavimas
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Ryšys su Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,vadybininkas
 DocType: Payment Entry,Payment From / To,Mokėjimo Nuo / Iki
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Data asortimentas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nauja kredito limitas yra mažesnis nei dabartinio nesumokėtos sumos klientui. Kredito limitas turi būti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nauja kredito limitas yra mažesnis nei dabartinio nesumokėtos sumos klientui. Kredito limitas turi būti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Tas pats daiktas buvo įvesta kelis kartus.
 DocType: SMS Settings,Receiver Parameter,imtuvas Parametras
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Remiantis&quot; ir &quot;grupę&quot; negali būti tas pats
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,geba data
 DocType: Student Batch Name,Batch Name,Serija Vardas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Lapą sukurta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,įrašyti
 DocType: Selling Settings,Customer Naming By,Klientų įvardijimas Iki
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Parodys studentą kaip pristatyti Studentų Mėnesio Lankomumas ataskaitos
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,Studentų dalyvavimas
 DocType: Sales Invoice Timesheet,Time Sheet,laikas lapas
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Žaliavos remiantis
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Prašome įvesti Išsamesnė informacija
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Prašome įvesti Išsamesnė informacija
 DocType: Interest,Interest,palūkanos
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Pardavimai
 DocType: Purchase Receipt,Other Details,Kitos detalės
@@ -739,7 +742,7 @@
 ,Absent Student Report,Nėra studento ataskaitos
 DocType: Email Digest,Next email will be sent on:,Kitas laiškas bus išsiųstas į:
 DocType: Offer Letter Term,Offer Letter Term,Laiško su pasiūlymu terminas
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Prekė turi variantus.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Prekė turi variantus.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Prekė {0} nerastas
 DocType: Bin,Stock Value,vertybinių popierių kaina
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Įmonės {0} neegzistuoja
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,Garantija Galiojimo data
 DocType: Material Request Item,Quantity and Warehouse,Kiekis ir sandėliavimo
 DocType: Sales Invoice,Commission Rate (%),Komisija tarifas (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nurodyti Pavadinimų serijos {0} per Sąranka&gt; Parametrai&gt; Webdesign Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nurodyti Pavadinimų serijos {0} per Sąranka&gt; Parametrai&gt; Webdesign Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Prašome pasirinkti programą
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Prašome pasirinkti programą
 DocType: Project,Estimated Cost,Numatoma kaina
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nėra sandėlyje punktas
 DocType: Mode of Payment Account,Default Account,numatytoji paskyra
 DocType: Payment Entry,Received Amount (Company Currency),Gautos sumos (Įmonės valiuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Švinas turi būti nustatyti, jei galimybės yra pagamintas iš švino"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Švinas turi būti nustatyti, jei galimybės yra pagamintas iš švino"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Prašome pasirinkti savaitę nuo dieną
 DocType: Production Order Operation,Planned End Time,Planuojamas Pabaigos laikas
 ,Sales Person Target Variance Item Group-Wise,Pardavimų Asmuo Tikslinė Dispersija punktas grupė-Išminčius
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Kainų sąrašas nepasirinkote
 DocType: Employee,Family Background,šeimos faktai
 DocType: Request for Quotation Supplier,Send Email,Siųsti laišką
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nėra leidimo
 DocType: Company,Default Bank Account,Numatytasis banko sąskaitos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtruoti remiantis partijos, pasirinkite Šalis Įveskite pirmą"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nėra darbuotojas nerasta
 DocType: Supplier Quotation,Stopped,sustabdyta
 DocType: Item,If subcontracted to a vendor,Jei subrangos sutartį pardavėjas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
 DocType: SMS Center,All Customer Contact,Viskas Klientų Susisiekite
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Įkelti akcijų likutį naudodami CSV.
 DocType: Warehouse,Tree Details,medis detalės
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalus sąskaitos faktūros suma
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kaina centras {2} nepriklauso Company {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Sąskaitos {2} negali būti Grupė
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prekė eilutė {IDX}: {DOCTYPE} {DOCNAME} neegzistuoja viršaus &quot;{DOCTYPE}&quot; stalo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prekė eilutė {IDX}: {DOCTYPE} {DOCNAME} neegzistuoja viršaus &quot;{DOCTYPE}&quot; stalo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,nėra užduotys
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mėnesio diena, kurią bus sukurta pvz 05, 28 ir tt automatinis sąskaitos faktūros"
 DocType: Asset,Opening Accumulated Depreciation,Atidarymo sukauptas nusidėvėjimas
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Balsuok
 DocType: Production Planning Tool,Select Items,pasirinkite prekę
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} prieš Bill {1} {2} data
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Žinoma Tvarkaraštis
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Žinoma Tvarkaraštis
 DocType: Maintenance Visit,Completion Status,užbaigimo būsena
 DocType: HR Settings,Enter retirement age in years,Įveskite pensinį amžių metais
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Tikslinė sandėlis
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Leisti per pristatymą ar gavimo net iki šio proc
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,importas Lankomumas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Visi punktas Grupės
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Visi punktas Grupės
 DocType: Process Payroll,Activity Log,veiklos žurnalas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Grynasis pelnas / nuostolis
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatiškai kurti pranešimą pateikus sandorius.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Pirkimo užsakymas su mokėjimo
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,"prognozuojama, Kiekis"
 DocType: Sales Invoice,Payment Due Date,Sumokėti iki
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Prekė variantas {0} jau egzistuoja su tais pačiais atributais
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Prekė variantas {0} jau egzistuoja su tais pačiais atributais
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Atidarymas&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atidarykite daryti
 DocType: Notification Control,Delivery Note Message,Važtaraštis pranešimas
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re Užsakomas kiekis
 DocType: Leave Block List Date,Leave Block List Date,Palikite Blokuoti sąrašą data
 DocType: Pricing Rule,Price or Discount,Kaina arba nuolaida
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Iš viso taikomi mokesčiai į pirkimo kvito sumų lentelė turi būti tokios pačios kaip viso mokesčių ir rinkliavų
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Iš viso taikomi mokesčiai į pirkimo kvito sumų lentelė turi būti tokios pačios kaip viso mokesčių ir rinkliavų
 DocType: Sales Team,Incentives,paskatos
 DocType: SMS Log,Requested Numbers,Pageidaujami numeriai
 DocType: Production Planning Tool,Only Obtain Raw Materials,Gauti tik žaliavų panaudojimas
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,Numatytieji mokėtinų sumų
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbuotojų {0} is not active arba neegzistuoja
 DocType: Fee Structure,Components,komponentai
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
 DocType: Quality Inspection Reading,Reading 6,Skaitymas 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkimo faktūros Advance
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Eilutės {0}: Mokėjimo prieš pirkimo / pardavimo ordino visada turi būti pažymėtas kaip anksto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,cheminis
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Numatytasis Bankas / Pinigų sąskaita bus automatiškai atnaujinta užmokesčių žurnalo įrašą, kai pasirinktas šis būdas."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Už Įvertinimas kodekso intervalai {0} sutampa su klasės intervalais kitų klasių. Prašome patikrinti intervalai {0} ir {1} ir bandykite dar kartą
 DocType: BOM,Raw Material Cost(Company Currency),Žaliavų kaina (Įmonės valiuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Visos prekės jau buvo pervestos šios produkcijos įsakymu.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Eilutė # {0}: Įvertinti gali būti ne didesnis nei naudotu dydžiu {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM svetainė punktas
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Įkelti savo laiške galvą ir logotipą. (Galite redaguoti juos vėliau).
 DocType: Timesheet Detail,Bill,sąskaita
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Kitas Nusidėvėjimas data yra įvesta kaip praeities datos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Kitas Nusidėvėjimas data yra įvesta kaip praeities datos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,baltas
 DocType: SMS Center,All Lead (Open),Visi švinas (Atviras)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Eilutės {0}: Kiekis neprieinama {4} sandėlyje {1} ne komandiruotės laiką įrašo ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Pavedimo tipas turi būti vienas iš {0}
 DocType: Lead,Next Contact Date,Kitas Kontaktinė data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,atidarymo Kiekis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
 DocType: Student Batch Name,Student Batch Name,Studentų Serija Vardas
 DocType: Holiday List,Holiday List Name,Atostogų sąrašas Vardas
 DocType: Repayment Schedule,Balance Loan Amount,Balansas Paskolos suma
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Nurodykite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,"Pašalinti elementai, be jokių kiekio ar vertės pokyčius."
 DocType: Delivery Note,Delivery To,Pristatyti
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Įgūdis lentelė yra privalomi
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Įgūdis lentelė yra privalomi
 DocType: Production Planning Tool,Get Sales Orders,Gauk pardavimo užsakymus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negali būti neigiamas
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Nuolaida
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Nuolaida
 DocType: Asset,Total Number of Depreciations,Viso nuvertinimai
 DocType: Sales Invoice Item,Rate With Margin,Norma atsargos
 DocType: Sales Invoice Item,Rate With Margin,Norma atsargos
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,Organizacijos pavadinimas
 DocType: Tax Rule,Shipping State,Pristatymas valstybė
 ,Projected Quantity as Source,"Prognozuojama, Kiekis, kaip šaltinį"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Prekė turi būti pridėta naudojant &quot;gauti prekes nuo pirkimo kvitus&quot; mygtuką
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Prekė turi būti pridėta naudojant &quot;gauti prekes nuo pirkimo kvitus&quot; mygtuką
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Įtraukti ne atsargos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,pardavimų sąnaudos
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,prieš
 DocType: Item,Default Selling Cost Center,Numatytasis Parduodami Kaina centras
 DocType: Sales Partner,Implementation Partner,įgyvendinimas partneriu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Pašto kodas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Pašto kodas
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
 DocType: Opportunity,Contact Info,Kontaktinė informacija
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Padaryti atsargų papildymams
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,skirstytuvas
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Krepšelis Pristatymas taisyklė
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Gamybos Užsakyti {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Prašome nustatyti &quot;Taikyti papildomą nuolaidą On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Prašome nustatyti &quot;Taikyti papildomą nuolaidą On&quot;
 ,Ordered Items To Be Billed,Užsakytas prekes Norėdami būti mokami
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Iš klasės turi būti mažesnis nei svyruoja
 DocType: Global Defaults,Global Defaults,Global Numatytasis
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Prašome įvesti Prekės kodas gauti SERIJOS NUMERIS
 DocType: Stock Settings,Default Item Group,Numatytasis Elementas Grupė
 DocType: Employee Loan,Partially Disbursed,dalinai Išmokėta
-DocType: Grading Structure,Grading System Name,Vertinimo sistemą Vardas
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tiekėjas duomenų bazę.
 DocType: Account,Balance Sheet,Balanso lapas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mokėjimo būdas yra neužpildė. Prašome patikrinti, ar sąskaita buvo nustatytas mokėjimų Mode arba POS profilis."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mokėjimo būdas yra neužpildė. Prašome patikrinti, ar sąskaita buvo nustatytas mokėjimų Mode arba POS profilis."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Jūsų pardavimų asmuo bus gauti priminimą šią dieną kreiptis į klientų
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Tas pats daiktas negali būti įrašytas kelis kartus.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daugiau sąskaitos gali būti grupėse, tačiau įrašai gali būti pareikštas ne grupės"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Darbas pabaigtas
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Prašome nurodyti bent vieną atributą Atributų lentelės
 DocType: Announcement,All Students,Visi studentai
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Prekė {0} turi būti ne akcijų punktas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Prekė {0} turi būti ne akcijų punktas
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Peržiūrėti Ledgeris
 DocType: Grading Scale,Intervals,intervalai
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Seniausi
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Studentų Mobilus Ne
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Likęs pasaulis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Naudodami {0} punktas negali turėti Serija
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Neregistruota redaguoti įšaldytą sąskaitą {0}
 DocType: Journal Entry,Get Outstanding Invoices,Gauk neapmokėtų sąskaitų faktūrų
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Pirkimo pavedimai padės jums planuoti ir sekti savo pirkimų
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Pirkimo pavedimai padės jums planuoti ir sekti savo pirkimų
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Bendras išdavimas / Pervežimas kiekis {0} Krovimas Užsisakyti {1} \ negali būti didesnis nei prašomo kiekio {2} už prekę {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,mažas
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sinchronizavimo Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Savo produktus ar paslaugas
 DocType: Mode of Payment,Mode of Payment,mokėjimo būdas
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
 DocType: Student Applicant,AP,A.
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tai yra šaknis punktas grupė ir negali būti pakeisti.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Grupė salė Taškų
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Dėl {0} tik kredito sąskaitos gali būti susijęs su kitos debeto įrašą
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bendras visų užduočių svoriai turėtų būti 1. Prašome reguliuoti svareliai visų projekto užduotis atitinkamai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Prekė {0} turi būti Prekė pagal subrangos sutartis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,kapitalo įranga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Kainodaros taisyklė pirmiausia atrenkami remiantis &quot;Taikyti&quot; srityje, kuris gali būti punktas, punktas Grupė ar prekės ženklą."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,žurnalo įrašą
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elementų pažangą
 DocType: Workstation,Workstation Name,Kompiuterizuotos darbo vietos Vardas
-DocType: Grade Interval,Grade Code,Įvertinimas kodas
+DocType: Grading Scale Interval,Grade Code,Įvertinimas kodas
 DocType: POS Item Group,POS Item Group,POS punktas grupė
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Siųskite Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,techninė įranga
 DocType: Sales Order,Recurring Upto,pasikartojančios upto
 DocType: Attendance,HR Manager,Žmogiškųjų išteklių vadybininkas
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Prašome pasirinkti įmonę,"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Prašome pasirinkti įmonę,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,privilegija atostogos
 DocType: Purchase Invoice,Supplier Invoice Date,Tiekėjas sąskaitos faktūros išrašymo data
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Jums reikia įgalinti Prekių krepšelis
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,maistas
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Senėjimas klasės 3
 DocType: Maintenance Schedule Item,No of Visits,Nėra apsilankymų
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Pažymėti Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Pažymėti Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Techninės priežiūros grafikas {0} egzistuoja nuo {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,mokosi studentas
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valiuta uždarymo sąskaita turi būti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma kiekis visų tikslų turėtų būti 100. Tai {0}
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Sąskaitų planas
 DocType: Material Request,Terms and Conditions Content,Terminai ir sąlygos turinys
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,negali būti didesnis nei 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
 DocType: Maintenance Visit,Unscheduled,Neplanuotai
 DocType: Employee,Owned,priklauso
 DocType: Salary Detail,Depends on Leave Without Pay,Priklauso nuo atostogų be Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Kuo didesnis skaičius, didesnis prioritetas"
 ,Purchase Invoice Trends,Pirkimo faktūros tendencijos
 DocType: Employee,Better Prospects,Geresnės perspektyvos
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Eilutė # {0}: Partija {1} turi tik {2} vnt. Prašome pasirinkti kitą partiją, kuri turi gauti {3} Kiekis arba padalinti eilutę į kelias eilutes, pristatyti / problemą iš kelių partijų"
 DocType: Vehicle,License Plate,Valstybinis numeris
 DocType: Appraisal,Goals,Tikslai
 DocType: Warranty Claim,Warranty / AMC Status,Garantija / AMC Būsena
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbuotojas negali pranešti pats.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jei sąskaita yra sušaldyti, įrašai leidžiama ribojamų vartotojams."
 DocType: Email Digest,Bank Balance,banko balansas
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Apskaitos įrašas už {0}: {1} galima tik valiuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Apskaitos įrašas už {0}: {1} galima tik valiuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Darbo profilis, reikalingas kvalifikacijos ir tt"
 DocType: Journal Entry Account,Account Balance,Sąskaitos balansas
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Mokesčių taisyklė sandorius.
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Rodyti Atvirų fiskalinius metus anketa P &amp; L likučius
 DocType: Shipping Rule,Shipping Account,Pristatymas paskyra
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Sąskaitos {2} yra neaktyvus
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Padaryti pardavimo užsakymus, siekiant padėti jums planuoti savo darbą ir įgyvendinti laiku"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Padaryti pardavimo užsakymus, siekiant padėti jums planuoti savo darbą ir įgyvendinti laiku"
 DocType: Quality Inspection,Readings,Skaitiniai
 DocType: Stock Entry,Total Additional Costs,Iš viso papildomų išlaidų
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,Vertinti
 DocType: Asset Movement,Stock Manager,akcijų direktorius
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Šaltinis sandėlis yra privalomas eilės {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakavimo lapelis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Pakavimo lapelis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Biuro nuoma
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Sąranka SMS Gateway nustatymai
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importas Nepavyko!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,šaltinis
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rodyti uždarytas
 DocType: Leave Type,Is Leave Without Pay,Ar palikti be Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,rasti Mokėjimo stalo Nėra įrašų
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Šis {0} prieštarauja {1} ir {2} {3}
 DocType: Student Attendance Tool,Students HTML,studentai HTML
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,Data Palikus
 DocType: Pricing Rule,For Price List,Kaina sąrašas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Sukurti leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Sukurti leads
 DocType: Maintenance Schedule,Schedules,tvarkaraščiai
 DocType: Purchase Invoice Item,Net Amount,Grynoji suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Išsamiau Nėra
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,programa mokinių
 DocType: Sales Invoice Item,Brand Name,Markės pavadinimas
 DocType: Purchase Receipt,Transporter Details,Transporter detalės
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Dėžė
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,galimas Tiekėjas
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,svarstymą 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Numatytąją BOM už {0} ne projekto rasti {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Ieškiniai dėl įmonės sąskaita.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studentai ne sistemos širdyje, pridėti visus savo mokinius"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studentai ne sistemos širdyje, pridėti visus savo mokinius"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Eilutės # {0} klirensas data {1} negali būti prieš čekis data {2}
 DocType: Company,Default Holiday List,Numatytasis poilsis sąrašas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Eilutės {0}: Nuo laiką ir Laikas {1} iš dalies sutampa su {2}
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dieną (-os), kada prašote atostogų yra šventės. Jums nereikia prašyti atostogų."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Persiųsti Mokėjimo paštu
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nauja užduotis
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Padaryti Citata
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Padaryti Citata
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Kiti pranešimai
 DocType: Dependent Task,Dependent Task,priklauso nuo darbo
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijos koeficientas pagal nutylėjimą Matavimo vienetas turi būti 1 eilės {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijos koeficientas pagal nutylėjimą Matavimo vienetas turi būti 1 eilės {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Atostogos tipo {0} negali būti ilgesnis nei {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pabandykite planuoja operacijas X dienų iš anksto.
 DocType: HR Settings,Stop Birthday Reminders,Sustabdyti Gimimo diena Priminimai
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Prašome Set Default Darbo užmokesčio MOKĖTINOS Narystė Bendrovėje {0}
 DocType: SMS Center,Receiver List,imtuvas sąrašas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Paieška punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Paieška punktas
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,suvartoti suma
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Grynasis Pakeisti pinigais
 DocType: Assessment Plan,Grading Scale,vertinimo skalė
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Matavimo vienetas {0} buvo įrašytas daugiau nei vieną kartą konversijos koeficientas lentelėje
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Matavimo vienetas {0} buvo įrašytas daugiau nei vieną kartą konversijos koeficientas lentelėje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jau baigtas
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Mokėjimo prašymas jau yra {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kaina išduotą prekės
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,rinkti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Prieš tiekėjo sąskaitoje {0} data {1}
 DocType: Customer,Default Price List,Numatytasis Kainų sąrašas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs negalite trinti finansiniai metai {0}. Finansiniai metai {0} yra numatytoji Global Settings
 DocType: Journal Entry,Entry Type,įrašo tipas
 ,Customer Credit Balance,Klientų kredito likučio
@@ -1686,8 +1685,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studijos pačiu instituto
 DocType: Territory,Territory Manager,teritorija direktorius
 DocType: Packed Item,To Warehouse (Optional),Į sandėlį (neprivalomas)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekė grupė&gt; Mascus Prekės Ženklo
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekė grupė&gt; Mascus Prekės Ženklo
 DocType: Payment Entry,Paid Amount (Company Currency),Mokama suma (Įmonės valiuta)
 DocType: Purchase Invoice,Additional Discount,Papildoma nuolaida
 DocType: Selling Settings,Selling Settings,parduoda Nustatymai
@@ -1697,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Žiūrėti krepšelį
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,rinkodaros išlaidos
 ,Item Shortage Report,Prekė trūkumas ataskaita
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",Svoris paminėta \ nLūdzu paminėti &quot;Svoris UOM&quot; per
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",Svoris paminėta \ nLūdzu paminėti &quot;Svoris UOM&quot; per
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Medžiaga Prašymas naudojamas, kad šių išteklių įrašas"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Kitas Nusidėvėjimas data yra privalomas naujo turto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Kitas Nusidėvėjimas data yra privalomas naujo turto
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atskiras kursas grindžiamas grupė kiekvieną partiją
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atskiras kursas grindžiamas grupė kiekvieną partiją
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Vieno vieneto elementą.
@@ -1716,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kaina centras yra reikalingas &quot;Pelno ir nuostolio&quot; sąskaitos {2}. Prašome įkurti numatytąją sąnaudų centro bendrovei.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Klientų grupė egzistuoja to paties pavadinimo prašome pakeisti kliento vardą arba pervardyti klientų grupei
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Klientų grupė egzistuoja to paties pavadinimo prašome pakeisti kliento vardą arba pervardyti klientų grupei
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,nauja Susisiekite
 DocType: Territory,Parent Territory,tėvų teritorija
 DocType: Quality Inspection Reading,Reading 2,Skaitymas 2
@@ -1745,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,susitaikymas JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Per daug stulpelių. Eksportuoti ataskaitą ir jį atspausdinti naudojant skaičiuoklės programą.
 DocType: Purchase Invoice Item,Batch No,Serijos Nr
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nepavyko rasti keitimo kursą {0} ir {1} pagrindiniams datos {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leisti kelis pardavimų užsakymų prieš Kliento Užsakymo
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobilus Nėra
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,pagrindinis
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variantas
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,pagrindinis
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variantas
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nustatyti priešdėlis numeracijos seriją apie sandorius savo
 DocType: Employee Attendance Tool,Employees HTML,darbuotojai HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Numatytasis BOM ({0}) turi būti aktyvus šią prekę ar jo šabloną
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Numatytasis BOM ({0}) turi būti aktyvus šią prekę ar jo šabloną
 DocType: Employee,Leave Encashed?,Palikite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Galimybė Nuo srityje yra privalomas
 DocType: Email Digest,Annual Expenses,metinės išlaidos
 DocType: Item,Variants,variantai
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Padaryti pirkinių užsakymą
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Padaryti pirkinių užsakymą
 DocType: SMS Center,Send To,siųsti
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nėra pakankamai atostogos balansas Palikti tipas {0}
 DocType: Payment Reconciliation Payment,Allocated amount,skirtos sumos
@@ -1779,7 +1773,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vertinimai
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serijos Nr įvestas punkte {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sąlyga laivybos taisyklės
-DocType: Grading Structure,Grading Intervals,klasifikavimo intervalai
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prašome įvesti
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Negali overbill už prekę {0} iš eilės {1} daugiau nei {2}. Leisti per lpi, prašome nustatyti Ieško Nustatymai"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Prašome nustatyti filtrą remiantis punktą arba sandėlyje
@@ -1792,16 +1785,17 @@
 DocType: Authorization Control,Authorization Control,autorizacija Valdymo
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Eilutės # {0}: Atmesta Sandėlis yra privalomas prieš atmetė punkte {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,mokėjimas
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Tvarkykite savo užsakymus
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Tvarkykite savo užsakymus
 DocType: Production Order Operation,Actual Time and Cost,Tikrasis Laikas ir kaina
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Medžiaga Prašymas maksimalių {0} galima už prekę {1} prieš Pardavimų ordino {2}
 DocType: Employee,Salutation,pasveikinimas
 DocType: Course,Course Abbreviation,Žinoma santrumpa
 DocType: Student Leave Application,Student Leave Application,Studentų atostogos taikymas
 DocType: Item,Will also apply for variants,Bus taikoma variantų
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbuotojų {0} pusę dienos {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Iš viso darbo valandų turi būti ne didesnis nei maks darbo valandų {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,apie
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Rinkinys daiktų metu pardavimas.
 DocType: Quotation Item,Actual Qty,Tikrasis Kiekis
 DocType: Sales Invoice Item,References,Nuorodos
@@ -1811,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Jūs įvedėte pasikartojančius elementus. Prašome ištaisyti ir bandykite dar kartą.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Bendradarbis
 DocType: Asset Movement,Asset Movement,turto judėjimas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nauja krepšelį
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,nauja krepšelį
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Prekė {0} nėra išspausdintas punktas
 DocType: SMS Center,Create Receiver List,Sukurti imtuvas sąrašas
 DocType: Vehicle,Wheels,ratai
@@ -1843,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Išjungia kūrimą laiko rąstų prieš Gamybos užsakymus. Veikla neturi būti stebimi nuo gamybos ordino
 DocType: Student,Student Mobile Number,Studentų Mobilusis Telefonas Numeris
 DocType: Item,Has Variants,turi variantams
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Pavadinimas Mėnesio pasiskirstymas
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID privalomi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID privalomi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID privalomi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID privalomi
 DocType: Sales Person,Parent Sales Person,Tėvų pardavimų asmuo
 DocType: Purchase Invoice,Recurring Invoice,pasikartojančios Sąskaita
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,projektų valdymas
@@ -1854,7 +1848,7 @@
 DocType: Budget,Fiscal Year,Fiskaliniai metai
 DocType: Vehicle Log,Fuel Price,kuro Kaina
 DocType: Budget,Budget,biudžetas
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Biudžetas negali būti skiriamas prieš {0}, nes tai ne pajamos ar sąnaudos sąskaita"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,pasiektas
 DocType: Student Admission,Application Form Route,Prašymo forma Vartojimo būdas
@@ -1885,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Suma {0} {1} išskaičiuota nuo {2}
 DocType: Employee,Salary Information,Pajamos Informacija
 DocType: Sales Person,Name and Employee ID,Vardas ir darbuotojo ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
 DocType: Website Item Group,Website Item Group,Interneto svetainė punktas grupė
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Muitai ir mokesčiai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Prašome įvesti Atskaitos data
@@ -1944,7 +1938,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Pakartokite Klientų pajamos
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) turi vaidmenį &quot;sąskaita patvirtinusio&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pora
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
 DocType: Asset,Depreciation Schedule,Nusidėvėjimas Tvarkaraštis
 DocType: Bank Reconciliation Detail,Against Account,prieš sąskaita
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pusė dienos data turi būti tarp Nuo datos ir iki šiol
@@ -1961,13 +1955,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
 ,Quotation Trends,Kainų tendencijos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Prekė Grupė nepaminėta prekės šeimininkui už prekę {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
 DocType: Shipping Rule Condition,Shipping Amount,Pristatymas suma
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,kol suma
 DocType: Purchase Invoice Item,Conversion Factor,konversijos koeficientas
 DocType: Purchase Order,Delivered,Pristatyta
 ,Vehicle Expenses,Transporto išlaidos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
+DocType: Serial No,Invoice Details,informacija apie sąskaitą
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
 DocType: Purchase Receipt,Vehicle Number,Automobilio numeris
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Data, kada bus sustabdyti kartojasi sąskaita"
 DocType: Employee Loan,Loan Amount,Paskolos suma
@@ -1991,7 +1986,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Papildoma Nuolaida suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
 DocType: Leave Block List Allow,Leave Block List Allow,Palikite Blokuoti sąrašas Leisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupė ne grupės
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sporto
 DocType: Loan Type,Loan Name,paskolos Vardas
@@ -2003,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Sandėlis, kuriame jūs išlaikyti atsargų atmestų daiktų"
 DocType: Production Order,Skip Material Transfer,Pereiti medžiagos pernešimas
 DocType: Production Order,Skip Material Transfer,Pereiti medžiagos pernešimas
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Negali rasti keitimo kursą {0}, kad {1} rakto dienos {2}. Prašome sukurti valiutos keitykla įrašą rankiniu būdu"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Jūsų finansiniai metai baigiasi
 DocType: POS Profile,Price List,Kainoraštis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} dabar numatytasis finansinius metus. Prašome atnaujinti savo naršyklę pakeitimas įsigaliotų.
@@ -2040,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Prekė {0} jau grįžo
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Finansiniai metai ** reiškia finansinius metus. Visi apskaitos įrašai ir kiti pagrindiniai sandoriai yra stebimi nuo ** finansiniams metams **.
 DocType: Opportunity,Customer / Lead Address,Klientas / Švino Adresas
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
 DocType: Student Admission,Eligibility,Tinkamumas
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Laidai padėti jums gauti verslo, pridėti visus savo kontaktus ir daugiau kaip jūsų laidų"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Laidai padėti jums gauti verslo, pridėti visus savo kontaktus ir daugiau kaip jūsų laidų"
 DocType: Production Order Operation,Actual Operation Time,Tikrasis veikimo laikas
 DocType: Authorization Rule,Applicable To (User),Taikoma (Vartotojas)
 DocType: Purchase Taxes and Charges,Deduct,atskaityti
@@ -2083,7 +2079,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Pasirinkite bendrovė ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Palikite tuščią, jei manoma, skirtų visiems departamentams"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipai darbo (nuolatinis, sutarčių, vidaus ir kt.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
 DocType: Process Payroll,Fortnightly,kas dvi savaitės
 DocType: Currency Exchange,From Currency,nuo valiuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prašome pasirinkti skirtos sumos, sąskaitos faktūros tipas ir sąskaitos numerį atleast vienoje eilėje"
@@ -2099,7 +2095,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Negalima pasirinkti įkrovimo tipas, kaip &quot;Dėl ankstesnės eilės Suma&quot; arba &quot;Dėl ankstesnės eilės Total&quot; už pirmoje eilutėje"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Vaikų punktas neturėtų būti Prekės paketas. Prašome pašalinti elementą `{0}` ir sutaupyti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bankinis
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Įdėti laiko apskaitos žiniaraščiai
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Įdėti laiko apskaitos žiniaraščiai
 DocType: Vehicle Service,Service Item,Paslaugų punktas
 DocType: Bank Guarantee,Bank Guarantee,Banko garantija
 DocType: Bank Guarantee,Bank Guarantee,Banko garantija
@@ -2149,8 +2145,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Kainos nebus rodomas, jei Kainų sąrašas nenustatytas"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Prašome nurodyti šalį šio Pristatymo taisyklės arba patikrinti pasaulio Pristatymas
 DocType: Stock Entry,Total Incoming Value,Iš viso Priimamojo Vertė
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debeto reikalingas
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debeto reikalingas
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkimo Kainų sąrašas
 DocType: Offer Letter Term,Offer Term,Siūlau terminas
 DocType: Quality Inspection,Quality Manager,Kokybės vadybininkas
@@ -2184,14 +2180,14 @@
 DocType: Opportunity,Lost Reason,Pamiršote Priežastis
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Naujas adresas
 DocType: Quality Inspection,Sample Size,imties dydis
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Prašome įvesti Gavimas dokumentą
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Visos prekės jau išrašyta sąskaita
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Prašome įvesti Gavimas dokumentą
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Visos prekės jau išrašyta sąskaita
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Nurodykite tinkamą &quot;Nuo byloje Nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daugiau kaštų centrai gali būti grupėse, tačiau įrašai gali būti pareikštas ne grupės"
 DocType: Project,External,išorinis
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Vartotojai ir leidimai
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Gamybos užsakymų Sukurta: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Gamybos užsakymų Sukurta: {0}
 DocType: Branch,Branch,filialas
 DocType: Guardian,Mobile Number,Mobilaus telefono numeris
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Spausdinimo ir paviljonai
@@ -2200,7 +2196,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijos Nr {0} nerastas
 DocType: Scheduling Tool,Student Batch,Studentų Serija
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Jūsų klientai
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Padaryti Studentas
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Padaryti Studentas
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Jūs buvote pakviestas bendradarbiauti su projektu: {0}
 DocType: Leave Block List Date,Block Date,Blokuoti data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,taikyti Dabar
@@ -2224,8 +2220,9 @@
 DocType: SMS Log,Sent To,Siunčiami į
 DocType: Payment Request,Make Sales Invoice,Padaryti pardavimo sąskaita-faktūra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programinė įranga
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Kitas Kontaktinė data negali būti praeityje
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Kitas Kontaktinė data negali būti praeityje
 DocType: Company,For Reference Only.,Tik nuoroda.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Pasirinkite Serija Nėra
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neteisingas {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,avanso suma
@@ -2239,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Byla Nr negali būti 0
 DocType: Item,Show a slideshow at the top of the page,Rodyti skaidrių peržiūrą į puslapio viršuje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,parduotuvės
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,parduotuvės
 DocType: Serial No,Delivery Time,Pristatymo laikas
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Senėjimo remiantis
 DocType: Item,End of Life,Gyvenimo pabaiga
@@ -2255,8 +2252,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,perduoti medžiagą
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nurodykite operacijas, veiklos sąnaudas ir suteikti unikalią eksploatuoti ne savo operacijas."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokumentas yra virš ribos iki {0} {1} už prekę {4}. Darai dar {3} prieš patį {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Pasirinkite Keisti suma sąskaita
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Pasirinkite Keisti suma sąskaita
 DocType: Purchase Invoice,Price List Currency,Kainų sąrašas Valiuta
 DocType: Naming Series,User must always select,Vartotojas visada turi pasirinkti
 DocType: Stock Settings,Allow Negative Stock,Leiskite Neigiama Stock
@@ -2267,7 +2264,7 @@
 DocType: Budget Account,Budget Account,biudžeto sąskaita
 DocType: Quality Inspection,Verified By,Patvirtinta
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nepavyksta pakeisti įmonės numatytasis valiuta, nes yra esami sandoriai. Sandoriai turi būti atšauktas pakeisti numatytasis valiuta."
-DocType: Grade Interval,Grade Description,Įvertinimas Aprašymas
+DocType: Grading Scale Interval,Grade Description,Įvertinimas Aprašymas
 DocType: Stock Entry,Purchase Receipt No,Pirkimo kvito Ne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,rimtai Pinigai
 DocType: Process Payroll,Create Salary Slip,Sukurti apie darbo užmokestį
@@ -2305,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,Dalyvavimas data
 DocType: Warranty Claim,Raised By,Užaugino
 DocType: Payment Gateway Account,Payment Account,Mokėjimo sąskaita
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Grynasis pokytis gautinos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,kompensacinė Išjungtas
 DocType: Offer Letter,Accepted,priimtas
@@ -2319,7 +2316,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Pristatymas taisyklė Etiketė
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,vartotojas Forumas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Greita leidinys įrašas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Jūs negalite keisti greitį, jei BOM minėta agianst bet kurį elementą"
 DocType: Employee,Previous Work Experience,Ankstesnis Darbo patirtis
@@ -2333,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Taisyklės ir sąlygų1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Instituto pavadinimas, kurį nustatote šią sistemą."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Apskaitos įrašas, užšaldyti iki šios datos, niekas negali padaryti / pakeisti įrašą, išskyrus žemiau nurodytą vaidmenį."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Prašome įrašyti dokumentą prieš generuoti priežiūros tvarkaraštį
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Prašome įrašyti dokumentą prieš generuoti priežiūros tvarkaraštį
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,projekto statusas
 DocType: UOM,Check this to disallow fractions. (for Nos),Pažymėkite tai norėdami atmesti frakcijas. (Už Nr)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Buvo sukurtos naujos gamybos užsakymų:
@@ -2356,6 +2353,7 @@
 DocType: Email Digest,How frequently?,Kaip dažnai?
 DocType: Purchase Receipt,Get Current Stock,Gauk Current Stock
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Medis bilis medžiagos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekė grupė&gt; Mascus Prekės Ženklo
 DocType: Student,Joining Date,Prisijungimas data
 ,Employees working on a holiday,"Darbuotojai, dirbantys atostogų"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Pažymėti dabartis
@@ -2437,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Sąskaitų data nepaminėta
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Gamyba
 DocType: Guardian,Occupation,okupacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Eilutės {0}: pradžios data turi būti prieš End data
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Eilutės {0}: pradžios data turi būti prieš End data
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Iš viso (Kiekis)
 DocType: Sales Invoice,This Document,Šis dokumentas
 DocType: Installation Note Item,Installed Qty,įdiegta Kiekis
@@ -2460,8 +2458,8 @@
 DocType: Notification Control,Sales Order Message,Pardavimų užsakymų pranešimas
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Numatytosios reikšmės, kaip kompanija, valiuta, einamuosius fiskalinius metus, ir tt"
 DocType: Payment Entry,Payment Type,Mokėjimo tipas
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
 DocType: Process Payroll,Select Employees,pasirinkite Darbuotojai
 DocType: Opportunity,Potential Sales Deal,Galimas Pardavimų Spręsti
 DocType: Payment Entry,Cheque/Reference Date,Čekis / Nuoroda data
@@ -2478,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Pasaulinis POS profilis {0} jau sukurtas kompanijos {1}
 DocType: Purchase Order,Ref SQ,teisėjas SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Pakeiskite prekę / BOM visose BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Gavimas turi būti pateiktas dokumentas
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Gavimas turi būti pateiktas dokumentas
 DocType: Purchase Invoice Item,Received Qty,gavo Kiekis
 DocType: Stock Entry Detail,Serial No / Batch,Serijos Nr / Serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nesumokėjo ir nepateikė
@@ -2491,7 +2489,7 @@
 ,To Produce,Gaminti
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Darbo užmokesčio
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Dėl eilės {0} iš {1}. Įtraukti {2} prekės norma, eilutės {3} taip pat turi būti įtraukti"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Padaryti vartotoją
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Padaryti vartotoją
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikavimas pakuotės už pristatymą (spausdinimui)
 DocType: Bin,Reserved Quantity,reserved Kiekis
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Prašome įvesti galiojantį elektroninio pašto adresą,"
@@ -2505,11 +2503,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Neįgaliųjų šablonas turi būti ne numatytasis šablonas
 DocType: Account,Income Account,pajamų sąskaita
 DocType: Payment Request,Amount in customer's currency,Suma kliento valiuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,pristatymas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,pristatymas
 DocType: Stock Reconciliation Item,Current Qty,Dabartinis Kiekis
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Žiūrėkite &quot;norma medžiagų pagrindu&quot; į kainuojančios skirsnyje
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Ankstesnis
 DocType: Appraisal Goal,Key Responsibility Area,Pagrindinė atsakomybė Plotas
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studentų Partijos padėti jums sekti lankomumo, vertinimai ir rinkliavos studentams"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studentų Partijos padėti jums sekti lankomumo, vertinimai ir rinkliavos studentams"
 DocType: Payment Entry,Total Allocated Amount,Visos skirtos sumos
 DocType: Item Reorder,Material Request Type,Medžiaga Prašymas tipas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural leidinys Įėjimo atlyginimus iš {0} ir {1}
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Įrašo Leads pramonės tipo.
 DocType: Item Supplier,Item Supplier,Prekė Tiekėjas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visi adresai.
 DocType: Company,Stock Settings,Akcijų Nustatymai
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sujungimas yra galimas tik tada, jei šie savybės yra tos pačios tiek įrašų. Ar grupė, Šaknų tipas, Įmonės"
@@ -2542,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ar siųsti žinutę apie renginį darbuotojams su statusu &quot;Atidaryti&quot;
 DocType: Task,Depends on Tasks,Priklauso nuo Užduotys
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Valdyti klientų grupei medį.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Priedai gali būti rodomas be leidžianti krepšelis
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nauja kaina centras vardas
 DocType: Leave Control Panel,Leave Control Panel,Palikite Valdymo skydas
@@ -2554,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,debeto
 DocType: Delivery Note,Required only for sample item.,Reikalinga tik imties elemento.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tikrasis Kiekis Po Sandorio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; tiekėjas tipas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; tiekėjas tipas
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ne darbo užmokestį rasti tarp {0} ir {1}
 ,Pending SO Items For Purchase Request,Kol SO daiktai įsigyti Užsisakyti
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentų Priėmimo
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} yra išjungtas
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} yra išjungtas
 DocType: Supplier,Billing Currency,atsiskaitymo Valiuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Labai didelis
@@ -2576,7 +2574,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Pagrindinis puslapis Teminiai Prekės
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Visi Vertinimo Grupės
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Naujas sandėlys Vardas
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Viso {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Viso {0} ({1})
 DocType: C-Form Invoice Detail,Territory,teritorija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Paminėkite nėra apsilankymų reikalingų
 DocType: Stock Settings,Default Valuation Method,Numatytasis vertinimo metodas
@@ -2594,7 +2592,7 @@
 DocType: Price List,Price List Master,Kainų sąrašas magistras
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pardavimo sandoriai gali būti pažymėti prieš kelis ** pardavėjai **, kad būtų galima nustatyti ir stebėti tikslus."
 ,S.O. No.,SO Nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Prašome sukurti klientui Švinas {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Prašome sukurti klientui Švinas {0}
 DocType: Price List,Applicable for Countries,Taikoma šalių
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,gali būti pateiktas palikti tik programas su statusu &quot;Patvirtinta&quot; ir &quot;Atmesta&quot;
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Studentų grupės pavadinimas yra privalomas eilės {0}
@@ -2675,7 +2673,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Apskaitos įrašas už Sandėlyje
 DocType: Vehicle Service,Engine Oil,Variklio alyva
 DocType: Sales Invoice,Sales Team1,pardavimų team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Prekė {0} neegzistuoja
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Prekė {0} neegzistuoja
 DocType: Sales Invoice,Customer Address,Klientų Adresas
 DocType: Employee Loan,Loan Details,paskolos detalės
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Eilutės {0}: baigė Kiekis turi būti didesnė už nulį.
@@ -2740,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Sandėliai su esamais sandoris negali būti konvertuojamos į grupę.
 DocType: Assessment Result Tool,Result HTML,rezultatas HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Baigia galioti
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Pridėti Studentai
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Pridėti Studentai
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Prašome pasirinkti {0}
 DocType: C-Form,C-Form No,C-formos Nėra
 DocType: BOM,Exploded_items,Exploded_items
@@ -2805,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,riba Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital &quot;
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademinis terminas su šia &quot;Akademinio metų&quot; {0} ir &quot;Terminas Vardas&quot; {1} jau egzistuoja. Prašome pakeisti šiuos įrašus ir pabandykite dar kartą.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kadangi yra esami sandoriai prieš {0} elementą, jūs negalite pakeisti vertę {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kadangi yra esami sandoriai prieš {0} elementą, jūs negalite pakeisti vertę {1}"
 DocType: UOM,Must be Whole Number,Turi būti sveikasis skaičius
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Naujų lapų Pervedimaiį (dienomis)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijos Nr {0} neegzistuoja
@@ -2849,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Paskutinė diena iki kito mėnesio
 DocType: Support Settings,Auto close Issue after 7 days,Auto arti išdavimas po 7 dienų
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Palikite negali būti skiriama iki {0}, kaip atostogos balansas jau perkėlimo persiunčiami būsimos atostogos paskirstymo įrašo {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Pastaba: Dėl / Nuoroda data viršija leidžiama klientų kredito dienas iki {0} dieną (-ai)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Pastaba: Dėl / Nuoroda data viršija leidžiama klientų kredito dienas iki {0} dieną (-ai)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studentų Pareiškėjas
 DocType: Asset Category Account,Accumulated Depreciation Account,Sukauptas nusidėvėjimas paskyra
 DocType: Stock Settings,Freeze Stock Entries,Freeze Akcijų įrašai
@@ -2877,8 +2875,8 @@
 DocType: Asset,Item Code,Prekės kodas
 DocType: Production Planning Tool,Create Production Orders,Sukurti gamybos užsakymus
 DocType: Serial No,Warranty / AMC Details,Garantija / AMC detalės
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
 DocType: Journal Entry,User Remark,vartotojas Pastaba
 DocType: Lead,Market Segment,Rinkos segmentas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Sumokėta suma negali būti didesnė nei visos neigiamos nesumokėtos sumos {0}
@@ -2897,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,Sukurti Materialieji Prašymai
 DocType: Employee Education,School/University,Mokykla / Universitetas
 DocType: Payment Request,Reference Details,nuoroda detalės
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Tikimasi Vertė Po naudingo tarnavimo laiką turi būti mažesnis nei bendrojo pirkinio sumos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Tikimasi Vertė Po naudingo tarnavimo laiką turi būti mažesnis nei bendrojo pirkinio sumos
 DocType: Sales Invoice Item,Available Qty at Warehouse,Turimas Kiekis į sandėlį
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,įvardintas suma
 DocType: Asset,Double Declining Balance,Dvivietis mažėjančio balanso
@@ -2918,19 +2916,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Skirtumas paskyra turi būti turto / įsipareigojimų tipo sąskaita, nes tai sandėlyje Susitaikymas yra atidarymas įrašas"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Išmokėta suma negali būti didesnis nei paskolos suma {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Gamybos Kad nebūtų sukurta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Gamybos Kad nebūtų sukurta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Nuo data&quot; turi būti po &quot;Iki datos&quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nepavyksta pakeisti statusą kaip studentas {0} yra susijęs su studento taikymo {1}
 DocType: Asset,Fully Depreciated,visiškai nusidėvėjusi
 ,Stock Projected Qty,Akcijų Numatoma Kiekis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Pažymėti Lankomumas HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citatos yra pasiūlymų, pasiūlymai turite atsiųsti savo klientams"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citatos yra pasiūlymų, pasiūlymai turite atsiųsti savo klientams"
 DocType: Sales Order,Customer's Purchase Order,Kliento Užsakymo
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijos Nr paketais
 DocType: Warranty Claim,From Company,iš Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma balais vertinimo kriterijai turi būti {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Prašome nustatyti Taškų nuvertinimai Užsakytas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prašome nustatyti Taškų nuvertinimai Užsakytas
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vertė arba Kiekis
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions pavedimai negali būti padidinta:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutė
@@ -3061,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentų grupė
 DocType: Shopping Cart Settings,Quotation Series,citata serija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Elementas egzistuoja to paties pavadinimo ({0}), prašome pakeisti elementą grupės pavadinimą ar pervardyti elementą"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Prašome pasirinkti klientui
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Prašome pasirinkti klientui
 DocType: C-Form,I,aš
 DocType: Company,Asset Depreciation Cost Center,Turto nusidėvėjimo išlaidos centras
 DocType: Sales Order Item,Sales Order Date,Pardavimų užsakymų data
@@ -3080,19 +3078,18 @@
 DocType: Vehicle,Insurance Details,draudimo detalės
 DocType: Account,Payable,mokėtinas
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Prašome įvesti grąžinimo terminams
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Skolininkai ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Skolininkai ({0})
 DocType: Pricing Rule,Margin,marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nauji klientai
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bendrasis pelnas %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Sąskaitų data
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Pilna Pirkimo suma yra privalomi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Pilna Pirkimo suma yra privalomi
 DocType: Lead,Address Desc,Adresas desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Šalis yra privalomi
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Temos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,"Atleast vienas, pardavimas arba pirkimas turi būti parenkamas"
-DocType: Grading Structure,Grade Intervals,intervalai Įvertinimas
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pasirinkite savo verslo pobūdį.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kur gamybos operacijos atliekamos.
 DocType: Asset Movement,Source Warehouse,šaltinis sandėlis
@@ -3121,6 +3118,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mėnesio pasiskirstymas procentais
 DocType: Territory,Territory Targets,Teritorija tikslai
 DocType: Delivery Note,Transporter Info,transporteris Informacija
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Prašome nustatyti numatytąjį {0} įmonėje {1}
 DocType: Cheque Print Template,Starting position from top edge,Pradinė padėtis nuo viršaus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Tas pats tiekėjas buvo įrašytas kelis kartus
@@ -3174,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Pertvarkyti Kiekis
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Dabartinis darbas Angos
 DocType: Company,Stock Adjustment Account,Vertybinių popierių reguliavimas paskyra
-DocType: Journal Entry,Write Off,Nusirašinėti
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Nusirašinėti
 DocType: Timesheet Detail,Operation ID,operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistemos vartotojas (Prisijunk) adresas. Jei nustatyta, ji taps nutylėjimą visiems HR formas."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Nuo {1}
@@ -3185,8 +3183,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Tiekėjas pristato Klientui
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Prekės / {0}) yra sandelyje
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Kitas data turi būti didesnis nei Skelbimo data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Rodyti mokesčių lengvata viršų
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Dėl / Nuoroda data negali būti po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Rodyti mokesčių lengvata viršų
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Dėl / Nuoroda data negali būti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Duomenų importas ir eksportas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Akcijų įrašai egzistuoti prieš {0} sandėlio, todėl jūs negalite iš naujo priskirti ar pakeisti ją"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Studentai Surasta
@@ -3198,14 +3196,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
 DocType: Program Enrollment,School House,Mokykla Namas
 DocType: Serial No,Out of AMC,Iš AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Prašome pasirinkti Citatos
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Prašome pasirinkti Citatos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Padaryti Priežiūros vizitas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prašome susisiekti su vartotojo, kuris turi pardavimo magistras Manager {0} vaidmenį"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Prašome pasirinkti Citatos
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Prašome pasirinkti Citatos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Padaryti Priežiūros vizitas
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prašome susisiekti su vartotojo, kuris turi pardavimo magistras Manager {0} vaidmenį"
 DocType: Company,Default Cash Account,Numatytasis pinigų sąskaitos
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Įmonės (ne klientas ar tiekėjas) meistras.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,"Tai yra, remiantis šio mokinių lankomumą"
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nėra Studentai
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pridėti daugiau elementų arba atidaryti visą formą
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Prašome įvesti &quot;numatyta pristatymo data&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Pristatymo Pastabos {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
@@ -3252,9 +3251,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,prieš susitaikymo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Norėdami {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Mokesčiai ir rinkliavos Pridėta (Įmonės valiuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Prekė Mokesčių eilutė {0} turi atsižvelgti tipo mokesčio ar pajamų ar sąnaudų arba Apmokestinimo
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Prekė Mokesčių eilutė {0} turi atsižvelgti tipo mokesčio ar pajamų ar sąnaudų arba Apmokestinimo
 DocType: Sales Order,Partly Billed,dalinai Įvardintas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Prekė {0} turi būti ilgalaikio turto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Prekė {0} turi būti ilgalaikio turto
 DocType: Item,Default BOM,numatytasis BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Prašome iš naujo tipo įmonės pavadinimas patvirtinti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Visos negrąžintos Amt
@@ -3277,7 +3276,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Kainų sąrašas Valiutų kursai
 DocType: Purchase Invoice Item,Rate,Kaina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,internas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresas pavadinimas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,adresas pavadinimas
 DocType: Stock Entry,From BOM,nuo BOM
 DocType: Assessment Code,Assessment Code,vertinimas kodas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,pagrindinis
@@ -3302,7 +3301,7 @@
 DocType: Purchase Invoice,Print Language,Spausdinti kalba
 DocType: Salary Slip,Total Working Hours,Iš viso darbo valandų
 DocType: Stock Entry,Including items for sub assemblies,Įskaitant daiktų sub asamblėjose
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Įveskite vertė turi būti teigiamas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Įveskite vertė turi būti teigiamas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,visos teritorijos
 DocType: Purchase Invoice,Items,Daiktai
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studentų jau mokosi.
@@ -3322,17 +3321,15 @@
 DocType: Issue,Opening Time,atidarymo laikas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Iš ir į datas, reikalingų"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vertybinių popierių ir prekių biržose
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Apskaičiuoti remiantis
 DocType: Delivery Note Item,From Warehouse,iš sandėlio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
 DocType: Assessment Plan,Supervisor Name,priežiūros Vardas
 DocType: Program Enrollment Course,Program Enrollment Course,Programos Priėmimas kursai
 DocType: Program Enrollment Course,Program Enrollment Course,Programos Priėmimas kursai
-DocType: Grading Structure,Grading Structure,rūšiavimas struktūra
 DocType: Purchase Taxes and Charges,Valuation and Total,Vertinimas ir viso
 DocType: Tax Rule,Shipping City,Pristatymas Miestas
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis elementas yra {0} (Šablonas) Variantas. Atributai bus nukopijuoti iš šablono, jei &quot;Ne Kopijuoti&quot; yra nustatytas"
 DocType: Notification Control,Customize the Notification,Tinkinti Pranešimas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Pinigų srautai iš operacijų
 DocType: Sales Invoice,Shipping Rule,Pristatymas taisyklė
@@ -3355,6 +3352,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Nėra numatytąją BOM egzistuoja punkte {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Prašome pasirinkti Skelbimo data pirmas
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Atidarymo data turėtų būti prieš uždarant data
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatymas numeracijos serijos Lankomumas per Setup&gt; numeravimas serija
 DocType: Leave Control Panel,Carry Forward,Tęsti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kaina centras su esamais sandoriai negali būti konvertuojamos į sąskaitų knygos
 DocType: Department,Days for which Holidays are blocked for this department.,"Dienų, kuriomis Šventės blokuojami šiame skyriuje."
@@ -3383,7 +3381,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Iš viso (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Pramogos ir poilsis
 DocType: Quality Inspection,Item Serial No,Prekė Serijos Nr
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Sukurti darbuotojų įrašus
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Sukurti darbuotojų įrašus
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Iš viso dabartis
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,apskaitos ataskaitos
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,valanda
@@ -3398,8 +3396,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Naujas BOM po pakeitimo
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Pardavimo punktas
 DocType: Payment Entry,Received Amount,gautos sumos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatymas Darbuotojų vardų sistemos žmogiškųjų išteklių&gt; HR Nustatymai
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatymas Darbuotojų vardų sistemos žmogiškųjų išteklių&gt; HR Nustatymai
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Sukurti visiškai kiekio, ignoruojant kiekį jau tam"
 DocType: Account,Tax,mokestis
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nežymimi
@@ -3412,7 +3408,7 @@
 DocType: Batch,Source Document Name,Šaltinis Dokumento pavadinimas
 DocType: Batch,Source Document Name,Šaltinis Dokumento pavadinimas
 DocType: Job Opening,Job Title,Darbo pavadinimas
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Sukurti Vartotojai
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Sukurti Vartotojai
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gramas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Aplankykite ataskaitą priežiūros skambučio.
@@ -3424,8 +3420,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kompensuojamos sąskaitos yra privalomas už prekę {0}
 DocType: BOM,Website Description,Interneto svetainė Aprašymas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Grynasis pokytis nuosavo kapitalo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
 DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,gavimas
 ,Sales Register,pardavimų Registruotis
@@ -3436,16 +3432,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nėra nieko keisti.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Santrauka šį mėnesį ir laukiant veikla
 DocType: Customer Group,Customer Group Name,Klientų Grupės pavadinimas
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nėra Klientai dar!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pinigų srautų ataskaita
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prašome pasirinkti perkelti skirtumą, jei taip pat norite įtraukti praėjusius finansinius metus balanso palieka šią fiskalinių metų"
 DocType: GL Entry,Against Voucher Type,Prieš čekių tipas
 DocType: Item,Attributes,atributai
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Prašome įvesti nurašyti paskyrą
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Paskutinė užsakymo data
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Sąskaita {0} nėra siejamas su kompanijos {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
 DocType: Student,Guardian Details,&quot;guardian&quot; informacija
 DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Pažymėti Dalyvavimas kelių darbuotojų
@@ -3470,14 +3468,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Eilutės {0} # sąskaita turi būti tipo &quot;ilgalaikio turto&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,iš Kiekis
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Taisyklės apskaičiuoti siuntimo sumą už pardavimą
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija yra privalomi
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija yra privalomi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansinės paslaugos
 DocType: Student Sibling,Student ID,Studento pažymėjimas
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Veiklos rūšys Time Įrašai
 DocType: Tax Rule,Sales,pardavimų
 DocType: Stock Entry Detail,Basic Amount,bazinis dydis
 DocType: Training Event,Exam,Egzaminas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
 DocType: Leave Allocation,Unused leaves,nepanaudoti lapai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,kr
 DocType: Tax Rule,Billing State,atsiskaitymo valstybė
@@ -3510,7 +3508,7 @@
 DocType: Payment Entry,Account Paid From,Sąskaita mokama iš
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Žaliavų punktas kodas
 DocType: Journal Entry,Write Off Based On,Nurašyti remiantis
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Padaryti Švinas
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Padaryti Švinas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Spausdinti Kanceliarinės
 DocType: Stock Settings,Show Barcode Field,Rodyti Brūkšninis kodas laukas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Siųsti Tiekėjo laiškus
@@ -3526,6 +3524,7 @@
 DocType: Offer Letter,Awaiting Response,Laukiama atsakymo
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,virš
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Paminėkite, jei nestandartinis mokama sąskaita"
 DocType: Salary Slip,Earning & Deduction,Pelningiausi &amp; išskaičiavimas
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Neprivaloma. Šis nustatymas bus naudojami filtruoti įvairiais sandoriais.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Neigiamas vertinimas Balsuok neleidžiama
@@ -3562,7 +3561,7 @@
 DocType: Program Enrollment Tool,Get Students From,Gauk Studentai iš
 DocType: Hub Settings,Seller Country,Pardavėjo šalis
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Paskelbti daiktai tinklalapyje
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupė jūsų mokiniai partijomis
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupė jūsų mokiniai partijomis
 DocType: Authorization Rule,Authorization Rule,autorizacija taisyklė
 DocType: Sales Invoice,Terms and Conditions Details,Nuostatos ir sąlygos detalės
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specifikacija
@@ -3622,7 +3621,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,išbandymas
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Atlyginimo komponentai
 DocType: Program Enrollment Tool,New Academic Year,Nauja akademiniai metai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Prekių grąžinimas / Kredito Pastaba
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Prekių grąžinimas / Kredito Pastaba
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automatinis įterpti Kainų sąrašas norma, jei trūksta"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Iš viso sumokėta suma
 DocType: Production Order Item,Transferred Qty,perkelta Kiekis
@@ -3663,6 +3662,7 @@
 ,Sales Funnel,pardavimų piltuvas
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Santrumpa yra privalomi
 DocType: Project,Task Progress,užduotis pažanga
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,krepšelis
 ,Qty to Transfer,Kiekis perkelti
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citatos klientų ar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vaidmuo leidžiama redaguoti šaldytą žaliavą
@@ -3696,7 +3696,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,rinkti mokesčius
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Brūkšninis kodas {0} jau naudojamas prekės {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Brūkšninis kodas {0} jau naudojamas prekės {1}
 DocType: Lead,Add to calendar on this date,Pridėti į kalendorių šią dieną
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Taisyklės pridedant siuntimo išlaidas.
 DocType: Item,Opening Stock,atidarymo sandėlyje
@@ -3714,7 +3714,7 @@
 DocType: Customer,From Lead,nuo švino
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Užsakymai išleido gamybai.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pasirinkite fiskalinių metų ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
 DocType: Program Enrollment Tool,Enroll Students,stoti Studentai
 DocType: Hub Settings,Name Token,vardas ženklas
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standartinė Parduodami
@@ -3725,7 +3725,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} prieš pardavimo sąskaita-faktūra {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,projekto pavadinimas
-DocType: Supplier,Mention if non-standard receivable account,"Nurodyk, jei gautina nestandartinis sąskaita"
+DocType: Customer,Mention if non-standard receivable account,"Nurodyk, jei gautina nestandartinis sąskaita"
 DocType: Journal Entry Account,If Income or Expense,Jei pajamos ar sąnaudos
 DocType: Production Order,Required Items,Reikalingi daiktai
 DocType: Stock Ledger Entry,Stock Value Difference,Akcijų vertės skirtumas
@@ -3756,6 +3756,7 @@
 DocType: Item,Taxes,Mokesčiai
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Mokama ir nepareiškė
 DocType: Project,Default Cost Center,Numatytasis Kaina centras
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nurodyti Pavadinimų serijos {0} per Sąranka&gt; Parametrai&gt; Webdesign Series
 DocType: Bank Guarantee,End Date,pabaigos data
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Akcijų sandoriai
 DocType: Budget,Budget Accounts,Biudžetinėse sąskaitose
@@ -3820,7 +3821,7 @@
 DocType: Customer,Sales Partner and Commission,Pardavimų partneris ir Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Palūkanų norma (%) / metus
 ,Project Quantity,Projektų Kiekis
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Viso {0} visoms prekėms yra lygus nuliui, gali būti, jūs turėtumėte pakeisti &quot;Paskirstyti mokesčius pagal&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Viso {0} visoms prekėms yra lygus nuliui, gali būti, jūs turėtumėte pakeisti &quot;Paskirstyti mokesčius pagal&quot;"
 DocType: Opportunity,To Discuss,Diskutuoti
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} vienetai {1} reikia {2} užbaigti šį sandorį.
 DocType: Loan Type,Rate of Interest (%) Yearly,Palūkanų norma (%) Metinės
@@ -3843,7 +3844,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Pažymėti Nėra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Eilutės {0}: Valiuta BOM # {1} turi būti lygus pasirinkta valiuta {2}
 DocType: Journal Entry Account,Exchange Rate,Valiutos kursas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
 DocType: Homepage,Tag Line,Gairė linija
 DocType: Fee Component,Fee Component,mokestis komponentas
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,laivyno valdymo
@@ -3860,7 +3861,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Sandėlių {0} neegzistuoja
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registruotis Dėl ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mėnesio Paskirstymo Procentai
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Pasirinktas elementas negali turėti Serija
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Pasirinktas elementas negali turėti Serija
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Vertinimo rodiklis į {0} punkte, kurie privalo daryti apskaitos įrašus nerastas {1} {2}. Jei elementas yra santykiuose kaip imties elementą {1}, paminėkite, kad {1} punkto lentelėje. Priešingu atveju, prašome sukurti atvykstamąjį akcijų sandorį elemento arba paminėti vertinimo lygis Prekės įrašo, tada bandykite submiting / atšaukti šį įrašą"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Medžiagų pristatytas prieš šią važtaraštyje
 DocType: Project,Customer Details,klientų informacija
@@ -3877,7 +3878,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Pateikė užsakymai negali būti ištrintas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Sąskaitos likutis jau debeto, jums neleidžiama nustatyti &quot;Balansas turi būti&quot; kaip &quot;Kreditas&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,kokybės valdymas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Prekė {0} buvo išjungta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Prekė {0} buvo išjungta
 DocType: Employee Loan,Repay Fixed Amount per Period,Grąžinti fiksuotas dydis vienam laikotarpis
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Prašome įvesti kiekį punkte {0}
 DocType: Employee External Work History,Employee External Work History,Darbuotojų Išorinis Darbo istorija
@@ -3904,7 +3905,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Studentų E-mail ID
 DocType: Employee,Notice (days),Pranešimas (dienų)
 DocType: Tax Rule,Sales Tax Template,Pardavimo mokestis Šablono
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
 DocType: Employee,Encashment Date,išgryninimo data
 DocType: Training Event,Internet,internetas
 DocType: Account,Stock Adjustment,vertybinių popierių reguliavimas
@@ -3938,6 +3939,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debeto Pastaba Išduotas
 DocType: Production Order,Warehouses,Sandėliai
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} turtas negali būti perduotas
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Šis elementas yra {0} (šablonų) variantas.
 DocType: Workstation,per hour,per valandą
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Pirkimas
 DocType: Announcement,Announcement,skelbimas
@@ -3953,7 +3955,7 @@
 DocType: Account,Receivable,gautinos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Eilutės # {0}: Neleidžiama keisti tiekėjo Užsakymo jau egzistuoja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vaidmenį, kurį leidžiama pateikti sandorius, kurie viršija nustatytus kredito limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Pasirinkite prekę Gamyba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Pasirinkite prekę Gamyba
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
 DocType: Item,Material Issue,medžiaga išdavimas
 DocType: Hub Settings,Seller Description,pardavėjas Aprašymas
@@ -3966,7 +3968,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Užsakytas
 DocType: Salary Detail,Component,Komponentas
 DocType: Assessment Criteria,Assessment Criteria Group,Vertinimo kriterijai grupė
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Atidarymo Sukauptas nusidėvėjimas turi būti mažesnis arba lygus {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Atidarymo Sukauptas nusidėvėjimas turi būti mažesnis arba lygus {0}
 DocType: Warehouse,Warehouse Name,Sandėlių Vardas
 DocType: Naming Series,Select Transaction,Pasirinkite Sandorio
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Prašome įvesti patvirtinimo vaidmuo arba patvirtinimo vartotoją
@@ -4001,7 +4003,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Norėdami nustatyti šią fiskalinių metų kaip numatytąjį, spustelėkite ant &quot;Set as Default&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,prisijungti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,trūkumo Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
 DocType: Employee Loan,Repay from Salary,Grąžinti iš Pajamos
 DocType: Leave Application,LAP/,juosmens /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},"Prašančioji mokėjimą nuo {0} {1} už sumą, {2}"
@@ -4019,7 +4021,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Vertinimo rezultatas detalės
 DocType: Employee Education,Employee Education,Darbuotojų Švietimas
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dubliuoti punktas grupė rastas daiktas grupės lentelėje
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
 DocType: Salary Slip,Net Pay,Grynasis darbo užmokestis
 DocType: Account,Account,sąskaita
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijos Nr {0} jau gavo
@@ -4028,7 +4030,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Sandėlių {0} nėra susijęs su bet kokios sąskaitos, prašome sukurti / sujungti atitinkamą (turto) sąskaitą sandėlį."
 DocType: Purchase Invoice,Recurring Id,pasikartojančios ID
 DocType: Customer,Sales Team Details,Sales Team detalės
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Ištrinti visam laikui?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Ištrinti visam laikui?
 DocType: Expense Claim,Total Claimed Amount,Iš viso ieškinių suma
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Galimas galimybės pardavinėti.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neteisingas {0}
@@ -4039,13 +4041,14 @@
 DocType: Warehouse,PIN,PIN kodas
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Nustatykite savo mokykla ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Bazinė Pakeisti Suma (Įmonės valiuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nieko apskaitos įrašai šiuos sandėlius
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nieko apskaitos įrašai šiuos sandėlius
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Išsaugoti dokumentą pirmas.
 DocType: Account,Chargeable,Apmokestinimo
 DocType: Company,Change Abbreviation,Pakeisti santrumpa
 DocType: Expense Claim Detail,Expense Date,Kompensuojamos data
 DocType: Item,Max Discount (%),Maksimali nuolaida (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Paskutinė užsakymo suma
+DocType: Task,Is Milestone,Ar Milestone
 DocType: Daily Work Summary,Email Sent To,Paštas siunčiami
 DocType: Budget,Warn,įspėti
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bet koks kitas pastabas, pažymėtina pastangų, kad reikia eiti į apskaitą."
@@ -4078,11 +4081,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&quot;Freeze Atsargos Senesni Than` turėtų būti mažesnis nei% d dienų.
 DocType: Tax Rule,Purchase Tax Template,Pirkimo Mokesčių šabloną
 ,Project wise Stock Tracking,Projektų protinga sandėlyje sekimo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Priežiūros planas {0} egzistuoja nuo {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tikrasis Kiekis (bent šaltinio / target)
 DocType: Item Customer Detail,Ref Code,teisėjas kodas
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Darbuotojų įrašus.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
 DocType: HR Settings,Payroll Settings,Payroll Nustatymai
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Rungtynių nesusieti sąskaitų faktūrų ir mokėjimų.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Vieta Užsakyti
@@ -4105,7 +4107,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekiai ir užstatai neteisingai išvalytas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Sąskaita {0}: Jūs negalite priskirti save kaip patronuojančios sąskaitą
 DocType: Purchase Invoice Item,Price List Rate,Kainų sąrašas Balsuok
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Sukurti klientų citatos
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Sukurti klientų citatos
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Rodyti &quot;Sandėlyje&quot; arba &quot;nėra sandėlyje&quot; remiantis sandėlyje turimus šiame sandėlį.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bilis medžiagos (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Vidutinis laikas, per kurį tiekėjas pateikia"
@@ -4127,7 +4129,7 @@
 DocType: Asset,Disposal Date,Atliekų data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Laiškai bus siunčiami į visus aktyvius bendrovės darbuotojams už tam tikrą valandą, jei jie neturi atostogų. Atsakymų santrauka bus išsiųstas vidurnaktį."
 DocType: Employee Leave Approver,Employee Leave Approver,Darbuotojų atostogos Tvirtintojas
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Eilutės {0}: an Pertvarkyti įrašas jau yra šiam sandėlį {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Eilutės {0}: an Pertvarkyti įrašas jau yra šiam sandėlį {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Negali paskelbti, kad prarastas, nes Citata buvo padaryta."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Mokymai Atsiliepimai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Gamybos Užsakyti {0} turi būti pateiktas
@@ -4135,7 +4137,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},"Žinoma, yra privalomi eilės {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Iki šiol gali būti ne anksčiau iš dienos
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc dokumentų tipas
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Įdėti / Redaguoti kainas
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Įdėti / Redaguoti kainas
 DocType: Batch,Parent Batch,tėvų Serija
 DocType: Batch,Parent Batch,tėvų Serija
 DocType: Cheque Print Template,Cheque Print Template,Čekis Spausdinti Šablono
@@ -4180,7 +4182,7 @@
 DocType: Item,Variant Based On,Variantas remiantis
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Iš viso weightage priskirti turi būti 100%. Ji yra {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Jūsų tiekėjai
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip Pamiršote nes yra pagamintas pardavimų užsakymų.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip Pamiršote nes yra pagamintas pardavimų užsakymų.
 DocType: Request for Quotation Item,Supplier Part No,Tiekėjas partijos nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;Vaulation ir viso&quot;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Gautas nuo
@@ -4190,7 +4192,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Nuo {0} už {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Eilutės # {0}: Nustatykite Tiekėjas už prekę {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Eilutės {0}: valandos vertė turi būti didesnė už nulį.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Interneto svetainė Paveikslėlis {0} pridedamas prie punkto {1} negali būti rastas
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Interneto svetainė Paveikslėlis {0} pridedamas prie punkto {1} negali būti rastas
 DocType: Issue,Content Type,turinio tipas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompiuteris
 DocType: Item,List this Item in multiple groups on the website.,Sąrašas šį Elementą keliomis grupėmis svetainėje.
@@ -4199,20 +4201,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Jūs nesate įgaliotas nustatyti Frozen vertę
 DocType: Payment Reconciliation,Get Unreconciled Entries,Gauk Unreconciled įrašai
 DocType: Payment Reconciliation,From Invoice Date,Iš sąskaitos faktūros išrašymo data
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Atsiskaitymo valiuta turi būti lygi arba numatytosios comapany anketa valiutos arba asmens sąskaita valiuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Atsiskaitymo valiuta turi būti lygi arba numatytosios comapany anketa valiutos arba asmens sąskaita valiuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Palikite išgryninimo
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ką tai daro?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,į sandėlį
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Visi Studentų Priėmimo
 ,Average Commission Rate,Vidutinis Komisija Balsuok
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ar Serijos ne&quot; negali būti &quot;Taip&quot; už NON-STOCK punktą
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ar Serijos ne&quot; negali būti &quot;Taip&quot; už NON-STOCK punktą
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Dalyvavimas negali būti ženklinami ateities datas
 DocType: Pricing Rule,Pricing Rule Help,Kainodaros taisyklė Pagalba
 DocType: School House,House Name,Namas Vardas
 DocType: Purchase Taxes and Charges,Account Head,sąskaita vadovas
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Atnaujinkite papildomas išlaidas apskaičiuoti iškrauti išlaidas daiktų
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,elektros
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridėti jūsų organizacijos pailsėti kaip savo vartotojams. Taip pat galite pridėti kviečiame klientus į jūsų portalą pridedant juos nuo Kontaktai
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridėti jūsų organizacijos pailsėti kaip savo vartotojams. Taip pat galite pridėti kviečiame klientus į jūsų portalą pridedant juos nuo Kontaktai
 DocType: Stock Entry,Total Value Difference (Out - In),Viso vertės skirtumas (iš - į)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Eilutės {0}: Valiutų kursai yra privalomi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Vartotojo ID nenustatyti Darbuotojo {0}
@@ -4221,7 +4223,7 @@
 DocType: Item,Customer Code,Kliento kodas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Gimimo diena priminimas {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas nuo paskutinė užsakymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
 DocType: Buying Settings,Naming Series,Pavadinimų serija
 DocType: Leave Block List,Leave Block List Name,Palikite blokuojamų sąrašą pavadinimas
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Draudimo pradžios data turėtų būti ne mažesnė nei draudimo pabaigos data
@@ -4236,7 +4238,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Pajamos Kuponas darbuotojo {0} jau sukurta laiko lape {1}
 DocType: Vehicle Log,Odometer,odometras
 DocType: Sales Order Item,Ordered Qty,Užsakytas Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Prekė {0} yra išjungtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Prekė {0} yra išjungtas
 DocType: Stock Settings,Stock Frozen Upto,Akcijų Šaldyti upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Laikotarpis nuo ir laikotarpis datų privalomų pasikartojančios {0}
@@ -4249,7 +4251,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Nurašyti suma (Įmonės valiuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Atsiskaitymo laikas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Numatytasis BOM už {0} nerastas
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Bakstelėkite elementus įtraukti juos čia
 DocType: Fees,Program Enrollment,programos Įrašas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nusileido kaina čekis
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prašome nustatyti {0}
@@ -4350,7 +4353,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Mažmeninė prekyba ir didmeninė prekyba
 DocType: Issue,First Responded On,Pirma atsakė
 DocType: Website Item Group,Cross Listing of Item in multiple groups,"Kryžius, sąrašas elementą kelių grupių"
-DocType: Grade Interval,Grade Interval,Įvertinimas intervalas
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalinė metų pradžios data ir fiskalinių metų pabaigos data jau nustatyta fiskaliniais metais {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Atnaujintas klirensas data
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Splitas Serija
@@ -4359,6 +4361,7 @@
 DocType: Request for Quotation Supplier,Download PDF,atsisiųsti PDF
 DocType: Production Order,Planned End Date,Planuojamas Pabaigos data
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Kur elementai yra saugomi.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; tiekėjas tipas
 DocType: Request for Quotation,Supplier Detail,tiekėjas detalės
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Klaida formulę ar būklės: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Sąskaitoje suma
@@ -4404,7 +4407,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Sąranka paprastas svetainė mano organizacijoje
 DocType: Payment Reconciliation,Receivable / Payable Account,Gautinos / mokėtinos sąskaitos
 DocType: Delivery Note Item,Against Sales Order Item,Prieš Pardavimų įsakymu punktas
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
 DocType: Item,Default Warehouse,numatytasis sandėlis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Biudžetas negali būti skiriamas prieš grupės sąskaitoje {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Prašome įvesti patronuojanti kaštų centrą
@@ -4464,7 +4467,7 @@
 ,Items To Be Requested,"Daiktai, kurių bus prašoma"
 DocType: Purchase Order,Get Last Purchase Rate,Gauk paskutinį pirkinį Balsuok
 DocType: Company,Company Info,Įmonės informacija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Pasirinkite arba pridėti naujų klientų
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Pasirinkite arba pridėti naujų klientų
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kaina centras privalo užsakyti sąnaudomis pretenziją
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Taikymas lėšos (turtas)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Tai yra, remiantis šio darbuotojo dalyvavimo"
@@ -4477,13 +4480,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop vartotojus nuo priėmimo prašymų įstoti į šių dienų.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,pirkimo suma
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Tiekėjas Citata {0} sukūrė
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Pabaiga metai bus ne anksčiau pradžios metus
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Pabaiga metai bus ne anksčiau pradžios metus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Išmokos darbuotojams
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Supakuotas kiekis turi vienodas kiekis už prekę {0} iš eilės {1}
 DocType: Production Order,Manufactured Qty,pagaminta Kiekis
 DocType: Purchase Receipt Item,Accepted Quantity,Priimamos Kiekis
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prašome nustatyti numatytąjį Atostogų sąrašas Darbuotojo {0} arba Įmonės {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neegzistuoja
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neegzistuoja
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vekseliai iškelti į klientams.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projektų ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Eilutės Nėra {0}: suma negali būti didesnė nei Kol Suma prieš expense punktą {1}. Kol suma yra {2}
@@ -4492,15 +4495,17 @@
 DocType: Quality Inspection Reading,Reading 3,Skaitymas 3
 ,Hub,įvorė
 DocType: GL Entry,Voucher Type,Bon tipas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
 DocType: Employee Loan Application,Approved,patvirtinta
 DocType: Pricing Rule,Price,kaina
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Darbuotojų atleidžiamas nuo {0} turi būti nustatyti kaip &quot;Left&quot;
 DocType: Guardian,Guardian,globėjas
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vertinimas {0} sukurtas darbuotojo {1} konkrečioje dat
 DocType: Employee,Education,švietimas
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanija įvardijimas Iki
 DocType: Employee,Current Address Is,Dabartinis adresas
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,keistas
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Neprivaloma. Nustato įmonės numatytasis valiuta, jeigu nenurodyta."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Apskaitos žurnalo įrašai.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Turimas Kiekis ne iš sandėlio
@@ -4537,7 +4542,7 @@
 DocType: Hub Settings,Hub Settings,Hub Nustatymai
 DocType: Project,Gross Margin %,"Bendroji marža,%"
 DocType: BOM,With Operations,su operacijų
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Apskaitos įrašai jau buvo padaryta valiuta {0} kompanijai {1}. Prašome pasirinkti gautinai ar mokėtinai sumai sąskaitą valiuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Apskaitos įrašai jau buvo padaryta valiuta {0} kompanijai {1}. Prašome pasirinkti gautinai ar mokėtinai sumai sąskaitą valiuta {0}.
 DocType: Asset,Is Existing Asset,Ar turimo turto
 DocType: Salary Detail,Statistical Component,Statistiniai komponentas
 DocType: Salary Detail,Statistical Component,Statistiniai komponentas
@@ -4593,7 +4598,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,prisegti logotipas
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,atsargų kiekis
 DocType: Customer,Commission Rate,Komisija Balsuok
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Padaryti variantas
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Padaryti variantas
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokuoti atostogų prašymai departamento.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Mokėjimo tipas turi būti vienas iš Gauti Pay ir vidaus perkėlimo
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Google Analytics
@@ -4606,6 +4611,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Leiskite gamyba Šventės
 DocType: Sales Order,Customer's Purchase Order Date,Kliento Užsakymo data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitalas
+DocType: Shopping Cart Settings,Show Public Attachments,Rodyti Viešieji Priedai
 DocType: Packing Slip,Package Weight Details,Pakuotės svoris detalės
 DocType: Payment Gateway Account,Payment Gateway Account,Mokėjimo šliuzai paskyra
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po mokėjimo pabaigos nukreipti vartotoją į pasirinktame puslapyje.
@@ -4630,7 +4636,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nerodyti kaip $ ir tt simbolis šalia valiutomis.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pusė dienos)
 DocType: Supplier,Credit Days,kredito dienų
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Padaryti Studentų Serija
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Padaryti Studentų Serija
 DocType: Leave Type,Is Carry Forward,Ar perkelti
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Gauti prekes iš BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Švinas Laikas dienas
@@ -4649,8 +4655,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,sankcijos suma
 DocType: GL Entry,Is Opening,Ar atidarymas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Eilutės {0}: debeto įrašą negali būti susieta su {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatymas numeracijos serijos Lankomumas per Setup&gt; numeravimas serija
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatymas numeracijos serijos Lankomumas per Setup&gt; numeravimas serija
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Sąskaita {0} neegzistuoja
 DocType: Account,Cash,pinigai
 DocType: Employee,Short biography for website and other publications.,Trumpa biografija interneto svetainės ir kitų leidinių.
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 8f84a90..0f20765 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Partijas Prece derīguma statuss
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Banka projekts
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Rādīt Variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Rādīt Variants
 DocType: Academic Term,Academic Term,Akadēmiskā Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiāls
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Daudzums
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Veselības aprūpe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Maksājuma kavējums (dienas)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servisa izdevumu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskālā gads {0} ir vajadzīga
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklāma
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pats uzņēmums ir reģistrēts vairāk nekā vienu reizi
 DocType: Employee,Married,Precējies
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Aizliegts {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Aizliegts {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Dabūtu preces no
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkta {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nav minētie posteņi
 DocType: Payment Reconciliation,Reconcile,Saskaņot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Pārtikas veikals
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,Padarīt Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensiju fondi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Nākamais nolietojums datums nevar būt pirms iegādes datuma
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nākamais nolietojums datums nevar būt pirms iegādes datuma
 DocType: SMS Center,All Sales Person,Visi Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mēneša Distribution ** palīdz izplatīt Budžeta / Target pāri mēnešiem, ja jums ir sezonalitātes jūsu biznesu."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nav atrastas preces
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nav atrastas preces
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Algu struktūra Trūkst
 DocType: Lead,Person Name,Persona Name
 DocType: Sales Invoice Item,Sales Invoice Item,PPR produkts
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","piemēram, &quot;Pamatskola&quot; vai &quot;universitāte&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,akciju Ziņojumi
 DocType: Warehouse,Warehouse Detail,Noliktava Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Beigu datums nedrīkst būt vēlāk kā gadu beigu datums akadēmiskā gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Vai pamatlīdzeklis&quot; nevar būt nekontrolēti, jo Asset ieraksts pastāv pret posteņa"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Vai pamatlīdzeklis&quot; nevar būt nekontrolēti, jo Asset ieraksts pastāv pret posteņa"
 DocType: Vehicle Service,Brake Oil,bremžu eļļa
 DocType: Tax Rule,Tax Type,Nodokļu Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
 DocType: BOM,Item Image (if not slideshow),Postenis attēls (ja ne slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Klientu pastāv ar tādu pašu nosaukumu
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundas likme / 60) * Faktiskais darba laiks
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Select BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Izmaksas piegādāto preču
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Svētki uz {0} nav starp No Datums un līdz šim
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,pakāpe
 DocType: Sales Invoice Item,Delivered By Supplier,Pasludināts piegādātāja
 DocType: SMS Center,All Contact,Visi Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ražošanas rīkojums jau radīta visiem posteņiem ar BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Ražošanas rīkojums jau radīta visiem posteņiem ar BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Gada alga
 DocType: Daily Work Summary,Daily Work Summary,Ikdienas darbs kopsavilkums
 DocType: Period Closing Voucher,Closing Fiscal Year,Noslēguma fiskālajā gadā
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ir iesaldēts
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ir iesaldēts
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Lūdzu, izvēlieties esošo uzņēmumu radīšanai kontu plānu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Akciju Izdevumi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Atlasīt Target noliktava
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kredītu uzņēmumā Valūta
 DocType: Delivery Note,Installation Status,Instalācijas statuss
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vai vēlaties atjaunināt apmeklēšanu? <br> Present: {0} \ <br> Nekonstatē: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Piegādes izejvielas iegādei
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Vismaz viens maksājuma veids ir nepieciešams POS rēķinu.
 DocType: Products Settings,Show Products as a List,Rādīt produktus kā sarakstu
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lejupielādēt veidni, aizpildīt atbilstošus datus un pievienot modificētu failu. Visi datumi un darbinieku saspēles izvēlēto periodu nāks veidnē, ar esošajiem apmeklējuma reģistru"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Padarīt Nolietojums Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Pieprasījums Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Izveidot darbinieku
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Izveidot darbinieku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Apraides
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Izpildīšana
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Sīkāka informācija par veiktajām darbībām.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plāns apkopes apmeklējumiem.
 DocType: SMS Settings,Enter url parameter for message,Ievadiet url parametrs ziņu
 DocType: POS Profile,Customer Groups,klientu grupas
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finanšu pārskati
 DocType: Guardian,Students,Students
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Noteikumus cenas un atlaides.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenrādis ir jāpiemēro pērk vai pārdod
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
 DocType: Company,Default Payroll Payable Account,Default Algu Kreditoru konts
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Vai atvēršana Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Pieminēt ja nestandarta saņemama konts piemērojams
 DocType: Course Schedule,Instructor Name,instruktors Name
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Pret pārdošanas rēķinu posteni
 ,Production Orders in Progress,Pasūtījums Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto naudas no finansēšanas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
 DocType: Lead,Address & Contact,Adrese un kontaktinformācija
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pievienot neizmantotās lapas no iepriekšējiem piešķīrumiem
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Kopā Izmaksu summa (via laiks lapas)
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankas ieraksti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Publicē Hub
 DocType: Student Admission,Student Admission,Studentu uzņemšana
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Postenis {0} ir atcelts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
 DocType: Item,Purchase Details,Pirkuma Details
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Paziņot pa e-pastu uz izveidojot automātisku Material pieprasījuma
 DocType: Journal Entry,Multi Currency,Multi Valūtas
 DocType: Payment Reconciliation Invoice,Invoice Type,Rēķins Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Piegāde Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Piegāde Note
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Izmaksas Sold aktīva
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksājums Entry ir modificēts pēc velk to. Lūdzu, velciet to vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
 DocType: Student Applicant,Admitted,uzņemta
 DocType: Workstation,Rent Cost,Rent izmaksas
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Pasūtījuma vērtība
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Skaidras naudas darījumi pret pusi vai iekšējai pārskaitījumu
 DocType: Shipping Rule,Valid for Countries,Derīgs valstīm
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Šis postenis ir Template un nevar tikt izmantoti darījumos. Postenis atribūti tiks pārkopēti uz variantiem, ja ""Nē Copy"" ir iestatīts"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Šis postenis ir Template un nevar tikt izmantoti darījumos. Postenis atribūti tiks pārkopēti uz variantiem, ja ""Nē Copy"" ir iestatīts"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kopā Order Uzskata
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Ievadiet ""Atkārtot mēneša diena"" lauka vērtību"
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Nodokļa likme
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} līdz {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Select postenis
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pārvērst ne-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,(Sērijas) posteņa.
 DocType: C-Form Invoice Detail,Invoice Date,Rēķina datums
 DocType: GL Entry,Debit Amount,Debets Summa
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Izveidot studentu grupas
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Pieprasījums piedāvājumam
 DocType: Salary Slip Timesheet,Working Hours,Darba laiks
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mainīt sākuma / pašreizējo kārtas numuru esošam sēriju.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Izveidot jaunu Klientu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Izveidot jaunu Klientu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ja vairāki Cenu Noteikumi turpina dominēt, lietotāji tiek aicināti noteikt prioritāti manuāli atrisināt konfliktu."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Izveidot pirkuma pasūtījumu
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Izveidot pirkuma pasūtījumu
 ,Purchase Register,Pirkuma Reģistrēties
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Piemērojamām izmaksām
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Brīvdienu pārvaldnieks
@@ -506,6 +509,7 @@
 DocType: Packing Slip,From Package No.,No Package Nr
 DocType: Item Attribute,To Range,Svārstās
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vērtspapīri un noguldījumi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nevar mainīt vērtēšanas metode, jo ir darījumi pret dažām precēm, kuras nav tā paša novērtēšanas metode"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kopā lapas piešķirtās ir obligāta
 DocType: Job Opening,Description of a Job Opening,Apraksts par vakanču
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Neapstiprinātas aktivitātes šodienu
@@ -533,7 +537,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
 DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
 DocType: Shipping Rule,Net Weight,Neto svars
 DocType: Employee,Emergency Phone,Avārijas Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,pirkt
@@ -543,7 +547,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Lūdzu noteikt atzīmi par sliekšņa 0%
 DocType: Sales Order,To Deliver,Piegādāt
 DocType: Purchase Invoice Item,Item,Prece
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
 DocType: Journal Entry,Difference (Dr - Cr),Starpība (Dr - Cr)
 DocType: Account,Profit and Loss,Peļņa un zaudējumi
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Managing Apakšuzņēmēji
@@ -569,7 +573,7 @@
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 DocType: Production Plan Item,Pending Qty,Kamēr Daudz
 DocType: Budget,Ignore,Ignorēt
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nav aktīvs
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nav aktīvs
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS nosūtīts šādiem numuriem: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup pārbaudīt izmēri drukāšanai
 DocType: Salary Slip,Salary Slip Timesheet,Alga Slip laika kontrolsaraksts
@@ -578,13 +582,13 @@
 DocType: Sales Invoice,Total Commission,Kopā Komisija
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Pirkuma čeka Nepieciešamais
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Vērtēšana Rate ir obligāta, ja atvēršana Stock ievadīts"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Vērtēšana Rate ir obligāta, ja atvēršana Stock ievadīts"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Uzkrātās vērtības
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Veikt klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Veikt klientu pasūtījumu
 DocType: Project Task,Project Task,Projekta uzdevums
 ,Lead Id,Potenciālā klienta ID
 DocType: C-Form Invoice Detail,Grand Total,Pavisam kopā
@@ -601,7 +605,7 @@
 DocType: Job Applicant,Resume Attachment,atsākt Pielikums
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Atkārtojiet Klienti
 DocType: Leave Control Panel,Allocate,Piešķirt
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Piezīme: Kopā piešķirtie lapas {0} nedrīkst būt mazāks par jau apstiprināto lapām {1} par periodu
 DocType: Announcement,Posted By,rakstīja
 DocType: Item,Delivered by Supplier (Drop Ship),Pasludināts ar piegādātāja (Drop Ship)
@@ -611,7 +615,7 @@
 DocType: Quotation,Quotation To,Piedāvājums:
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lūdzu noteikt Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lūdzu noteikt Company
@@ -623,7 +627,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pārdošanas rēķins laika kontrolsaraksts
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Izvēlieties Maksājumu konts padarīt Banka Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Izveidot Darbinieku uzskaiti, lai pārvaldītu lapiņas, izdevumu deklarācijas un algas"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Izveidot Darbinieku uzskaiti, lai pārvaldītu lapiņas, izdevumu deklarācijas un algas"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Pievienot zināšanu bāzes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Priekšlikums Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Maksājumu Entry atskaitīšana
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Saistība ar Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Vadītājs
 DocType: Payment Entry,Payment From / To,Maksājums no / uz
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,datumu diapazons
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Jaunais kredītlimits ir mazāks nekā pašreizējais nesamaksātās summas par klientam. Kredīta limits ir jābūt atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Jaunais kredītlimits ir mazāks nekā pašreizējais nesamaksātās summas par klientam. Kredīta limits ir jābūt atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
 DocType: SMS Settings,Receiver Parameter,Uztvērējs parametrs
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Pamatojoties uz"" un ""Grupēt pēc"", nevar būt vienādi"
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
 DocType: Student Batch Name,Batch Name,partijas nosaukums
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Kontrolsaraksts izveidots:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,uzņemt
 DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Rādīs studentam par klātesošu studentu ikmēneša Apmeklējumu ziņojums
@@ -719,7 +722,7 @@
 DocType: Student Attendance,Student Attendance,Student apmeklējums
 DocType: Sales Invoice Timesheet,Time Sheet,Laika uzskaites tabula
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush izejvielas Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ievadiet Papildus informācija
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ievadiet Papildus informācija
 DocType: Interest,Interest,Interese
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Cita informācija
@@ -737,7 +740,7 @@
 ,Absent Student Report,Nekonstatē Student pārskats
 DocType: Email Digest,Next email will be sent on:,Nākamais e-pastu tiks nosūtīts uz:
 DocType: Offer Letter Term,Offer Letter Term,Akcija vēstule termins
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Prece ir varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} prece nav atrasta
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Uzņēmuma {0} neeksistē
@@ -746,8 +749,6 @@
 DocType: Serial No,Warranty Expiry Date,Garantijas Derīguma termiņš
 DocType: Material Request Item,Quantity and Warehouse,Daudzums un Noliktavas
 DocType: Sales Invoice,Commission Rate (%),Komisijas likme (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Lūdzu, izvēlieties programma"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Lūdzu, izvēlieties programma"
 DocType: Project,Estimated Cost,Paredzamās izmaksas
@@ -766,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nav krājums punkts
 DocType: Mode of Payment Account,Default Account,Default Account
 DocType: Payment Entry,Received Amount (Company Currency),Saņemtā summa (Company valūta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Potenciālais klients ir jānosaka, ja IESPĒJA ir izveidota no Potenciālā klienta"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Potenciālais klients ir jānosaka, ja IESPĒJA ir izveidota no Potenciālā klienta"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Lūdzu, izvēlieties nedēļas off diena"
 DocType: Production Order Operation,Planned End Time,Plānotais Beigu laiks
 ,Sales Person Target Variance Item Group-Wise,Sales Person Mērķa Variance Prece Group-Wise
@@ -830,7 +831,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Cenrādis nav izvēlēts
 DocType: Employee,Family Background,Ģimene Background
 DocType: Request for Quotation Supplier,Send Email,Sūtīt e-pastu
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nav Atļaujas
 DocType: Company,Default Bank Account,Default bankas kontu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
@@ -843,8 +844,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Darbinieks nav atrasts
 DocType: Supplier Quotation,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
 DocType: SMS Center,All Customer Contact,Visas klientu Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Augšupielādēt akciju līdzsvaru caur csv.
 DocType: Warehouse,Tree Details,Tree Details
@@ -855,8 +856,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimālā Rēķina summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} nepieder Uzņēmumu {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: kontu {2} nevar būt grupa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prece Row {idx}: {DOCTYPE} {DOCNAME} neeksistē iepriekš &#39;{DOCTYPE}&#39; tabula
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prece Row {idx}: {DOCTYPE} {DOCNAME} neeksistē iepriekš &#39;{DOCTYPE}&#39; tabula
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nav uzdevumi
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto rēķins tiks radīts, piemēram 05, 28 utt"
 DocType: Asset,Opening Accumulated Depreciation,Atklāšanas Uzkrātais nolietojums
@@ -872,7 +873,7 @@
 DocType: Bin,Moving Average Rate,Moving vidējā likme
 DocType: Production Planning Tool,Select Items,Izvēlieties preces
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursu grafiks
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursu grafiks
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: HR Settings,Enter retirement age in years,Ievadiet pensionēšanās vecumu gados
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Mērķa Noliktava
@@ -880,7 +881,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Atļaut pār piegādi vai saņemšanu līdz pat šim procentiem
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Visi punkts grupas
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Visi punkts grupas
 DocType: Process Payroll,Activity Log,Aktivitāte Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto peļņa / zaudējumi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
@@ -891,7 +892,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Prognozēts Daudz
 DocType: Sales Invoice,Payment Due Date,Maksājuma Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Atklāšana&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atvērt darīt
 DocType: Notification Control,Delivery Note Message,Piegāde Note Message
@@ -907,7 +908,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Daudz
 DocType: Leave Block List Date,Leave Block List Date,Atstājiet Block saraksts datums
 DocType: Pricing Rule,Price or Discount,Cenu vai Atlaide
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Kopā piemērojamām izmaksām, kas pirkuma čeka Items galda jābūt tāds pats kā Kopā nodokļiem un nodevām"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Kopā piemērojamām izmaksām, kas pirkuma čeka Items galda jābūt tāds pats kā Kopā nodokļiem un nodevām"
 DocType: Sales Team,Incentives,Stimuli
 DocType: SMS Log,Requested Numbers,Pieprasītie Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Iegūt tikai izejvielas
@@ -965,8 +966,7 @@
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Fee Structure,Components,sastāvdaļas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
@@ -1018,8 +1018,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Ķīmisks
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Naudas konts tiks automātiski atjaunināti Algu Journal Entry ja ir izvēlēts šis režīms.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Par Novērtējums kodeksa intervāli {0} pārklājas ar klases intervālu citu kategoriju. Lūdzu, pārbaudiet intervāli {0} un {1} un mēģiniet vēlreiz"
 DocType: BOM,Raw Material Cost(Company Currency),Izejvielu izmaksas (Company valūta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Rinda # {0}: Rate nevar būt lielāks par kursu, kas izmantots {1} {2}"
@@ -1032,7 +1030,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website punkts
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
 DocType: Timesheet Detail,Bill,Rēķins
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Nākamais Nolietojums datums tiek ievadīta kā pagātnes datumu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Nākamais Nolietojums datums tiek ievadīta kā pagātnes datumu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Balts
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rinda {0}: Daudz nav pieejams {4} noliktavā {1} pēc norīkojuma laiku ieraksta ({2} {3})
@@ -1047,7 +1045,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Rīkojums Type jābūt vienam no {0}
 DocType: Lead,Next Contact Date,Nākamais Contact Datums
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Atklāšanas Daudzums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
 DocType: Student Batch Name,Student Batch Name,Student Partijas nosaukums
 DocType: Holiday List,Holiday List Name,Brīvdienu saraksta Nosaukums
 DocType: Repayment Schedule,Balance Loan Amount,Balance Kredīta summa
@@ -1067,10 +1065,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},"Lūdzu, norādiet {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
 DocType: Delivery Note,Delivery To,Piegāde uz
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Planning Tool,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nevar būt negatīvs
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Atlaide
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Atlaide
 DocType: Asset,Total Number of Depreciations,Kopējais skaits nolietojuma
 DocType: Sales Invoice Item,Rate With Margin,Novērtēt Ar Margin
 DocType: Sales Invoice Item,Rate With Margin,Novērtēt Ar Margin
@@ -1099,7 +1097,7 @@
 DocType: Lead,Organization Name,Organizācijas nosaukums
 DocType: Tax Rule,Shipping State,Piegāde Valsts
 ,Projected Quantity as Source,Prognozēts daudzums kā resurss
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Iekļaut nav krājumu priekšmetiem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Pārdošanas izmaksas
@@ -1107,7 +1105,7 @@
 DocType: GL Entry,Against,Pret
 DocType: Item,Default Selling Cost Center,Default pārdošana Izmaksu centrs
 DocType: Sales Partner,Implementation Partner,Īstenošana Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Pasta indekss
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Pasta indekss
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} {1}
 DocType: Opportunity,Contact Info,Kontaktinformācija
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Krājumu
@@ -1151,7 +1149,7 @@
 DocType: Sales Partner,Distributor,Izplatītājs
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Grozs Piegāde noteikums
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 DocType: Global Defaults,Global Defaults,Globālie Noklusējumi
@@ -1186,11 +1184,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Ievadiet pozīcijas kods, lai iegūtu partijas numurs"
 DocType: Stock Settings,Default Item Group,Default Prece Group
 DocType: Employee Loan,Partially Disbursed,Daļēji Izmaksātā
-DocType: Grading Structure,Grading System Name,Šķirošana System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Piegādātājs datu bāze.
 DocType: Account,Balance Sheet,Bilance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksājums Mode nav konfigurēta. Lūdzu, pārbaudiet, vai konts ir iestatīts uz maksājumu Mode vai POS profils."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksājums Mode nav konfigurēta. Lūdzu, pārbaudiet, vai konts ir iestatīts uz maksājumu Mode vai POS profils."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Jūsu pārdošanas persona saņems atgādinājumu par šo datumu, lai sazināties ar klientu"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Pašu posteni nevar ievadīt vairākas reizes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Turpmākas kontus var veikt saskaņā grupās, bet ierakstus var izdarīt pret nepilsoņu grupām"
@@ -1229,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Darbs Gatavs
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Lūdzu, norādiet vismaz vienu atribūtu Atribūti tabulā"
 DocType: Announcement,All Students,Visi studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Prece {0} ir jābūt ne-akciju postenis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Prece {0} ir jābūt ne-akciju postenis
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervāli
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Pārējā pasaule
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
@@ -1274,8 +1271,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
 DocType: Journal Entry,Get Outstanding Invoices,Saņemt neapmaksātus rēķinus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Pirkuma pasūtījumu palīdzēt jums plānot un sekot līdzi saviem pirkumiem
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Pirkuma pasūtījumu palīdzēt jums plānot un sekot līdzi saviem pirkumiem
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kopējais Issue / Transfer daudzums {0} Iekraušanas Pieprasījums {1} \ nedrīkst būt lielāks par pieprasīto daudzumu {2} postenim {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mazs
@@ -1299,7 +1296,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Jūsu Produkti vai Pakalpojumi
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
@@ -1317,7 +1314,7 @@
 DocType: Student Group Student,Group Roll Number,Grupas Roll skaits
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kopējais visu uzdevumu atsvari būtu 1. Lūdzu regulēt svaru visām projekta uzdevumus atbilstoši
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitāla Ekipējums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
@@ -1344,7 +1341,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} preces progress
 DocType: Workstation,Workstation Name,Darba vietas nosaukums
-DocType: Grade Interval,Grade Code,grade Code
+DocType: Grading Scale Interval,Grade Code,grade Code
 DocType: POS Item Group,POS Item Group,POS Prece Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
@@ -1361,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Detaļas
 DocType: Sales Order,Recurring Upto,Periodisks Līdz pat
 DocType: Attendance,HR Manager,HR vadītājs
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Lūdzu, izvēlieties Company"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Lūdzu, izvēlieties Company"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Piegādātāju rēķinu Datums
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,"Jums ir nepieciešams, lai dotu iespēju Grozs"
@@ -1377,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Pārtika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Novecošana Range 3
 DocType: Maintenance Schedule Item,No of Visits,Nē apmeklējumu
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Maintenance grafiks {0} eksistē pret {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Mācās students
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valūta Noslēguma kontā jābūt {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Punktu summa visiem mērķiem vajadzētu būt 100. Tas ir {0}
@@ -1426,13 +1424,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontu
 DocType: Material Request,Terms and Conditions Content,Noteikumi un nosacījumi saturs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Maintenance Visit,Unscheduled,Neplānotā
 DocType: Employee,Owned,Pieder
 DocType: Salary Detail,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
 DocType: Pricing Rule,"Higher the number, higher the priority","Lielāks skaitlis, augstākā prioritāte"
 ,Purchase Invoice Trends,Pirkuma rēķins tendences
 DocType: Employee,Better Prospects,Labākas izredzes
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rinda # {0}: Partiju {1} ir tikai {2} gb. Lūdzu, izvēlieties citu partiju, kas ir {3} qty pieejama vai sadalīt rindu uz vairākās rindās, lai nodrošinātu / problēmu no vairākām partijām"
 DocType: Vehicle,License Plate,Numurzīme
 DocType: Appraisal,Goals,Mērķi
 DocType: Warranty Claim,Warranty / AMC Status,Garantijas / AMC statuss
@@ -1450,7 +1449,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ja konts ir sasalusi, ieraksti ir atļauts ierobežotas lietotājiem."
 DocType: Email Digest,Bank Balance,Bankas bilance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Darba profils, nepieciešams kvalifikācija uc"
 DocType: Journal Entry Account,Account Balance,Konta atlikuma
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
@@ -1461,7 +1460,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Rādīt Atvērto fiskālajā gadā ir P &amp; L atlikumus
 DocType: Shipping Rule,Shipping Account,Piegāde Konts
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ir neaktīvs
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Padarīt Pārdošanas pasūtījumu lai palīdzētu jums plānot savu darbu un piegādāt uz laiku
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Padarīt Pārdošanas pasūtījumu lai palīdzētu jums plānot savu darbu un piegādāt uz laiku
 DocType: Quality Inspection,Readings,Rādījumus
 DocType: Stock Entry,Total Additional Costs,Kopējās papildu izmaksas
 DocType: Course Schedule,SH,SH
@@ -1472,7 +1471,7 @@
 DocType: Shipping Rule Condition,To Value,Vērtēt
 DocType: Asset Movement,Stock Manager,Krājumu pārvaldnieks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Iepakošanas Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Iepakošanas Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS vārti iestatījumi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import neizdevās!
@@ -1498,7 +1497,7 @@
 DocType: Sales Invoice,Source,Avots
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rādīt slēgts
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset kategorija ir obligāta ilgtermiņa ieguldījumu postenim
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset kategorija ir obligāta ilgtermiņa ieguldījumu postenim
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Šī {0} konflikti ar {1} uz {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenti HTML
@@ -1516,7 +1515,7 @@
 DocType: Student,Date of Leaving,Aiziešanas datumu
 DocType: Pricing Rule,For Price List,Par cenrādi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Izveidot Sasaistes
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Izveidot Sasaistes
 DocType: Maintenance Schedule,Schedules,Saraksti
 DocType: Purchase Invoice Item,Net Amount,Neto summa
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nr
@@ -1544,7 +1543,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,programma iestājas
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kaste
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,iespējams piegādātājs
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizācija
@@ -1578,7 +1577,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Default BOM par {0} nav atrasts Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti tiek centrā sistēmas, pievienot visus savus skolēnus"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti tiek centrā sistēmas, pievienot visus savus skolēnus"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Clearance datums {1} nevar būt pirms Čeku datums {2}
 DocType: Company,Default Holiday List,Default brīvdienu sarakstu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rinda {0}: laiku un uz laiku no {1} pārklājas ar {2}
@@ -1590,20 +1589,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Diena (-s), kad jūs piesakāties atvaļinājumu ir brīvdienas. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Atkārtoti nosūtīt maksājumu E-pasts
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,jauns uzdevums
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Padarīt citāts
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Padarīt citāts
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,citas Ziņojumi
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Lūdzu noteikt Noklusējuma Algas Kreditoru kontu Uzņēmumu {0}
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Meklēt punkts
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Meklēt punkts
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Patērētā summa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto izmaiņas naudas
 DocType: Assessment Plan,Grading Scale,Šķirošana Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jau pabeigts
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Maksājuma pieprasījums jau eksistē {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
@@ -1641,7 +1640,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,savākt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
 DocType: Customer,Default Price List,Default Cenrādis
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs nevarat izdzēst saimnieciskais gads {0}. Fiskālā gads {0} ir noteikta kā noklusējuma Global iestatījumi
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klientu kredīta atlikuma
@@ -1684,8 +1683,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studijas pašā institūtā
 DocType: Territory,Territory Manager,Teritorija vadītājs
 DocType: Packed Item,To Warehouse (Optional),Lai Noliktava (pēc izvēles)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prece Kods&gt; Prece Group&gt; Brand
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prece Kods&gt; Prece Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Apmaksātais Summa (Company valūta)
 DocType: Purchase Invoice,Additional Discount,Papildu Atlaide
 DocType: Selling Settings,Selling Settings,Pārdošanas iestatījumi
@@ -1695,9 +1692,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View in grozs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Materiāls Pieprasījums izmantoti, lai šā krājuma Entry"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Nākamais Nolietojums datums ir obligāta jaunu aktīvu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Nākamais Nolietojums datums ir obligāta jaunu aktīvu
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atsevišķa kurss balstās grupa katru Partijas
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atsevišķa kurss balstās grupa katru Partijas
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Viena vienība posteņa.
@@ -1714,9 +1711,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Izmaksu centrs ir nepieciešams peļņas un zaudējumu &quot;konta {2}. Lūdzu izveidot noklusējuma izmaksu centru uzņēmumam.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu mainīt Klienta nosaukumu vai pārdēvēt klientu grupai"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu grupas&gt; Teritorija
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu grupas&gt; Teritorija
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu mainīt Klienta nosaukumu vai pārdēvēt klientu grupai"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Jauns kontakts
 DocType: Territory,Parent Territory,Parent Teritorija
 DocType: Quality Inspection Reading,Reading 2,Lasīšana 2
@@ -1743,21 +1738,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Izlīgums JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Pārāk daudz kolonnas. Eksportēt ziņojumu un izdrukāt to, izmantojot izklājlapu lietotni."
 DocType: Purchase Invoice Item,Batch No,Partijas Nr
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nevar atrast kursu {0} līdz {1} atslēgai datumā {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Atļaut vairākas pārdošanas pasūtījumos pret Klienta Pirkuma pasūtījums
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobilo Nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Galvenais
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variants
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Galvenais
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variants
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
 DocType: Employee Attendance Tool,Employees HTML,darbinieki HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
 DocType: Employee,Leave Encashed?,Atvaļinājums inkasēta?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Iespēja No jomā ir obligāta
 DocType: Email Digest,Annual Expenses,gada izdevumi
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Izveidot pirkuma pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Izveidot pirkuma pasūtījumu
 DocType: SMS Center,Send To,Sūtīt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Piešķirtā summa
@@ -1777,7 +1771,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vērtējumi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dublēt Sērijas Nr stājās postenī {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nosacījums Shipping Reglamenta
-DocType: Grading Structure,Grading Intervals,šķirošanas intervāli
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ievadiet
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nevar overbill par postenī {0} rindā {1} vairāk nekā {2}. Lai ļautu pār-rēķinu, lūdzu, noteikti Pērkot Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Lūdzu iestatīt filtru pamatojoties postenī vai noliktavā
@@ -1790,16 +1783,17 @@
 DocType: Authorization Control,Authorization Control,Autorizācija Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Noraidīts Warehouse ir obligāta pret noraidīts postenī {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Maksājums
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Pārvaldīt savus pasūtījumus
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Pārvaldīt savus pasūtījumus
 DocType: Production Order Operation,Actual Time and Cost,Faktiskais laiks un izmaksas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiāls pieprasījums maksimāli {0} var izdarīt postenī {1} pret pārdošanas ordeņa {2}
 DocType: Employee,Salutation,Sveiciens
 DocType: Course,Course Abbreviation,Protams saīsinājums
 DocType: Student Leave Application,Student Leave Application,Studentu atvaļinājums
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbinieku {0} uz pusi dienas uz {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Kopējais darba laiks nedrīkst būt lielāks par max darba stundas {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Par
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Paka posteņus pēc pārdošanas laikā.
 DocType: Quotation Item,Actual Qty,Faktiskais Daudz
 DocType: Sales Invoice Item,References,Atsauces
@@ -1809,7 +1803,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Esat ievadījis dublikātus preces. Lūdzu, labot un mēģiniet vēlreiz."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Līdzstrādnieks
 DocType: Asset Movement,Asset Movement,Asset kustība
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Jauns grozs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Jauns grozs
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postenis {0} nav sērijveida punkts
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
 DocType: Vehicle,Wheels,Riteņi
@@ -1841,10 +1835,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Izslēdz izveidi laika apaļkoku pret pasūtījumu. Darbības nedrīkst izsekot pret Ražošanas uzdevums
 DocType: Student,Student Mobile Number,Studentu Mobilā tālruņa numurs
 DocType: Item,Has Variants,Ir Varianti
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Partijas ID ir obligāta
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Partijas ID ir obligāta
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partijas ID ir obligāta
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partijas ID ir obligāta
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Atkārtojas rēķins
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
@@ -1852,7 +1846,7 @@
 DocType: Budget,Fiscal Year,Fiskālā gads
 DocType: Vehicle Log,Fuel Price,degvielas cena
 DocType: Budget,Budget,Budžets
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžets nevar iedalīt pret {0}, jo tas nav ienākumu vai izdevumu kontu"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Izpildīts
 DocType: Student Admission,Application Form Route,Pieteikums forma
@@ -1883,7 +1877,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Summa {0} {1} atskaitīt pret {2}
 DocType: Employee,Salary Information,Alga informācija
 DocType: Sales Person,Name and Employee ID,Darbinieka Vārds un ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
 DocType: Website Item Group,Website Item Group,Mājas lapa Prece Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Nodevas un nodokļi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ievadiet Atsauces datums
@@ -1942,7 +1936,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Atkārtot Klientu Ieņēmumu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) ir jābūt lomu rēķina apstiprinātāja """
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pāris
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
 DocType: Asset,Depreciation Schedule,nolietojums grafiks
 DocType: Bank Reconciliation Detail,Against Account,Pret kontu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date jābūt starp No Datums un līdz šim
@@ -1959,13 +1953,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
 ,Quotation Trends,Piedāvājumu tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
 DocType: Purchase Order,Delivered,Pasludināts
 ,Vehicle Expenses,transportlīdzekļu Izdevumi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
+DocType: Serial No,Invoice Details,Informācija par rēķinu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļu skaits
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datums, kurā atkārtojas rēķins tiks apstāties"
 DocType: Employee Loan,Loan Amount,Kredīta summa
@@ -1989,7 +1984,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Papildus Atlaides summa
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporta
 DocType: Loan Type,Loan Name,aizdevums Name
@@ -2001,6 +1996,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Noliktava, kur jums ir saglabāt krājumu noraidīto posteņiem"
 DocType: Production Order,Skip Material Transfer,Izlaist materiāla pārnese
 DocType: Production Order,Skip Material Transfer,Izlaist materiāla pārnese
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Nevar atrast valūtas kursu {0} uz {1} par galveno dienas {2}. Lūdzu, izveidojiet Valūtas maiņas rekordu manuāli"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Jūsu finanšu gads beidzas
 DocType: POS Profile,Price List,Cenrādis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} tagad ir noklusējuma saimnieciskais gads. Lūdzu, atsvaidziniet savu pārlūkprogrammu, lai izmaiņas stātos spēkā."
@@ -2038,9 +2034,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Postenis {0} jau ir atgriezies
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Saimnieciskais gads ** pārstāv finanšu gads. Visus grāmatvedības ierakstus un citi lielākie darījumi kāpurķēžu pret ** fiskālā gada **.
 DocType: Opportunity,Customer / Lead Address,Klients / Lead adrese
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 DocType: Student Admission,Eligibility,Tiesības
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Sasaistes palīdzēt jums iegūt biznesa, pievienot visus savus kontaktus un vairāk kā jūsu rezultātā"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Sasaistes palīdzēt jums iegūt biznesa, pievienot visus savus kontaktus un vairāk kā jūsu rezultātā"
 DocType: Production Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
@@ -2081,7 +2077,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Izvēlieties Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Atstāt tukšu, ja to uzskata par visu departamentu"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Nodarbinātības veidi (pastāvīgs, līgums, intern uc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Process Payroll,Fortnightly,divnedēļu
 DocType: Currency Exchange,From Currency,No Valūta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
@@ -2097,7 +2093,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nav iespējams izvēlēties maksas veidu, kā ""Par iepriekšējo rindu summas"" vai ""Par iepriekšējā rindā Total"" par pirmās rindas"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Bērnu Prece nedrīkst būt Product Bundle. Lūdzu, noņemiet objektu `{0}` un saglabāt"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banku
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Pievienot laika uzskaites
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Pievienot laika uzskaites
 DocType: Vehicle Service,Service Item,Servisa punkts
 DocType: Bank Guarantee,Bank Guarantee,Bankas garantija
 DocType: Bank Guarantee,Bank Guarantee,Bankas garantija
@@ -2147,8 +2143,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cenas netiks parādīts, ja Cenrādis nav noteikts"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Lūdzu, norādiet valsti šim Shipping noteikuma vai pārbaudīt Worldwide Shipping"
 DocType: Stock Entry,Total Incoming Value,Kopā Ienākošais vērtība
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debets ir nepieciešama
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debets ir nepieciešama
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkuma Cenrādis
 DocType: Offer Letter Term,Offer Term,Piedāvājums Term
 DocType: Quality Inspection,Quality Manager,Kvalitātes vadītājs
@@ -2182,14 +2178,14 @@
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Jaunā adrese
 DocType: Quality Inspection,Sample Size,Izlases lielums
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ievadiet saņemšana dokuments
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Visi posteņi jau ir rēķinā
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ievadiet saņemšana dokuments
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Visi posteņi jau ir rēķinā
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Lūdzu, norādiet derīgu ""No lietā Nr '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
 DocType: Project,External,Ārējs
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Lietotāji un atļaujas
 DocType: Vehicle Log,VLOG.,Vlogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ražošanas Pasūtījumi Izveidoja: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Ražošanas Pasūtījumi Izveidoja: {0}
 DocType: Branch,Branch,Filiāle
 DocType: Guardian,Mobile Number,Mobilā telefona numurs
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukāšana un zīmols
@@ -2198,7 +2194,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Sērijas Nr {0} nav atrasts
 DocType: Scheduling Tool,Student Batch,Student Partijas
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Jūsu klienti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,padarīt Students
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,padarīt Students
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Jūs esat uzaicināts sadarboties projektam: {0}
 DocType: Leave Block List Date,Block Date,Block Datums
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Pieteikties tagad
@@ -2222,8 +2218,9 @@
 DocType: SMS Log,Sent To,Nosūtīts
 DocType: Payment Request,Make Sales Invoice,Izveidot PPR
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programmatūra
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Nākamais Kontaktinformācija datums nedrīkst būt pagātnē
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nākamais Kontaktinformācija datums nedrīkst būt pagātnē
 DocType: Company,For Reference Only.,Tikai atsaucei.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Izvēlieties Partijas Nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nederīga {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Summa
@@ -2237,7 +2234,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. nevar būt 0
 DocType: Item,Show a slideshow at the top of the page,Parādiet slaidrādi augšpusē lapas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Veikali
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Veikali
 DocType: Serial No,Delivery Time,Piegādes laiks
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Novecošanās Based On
 DocType: Item,End of Life,End of Life
@@ -2253,8 +2250,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Materiāls
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Norādiet operācijas, ekspluatācijas izmaksas un sniegt unikālu ekspluatācijā ne jūsu darbībām."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokuments ir pāri robežai ar {0} {1} par posteni {4}. Jūs padarīt vēl {3} pret pats {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Izvēlieties Mainīt summu konts
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Izvēlieties Mainīt summu konts
 DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
 DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvs Stock
@@ -2265,7 +2262,7 @@
 DocType: Budget Account,Budget Account,budžeta kontā
 DocType: Quality Inspection,Verified By,Verified by
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nevar mainīt uzņēmuma noklusējuma valūtu, jo ir kādi darījumi. Darījumi jāanulē, lai mainītu noklusējuma valūtu."
-DocType: Grade Interval,Grade Description,grade Apraksts
+DocType: Grading Scale Interval,Grade Description,grade Apraksts
 DocType: Stock Entry,Purchase Receipt No,Pirkuma čeka Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Rokas naudas
 DocType: Process Payroll,Create Salary Slip,Izveidot algas lapu
@@ -2303,7 +2300,7 @@
 DocType: Upload Attendance,Attendance To Date,Apmeklējumu Lai datums
 DocType: Warranty Claim,Raised By,Paaugstināts Līdz
 DocType: Payment Gateway Account,Payment Account,Maksājumu konts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto izmaiņas debitoru
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensējošs Off
 DocType: Offer Letter,Accepted,Pieņemts
@@ -2317,7 +2314,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,lietotāju forums
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
 DocType: Employee,Previous Work Experience,Iepriekšējā darba pieredze
@@ -2331,7 +2328,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Institūta nosaukums, ko jums ir izveidot šo sistēmu."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Grāmatvedības ieraksts iesaldēta līdz šim datumam, neviens nevar darīt / mainīt ierakstu izņemot lomu zemāk norādīto."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Lūdzu, saglabājiet dokumentu pirms ražošanas apkopes grafiku"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Lūdzu, saglabājiet dokumentu pirms ražošanas apkopes grafiku"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekta statuss
 DocType: UOM,Check this to disallow fractions. (for Nos),Pārbaudiet to neatļaut frakcijas. (Par Nr)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Tika izveidoti šādi pasūtījumu:
@@ -2354,6 +2351,7 @@
 DocType: Email Digest,How frequently?,Cik bieži?
 DocType: Purchase Receipt,Get Current Stock,Saņemt krājumam
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill Materiālu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prece Kods&gt; Prece Group&gt; Brand
 DocType: Student,Joining Date,savieno datums
 ,Employees working on a holiday,Darbinieki strādā par brīvdienu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
@@ -2435,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Klīrenss datums nav minēts
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Ražošana
 DocType: Guardian,Occupation,nodarbošanās
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
 DocType: Sales Invoice,This Document,šo dokumentu
 DocType: Installation Note Item,Installed Qty,Uzstādītas Daudz
@@ -2458,8 +2456,8 @@
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Iestatītu noklusētās vērtības, piemēram, Company, valūtas, kārtējā fiskālajā gadā, uc"
 DocType: Payment Entry,Payment Type,Maksājuma veids
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
 DocType: Process Payroll,Select Employees,Izvēlieties Darbinieki
 DocType: Opportunity,Potential Sales Deal,Potenciālie Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Čeks / Reference Date
@@ -2476,7 +2474,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} jau radīts uzņēmums {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Aizstāt preci / BOM visās BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvīts dokuments ir jāiesniedz
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvīts dokuments ir jāiesniedz
 DocType: Purchase Invoice Item,Received Qty,Saņēma Daudz
 DocType: Stock Entry Detail,Serial No / Batch,Sērijas Nr / Partijas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,"Nav samaksāta, un nav sniegusi"
@@ -2489,7 +2487,7 @@
 ,To Produce,Ražot
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Algas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Par rindu {0} jo {1}. Lai iekļautu {2} vienības likmi, rindas {3} jāiekļauj arī"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,padarīt lietotāju
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,padarīt lietotāju
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikācija paketes par piegādi (drukāšanai)
 DocType: Bin,Reserved Quantity,Rezervēts daudzums
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ievadiet derīgu e-pasta adresi
@@ -2503,11 +2501,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Invalīdu veidni nedrīkst noklusējuma veidni
 DocType: Account,Income Account,Ienākumu konta
 DocType: Payment Request,Amount in customer's currency,Summa klienta valūtā
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Nodošana
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Nodošana
 DocType: Stock Reconciliation Item,Current Qty,Pašreizējais Daudz
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Skatīt ""Rate Materiālu Balstoties uz"" in tāmēšanu iedaļā"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Iepriekšējā
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studentu Partijas palīdzēs jums izsekot apmeklējumu, slēdzienus un maksu studentiem"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studentu Partijas palīdzēs jums izsekot apmeklējumu, slēdzienus un maksu studentiem"
 DocType: Payment Entry,Total Allocated Amount,Kopējā piešķirtā summa
 DocType: Item Reorder,Material Request Type,Materiāls Pieprasījuma veids
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry algām no {0} līdz {1}
@@ -2530,7 +2529,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
@@ -2540,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Vai Uzrakstīt par pasākumu darbiniekiem ar statusu &quot;Atvērt&quot;
 DocType: Task,Depends on Tasks,Atkarīgs no uzdevumiem
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Pārvaldīt Klientu grupa Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Pielikumi var parādīt bez ļaujot iepirkumu grozu
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Jaunais Izmaksu centrs Name
 DocType: Leave Control Panel,Leave Control Panel,Atstājiet Control Panel
@@ -2552,12 +2552,10 @@
 DocType: Sales Invoice,Debit To,Debets
 DocType: Delivery Note,Required only for sample item.,Nepieciešams tikai paraugu posteni.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs veids
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs veids
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nav alga slip atrasts starp {0} un {1}
 ,Pending SO Items For Purchase Request,Kamēr SO šeit: pirkuma pieprasījumu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentu Uzņemšana
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ir izslēgts
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ir izslēgts
 DocType: Supplier,Billing Currency,Norēķinu valūta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Īpaši liels
@@ -2574,7 +2572,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Visi novērtēšanas grupas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Jauns Noliktava vārds
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Kopā {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Kopā {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
 DocType: Stock Settings,Default Valuation Method,Default Vērtēšanas metode
@@ -2592,7 +2590,7 @@
 DocType: Price List,Price List Master,Cenrādis Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pārdošanas darījumi var tagged pret vairāku ** pārdevēji **, lai jūs varat noteikt un kontrolēt mērķus."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Atstājiet Pieteikumus ar statusu tikai &quot;Apstiprināts&quot; un &quot;Noraidīts&quot; var iesniegt
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Grupas nosaukums ir obligāta kārtas {0}
@@ -2673,7 +2671,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 DocType: Vehicle Service,Engine Oil,Motora eļļas
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
 DocType: Employee Loan,Loan Details,aizdevums Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rinda {0}: Pabeigts Daudz jābūt lielākai par nulli.
@@ -2738,7 +2736,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Noliktavas ar esošo darījumu nevar pārvērst grupai.
 DocType: Assessment Result Tool,Result HTML,rezultāts HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Beigu termiņš
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Pievienot Students
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Pievienot Students
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Lūdzu, izvēlieties {0}"
 DocType: C-Form,C-Form No,C-Form Nr
 DocType: BOM,Exploded_items,Exploded_items
@@ -2803,7 +2801,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akadēmiskā termins ar šo &quot;mācību gada&quot; {0} un &quot;Termina nosaukums&quot; {1} jau eksistē. Lūdzu mainīt šos ierakstus un mēģiniet vēlreiz.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Tā kā ir esošie darījumi pret posteni {0}, jūs nevarat mainīt vērtību {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Tā kā ir esošie darījumi pret posteni {0}, jūs nevarat mainīt vērtību {1}"
 DocType: UOM,Must be Whole Number,Jābūt veselam skaitlim
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Jaunas lapas Piešķirtas (dienās)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Sērijas Nr {0} nepastāv
@@ -2847,7 +2845,7 @@
 DocType: Supplier,Last Day of the Next Month,Pēdējā diena nākamajā mēnesī
 DocType: Support Settings,Auto close Issue after 7 days,Auto tuvu Issue pēc 7 dienām
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atvaļinājumu nevar tikt piešķirts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Pretendents
 DocType: Asset Category Account,Accumulated Depreciation Account,Uzkrātais nolietojums konts
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
@@ -2875,8 +2873,8 @@
 DocType: Asset,Item Code,Postenis Code
 DocType: Production Planning Tool,Create Production Orders,Izveidot pasūtījumu
 DocType: Serial No,Warranty / AMC Details,Garantijas / AMC Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
 DocType: Lead,Market Segment,Tirgus segmentā
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Samaksātā summa nedrīkst būt lielāka par kopējo negatīvo nenomaksātās summas {0}
@@ -2895,7 +2893,7 @@
 DocType: Production Planning Tool,Create Material Requests,Izveidot Materiāls Pieprasījumi
 DocType: Employee Education,School/University,Skola / University
 DocType: Payment Request,Reference Details,Atsauce Details
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Paredzams, Value Pēc Lietderīgās lietošanas laika jābūt mazākam nekā Bruto Pirkuma summa"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Paredzams, Value Pēc Lietderīgās lietošanas laika jābūt mazākam nekā Bruto Pirkuma summa"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Pieejams Daudz at Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jāmaksā Summa
 DocType: Asset,Double Declining Balance,Paātrināto norakstīšanas
@@ -2916,19 +2914,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Izmaksātā summa nedrīkst būt lielāka par aizdevuma summu {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produkcija Pasūtījums nav izveidots
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Produkcija Pasūtījums nav izveidots
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nevar mainīt statusu kā studentam {0} ir saistīta ar studentu pieteikumu {1}
 DocType: Asset,Fully Depreciated,pilnībā amortizēta
 ,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Ievērojama Apmeklējumu HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citāti ir priekšlikumi, cenas jums ir nosūtīti uz jūsu klientiem"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citāti ir priekšlikumi, cenas jums ir nosūtīti uz jūsu klientiem"
 DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Sērijas Nr un partijas
 DocType: Warranty Claim,From Company,No Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa rādītājus vērtēšanas kritēriju jābūt {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Lūdzu noteikts skaits nolietojuma Rezervēts
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Lūdzu noteikts skaits nolietojuma Rezervēts
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vērtība vai Daudz
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minūte
@@ -3059,7 +3057,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentu grupa
 DocType: Shopping Cart Settings,Quotation Series,Piedāvājuma sērija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Lūdzu, izvēlieties klientu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,"Lūdzu, izvēlieties klientu"
 DocType: C-Form,I,es
 DocType: Company,Asset Depreciation Cost Center,Aktīvu amortizācijas izmaksas Center
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3078,19 +3076,18 @@
 DocType: Vehicle,Insurance Details,apdrošināšana Details
 DocType: Account,Payable,Maksājams
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ievadiet atmaksas termiņi
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitori ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Robeža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Jauni klienti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto peļņa%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Klīrenss Datums
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto Pirkuma summa ir obligāta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Pirkuma summa ir obligāta
 DocType: Lead,Address Desc,Adrese Dilst
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Puse ir obligāta
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Tēma Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Jāizvēlas Vismaz viens pirkšana vai pārdošana
-DocType: Grading Structure,Grade Intervals,Novērtējums intervāli
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Izvēlieties raksturu jūsu biznesu.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Gadījumos, kad ražošanas darbības tiek veiktas."
 DocType: Asset Movement,Source Warehouse,Source Noliktava
@@ -3119,6 +3116,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu grupas&gt; Teritorija
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Lūdzu iestatīt noklusēto {0} uzņēmumā {1}
 DocType: Cheque Print Template,Starting position from top edge,Sākuma stāvoklis no augšējās malas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Pats piegādātājs ir ievadīts vairākas reizes
@@ -3172,7 +3170,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Pārkārtot Daudz
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Pašreizējās vakanču
 DocType: Company,Stock Adjustment Account,Stock konta korekcijas
-DocType: Journal Entry,Write Off,Uzrakstiet Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Uzrakstiet Off
 DocType: Timesheet Detail,Operation ID,Darbība ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Ja kas, tas kļūs noklusējuma visiem HR formām."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: No {1}
@@ -3183,8 +3181,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Piegādātājs piegādā Klientam
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / postenis / {0}) ir no krājumiem
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Nākamais datums nedrīkst būt lielāks par norīkošanu Datums
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Rādīt nodokļu break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datu importēšana un eksportēšana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Krājumu pastāvēt pret Warehouse {0}, līdz ar to nevar atkārtoti piešķirt vai mainīt to"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nav studenti Atrasts
@@ -3196,14 +3194,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Lūdzu, izvēlieties citāti"
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Lūdzu, izvēlieties citāti"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Lūdzu, izvēlieties citāti"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Lūdzu, izvēlieties citāti"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
 DocType: Company,Default Cash Account,Default Naudas konts
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tas ir balstīts uz piedalīšanos šajā Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nav Skolēni
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pievienotu citus objektus vai Atvērt pilnu formu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
@@ -3250,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pirms samierināšanās
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Uz {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Nodokļi un maksājumi Pievienoja (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
 DocType: Sales Order,Partly Billed,Daļēji Jāmaksā
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Prece {0} ir jābūt pamatlīdzekļu posteni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Prece {0} ir jābūt pamatlīdzekļu posteni
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Lūdzu, atkārtoti tipa uzņēmuma nosaukums, lai apstiprinātu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Kopā Izcila Amt
@@ -3275,7 +3274,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Cenrādis Valūtas kurss
 DocType: Purchase Invoice Item,Rate,Likme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interns
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adrese nosaukums
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adrese nosaukums
 DocType: Stock Entry,From BOM,No BOM
 DocType: Assessment Code,Assessment Code,novērtējums Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Pamata
@@ -3300,7 +3299,7 @@
 DocType: Purchase Invoice,Print Language,print valoda
 DocType: Salary Slip,Total Working Hours,Kopējais darba laiks
 DocType: Stock Entry,Including items for sub assemblies,Ieskaitot posteņiem apakš komplektiem
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Ievadiet vērtība ir pozitīva
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Ievadiet vērtība ir pozitīva
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Visas teritorijas
 DocType: Purchase Invoice,Items,Preces
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Students jau ir uzņemti.
@@ -3319,17 +3318,15 @@
 DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,No un uz datumiem nepieciešamo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktavas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
 DocType: Assessment Plan,Supervisor Name,uzraudzītājs Name
 DocType: Program Enrollment Course,Program Enrollment Course,Programmas Uzņemšana kurss
 DocType: Program Enrollment Course,Program Enrollment Course,Programmas Uzņemšana kurss
-DocType: Grading Structure,Grading Structure,Šķirošana struktūra
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
 DocType: Tax Rule,Shipping City,Piegāde City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis postenis ir variants {0} (veidni). Atribūti tiks pārkopēti no šablona, ja ""Nē Copy"" ir iestatīts"
 DocType: Notification Control,Customize the Notification,Pielāgot paziņojumu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Naudas plūsma no darbības
 DocType: Sales Invoice,Shipping Rule,Piegāde noteikums
@@ -3352,6 +3349,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Atvēršanas datums būtu pirms slēgšanas datums
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu uzstādīšana numerācijas sērijas apmeklēšanu, izmantojot Setup&gt; numerācija Series"
 DocType: Leave Control Panel,Carry Forward,Virzīt uz priekšu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par virsgrāmatā"
 DocType: Department,Days for which Holidays are blocked for this department.,Dienas kuriem Brīvdienas ir bloķēta šajā departamentā.
@@ -3380,7 +3378,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kopā (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Postenis Sērijas Nr
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Izveidot Darbinieku Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Izveidot Darbinieku Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Kopā Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,grāmatvedības pārskati
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Stunda
@@ -3395,8 +3393,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Jaunais BOM pēc nomaiņas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Saņemtā summa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Izveidot pilnu daudzumu, ignorējot daudzumu jau pēc pasūtījuma"
 DocType: Account,Tax,Nodoklis
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nav marķēti
@@ -3409,7 +3405,7 @@
 DocType: Batch,Source Document Name,Avota Dokumenta nosaukums
 DocType: Batch,Source Document Name,Avota Dokumenta nosaukums
 DocType: Job Opening,Job Title,Amats
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Izveidot lietotāju
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Izveidot lietotāju
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,grams
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Apmeklējiet pārskatu uzturēšanas zvanu.
@@ -3421,8 +3417,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
 DocType: BOM,Website Description,Mājas lapa Apraksts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto pašu kapitāla izmaiņas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kvīts
 ,Sales Register,Sales Reģistrēties
@@ -3433,16 +3429,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Nav nekas, lai rediģētu."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,"No klientiem, kuri vēl!"
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Naudas plūsmas pārskats
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Lūdzu, izvēlieties Carry priekšu, ja jūs arī vēlaties iekļaut iepriekšējā finanšu gadā bilance atstāj šajā fiskālajā gadā"
 DocType: GL Entry,Against Voucher Type,Pret kupona Tips
 DocType: Item,Attributes,Atribūti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Ievadiet norakstīt kontu
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Pēdējā pasūtījuma datums
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark apmeklēšana vairākiem darbiniekiem
@@ -3467,14 +3465,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rinda {0} # jāņem tipa &quot;pamatlīdzekļu&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Daudz
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Noteikumi aprēķināt kuģniecības summu pārdošanu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Dokumenta numurs ir obligāts
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Dokumenta numurs ir obligāts
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Darbības veidi Time Baļķi
 DocType: Tax Rule,Sales,Pārdevums
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
 DocType: Training Event,Exam,eksāmens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
 DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Norēķinu Valsts
@@ -3507,7 +3505,7 @@
 DocType: Payment Entry,Account Paid From,Konts maksā no
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Izejvielas Produkta kods
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,padarīt Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,padarīt Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Drukas un Kancelejas
 DocType: Stock Settings,Show Barcode Field,Rādīt Svītrkoda Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
@@ -3523,6 +3521,7 @@
 DocType: Offer Letter,Awaiting Response,Gaida atbildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Iepriekš
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Pieminēt ja nestandarta jāmaksā konts
 DocType: Salary Slip,Earning & Deduction,Nopelnot & atskaitīšana
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
@@ -3559,7 +3558,7 @@
 DocType: Program Enrollment Tool,Get Students From,Iegūt studentus no
 DocType: Hub Settings,Seller Country,Pārdevējs Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicēt punkti Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupu jūsu skolēni partijās
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupu jūsu skolēni partijās
 DocType: Authorization Rule,Authorization Rule,Autorizācija noteikums
 DocType: Sales Invoice,Terms and Conditions Details,Noteikumi un nosacījumi Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikācijas
@@ -3619,7 +3618,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probācija
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,algu komponenti
 DocType: Program Enrollment Tool,New Academic Year,Jaunā mācību gada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Atgriešana / kredītu piezīmi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Atgriešana / kredītu piezīmi
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Kopējais samaksāto summu
 DocType: Production Order Item,Transferred Qty,Nodota Daudz
@@ -3660,6 +3659,7 @@
 ,Sales Funnel,Pārdošanas piltuve
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Saīsinājums ir obligāta
 DocType: Project,Task Progress,uzdevums Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Rati
 ,Qty to Transfer,Daudz Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citāti par potenciālajiem klientiem vai klientiem.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Loma Atļauts rediģēt saldētas krājumus
@@ -3693,7 +3693,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,savākt maksas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
 DocType: Lead,Add to calendar on this date,Pievienot kalendāram šajā datumā
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Noteikumi par piebilstot piegādes izmaksas.
 DocType: Item,Opening Stock,Atklāšanas Stock
@@ -3711,7 +3711,7 @@
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pasūtījumi izlaists ražošanai.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Program Enrollment Tool,Enroll Students,uzņemt studentus
 DocType: Hub Settings,Name Token,Nosaukums Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard pārdošana
@@ -3722,7 +3722,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projekta nosaukums
-DocType: Supplier,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
+DocType: Customer,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
 DocType: Journal Entry Account,If Income or Expense,Ja ieņēmumi vai izdevumi
 DocType: Production Order,Required Items,Nepieciešamie Items
 DocType: Stock Ledger Entry,Stock Value Difference,Preces vērtība Starpība
@@ -3753,6 +3753,7 @@
 DocType: Item,Taxes,Nodokļi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Maksas un nav sniegusi
 DocType: Project,Default Cost Center,Default Izmaksu centrs
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 DocType: Bank Guarantee,End Date,Beigu datums
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,akciju Darījumi
 DocType: Budget,Budget Accounts,budžeta konti
@@ -3817,7 +3818,7 @@
 DocType: Customer,Sales Partner and Commission,Pārdošanas Partner un Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Procentu likme (%) / gads
 ,Project Quantity,projekta daudzums
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var būt jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var būt jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
 DocType: Opportunity,To Discuss,Apspriediet
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} vienības {1} nepieciešama {2}, lai pabeigtu šo darījumu."
 DocType: Loan Type,Rate of Interest (%) Yearly,Procentu likme (%) Gada
@@ -3840,7 +3841,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Nekonstatē
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rinda {0}: valūta BOM # {1} jābūt vienādam ar izvēlētās valūtas {2}
 DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,maksa Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
@@ -3857,7 +3858,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Noliktava {0} nepastāv
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Reģistrēties Par ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mēneša procentuālo sadalījumu
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Vērtēšanas likme nav atrasts par Pozīcijas {0}, kas ir nepieciešama, lai darīt grāmatvedības ierakstus {1} {2}. Ja prece ir transakcijas kā izlases vienumu {1}, lūdzu, norādiet, ka {1} Vienības tabulā. Pretējā gadījumā, lūdzu, izveidojiet ienākošo krājumu darījumu par objektu vai pieminēt vērtēšanas likmi postenī ierakstu, un tad mēģiniet submiting / šo ierakstu atcelšana"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiālu piegādā pret šo piegāde piezīmes
 DocType: Project,Customer Details,Klientu Details
@@ -3874,7 +3875,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Iesniegtie pasūtījumus nevar izdzēst
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kvalitātes vadība
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Prece {0} ir atspējota
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Prece {0} ir atspējota
 DocType: Employee Loan,Repay Fixed Amount per Period,Atmaksāt summu par vienu periodu
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
 DocType: Employee External Work History,Employee External Work History,Darbinieku Ārējās Work Vēsture
@@ -3901,7 +3902,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Paziņojums (dienas)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
 DocType: Employee,Encashment Date,Inkasācija Datums
 DocType: Training Event,Internet,internets
 DocType: Account,Stock Adjustment,Stock korekcija
@@ -3935,6 +3936,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Parādzīme Izdoti
 DocType: Production Order,Warehouses,Noliktavas
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktīvu nevar nodot
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Šis postenis ir variants {0} (veidnes).
 DocType: Workstation,per hour,stundā
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 DocType: Announcement,Announcement,paziņojums
@@ -3950,7 +3952,7 @@
 DocType: Account,Receivable,Saņemams
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Loma, kas ir atļauts iesniegt darījumus, kas pārsniedz noteiktos kredīta limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Izvēlieties preces Rūpniecība
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Izvēlieties preces Rūpniecība
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
 DocType: Item,Material Issue,Materiāls Issue
 DocType: Hub Settings,Seller Description,Pārdevējs Apraksts
@@ -3963,7 +3965,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pasūtīts
 DocType: Salary Detail,Component,komponents
 DocType: Assessment Criteria,Assessment Criteria Group,Vērtēšanas kritēriji Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Atklāšanas Uzkrātais nolietojums jābūt mazākam nekā vienādam ar {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Atklāšanas Uzkrātais nolietojums jābūt mazākam nekā vienādam ar {0}
 DocType: Warehouse,Warehouse Name,Noliktavas nosaukums
 DocType: Naming Series,Select Transaction,Izvēlieties Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ievadiet apstiprināšana loma vai apstiprināšana lietotāju
@@ -3998,7 +4000,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Lai uzstādītu šo taksācijas gadu kā noklusējumu, noklikšķiniet uz ""Set as Default"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pievienoties
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
 DocType: Employee Loan,Repay from Salary,Atmaksāt no algas
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Pieprasot samaksu pret {0} {1} par summu {2}
@@ -4016,7 +4018,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Novērtējums rezultāts Detail
 DocType: Employee Education,Employee Education,Darbinieku izglītība
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dublikāts postenis grupa atrodama postenī grupas tabulas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Konts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Sērijas Nr {0} jau ir saņēmis
@@ -4025,7 +4027,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Noliktava {0} nav saistīts ar jebkuru kontu, lūdzu, izveidojiet / saiti atbilstošo (aktīvs) kontu noliktavā."
 DocType: Purchase Invoice,Recurring Id,Atkārtojas Id
 DocType: Customer,Sales Team Details,Sales Team Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Izdzēst neatgriezeniski?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Izdzēst neatgriezeniski?
 DocType: Expense Claim,Total Claimed Amount,Kopējais pieprasītā summa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciālie iespējas pārdot.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Nederīga {0}
@@ -4036,13 +4038,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup jūsu skola ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Summa (Company valūta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Saglabājiet dokumentu pirmās.
 DocType: Account,Chargeable,Iekasējams
 DocType: Company,Change Abbreviation,Mainīt saīsinājums
 DocType: Expense Claim Detail,Expense Date,Izdevumu Datums
 DocType: Item,Max Discount (%),Max Atlaide (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Pēdējā pasūtījuma Summa
+DocType: Task,Is Milestone,Vai Milestone
 DocType: Daily Work Summary,Email Sent To,E-pasts nosūtīts
 DocType: Budget,Warn,Brīdināt
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos."
@@ -4075,11 +4078,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Iesaldēt Krājumus vecākus par` jābūt mazākam par %d dienām.
 DocType: Tax Rule,Purchase Tax Template,Iegādāties Nodokļu veidne
 ,Project wise Stock Tracking,Projekts gudrs Stock izsekošana
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Uzturēšana Kalendārs {0} nepastāv pret {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiskā Daudz (pie avota / mērķa)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Darbinieku ieraksti.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
 DocType: HR Settings,Payroll Settings,Algas iestatījumi
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match nesaistītajos rēķiniem un maksājumiem.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Pasūtīt
@@ -4102,7 +4104,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čeki un noguldījumi nepareizi noskaidroti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
 DocType: Purchase Invoice Item,Price List Rate,Cenrādis Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Izveidot klientu citātus
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Izveidot klientu citātus
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Parādiet ""noliktavā"", vai ""nav noliktavā"", pamatojoties uz pieejamā krājuma šajā noliktavā."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Vidējais laiks, ko piegādātājs piegādāt"
@@ -4124,7 +4126,7 @@
 DocType: Asset,Disposal Date,Atbrīvošanās datums
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pastu tiks nosūtīts visiem Active uzņēmuma darbiniekiem tajā konkrētajā stundā, ja viņiem nav brīvdienu. Atbilžu kopsavilkums tiks nosūtīts pusnaktī."
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,apmācības Atsauksmes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
@@ -4132,7 +4134,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurss ir obligāta kārtas {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Līdz šim nevar būt agrāk no dienas
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Pievienot / rediģēt Cenas
 DocType: Batch,Parent Batch,Mātes Partijas
 DocType: Batch,Parent Batch,Mātes Partijas
 DocType: Cheque Print Template,Cheque Print Template,Čeku Print Template
@@ -4177,7 +4179,7 @@
 DocType: Item,Variant Based On,"Variants, kura pamatā"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Jūsu Piegādātāji
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
 DocType: Request for Quotation Item,Supplier Part No,Piegādātājs daļas nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nevar atskaitīt, ja kategorija ir &quot;vērtēšanas&quot; vai &quot;Vaulation un Total&quot;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Saņemts no
@@ -4187,7 +4189,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: No {0} uz {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rinda {0}: Stundas vērtībai ir jābūt lielākai par nulli.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
@@ -4196,20 +4198,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
 DocType: Payment Reconciliation,From Invoice Date,No rēķina datuma
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Norēķinu valūta ir jābūt vienādam vai nu noklusējuma comapany valūtu vai partija konta valūtā
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Norēķinu valūta ir jābūt vienādam vai nu noklusējuma comapany valūtu vai partija konta valūtā
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,atstājiet inkasācijas
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ko tas dod?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Uz noliktavu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Visas Studentu Uzņemšana
 ,Average Commission Rate,Vidēji Komisija likme
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
 DocType: School House,House Name,Māja vārds
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,"Atjaunināt papildu izmaksas, lai aprēķinātu izkraut objektu izmaksas"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrības
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Pievienojiet pārējo Jūsu organizācija, kā jūsu lietotājiem. Jūs varat pievienot arī uzaicināt klientus, lai jūsu portāla, pievienojot tos no kontaktiem"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Pievienojiet pārējo Jūsu organizācija, kā jūsu lietotājiem. Jūs varat pievienot arī uzaicināt klientus, lai jūsu portāla, pievienojot tos no kontaktiem"
 DocType: Stock Entry,Total Value Difference (Out - In),Kopējā vērtība Starpība (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},"Lietotāja ID nav noteikts, Darbinieka {0}"
@@ -4218,7 +4220,7 @@
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Apdrošināšanas Sākuma datums jābūt mazākam nekā apdrošināšana Beigu datums
@@ -4233,7 +4235,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Alga Slip darbinieka {0} jau radīts laiks lapas {1}
 DocType: Vehicle Log,Odometer,odometra
 DocType: Sales Order Item,Ordered Qty,Pasūtīts daudzums
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},"Laika posmā no un periodu, lai datumiem obligātajām atkārtotu {0}"
@@ -4246,7 +4248,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
 DocType: Sales Invoice Timesheet,Billing Hours,Norēķinu Stundas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Default BOM par {0} nav atrasts
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Pieskarieties objektus, lai pievienotu tos šeit"
 DocType: Fees,Program Enrollment,Program Uzņemšanas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lūdzu noteikt {0}
@@ -4347,7 +4350,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
 DocType: Issue,First Responded On,First atbildēja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross uzskaitījums Prece ir vairākām grupām
-DocType: Grade Interval,Grade Interval,grade intervāls
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskālā gada sākuma datums un fiskālā gada beigu datums jau ir paredzēta fiskālā gada {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,atjaunināts klīrenss Datums
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Partijas
@@ -4356,6 +4358,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Lejupielādēt PDF
 DocType: Production Order,Planned End Date,Plānotais beigu datums
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs veids
 DocType: Request for Quotation,Supplier Detail,piegādātājs Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Kļūda formulu vai stāvoklī: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Rēķinā summa
@@ -4401,7 +4404,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Uzstādīt vienkāršu mājas lapu manai organizācijai
 DocType: Payment Reconciliation,Receivable / Payable Account,Debitoru / kreditoru konts
 DocType: Delivery Note Item,Against Sales Order Item,Pret Sales Order posteni
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ievadiet mātes izmaksu centru
@@ -4461,7 +4464,7 @@
 ,Items To Be Requested,"Preces, kas jāpieprasa"
 DocType: Purchase Order,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Company,Company Info,Uzņēmuma informācija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Izmaksu centrs ir nepieciešams rezervēt izdevumu prasību
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Līdzekļu (aktīvu)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tas ir balstīts uz piedalīšanos šī darbinieka
@@ -4474,13 +4477,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pietura lietotājiem veikt Leave Pieteikumi uz nākamajās dienās.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,pirkuma summa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Piegādātājs Piedāvājums {0} izveidots
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Darbinieku pabalsti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Production Order,Manufactured Qty,Ražoti Daudz
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Lūdzu iestatīt noklusējuma brīvdienu sarakstu par darbinieka {0} vai Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neeksistē
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neeksistē
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
@@ -4489,15 +4492,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lasīšana 3
 ,Hub,Rumba
 DocType: GL Entry,Voucher Type,Kuponu Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Employee Loan Application,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
 DocType: Guardian,Guardian,aizbildnis
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Izvērtēšana {0} radīts Darbinieku {1} dotajā datumu diapazonā
 DocType: Employee,Education,Izglītība
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampaņas nosaukšana Līdz
 DocType: Employee,Current Address Is,Pašreizējā adrese ir
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,pārveidots
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Pēc izvēles. Komplekti uzņēmuma noklusējuma valūtu, ja nav norādīts."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
@@ -4534,7 +4539,7 @@
 DocType: Hub Settings,Hub Settings,Hub iestatījumi
 DocType: Project,Gross Margin %,Bruto rezerve%
 DocType: BOM,With Operations,Ar operāciju
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
 DocType: Asset,Is Existing Asset,Vai esošajam aktīvam
 DocType: Salary Detail,Statistical Component,statistikas komponents
 DocType: Salary Detail,Statistical Component,statistikas komponents
@@ -4590,7 +4595,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pievienojiet Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,krājumu līmeņi
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Izveidot Variantu
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Izveidot Variantu
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksājuma veids ir viens no saņemšana, Pay un Iekšējās Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4603,6 +4608,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Atļaut Production brīvdienās
 DocType: Sales Order,Customer's Purchase Order Date,Klienta Pasūtījuma datums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Pamatkapitāls
+DocType: Shopping Cart Settings,Show Public Attachments,Parādīt publisko pielikumus
 DocType: Packing Slip,Package Weight Details,Iepakojuma svars Details
 DocType: Payment Gateway Account,Payment Gateway Account,Maksājumu Gateway konts
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pēc maksājuma pabeigšanas novirzīt lietotāju uz izvēlētā lapā.
@@ -4627,7 +4633,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nerādīt kādu simbolu, piemēram, $$ utt blakus valūtām."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Padarīt Student Sērija
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Padarīt Student Sērija
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Dabūtu preces no BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Izpildes laiks dienas
@@ -4646,8 +4652,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sodīts Summa
 DocType: GL Entry,Is Opening,Vai atvēršana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu uzstādīšana numerācijas sērijas apmeklēšanu, izmantojot Setup&gt; numerācija Series"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu uzstādīšana numerācijas sērijas apmeklēšanu, izmantojot Setup&gt; numerācija Series"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konts {0} nepastāv
 DocType: Account,Cash,Nauda
 DocType: Employee,Short biography for website and other publications.,Īsa biogrāfija mājas lapas un citas publikācijas.
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 845ece7..74a2c82 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Серија ставка истечен статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банкарски Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Прикажи Варијанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Прикажи Варијанти
 DocType: Academic Term,Academic Term,академски мандат
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материјал
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Кол
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравствена заштита
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задоцнување на плаќањето (во денови)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Расходи на услуги
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е потребен
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Рекламирање
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Истата компанија се внесе повеќе од еднаш
 DocType: Employee,Married,Брак
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се дозволени за {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не се дозволени за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Се предмети од
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Нема ставки наведени
 DocType: Payment Reconciliation,Reconcile,Помират
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 DocType: Process Payroll,Make Bank Entry,Направете банка Влегување
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиски фондови
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следна Амортизација датум не може да биде пред Дата на продажба
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следна Амортизација датум не може да биде пред Дата на продажба
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** ** Месечен Дистрибуција помага да се дистрибуираат на буџетот / Целна низ месеци, ако има сезоната во вашиот бизнис."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Не се пронајдени производи
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Не се пронајдени производи
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Плата Структура исчезнати
 DocType: Lead,Person Name,Име лице
 DocType: Sales Invoice Item,Sales Invoice Item,Продажна Фактура Артикал
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","на пример, &quot;ОУ&quot; или &quot;Универзитетот&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,акции на извештаи
 DocType: Warehouse,Warehouse Detail,Магацински Детал
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Термин Датум на завршување не може да биде подоцна од годината Датум на завршување на учебната година во која е поврзана на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Дали е фиксни средства"" не може да е немаркирано , како што постои евиденција на средствата во однос на ставките"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Дали е фиксни средства"" не може да е немаркирано , како што постои евиденција на средствата во однос на ставките"
 DocType: Vehicle Service,Brake Oil,кочница нафта
 DocType: Tax Rule,Tax Type,Тип на данок
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
 DocType: BOM,Item Image (if not slideshow),Точка слика (доколку не слајдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Постои клиентите со исто име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оцени / 60) * Крај на време операција
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,изберете Бум
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,изберете Бум
 DocType: SMS Log,SMS Log,SMS Влез
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Цената на испорачани материјали
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Празникот на {0} не е меѓу Од датум и до денес
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,одделение
 DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: SMS Center,All Contact,Сите Контакт
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производството со цел веќе создадена за сите предмети со Бум
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Производството со цел веќе создадена за сите предмети со Бум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годишна плата
 DocType: Daily Work Summary,Daily Work Summary,Секојдневната работа Резиме
 DocType: Period Closing Voucher,Closing Fiscal Year,Затворање на фискалната година
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} е замрзнат
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} е замрзнат
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Ве молиме одберете постоечка компанија за создавање сметковниот
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Акции Трошоци
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Одберете Целна Магацински
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Контра Влегување
 DocType: Journal Entry Account,Credit in Company Currency,Кредит во компанијата Валута
 DocType: Delivery Note,Installation Status,Инсталација Статус
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Дали сакате да го обновите присуство? <br> Присутни: {0} \ <br> Отсутни: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прифатени + Отфрлени Количина мора да биде еднаков Доби количество за Точка {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Снабдување на суровини за набавка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Потребна е барем еден начин за плаќање на POS фактура.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Потребна е барем еден начин за плаќање на POS фактура.
 DocType: Products Settings,Show Products as a List,Прикажи производи во облик на листа
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преземете ја Шаблон, пополнете соодветни податоци и да го прикачите по промената на податотеката. Сите датуми и вработен комбинација на избраниот период ќе дојде во дефиниција, со постоечките записи посетеност"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Направете Амортизација Влегување
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Тип на Барањето
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Направете вработените
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Направете вработените
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Емитување
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Извршување
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детали за операции извршени.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План за посети одржување.
 DocType: SMS Settings,Enter url parameter for message,Внесете URL параметар за порака
 DocType: POS Profile,Customer Groups,Групи на клиентите
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,финансиски извештаи
 DocType: Guardian,Students,студентите
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила за примена на цените и попуст.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Мора да се примени Ценовник за Купување или Продажба
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за оваа трансакција
 DocType: Company,Default Payroll Payable Account,Аватарот на Даноци се плаќаат сметка
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Ажурирање на е-мејл група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Ажурирање на е-мејл група
 DocType: Sales Invoice,Is Opening Entry,Се отвора Влегување
 DocType: Customer Group,Mention if non-standard receivable account applicable,Да се наведе ако нестандардни побарувања сметка за важечките
 DocType: Course Schedule,Instructor Name,инструктор Име
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Во однос на ставка од Продажна фактура
 ,Production Orders in Progress,Производство налози во прогрес
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето паричен тек од финансирањето
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Вкупно Износ на трошоци (преку време лист)
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банката записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Објави во Hub
 DocType: Student Admission,Student Admission,за прием на студентите
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Точка {0} е откажана
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 DocType: Item,Purchase Details,Купување Детали за
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Да го извести преку е-пошта на создавање на автоматски материјал Барање
 DocType: Journal Entry,Multi Currency,Мулти Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип на фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Потврда за испорака
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Трошоци на продадени средства
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} влезе двапати во ставка Данок
-DocType: Grade Interval,Min Score,мин рејтинг
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} влезе двапати во ставка Данок
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
 DocType: Student Applicant,Admitted,призна
 DocType: Workstation,Rent Cost,Изнајмување на трошоците
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,цел вредност
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банка / Готовински трансакции од страна или за внатрешен трансфер
 DocType: Shipping Rule,Valid for Countries,Важат за земјите
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Вкупно Разгледани Нарачки
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ве молиме внесете &quot;Повторување на Денот на месец областа вредност
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Даночна стапка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} веќе наменети за вработените {1} за период {2} до {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Одберете ја изборната ставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Претворат во не-групата
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Серија (дел) од една ставка.
 DocType: C-Form Invoice Detail,Invoice Date,Датум на фактурата
 DocType: GL Entry,Debit Amount,Износ дебитна
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Креирај студентски групи
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Барање за прибирање НА ПОНУДИ
 DocType: Salary Slip Timesheet,Working Hours,Работно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промените почетниот / тековниот број на секвенца на постоечки серија.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Креирај нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Креирај нов клиент
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако има повеќе Правила Цените и понатаму преовладуваат, корисниците се бара да поставите приоритет рачно за решавање на конфликтот."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Создаде купување на налози
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Создаде купување на налози
 ,Purchase Register,Купување Регистрирај се
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Се применува Давачки
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобалните поставувања за сите производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати до
 DocType: SMS Log,Sent On,Испрати на
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Одмор господар.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Од Пакет број
 DocType: Item Attribute,To Range,Да се движи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Хартии од вредност и депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да го смените начинот на вреднување, како што постојат трансакции против некои предмети кои не го имаат свој метод на вреднување"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Вкупно Отсуства распределени е задолжително
 DocType: Job Opening,Description of a Job Opening,Опис на работно место
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Во очекување на активности за денес
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
 DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Размислете за купување
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ве молиме да се дефинира одделение за Праг 0%
 DocType: Sales Order,To Deliver,За да овозможи
 DocType: Purchase Invoice Item,Item,Точка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
 DocType: Account,Profit and Loss,Добивка и загуба
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управување Склучување
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 DocType: Production Plan Item,Pending Qty,Во очекување на Количина
 DocType: Budget,Ignore,Игнорирај
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не е активен
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не е активен
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},СМС испратен до следните броеви: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,проверка подесување димензии за печатење
 DocType: Salary Slip,Salary Slip Timesheet,Плата фиш timesheet
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Вкупно Маргина
 DocType: Pricing Rule,Sales Partner,Продажбата партнер
 DocType: Buying Settings,Purchase Receipt Required,Купување Прием Потребно
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Вреднување курс е задолжително ако влезе отворање на Акции
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Вреднување курс е задолжително ако влезе отворање на Акции
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Акумулирана вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Направи Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Направи Продај Побарувања
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Потенцијален клиент Id
 DocType: C-Form Invoice Detail,Grand Total,Сѐ Вкупно
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,продолжи Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повтори клиенти
 DocType: Leave Control Panel,Allocate,Распредели
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Продажбата Враќање
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Забелешка: Вкупно распределени лисја {0} не треба да биде помал од веќе одобрен лисја {1} за периодот
 DocType: Announcement,Posted By,Испратено од
 DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,Понуда за
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардна единица мерка за ставка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (и) со друг UOM. Ќе треба да се создаде нова ставка и да се користи различен стандарден UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардна единица мерка за ставка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (и) со друг UOM. Ќе треба да се создаде нова ставка и да се користи различен стандарден UOM.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Распределени износ не може да биде негативен
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ве молиме да се постави на компанијата
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ве молиме да се постави на компанијата
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продај фактура timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Изберете Account плаќање да се направи банка Влегување
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Креирај вработен евиденција за управување со лисја, барања за трошоци и плати"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Креирај вработен евиденција за управување со лисја, барања за трошоци и плати"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додади во База на знаење
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Пишување предлози
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаќање за влез Одбивање
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Врска со Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менаџер
 DocType: Payment Entry,Payment From / To,Плаќање од / до
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Период
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е помала од сегашната преостанатиот износ за клиентите. Кредитен лимит мора да биде барем {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е помала од сегашната преостанатиот износ за клиентите. Кредитен лимит мора да биде барем {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Врз основа на&quot; и &quot;група Со&quot; не може да биде ист
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,Резолуцијата Датум
 DocType: Student Batch Name,Batch Name,Име на серијата
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet е основан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,запишат
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ќе се покаже на ученикот како Присутни во Студентски Публика Месечен извештај
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,студентски Публика
 DocType: Sales Invoice Timesheet,Time Sheet,време лист
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Суровини врз основа на
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ве молиме внесете детали ставка
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ве молиме внесете детали ставка
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,пред продажбата
 DocType: Purchase Receipt,Other Details,Други детали
@@ -739,7 +742,7 @@
 ,Absent Student Report,Отсутни Студентски извештај
 DocType: Email Digest,Next email will be sent on:,Следната е-мејл ќе бидат испратени на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда писмо Рок
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компанијата {0} не постои
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,Гаранција датумот на истекување
 DocType: Material Request Item,Quantity and Warehouse,Кол и Магацински
 DocType: Sales Invoice,Commission Rate (%),Комисијата стапка (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Ве молиме одберете програма
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Ве молиме одберете програма
 DocType: Project,Estimated Cost,Проценетите трошоци
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не е складишна ставка
 DocType: Mode of Payment Account,Default Account,Стандардно профил
 DocType: Payment Entry,Received Amount (Company Currency),Добиениот износ (Фирма валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ве молиме изберете неделно слободен ден
 DocType: Production Order Operation,Planned End Time,Планирани Крај
 ,Sales Person Target Variance Item Group-Wise,Продажбата на лице Целна група Варијанса точка-wise
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Request for Quotation Supplier,Send Email,Испрати E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Нема дозвола
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не се пронајдени вработен
 DocType: Supplier Quotation,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Група на студенти веќе се ажурираат.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Група на студенти веќе се ажурираат.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Група на студенти веќе се ажурираат.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Група на студенти веќе се ажурираат.
 DocType: SMS Center,All Customer Contact,Сите корисници Контакт
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Внеси акции рамнотежа преку CSV.
 DocType: Warehouse,Tree Details,Детали за дрво
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минималниот износ на фактура
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Цена Центар {2} не припаѓа на компанијата {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Сметка {2} не може да биде група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка ред IDX {}: {DOCTYPE} {docname} не постои во над &quot;{DOCTYPE}&quot; маса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка ред IDX {}: {DOCTYPE} {docname} не постои во над &quot;{DOCTYPE}&quot; маса
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Не задачи
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","На ден од месецот на кој авто фактура ќе биде генериранa на пример 05, 28 итн"
 DocType: Asset,Opening Accumulated Depreciation,Отворање Акумулирана амортизација
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,Преселба Просечна стапка
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Распоред на курсот
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Распоред на курсот
 DocType: Maintenance Visit,Completion Status,Проектот Статус
 DocType: HR Settings,Enter retirement age in years,Внесете пензионирање возраст во години
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целна Магацински
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Увоз Публика
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Сите групи на ставки
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Сите групи на ставки
 DocType: Process Payroll,Activity Log,Активност Влез
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Нето добивка / загуба
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Нарачка на плаќање
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање најдоцна до Датум
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Отворање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Отворете го направите
 DocType: Notification Control,Delivery Note Message,Испратница порака
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Повторно да Количина
 DocType: Leave Block List Date,Leave Block List Date,Остави Забрани Листа Датум
 DocType: Pricing Rule,Price or Discount,Цена или попуст
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Вкупно применливи давачки во Набавка Потврда Предмети маса мора да биде иста како и вкупните даноци и давачки
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Вкупно применливи давачки во Набавка Потврда Предмети маса мора да биде иста како и вкупните даноци и давачки
 DocType: Sales Team,Incentives,Стимулации
 DocType: SMS Log,Requested Numbers,Бара броеви
 DocType: Production Planning Tool,Only Obtain Raw Materials,Добивање само суровини
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,Стандардно Обврски
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Fee Structure,Components,делови
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хемиски
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Аватарот на банка / готовинска сметка ќе се ажурира автоматски во Плата весник Влегување кога е избран овој режим.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Интервалите за Степен законик {0} поклопува со интервали одделение за другите одделенија. Ве молиме проверете интервали {0} и {1} и обидете се повторно
 DocType: BOM,Raw Material Cost(Company Currency),Суровина Цена (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Сите ставки се веќе префрлени за оваа нарачка за производство.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ред # {0}: стапка не може да биде поголема од стапката користи во {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM на вебсајт ставки
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
 DocType: Timesheet Detail,Bill,Бил
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Бела
 DocType: SMS Center,All Lead (Open),Сите Потенцијални клиенти (Отворени)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина не се достапни за {4} во магацин {1} на објавување времето на стапување ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Цел типот мора да биде еден од {0}
 DocType: Lead,Next Contact Date,Следна Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отворање Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
 DocType: Student Batch Name,Student Batch Name,Студентски Серија Име
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
 DocType: Repayment Schedule,Balance Loan Amount,Биланс на кредит Износ
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Ве молиме наведете {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може да биде негативен
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Вкупен број на амортизација
 DocType: Sales Invoice Item,Rate With Margin,Стапка со маргина
 DocType: Sales Invoice Item,Rate With Margin,Стапка со маргина
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,Име на организацијата
 DocType: Tax Rule,Shipping State,Превозот држава
 ,Projected Quantity as Source,Проектирани Кол како Извор
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
 DocType: Employee,A-,А-
 DocType: Production Planning Tool,Include non-stock items,Вклучуваат не-акции предмети
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Трошоци за продажба
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандарден Продажен трошочен центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Поштенски
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Поштенски
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Продај Побарувања {0} е {1}
 DocType: Opportunity,Contact Info,Контакт инфо
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Акции правење записи
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
 ,Ordered Items To Be Billed,Нареди ставки за да бидат фактурирани
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Од опсег мора да биде помала од на опсег
 DocType: Global Defaults,Global Defaults,Глобална Стандардни
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Ве молиме внесете Точка законик за да се добие број на серијата
 DocType: Stock Settings,Default Item Group,Стандардно Точка група
 DocType: Employee Loan,Partially Disbursed,делумно исплатени
-DocType: Grading Structure,Grading System Name,Име на систем на оценување
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдувач база на податоци.
 DocType: Account,Balance Sheet,Биланс на состојба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Продажбата на лицето ќе добиете потсетување на овој датум да се јавите на клиент
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Истата ставка не може да се внесе повеќе пати.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Работата е завршена
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ве молиме да наведете барем еден атрибут во табелата атрибути
 DocType: Announcement,All Students,сите студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Ставка {0} мора да биде не-складишни ставки
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Ставка {0} мора да биде не-складишни ставки
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Види Леџер
 DocType: Grading Scale,Intervals,интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Студентски мобилен број
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Купување на налози да ви помогне да планираат и да се надоврзе на вашите купувања
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Купување на налози да ви помогне да планираат и да се надоврзе на вашите купувања
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Мали
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync мајстор на податоци
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
 DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,BOM (Список на материјали)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Група тек број
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Вкупниот износ на сите задача тежина треба да биде 1. Ве молиме да се приспособат тежини на сите задачи на проектот соодветно
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитал опрема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ставки во тек
 DocType: Workstation,Workstation Name,Работна станица Име
-DocType: Grade Interval,Grade Code,одделение законик
+DocType: Grading Scale Interval,Grade Code,одделение законик
 DocType: POS Item Group,POS Item Group,ПОС Точка група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} не му припаѓа на идентот {1}
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Хардвер
 DocType: Sales Order,Recurring Upto,Повторувачки Upto
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Ве молиме изберете една компанија
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Ве молиме изберете една компанија
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привилегија Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Добавувачот датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Вие треба да им овозможи на Корпа
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Стареењето опсег од 3
 DocType: Maintenance Schedule Item,No of Visits,Број на посети
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},"Одржување распоред {0} постои се против, {1}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Запишувањето на студентите
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на завршната сметка мора да биде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир на бодови за сите цели треба да бидат 100. Тоа е {0}
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Сметковниот план
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи неплатено отсуство
 DocType: Pricing Rule,"Higher the number, higher the priority","Повисок број, поголем приоритет"
 ,Purchase Invoice Trends,Купување на фактура трендови
 DocType: Employee,Better Prospects,Подобри можности
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","На редот бр # {0}: на серијата {1} има само {2} Количина. Ве молам изберете друга серија која има на располагање {3} Количина или поделени на ред во повеќе редови, да ја испорача / прашање од повеќе серии"
 DocType: Vehicle,License Plate,Табличка
 DocType: Appraisal,Goals,Цели
 DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ Статус
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Вработените не можат да известуваат за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако на сметката е замрзната, записи им е дозволено да ограничено корисници."
 DocType: Email Digest,Bank Balance,Банката биланс
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Работа профил, потребните квалификации итн"
 DocType: Journal Entry Account,Account Balance,Баланс на сметка
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Правило данок за трансакции.
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Прикажи незатворени фискална година L салда на P &amp;
 DocType: Shipping Rule,Shipping Account,Испорака на профилот
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивен
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Направете Продај Нарачка да ви помогне да планирате вашата работа и дава на време
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Направете Продај Нарачка да ви помогне да планирате вашата работа и дава на време
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Вкупно Дополнителни трошоци
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,На вредноста
 DocType: Asset Movement,Stock Manager,Акции менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Пакување фиш
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Пакување фиш
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Канцеларијата изнајмување
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Поставките за поставка на SMS портал
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,Извор
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Прикажи затворени
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Категорија средства е задолжително за ставка од основните средства
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Категорија средства е задолжително за ставка од основните средства
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не се пронајдени во табелата за платен записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ова {0} конфликти со {1} и {2} {3}
 DocType: Student Attendance Tool,Students HTML,студентите HTML
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,Дата на Оставањето
 DocType: Pricing Rule,For Price List,За Ценовник
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Извршниот Барај
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Креирај води
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Креирај води
 DocType: Maintenance Schedule,Schedules,Распоред
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детален број
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Програмата запишувања
 DocType: Sales Invoice Item,Brand Name,Името на брендот
 DocType: Purchase Receipt,Transporter Details,Транспортерот Детали
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Потребен е стандарден магацин за избраната ставка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Потребен е стандарден магацин за избраната ставка
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Кутија
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,можни Добавувачот
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организацијата
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Аватарот на бирото за {0} не е пронајден за Проектот {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Барања за сметка на компанијата.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студентите се во центарот на системот, да додадете сите ваши студенти"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студентите се во центарот на системот, да додадете сите ваши студенти"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ред # {0}: датум Чистење {1} не може да биде пред Чек Датум {2}
 DocType: Company,Default Holiday List,Стандардно летни Листа
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од време и на време од {1} е се преклопуваат со {2}
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Препратат на плаќање E-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,нова задача
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Направете цитат
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Направете цитат
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,други извештаи
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Обидете се планира операции за X дена однапред.
 DocType: HR Settings,Stop Birthday Reminders,Стоп роденден потсетници
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
 DocType: SMS Center,Receiver List,Листа на примачот
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Барај точка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Барај точка
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Конзумира Износ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нето промени во Пари
 DocType: Assessment Plan,Grading Scale,скала за оценување
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,веќе завршени
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Веќе постои плаќање Барам {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Собери
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,рекорд движење средства {0} создадена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,рекорд движење средства {0} создадена
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Не може да избришете фискалната {0}. Фискалната година {0} е поставена како стандардна во глобалните поставувања
 DocType: Journal Entry,Entry Type,Тип на влез
 ,Customer Credit Balance,Клиент кредитна биланс
@@ -1686,8 +1685,6 @@
 DocType: Student Sibling,Studying in Same Institute,Студирање во истиот институт
 DocType: Territory,Territory Manager,Територија менаџер
 DocType: Packed Item,To Warehouse (Optional),До Магацински (опционално)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 DocType: Payment Entry,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Нагодувања за Продажби
@@ -1697,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Види во кошничката
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Барање користат да се направи овој парк Влегување
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следна Амортизација Регистриран е задолжително за нови средства
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следна Амортизација Регистриран е задолжително за нови средства
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Посебен разбира врз основа група за секоја серија
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Посебен разбира врз основа група за секоја серија
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Една единица на некој објект.
@@ -1716,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Не е потребно трошоците центар за &#39;Добивка и загуба на сметка {2}. Ве молиме да се воспостави центар стандардно Цена за компанијата.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Веќе има Група на клиенти со истото име, Ве молиме сменете го Името на клиентот или преименувајте ја Групата на клиенти"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Веќе има Група на клиенти со истото име, Ве молиме сменете го Името на клиентот или преименувајте ја Групата на клиенти"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нов контакт
 DocType: Territory,Parent Territory,Родител Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
@@ -1745,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Помирување JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 DocType: Purchase Invoice Item,Batch No,Серија Не
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Не може да се најде на девизниот курс за {0} до {1} за клучните датум {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Им овозможи на повеќе Продај Нарачка против нарачка на купувачи
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Мобилен телефон
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Главните
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Варијанта
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Главните
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
 DocType: Employee Attendance Tool,Employees HTML,вработените HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
 DocType: Employee,Leave Encashed?,Остави Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можност од поле е задолжително
 DocType: Email Digest,Annual Expenses,годишните трошоци
 DocType: Item,Variants,Варијанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,"Лимит,"
@@ -1779,7 +1773,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,оценувања
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за испорака Правило
-DocType: Grading Structure,Grading Intervals,оценување интервали
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ве молиме внесете
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не може да се overbill за предмет {0} во ред {1} повеќе од {2}. Да им овозможи на над-платежна, Ве молиме да се постави за купување на Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Поставете филтер врз основа на точка или Магацински
@@ -1792,16 +1785,17 @@
 DocType: Authorization Control,Authorization Control,Овластување за контрола
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Плаќање
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Управување со вашите нарачки
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Управување со вашите нарачки
 DocType: Production Order Operation,Actual Time and Cost,Крај на време и трошоци
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материјал Барање за максимум {0} може да се направи за ставката {1} против Продај Побарувања {2}
 DocType: Employee,Salutation,Титула
 DocType: Course,Course Abbreviation,Кратенка на курсот
 DocType: Student Leave Application,Student Leave Application,Студентски оставите апликацијата
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Вработен {0} на половина ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Вкупно работно време не смее да биде поголема од работното време max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Група предмети во моментот на продажба
 DocType: Quotation Item,Actual Qty,Крај на Количина
 DocType: Sales Invoice Item,References,Референци
@@ -1811,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Внесовте дупликат предмети. Ве молиме да се поправат и обидете се повторно.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Соработник
 DocType: Asset Movement,Asset Movement,средства движење
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,нов кошничка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,нов кошничка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Ставка {0} не е во серија
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
 DocType: Vehicle,Wheels,тркала
@@ -1843,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Оневозможува создавање на време логови против производство наредби. Операции нема да бидат следени од цел производство
 DocType: Student,Student Mobile Number,Студентски мобилен број
 DocType: Item,Has Variants,Има варијанти
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID е задолжително
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID е задолжително
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID е задолжително
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID е задолжително
 DocType: Sales Person,Parent Sales Person,Родител продажбата на лице
 DocType: Purchase Invoice,Recurring Invoice,Повторувачки Фактура
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управување со проекти
@@ -1854,7 +1848,7 @@
 DocType: Budget,Fiscal Year,Фискална година
 DocType: Vehicle Log,Fuel Price,гориво Цена
 DocType: Budget,Budget,Буџет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџетот не може да биде доделен од {0}, како што не е сметката за приходи и трошоци"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнати
 DocType: Student Admission,Application Form Route,Формулар Пат
@@ -1885,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Износот {0} {1} одзема против {2}
 DocType: Employee,Salary Information,Плата Информации
 DocType: Sales Person,Name and Employee ID,Име и вработените проект
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
 DocType: Website Item Group,Website Item Group,Веб-страница Точка група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Давачки и даноци
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ве молиме внесете референтен датум
@@ -1944,7 +1938,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете приходи за корисници
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора да имаат улога &quot;расход Approver&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Пар
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Изберете BOM и Количина за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Изберете BOM и Количина за производство
 DocType: Asset,Depreciation Schedule,амортизација Распоред
 DocType: Bank Reconciliation Detail,Against Account,Против профил
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Половина ден датум треба да биде помеѓу Од датум и до денес
@@ -1961,13 +1955,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
 ,Quotation Trends,Трендови на Понуди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Дадени
 ,Vehicle Expenses,Трошоци возило
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
+DocType: Serial No,Invoice Details,Детали за фактура
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
 DocType: Purchase Receipt,Vehicle Number,Број на возило
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датумот на кој се повторуваат фактура ќе се запре
 DocType: Employee Loan,Loan Amount,Износ на кредитот
@@ -1991,7 +1986,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr не може да биде празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група за Не-групата
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 DocType: Loan Type,Loan Name,заем Име
@@ -2003,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Складиште, каде што се одржување на залихи на одбиени предмети"
 DocType: Production Order,Skip Material Transfer,Скокни на материјалот трансфер
 DocType: Production Order,Skip Material Transfer,Скокни на материјалот трансфер
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Не може да се најде на девизниот курс за {0} до {1} за клучните датум {2}. Ве молиме да се создаде рекорд Девизен рачно
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Вашата финансиска година завршува на
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} сега е стандардно фискална година. Ве молиме да обновите вашиот прелистувач за промените да имаат ефект.
@@ -2040,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Точка {0} веќе се вратени
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискалната година ** претставува финансиска година. Сите сметководствени записи и други големи трансакции се следи против ** ** фискалната година.
 DocType: Opportunity,Customer / Lead Address,Клиент / Потенцијален клиент адреса
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
 DocType: Student Admission,Eligibility,подобност
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Води да ви помогне да се бизнис, да додадете сите ваши контакти и повеќе како вашиот води"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Води да ви помогне да се бизнис, да додадете сите ваши контакти и повеќе како вашиот води"
 DocType: Production Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
@@ -2083,7 +2079,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изберете компанијата ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Process Payroll,Fortnightly,на секои две недели
 DocType: Currency Exchange,From Currency,Од валутен
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
@@ -2099,7 +2095,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не може да го изберете видот на пресметување како 'Износ на претходниот ред' или 'Вкупно на претходниот ред' за првиот ред
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Ставката од подгрупата, не треба да биде во Пакетот Производи. Ве молиме отстранете ја ставката '{0}'"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банкарство
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Додади Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Додади Timesheets
 DocType: Vehicle Service,Service Item,послужната ствар
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
@@ -2149,8 +2145,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цените нема да бидат прикажани ако цената листата не е поставена
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Наведи земјата за оваа Испорака Правило или проверете Во светот испорака
 DocType: Stock Entry,Total Incoming Value,Вкупно Вредност на Прилив
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебитна Да се бара
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебитна Да се бара
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Откупната цена Листа
 DocType: Offer Letter Term,Offer Term,Понуда Рок
 DocType: Quality Inspection,Quality Manager,Менаџер за квалитет
@@ -2184,14 +2180,14 @@
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Големина на примерокот
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ве молиме внесете Потврда документ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Сите ставки се спремни за фактурирање
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ве молиме внесете Потврда документ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Сите ставки се спремни за фактурирање
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ве молиме наведете валидна &quot;од случај бр &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
 DocType: Project,External,Надворешни
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволи
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производство наредби Направено: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Производство наредби Направено: {0}
 DocType: Branch,Branch,Филијали
 DocType: Guardian,Mobile Number,Мобилен број
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печатење и Брендирање
@@ -2200,7 +2196,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Сериски № {0} не е пронајдена
 DocType: Scheduling Tool,Student Batch,студентски Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Направете Студентски
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Направете Студентски
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Вие сте поканети да соработуваат на проектот: {0}
 DocType: Leave Block List Date,Block Date,Датум на блок
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Аплицирај сега
@@ -2224,8 +2220,9 @@
 DocType: SMS Log,Sent To,Испратени до
 DocType: Payment Request,Make Sales Invoice,Направи Продажна Фактура
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,софтвери
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следна Контакт датум не може да биде во минатото
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следна Контакт датум не може да биде во минатото
 DocType: Company,For Reference Only.,За повикување само.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Изберете Серија Не
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Однапред Износ
@@ -2239,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,На случај бр не може да биде 0
 DocType: Item,Show a slideshow at the top of the page,Прикажи слајдшоу на врвот на страната
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Продавници
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Продавници
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
 DocType: Item,End of Life,Крајот на животот
@@ -2255,8 +2252,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Пренос на материјал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овој документ е над границата од {0} {1} за ставката {4}. Ви се прави уште една {3} против истиот {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Поставете се повторуваат по спасување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,износот сметка Одберете промени
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Поставете се повторуваат по спасување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,износот сметка Одберете промени
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
@@ -2267,7 +2264,7 @@
 DocType: Budget Account,Budget Account,За буџетот на профилот
 DocType: Quality Inspection,Verified By,Заверена од
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени стандардно валута компанијата, бидејќи постојат постојните трансакции. Трансакции треба да бидат откажани да се промени валута на стандардните."
-DocType: Grade Interval,Grade Description,степен Опис
+DocType: Grading Scale Interval,Grade Description,степен Опис
 DocType: Stock Entry,Purchase Receipt No,Купување Потврда Не
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Искрена пари
 DocType: Process Payroll,Create Salary Slip,Креирај Плата фиш
@@ -2305,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,Публика: Да најдам
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Gateway Account,Payment Account,Уплатна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Нето промени во Побарувања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Обесштетување Off
 DocType: Offer Letter,Accepted,Прифатени
@@ -2319,7 +2316,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,корисникот форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
 DocType: Employee,Previous Work Experience,Претходно работно искуство
@@ -2333,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Името на Институтот за кои ќе се поставување на овој систем.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Сметководство влез замрзнати до овој датум, никој не може да се направи / менувате влез освен улога наведени подолу."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Ве молиме да ги зачувате документот пред генерирање на одржување распоред
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ве молиме да ги зачувате документот пред генерирање на одржување распоред
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проектот
 DocType: UOM,Check this to disallow fractions. (for Nos),Изберете го ова за да ги оневозможите фракции. (За NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,се создадени по производство наредби:
@@ -2356,6 +2353,7 @@
 DocType: Email Digest,How frequently?,Колку често?
 DocType: Purchase Receipt,Get Current Stock,Добие моменталната залиха
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дрвото на Бил на материјали
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 DocType: Student,Joining Date,Состави Датум
 ,Employees working on a holiday,Вработени кои работат на одмор
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марк Тековен
@@ -2437,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Чистење Датум кои не се споменати
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
 DocType: Guardian,Occupation,професија
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Вкупно (Количина)
 DocType: Sales Invoice,This Document,овој документ
 DocType: Installation Note Item,Installed Qty,Инсталиран Количина
@@ -2460,8 +2458,8 @@
 DocType: Notification Control,Sales Order Message,Продај Побарувања порака
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Постави стандардните вредности, како компанија, валута, тековната фискална година, и др"
 DocType: Payment Entry,Payment Type,Тип на плаќање
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
 DocType: Process Payroll,Select Employees,Избери Вработени
 DocType: Opportunity,Potential Sales Deal,Потенцијален Продај договор
 DocType: Payment Entry,Cheque/Reference Date,Чек / референтен датум
@@ -2478,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобална ПОС Профил {0} веќе создадена за компанија {1}
 DocType: Purchase Order,Ref SQ,Реф SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Заменете Точка / Бум во сите BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,мора да се поднесе приемот на документи
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,мора да се поднесе приемот на документи
 DocType: Purchase Invoice Item,Received Qty,Доби Количина
 DocType: Stock Entry Detail,Serial No / Batch,Сериски Не / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Што не се платени и не испорачува
@@ -2491,7 +2489,7 @@
 ,To Produce,Да произведе
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Даноци
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","На ред {0} во {1}. Да {2} вклучите во стапката точка, редови {3} исто така, мора да бидат вклучени"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Направете пристап
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Направете пристап
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација на пакетот за испорака (за печатење)
 DocType: Bin,Reserved Quantity,Кол задржани
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ве молиме внесете валидна е-мејл адреса
@@ -2505,11 +2503,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Лицата со посебни потреби образецот не мора да биде стандардна дефиниција
 DocType: Account,Income Account,Сметка приходи
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Испорака
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Видете &quot;стапката на материјали врз основа на&quot; Чини во Дел
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Пред
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студентски Пакетите да ви помогне да ги пратите на посетеност, проценки и такси за студентите"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студентски Пакетите да ви помогне да ги пратите на посетеност, проценки и такси за студентите"
 DocType: Payment Entry,Total Allocated Amount,"Вкупно лимит,"
 DocType: Item Reorder,Material Request Type,Материјал Тип на Барањето
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural весник за влез на платите од {0} до {1}
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Следи ги Потенцијалните клиенти по вид на индустрија.
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
@@ -2542,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ќе испрати е-маил за случај на вработените со статус на &quot;Отворени&quot;
 DocType: Task,Depends on Tasks,Зависи Задачи
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управување на клиентите група на дрвото.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Додатоци може да бидат прикажани без овозможување на количката
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Нова цена центар Име
 DocType: Leave Control Panel,Leave Control Panel,Остави контролен панел
@@ -2554,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,Дебит
 DocType: Delivery Note,Required only for sample item.,Потребно е само за примерок точка.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Крај Количина По трансакцијата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Не се лизга плата и помеѓу {0} и {1}
 ,Pending SO Items For Purchase Request,Во очекување на ПА Теми за купување Барање
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,студент Запишување
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} е исклучен
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} е исклучен
 DocType: Supplier,Billing Currency,Платежна валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2576,7 +2574,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Почетната страница од пребарувачот Избрана производ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Сите оценка групи
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нова Магацински Име
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Вкупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Вкупно {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територија
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ве молиме спомнете Број на посети бара
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
@@ -2594,7 +2592,7 @@
 DocType: Price List,Price List Master,Ценовник мајстор
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
 ,S.O. No.,ПА број
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Ве молиме креирајте Клиент од Потенцијален клиент {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Ве молиме креирајте Клиент од Потенцијален клиент {0}
 DocType: Price List,Applicable for Countries,Применливи за земјите
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само апликации со статус &#39;одобрена &quot;и&quot; Отфрлени &quot;може да се поднесе
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Група на студенти Името е задолжително во ред {0}
@@ -2675,7 +2673,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Сметководство за влез на берза
 DocType: Vehicle Service,Engine Oil,на моторното масло
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
 DocType: Employee Loan,Loan Details,Детали за заем
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршено Количина мора да биде поголема од нула.
@@ -2740,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Магацини со постоечките трансакцијата не може да се конвертира во групата.
 DocType: Assessment Result Tool,Result HTML,резултат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,истекува на
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Додај Студентите
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Додај Студентите
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Ве молиме изберете {0}
 DocType: C-Form,C-Form No,C-Образец бр
 DocType: BOM,Exploded_items,Exploded_items
@@ -2805,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,граница Преминал
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вложување на капитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академски мандат, со ова &#39;академска година&#39; {0} и &quot;Рок Име&quot; {1} веќе постои. Ве молиме да ги менувате овие ставки и обидете се повторно."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Како што веќе постојат трансакции против ставка {0}, не може да се промени вредноста на {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Како што веќе постојат трансакции против ставка {0}, не може да се промени вредноста на {1}"
 DocType: UOM,Must be Whole Number,Мора да биде цел број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови лисја распределени (во денови)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Сериски № {0} не постои
@@ -2849,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Последниот ден од наредниот месец
 DocType: Support Settings,Auto close Issue after 7 days,Авто блиску прашање по 7 дена
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Одмор не може да се одвои пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студентски Подносител
 DocType: Asset Category Account,Accumulated Depreciation Account,Акумулирана амортизација сметка
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
@@ -2877,8 +2875,8 @@
 DocType: Asset,Item Code,Точка законик
 DocType: Production Planning Tool,Create Production Orders,Креирај Производство Нарачка
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детали за
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
 DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
@@ -2897,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,Креирај Материјал Барања
 DocType: Employee Education,School/University,Училиште / Факултет
 DocType: Payment Request,Reference Details,Референца Детали
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
 DocType: Sales Invoice Item,Available Qty at Warehouse,На располагање Количина на складиште
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Фактурирани Износ
 DocType: Asset,Double Declining Balance,Двоен опаѓачки баланс
@@ -2918,19 +2916,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Повлечениот износ не може да биде поголема од кредит Износ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производство цел не создаде
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Производство цел не создаде
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датум"" мора да биде по ""до датум"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},не може да го промени својот статус како студент {0} е поврзан со примена студент {1}
 DocType: Asset,Fully Depreciated,целосно амортизираните
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Забележително присуство на HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",Цитати се и понудите што сте ги испратиле на вашите клиенти
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",Цитати се и понудите што сте ги испратиле на вашите клиенти
 DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Сериски Не и серија
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Збирот на резултатите на критериумите за оценување треба да биде {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Поставете Број на амортизациони Резервирано
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Поставете Број на амортизациони Резервирано
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Вредност или Количина
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Минута
@@ -3061,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,група на студенти
 DocType: Shopping Cart Settings,Quotation Series,Серија на Понуди
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка ({0}) со исто име веќе постои, ве молиме сменете го името на групата ставки или името на ставката"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Ве молам изберете клиентите
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Ве молам изберете клиентите
 DocType: C-Form,I,јас
 DocType: Company,Asset Depreciation Cost Center,Центар Амортизација Трошоци средства
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
@@ -3080,19 +3078,18 @@
 DocType: Vehicle,Insurance Details,Детали за осигурување
 DocType: Account,Payable,Треба да се плати
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ве молиме внесете отплата периоди
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Должници ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Должници ({0})
 DocType: Pricing Rule,Margin,маргина
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Бруто добивка%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Чистење Датум
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Бруто купување износ е задолжително
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Бруто купување износ е задолжително
 DocType: Lead,Address Desc,Адреса Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Партијата е задолжително
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Име на тема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Најмалку едно мора да биде избрано од Продажби или Купување
-DocType: Grading Structure,Grade Intervals,интервали одделение
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изберете од природата на вашиот бизнис.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Каде што се врши производните операции.
 DocType: Asset Movement,Source Warehouse,Извор Магацински
@@ -3121,6 +3118,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентуална распределба
 DocType: Territory,Territory Targets,Територија Цели
 DocType: Delivery Note,Transporter Info,Превозникот Информации
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Поставете стандардно {0} во компанијата {1}
 DocType: Cheque Print Template,Starting position from top edge,Почетна позиција од горниот раб
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Ист снабдувач се внесени повеќе пати
@@ -3173,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Пренареждане Количина
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Тековни работни места
 DocType: Company,Stock Adjustment Account,Акциите прилагодување профил
-DocType: Journal Entry,Write Off,Отпис
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отпис
 DocType: Timesheet Detail,Operation ID,Операција проект
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Систем за корисници (Најавете се) проект. Ако е поставено, тоа ќе биде стандардно за сите форми на човечките ресурси."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Од {1}
@@ -3184,8 +3182,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Снабдувачот доставува до клиентите
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Образец / ставка / {0}) е надвор од складиште
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Следниот датум мора да биде поголема од објавувањето Датум
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Шоуто данок распадот
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Податоци за увоз и извоз
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Акции записи постојат против Магацински {0}, па оттука не може повторно да се додели или да ја менувате"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Не е пронајдено студенти
@@ -3197,14 +3195,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
 DocType: Program Enrollment,School House,школа куќа
 DocType: Serial No,Out of AMC,Од АМЦ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Ве молиме изберете Цитати
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Ве молиме изберете Цитати
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Направете Одржување Посета
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Ве молиме изберете Цитати
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Ве молиме изберете Цитати
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Направете Одржување Посета
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
 DocType: Company,Default Cash Account,Стандардно готовинска сметка
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ова се базира на присуството на овој студент
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Не Студентите во
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додај повеќе ставки или отвори образец
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
@@ -3251,9 +3250,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Пред помирување
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Даноци и давачки Додадено (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
 DocType: Sales Order,Partly Billed,Делумно Опишан
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Ставка {0} мора да биде основни средства
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Ставка {0} мора да биде основни средства
 DocType: Item,Default BOM,Стандардно Бум
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Вкупен Неизмирен Изн.
@@ -3276,7 +3275,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
 DocType: Purchase Invoice Item,Rate,Цена
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Практикант
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,адреса
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,адреса
 DocType: Stock Entry,From BOM,Од бирото
 DocType: Assessment Code,Assessment Code,Код оценување
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основни
@@ -3301,7 +3300,7 @@
 DocType: Purchase Invoice,Print Language,Печати јазик
 DocType: Salary Slip,Total Working Hours,Вкупно Работно време
 DocType: Stock Entry,Including items for sub assemblies,Вклучувајќи и предмети за суб собранија
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Сите територии
 DocType: Purchase Invoice,Items,Теми
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студентот се веќе запишани.
@@ -3321,17 +3320,15 @@
 DocType: Issue,Opening Time,Отворање Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Од и до датуми потребни
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од Магацин
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
 DocType: Assessment Plan,Supervisor Name,Име супервизор
 DocType: Program Enrollment Course,Program Enrollment Course,Програма за запишување на курсот
 DocType: Program Enrollment Course,Program Enrollment Course,Програма за запишување на курсот
-DocType: Grading Structure,Grading Structure,оценување Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и Вкупно
 DocType: Tax Rule,Shipping City,Превозот Сити
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Оваа содржина е варијанта на {0} (дефиниција). Атрибути ќе бидат копирани во текот од дефиниција освен ако е &quot;Не Копирај&quot; е поставена
 DocType: Notification Control,Customize the Notification,Персонализација на известувањето
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Парични текови од работење
 DocType: Sales Invoice,Shipping Rule,Испорака Правило
@@ -3354,6 +3351,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Отворање датум треба да биде пред крајниот датум
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме поставете брои серија за присуство преку поставување&gt; нумерација Серија
 DocType: Leave Control Panel,Carry Forward,Пренесување
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Трошоците центар со постојните трансакции не може да се конвертира Леџер
 DocType: Department,Days for which Holidays are blocked for this department.,Деновите за кои Празници се блокирани за овој оддел.
@@ -3382,7 +3380,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Вкупно (Износ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Точка Сериски Не
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Креирај вработените рекорди
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Креирај вработените рекорди
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Вкупно Сегашно
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,сметководствени извештаи
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
@@ -3397,8 +3395,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Новиот Бум по замена
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Точка на продажба
 DocType: Payment Entry,Received Amount,добиениот износ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Се создаде целосна количина, неа веќе количина на ред"
 DocType: Account,Tax,Данок
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,не е означен
@@ -3411,7 +3407,7 @@
 DocType: Batch,Source Document Name,Извор документ Име
 DocType: Batch,Source Document Name,Извор документ Име
 DocType: Job Opening,Job Title,Работно место
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,креирате корисници
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,креирате корисници
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетете извештај за одржување повик.
@@ -3423,8 +3419,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: BOM,Website Description,Веб-сајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промени во капиталот
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,приемот
 ,Sales Register,Продажбата Регистрирај се
@@ -3435,16 +3431,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема ништо да се променат.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Сè уште нема клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај за паричниот тек
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Ве молиме изберете ја носи напред ако вие исто така сакаат да се вклучат во претходната фискална година биланс остава на оваа фискална година
 DocType: GL Entry,Against Voucher Type,Против ваучер Тип
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последните Ред Датум
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
 DocType: Student,Guardian Details,Гардијан Детали
 DocType: C-Form,C-Form,C-Форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посетеност за повеќе вработени
@@ -3469,14 +3467,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # сметка мора да биде од типот &quot;основни средства&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Количина
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила за да се пресмета износот превозот за продажба
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серија е задолжително
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серија е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансиски Услуги
 DocType: Student Sibling,Student ID,студентски проект
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Типови на активности за Време на дневници
 DocType: Tax Rule,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
 DocType: Training Event,Exam,испит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Платежна држава
@@ -3509,7 +3507,7 @@
 DocType: Payment Entry,Account Paid From,Сметка платени од
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Точка законик
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Направете Водач
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Направете Водач
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Печатење и идентитет
 DocType: Stock Settings,Show Barcode Field,Прикажи Баркод поле
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Испрати Добавувачот пораки
@@ -3525,6 +3523,7 @@
 DocType: Offer Letter,Awaiting Response,Чекам одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Над
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Спомене, ако не-стандардни плаќа сметката"
 DocType: Salary Slip,Earning & Deduction,Заработувајќи &amp; Одбивање
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
@@ -3561,7 +3560,7 @@
 DocType: Program Enrollment Tool,Get Students From,Земете студенти од
 DocType: Hub Settings,Seller Country,Продавачот Земја
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Предмети објавуваат на веб-страницата
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група на учениците во групи
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група на учениците во групи
 DocType: Authorization Rule,Authorization Rule,Овластување Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови и правила Детали за
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Спецификации
@@ -3621,7 +3620,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Условна казна
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата Делови
 DocType: Program Enrollment Tool,New Academic Year,Новата академска година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Врати / кредит Забелешка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Врати / кредит Забелешка
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Вкупно Исплатен износ
 DocType: Production Order Item,Transferred Qty,Пренесува Количина
@@ -3662,6 +3661,7 @@
 ,Sales Funnel,Продажбата на инка
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Кратенка задолжително
 DocType: Project,Task Progress,задача за напредокот
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Количка
 ,Qty to Transfer,Количина да се Трансфер на
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Понуди до Потенцијални клиенти или Клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
@@ -3695,7 +3695,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,собирање на претплатата
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во ставка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во ставка {1}
 DocType: Lead,Add to calendar on this date,Додади во календарот на овој датум
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
 DocType: Item,Opening Stock,отворање на Акции
@@ -3713,7 +3713,7 @@
 DocType: Customer,From Lead,Од Потенцијален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Нарачка пуштени во производство.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изберете фискалната година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Program Enrollment Tool,Enroll Students,Студентите кои се запишуваат
 DocType: Hub Settings,Name Token,Име знак
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продажба
@@ -3724,7 +3724,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} во однос на Продажна фактура {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Име на проектот
-DocType: Supplier,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
+DocType: Customer,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
 DocType: Journal Entry Account,If Income or Expense,Ако приходите и расходите
 DocType: Production Order,Required Items,Задолжителни предмети
 DocType: Stock Ledger Entry,Stock Value Difference,Акции Вредност разликата
@@ -3755,6 +3755,7 @@
 DocType: Item,Taxes,Даноци
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Платени и не предаде
 DocType: Project,Default Cost Center,Стандардната цена центар
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 DocType: Bank Guarantee,End Date,Крај Датум
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,акции трансакции
 DocType: Budget,Budget Accounts,буџетски сметки
@@ -3819,7 +3820,7 @@
 DocType: Customer,Sales Partner and Commission,Продажба партнер и на Комисијата
 DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стапка (%) / година
 ,Project Quantity,проектот Кол
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање промени врз основа на&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање промени врз основа на&quot;"
 DocType: Opportunity,To Discuss,За да дискутираат
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} единици од {1} потребни {2} за да се заврши оваа трансакција.
 DocType: Loan Type,Rate of Interest (%) Yearly,Каматна стапка (%) Годишен
@@ -3842,7 +3843,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Отсутни
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута на Бум # {1} треба да биде еднаква на избраната валута {2}
 DocType: Journal Entry Account,Exchange Rate,На девизниот курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,надомест Компонента
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,транспортен менаџмент
@@ -3859,7 +3860,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Магацински {0} не постои
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирајте се за ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечен Процентите Дистрибуција
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,На избраната ставка не може да има Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,На избраната ставка не може да има Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","стапка на вреднување не најде за Точка {0}, кои се потребни да се направи на сметководствените ставки за {1} {2}. Ако објектот е transacting како вид на примерок во {1}, Ве молиме да се напомене дека во {1} маса точка. Ако не е, се создаде дојдовен акциите на трансакцијата за стапката на вреднување ставка или споменува во евиденцијата на објектот, а потоа се обиде доставување / поништување на овој запис"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% На материјалите доставени од ова за испорака
 DocType: Project,Customer Details,Детали за корисници
@@ -3876,7 +3877,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Поднесени налози не може да биде избришан
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Управување со квалитет
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Точка {0} е исклучена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Точка {0} е исклучена
 DocType: Employee Loan,Repay Fixed Amount per Period,Отплати фиксен износ за период
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
@@ -3903,7 +3904,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Студент e-mail проект
 DocType: Employee,Notice (days),Известување (во денови)
 DocType: Tax Rule,Sales Tax Template,Данок на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Изберете предмети за да се спаси фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Изберете предмети за да се спаси фактура
 DocType: Employee,Encashment Date,Датум на инкасо
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Акциите прилагодување
@@ -3937,6 +3938,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Задолжување Издадено
 DocType: Production Order,Warehouses,Магацини
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} средства не можат да се пренесат
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Оваа содржина е варијанта на {0} (дефиниција).
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,купување
 DocType: Announcement,Announcement,најава
@@ -3952,7 +3954,7 @@
 DocType: Account,Receivable,Побарувања
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Не е дозволено да се промени Добавувачот како веќе постои нарачка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улогата што може да поднесе трансакции кои надминуваат кредитни лимити во собата.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Изберете предмети за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Изберете предмети за производство
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
 DocType: Item,Material Issue,Материјал Број
 DocType: Hub Settings,Seller Description,Продавачот Опис
@@ -3965,7 +3967,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Нареди
 DocType: Salary Detail,Component,компонента
 DocType: Assessment Criteria,Assessment Criteria Group,Критериуми за оценување група
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Отворање Акумулирана амортизација треба да биде помалку од еднаква на {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Отворање Акумулирана амортизација треба да биде помалку од еднаква на {0}
 DocType: Warehouse,Warehouse Name,Магацински Име
 DocType: Naming Series,Select Transaction,Изберете Трансакција
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ве молиме внесете Одобрување улога или одобрување на пристап
@@ -4000,7 +4002,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на &quot;Постави како стандарден&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Зачлени се
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Employee Loan,Repay from Salary,Отплати од плата
 DocType: Leave Application,LAP/,КРУГ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Барајќи исплата од {0} {1} за износот {2}
@@ -4018,7 +4020,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Проценка Резултат детали
 DocType: Employee Education,Employee Education,Вработен образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Дупликат група точка најде во табелата на точката група
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
 DocType: Salary Slip,Net Pay,Нето плати
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Сериски № {0} е веќе доби
@@ -4027,7 +4029,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Магацински {0} не е поврзана со било која сметка, Ве молиме да креирате / водат соодветните (средства) се за склад."
 DocType: Purchase Invoice,Recurring Id,Повторувачки Id
 DocType: Customer,Sales Team Details,Тим за продажба Детали за
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Избриши засекогаш?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Избриши засекогаш?
 DocType: Expense Claim,Total Claimed Amount,Вкупен Износ на Побарувања
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијални можности за продажба.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неважечки {0}
@@ -4038,13 +4040,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Конфигурирање на вашиот школа во ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),База промени Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Зачувај го документот во прв план.
 DocType: Account,Chargeable,Наплатени
 DocType: Company,Change Abbreviation,Промена Кратенка
 DocType: Expense Claim Detail,Expense Date,Датум на сметка
 DocType: Item,Max Discount (%),Макс попуст (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последна нарачана Износ
+DocType: Task,Is Milestone,е Milestone
 DocType: Daily Work Summary,Email Sent To,-Мејл испратен до
 DocType: Budget,Warn,Предупреди
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата."
@@ -4077,11 +4080,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
 DocType: Tax Rule,Purchase Tax Template,Купување Данок Шаблон
 ,Project wise Stock Tracking,Проектот мудро берза за следење
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Постои Распоред за одржување {0} од {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Крај Количина (на изворот на / target)
 DocType: Item Customer Detail,Ref Code,Реф законик
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Вработен евиденција.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
 DocType: HR Settings,Payroll Settings,Settings Даноци
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Одговара на не-поврзани фактури и плаќања.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Поставите цел
@@ -4104,7 +4106,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекови и депозити неправилно исчистена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценовник стапка
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Креирај понуди на клиентите
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Креирај понуди на клиентите
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Покажуваат &quot;Залиха&quot; или &quot;Не во парк&quot; врз основа на акции на располагање во овој склад.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Бил на материјали (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Просечно време преземени од страна на снабдувачот да испорача
@@ -4126,7 +4128,7 @@
 DocType: Asset,Disposal Date,отстранување Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Пораките ќе бидат испратени до сите активни вработени на компанијата во дадениот час, ако тие немаат одмор. Резиме на одговорите ќе бидат испратени на полноќ."
 DocType: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Повратни информации
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
@@ -4134,7 +4136,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курсот е задолжително во ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До денес не може да биде пред од денот
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Додај / Уреди цени
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Додај / Уреди цени
 DocType: Batch,Parent Batch,родител Batch
 DocType: Batch,Parent Batch,родител Batch
 DocType: Cheque Print Template,Cheque Print Template,Чек Шаблон за печатење
@@ -4179,7 +4181,7 @@
 DocType: Item,Variant Based On,Варијанта врз основа на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Вашите добавувачи
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
 DocType: Request for Quotation Item,Supplier Part No,Добавувачот Дел Не
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не може да се одбие кога категорија е наменета за &quot;оценка&quot; или &quot;Vaulation и вкупно&quot;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Добиени од
@@ -4189,7 +4191,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Од {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Ред {0}: часови вредност мора да биде поголема од нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
 DocType: Issue,Content Type,Типот на содржина
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
@@ -4198,20 +4200,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
 DocType: Payment Reconciliation,From Invoice Date,Фактура од Датум
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Платежна валута мора да биде еднаков на валута или партиската сметка валута или comapany е стандардно
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Платежна валута мора да биде еднаков на валута или партиската сметка валута или comapany е стандардно
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставете Инкасо
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Што да направам?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Да се Магацински
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Сите студентски приемните
 ,Average Commission Rate,Просечната стапка на Комисијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Серискиот број"" не може да биде ""Да"" за не-складишни ставки"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Серискиот број"" не може да биде ""Да"" за не-складишни ставки"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
 DocType: School House,House Name,Име куќа
 DocType: Purchase Taxes and Charges,Account Head,Сметка на главата
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Ажурирање на дополнителни трошоци за да се пресмета слета трошоците за предмети
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Електрични
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додадете го остатокот од вашата организација, како на вашите корисници. Можете исто така да ги покани на клиентите да вашиот портал со додавање на нив од Contacts"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додадете го остатокот од вашата организација, како на вашите корисници. Можете исто така да ги покани на клиентите да вашиот портал со додавање на нив од Contacts"
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно Разлика во Вредност (Излез - Влез)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID на корисникот не е поставена за вработените {0}
@@ -4220,7 +4222,7 @@
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Роденден Потсетник за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дена од денот на нарачка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
 DocType: Buying Settings,Naming Series,Именување Серија
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Дата на започнување осигурување треба да биде помал од осигурување Дата на завршување
@@ -4235,7 +4237,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
 DocType: Vehicle Log,Odometer,километража
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM не содржи количини
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
@@ -4248,7 +4250,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,платежна часа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Аватарот на бирото за {0} не е пронајден
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Допрете ставки за да го додадете ги овде
 DocType: Fees,Program Enrollment,програма за запишување
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ве молиме да се постави {0}
@@ -4349,7 +4352,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Мало и големо
 DocType: Issue,First Responded On,Прво одговорија
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крстот на оглас на точка во повеќе групи
-DocType: Grade Interval,Grade Interval,одделение Интервал
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Почеток Датум и фискалната година Крај Датум веќе се поставени во фискалната {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Дозвола Датум ажурирани
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит Batch
@@ -4358,6 +4360,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Преземи како PDF
 DocType: Production Order,Planned End Date,Планирани Крај Датум
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Каде што предмети се чуваат.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 DocType: Request for Quotation,Supplier Detail,добавувачот детали
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Грешка во формулата или состојба: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Фактурираниот износ
@@ -4403,7 +4406,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Поставување на едноставен веб-сајт за мојата организација
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Во однос на ставка од продажна нарачка
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ве молиме внесете цена центар родител
@@ -4463,7 +4466,7 @@
 ,Items To Be Requested,Предмети да се бара
 DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Company,Company Info,Инфо за компанијата
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Изберете или да додадете нови клиенти
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Изберете или да додадете нови клиенти
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,центар за трошоци е потребно да се резервира на барање за сметка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ова се базира на присуството на вработениот
@@ -4476,13 +4479,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп за корисниците од правење Остави апликации на наредните денови.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,купување износ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Користи за вработените
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Production Order,Manufactured Qty,Произведени Количина
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постои
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не постои
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Сметки се зголеми на клиенти.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,На проект
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
@@ -4491,15 +4494,17 @@
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Центар
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Employee Loan Application,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
 DocType: Guardian,Guardian,Гардијан
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Процена {0} создадена за вработените {1} во дадениот период
 DocType: Employee,Education,Образование
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,дел
 DocType: Selling Settings,Campaign Naming By,Именувањето на кампањата од страна на
 DocType: Employee,Current Address Is,Тековни адреса е
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,изменета
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
@@ -4536,7 +4541,7 @@
 DocType: Hub Settings,Hub Settings,Settings центар
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Со операции
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
 DocType: Asset,Is Existing Asset,Е постојните средства
 DocType: Salary Detail,Statistical Component,Компонента за статистика
 DocType: Salary Detail,Statistical Component,Компонента за статистика
@@ -4592,7 +4597,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикачи Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,акции степени
 DocType: Customer,Commission Rate,Комисијата стапка
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Направи Варијанта
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Апликации одмор блок од страна на одделот.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип на плаќање мора да биде еден од примање, Плати и внатрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,анализатор
@@ -4605,6 +4610,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Овозможете производството за празниците
 DocType: Sales Order,Customer's Purchase Order Date,Клиентите нарачка Датум
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал
+DocType: Shopping Cart Settings,Show Public Attachments,Прикажи јавни додатоци
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детали за
 DocType: Payment Gateway Account,Payment Gateway Account,Исплата Портал профил
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,По уплатата пренасочува корисникот да избраната страница.
@@ -4629,7 +4635,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не покажува никакви симбол како $ итн до валути.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Пола ден)
 DocType: Supplier,Credit Days,Кредитна дена
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Направете Студентски Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Направете Студентски Batch
 DocType: Leave Type,Is Carry Forward,Е пренесување
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Земи ставки од BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Потенцијален клиент Време Денови
@@ -4648,8 +4654,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: GL Entry,Is Opening,Се отвора
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме поставете брои серија за присуство преку поставување&gt; нумерација Серија
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме поставете брои серија за присуство преку поставување&gt; нумерација Серија
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,На сметка {0} не постои
 DocType: Account,Cash,Пари
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за веб-страница и други публикации.
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index a3d0f38..bf44fb5 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,ബാച്ച് ഇനം കാലഹരണപ്പെടൽ അവസ്ഥ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
 DocType: Mode of Payment Account,Mode of Payment Account,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ഷോ രൂപഭേദങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ഷോ രൂപഭേദങ്ങൾ
 DocType: Academic Term,Academic Term,അക്കാദമിക് ടേം
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,മെറ്റീരിയൽ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ക്വാണ്ടിറ്റി
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ആരോഗ്യ പരിരക്ഷ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),പേയ്മെന്റ് കാലതാമസം (ദിവസം)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,സേവന ചിലവേറിയ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,വികയപതം
 DocType: Maintenance Schedule Item,Periodicity,ഇതേ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,സാമ്പത്തിക വർഷത്തെ {0} ആവശ്യമാണ്
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,അഡ്വർടൈസിങ്
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ഒരേ കമ്പനി ഒന്നിലധികം തവണ നൽകുമ്പോഴുള്ള
 DocType: Employee,Married,വിവാഹിത
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} അനുവദനീയമല്ല
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} അനുവദനീയമല്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ഉൽപ്പന്ന {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ഇനങ്ങളൊന്നും ലിസ്റ്റ്
 DocType: Payment Reconciliation,Reconcile,രഞ്ജിപ്പുണ്ടാക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,പലചരക്ക്
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 DocType: Process Payroll,Make Bank Entry,ബാങ്ക് എൻട്രി നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,പെൻഷൻ ഫണ്ട്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
 DocType: SMS Center,All Sales Person,എല്ലാ സെയിൽസ് വ്യാക്തി
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** പ്രതിമാസ വിതരണം ** നിങ്ങളുടെ ബിസിനസ്സിൽ seasonality ഉണ്ടെങ്കിൽ മാസം ഉടനീളം ബജറ്റ് / target വിതരണം സഹായിക്കുന്നു.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,കണ്ടെത്തിയില്ല ഇനങ്ങൾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,കണ്ടെത്തിയില്ല ഇനങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
 DocType: Lead,Person Name,വ്യക്തി നാമം
 DocType: Sales Invoice Item,Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ഉദാ: &quot;പ്രൈമറി സ്കൂൾ&quot; അല്ലെങ്കിൽ &quot;യൂണിവേഴ്സിറ്റി&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ഓഹരി റിപ്പോർട്ടുകൾ
 DocType: Warehouse,Warehouse Detail,വെയർഹൗസ് വിശദാംശം
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ടേം അവസാന തീയതി പിന്നീട് ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം അവസാനം തീയതി കൂടുതലാകാൻ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ഫിക്സ്ഡ് സ്വത്ത്&quot; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ഫിക്സ്ഡ് സ്വത്ത്&quot; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
 DocType: Vehicle Service,Brake Oil,ബ്രേക്ക് ഓയിൽ
 DocType: Tax Rule,Tax Type,നികുതി തരം
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},നിങ്ങൾ {0} മുമ്പായി എൻട്രികൾ ചേർക്കാൻ അല്ലെങ്കിൽ അപ്ഡേറ്റ് ചെയ്യാൻ അധികാരമില്ല
 DocType: BOM,Item Image (if not slideshow),ഇനം ഇമേജ് (അതില് അല്ല എങ്കിൽ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ഒരു കസ്റ്റമർ സമാന പേരിൽ നിലവിലുണ്ട്
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(അന്ത്യസമയം റേറ്റ് / 60) * യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
 DocType: SMS Log,SMS Log,എസ്എംഎസ് ലോഗ്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,കൈമാറി ഇനങ്ങൾ ചെലവ്
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ന് {0} അവധി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള അല്ല
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,പദവി
 DocType: Sales Invoice Item,Delivered By Supplier,വിതരണക്കാരൻ രക്ഷപ്പെടുത്തി
 DocType: SMS Center,All Contact,എല്ലാ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ഇതിനകം BOM ലേക്ക് എല്ലാ ഇനങ്ങളും സൃഷ്ടിച്ച പ്രൊഡക്ഷൻ ഓർഡർ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ഇതിനകം BOM ലേക്ക് എല്ലാ ഇനങ്ങളും സൃഷ്ടിച്ച പ്രൊഡക്ഷൻ ഓർഡർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,വാർഷിക ശമ്പളം
 DocType: Daily Work Summary,Daily Work Summary,നിത്യജീവിതത്തിലെ ഔദ്യോഗിക ചുരുക്കം
 DocType: Period Closing Voucher,Closing Fiscal Year,അടയ്ക്കുന്ന ധനകാര്യ വർഷം
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} മരവിച്ചു
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} മരവിച്ചു
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട് സൃഷ്ടിക്കുന്നതിനുള്ള കമ്പനി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,സ്റ്റോക്ക് ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,കോൺട്ര എൻട്രി
 DocType: Journal Entry Account,Credit in Company Currency,കമ്പനി കറൻസി ക്രെഡിറ്റ്
 DocType: Delivery Note,Installation Status,ഇന്സ്റ്റലേഷന് അവസ്ഥ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",നിങ്ങൾ ഹാജർ അപ്ഡേറ്റ് ചെയ്യാൻ താൽപ്പര്യമുണ്ടോ? <br> അവതരിപ്പിക്കുക: {0} \ <br> നിലവില്ല: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},സമ്മതിച്ച + Qty ഇനം {0} ലഭിച്ചത് അളവ് തുല്യമോ ആയിരിക്കണം നിരസിച്ചു
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,വാങ്ങൽ വേണ്ടി സപ്ലൈ അസംസ്കൃത വസ്തുക്കൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,പേയ്മെന്റ് കുറഞ്ഞത് ഒരു മോഡ് POS ൽ ഇൻവോയ്സ് ആവശ്യമാണ്.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,പേയ്മെന്റ് കുറഞ്ഞത് ഒരു മോഡ് POS ൽ ഇൻവോയ്സ് ആവശ്യമാണ്.
 DocType: Products Settings,Show Products as a List,ഒരു പട്ടിക ഉൽപ്പന്നങ്ങൾ കാണിക്കുക
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ഫലകം ഡൗൺലോഡ്, ഉചിതമായ ഡാറ്റ പൂരിപ്പിക്കുക പ്രമാണത്തെ കൂട്ടിച്ചേർക്കുക. തിരഞ്ഞെടുത്ത കാലയളവിൽ എല്ലാ തീയതി ജീവനക്കാരൻ കോമ്പിനേഷൻ നിലവിലുള്ള ഹാജർ രേഖകളുമായി, ടെംപ്ലേറ്റ് വരും"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി നിർമ്മിക്കുക
 DocType: Appraisal Template Goal,KRA,ക്ര
 DocType: Lead,Request Type,അഭ്യർത്ഥന തരം
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ജീവനക്കാരുടെ നിർമ്മിക്കുക
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ജീവനക്കാരുടെ നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,പ്രക്ഷേപണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,വധശിക്ഷയുടെ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,പ്രവർത്തനങ്ങൾ വിശദാംശങ്ങൾ പുറത്തു കൊണ്ടുപോയി.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,അറ്റകുറ്റപ്പണി സന്ദർശനവേളയിൽ പ്ലാൻ.
 DocType: SMS Settings,Enter url parameter for message,സന്ദേശം വേണ്ടി URL പാരമീറ്റർ നൽകുക
 DocType: POS Profile,Customer Groups,ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,സാമ്പത്തിക പ്രസ്താവനകൾ
 DocType: Guardian,Students,വിദ്യാർത്ഥികൾ
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,വിലനിർണ്ണയവും നല്കിയിട്ടുള്ള അപേക്ഷിക്കുവാനുള്ള നിയമങ്ങൾ.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,വില പട്ടിക വാങ്ങുമ്പോള് വില്ക്കുകയും ബാധകമായ ആയിരിക്കണം
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
 DocType: Naming Series,Series List for this Transaction,ഈ ഇടപാടിനായി സീരീസ് പട്ടിക
 DocType: Company,Default Payroll Payable Account,സ്ഥിരസ്ഥിതി പേയ്റോൾ അടയ്ക്കേണ്ട അക്കൗണ്ട്
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,അപ്ഡേറ്റ് ഇമെയിൽ ഗ്രൂപ്പ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,അപ്ഡേറ്റ് ഇമെയിൽ ഗ്രൂപ്പ്
 DocType: Sales Invoice,Is Opening Entry,എൻട്രി തുറക്കുകയാണ്
 DocType: Customer Group,Mention if non-standard receivable account applicable,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് ബാധകമാണെങ്കിൽ പ്രസ്താവിക്കുക
 DocType: Course Schedule,Instructor Name,പരിശീലകൻ പേര്
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം എഗെൻസ്റ്റ്
 ,Production Orders in Progress,പുരോഗതിയിലാണ് പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
 DocType: Lead,Address & Contact,വിലാസം &amp; ബന്ധപ്പെടാനുള്ള
 DocType: Leave Allocation,Add unused leaves from previous allocations,മുൻ വിഹിതം നിന്ന് ഉപയോഗിക്കാത്ത ഇലകൾ ചേർക്കുക
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},അടുത്തത് ആവർത്തിക്കുന്നു {0} {1} സൃഷ്ടിക്കപ്പെടും
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ആകെ ആറെണ്ണവും തുക (ടൈം ഷീറ്റ് വഴി)
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ബാങ്ക് എൻട്രികൾ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
 DocType: Student Admission,Student Admission,വിദ്യാർത്ഥിയുടെ അഡ്മിഷൻ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ഓട്ടോമാറ്റിക് മെറ്റീരിയൽ അഭ്യർത്ഥന സൃഷ്ടിക്ക് ന് ഇമെയിൽ വഴി അറിയിക്കുക
 DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
 DocType: Payment Reconciliation Invoice,Invoice Type,ഇൻവോയിസ് തരം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ഡെലിവറി നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,ഡെലിവറി നോട്ട്
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,വിറ്റത് അസറ്റ് ചെലവ്
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,നിങ്ങൾ അതു കടിച്ചുകീറി ശേഷം പെയ്മെന്റ് എൻട്രി പരിഷ്ക്കരിച്ചു. വീണ്ടും തുടയ്ക്കുക ദയവായി.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
-DocType: Grade Interval,Min Score,കുറഞ്ഞത് സ്കോർ
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ഈ ആഴ്ച തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾക്കായി ചുരുക്കം
 DocType: Student Applicant,Admitted,പ്രവേശിപ്പിച്ചു
 DocType: Workstation,Rent Cost,രെംട് ചെലവ്
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ഓർഡർ മൂല്യം
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,പാർട്ടി വിരുദ്ധ അല്ലെങ്കിൽ ആന്തരിക കൈമാറ്റം ബാങ്ക് / ക്യാഷ് ഇടപാടുകൾ
 DocType: Shipping Rule,Valid for Countries,രാജ്യങ്ങൾ സാധുവായ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ഈ ഇനം ഒരു ഫലകം ആണ് ഇടപാടുകൾ ഉപയോഗിക്കാവൂ കഴിയില്ല. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ ഇനം ആട്റിബ്യൂട്ടുകൾക്ക് വകഭേദങ്ങളും കടന്നുവന്നു പകർത്തുന്നു
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ഈ ഇനം ഒരു ഫലകം ആണ് ഇടപാടുകൾ ഉപയോഗിക്കാവൂ കഴിയില്ല. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ ഇനം ആട്റിബ്യൂട്ടുകൾക്ക് വകഭേദങ്ങളും കടന്നുവന്നു പകർത്തുന്നു
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ആകെ ഓർഡർ പരിഗണിക്കും
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ഫീൽഡ് മൂല്യം &#39;ഡേ മാസം ആവർത്തിക്കുക&#39; നൽകുക
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,നികുതി നിരക്ക്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ഇതിനകം കാലാവധിയിൽ എംപ്ലോയിസ് {1} അനുവദിച്ചിട്ടുണ്ട് {2} {3} വരെ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2} അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,നോൺ-ഗ്രൂപ്പ് പരിവർത്തനം
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ഒരു ഇനത്തിന്റെ ബാച്ച് (ചീട്ടു).
 DocType: C-Form Invoice Detail,Invoice Date,രസീത് തീയതി
 DocType: GL Entry,Debit Amount,ഡെബിറ്റ് തുക
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
 DocType: Purchase Order,% Received,% ലഭിച്ചു
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,വിദ്യാർത്ഥി ഗ്രൂപ്പുകൾ സൃഷ്ടിക്കുക
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,ക്വട്ടേഷൻ അഭ്യർത്ഥന
 DocType: Salary Slip Timesheet,Working Hours,ജോലിചെയ്യുന്ന സമയം
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,നിലവിലുള്ള ഒരു പരമ്പരയിലെ തുടങ്ങുന്ന / നിലവിലെ ക്രമസംഖ്യ മാറ്റുക.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ഒന്നിലധികം പ്രൈസിങ് നിയമങ്ങൾ വിജയം തുടരുകയാണെങ്കിൽ, ഉപയോക്താക്കൾക്ക് വൈരുദ്ധ്യം പരിഹരിക്കാൻ മാനുവലായി മുൻഗണന സജ്ജീകരിക്കാൻ ആവശ്യപ്പെട്ടു."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 ,Purchase Register,രജിസ്റ്റർ വാങ്ങുക
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ബാധകമായ നിരക്കുകളും
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,എല്ലാ നിർമാണ പ്രക്രിയകൾ വേണ്ടി ആഗോള ക്രമീകരണങ്ങൾ.
 DocType: Accounts Settings,Accounts Frozen Upto,ശീതീകരിച്ച വരെ അക്കൗണ്ടുകൾ
 DocType: SMS Log,Sent On,ദിവസം അയച്ചു
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
 DocType: HR Settings,Employee record is created using selected field. ,ജീവനക്കാർ റെക്കോർഡ് തിരഞ്ഞെടുത്ത ഫീൽഡ് ഉപയോഗിച്ച് സൃഷ്ടിക്കപ്പെട്ടിരിക്കുന്നത്.
 DocType: Sales Order,Not Applicable,ബാധകമല്ല
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,പാക്കേജ് നമ്പർ നിന്ന്
 DocType: Item Attribute,To Range,പരിധി വരെ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,സെക്യൂരിറ്റീസ് ആൻഡ് നിക്ഷേപങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",വിപണിമൂല്യം രീതി മാറ്റാൻ കഴിയില്ല അത് സ്വന്തം മതിപ്പു രീതി ഇല്ല ചില ഇനങ്ങൾ നേരെ ഇടപാടുകൾ ഉണ്ട് പോലെ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,അനുവദിച്ച മൊത്തം ഇലകൾ നിർബന്ധമായും
 DocType: Job Opening,Description of a Job Opening,ഒരു ഇയ്യോബ് തുറക്കുന്നു വിവരണം
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ഇന്ന് അവശേഷിക്കുന്ന പ്രവർത്തനങ്ങൾ
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
 DocType: Production Order,Additional Operating Cost,അധിക ഓപ്പറേറ്റിംഗ് ചെലവ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,കോസ്മെറ്റിക്സ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
 DocType: Shipping Rule,Net Weight,മൊത്തം ഭാരം
 DocType: Employee,Emergency Phone,എമർജൻസി ഫോൺ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,വാങ്ങാൻ
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ത്രെഷോൾഡ് 0% വേണ്ടി ഗ്രേഡ് define ദയവായി
 DocType: Sales Order,To Deliver,വിടുവിപ്പാൻ
 DocType: Purchase Invoice Item,Item,ഇനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
 DocType: Journal Entry,Difference (Dr - Cr),വ്യത്യാസം (ഡോ - CR)
 DocType: Account,Profit and Loss,ലാഭവും നഷ്ടവും
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,മാനേജിംഗ് ചൂടുകാലമാണെന്നത്
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,ഇന്സ്റ്റലേഷന് കുറിപ്പ് ഇനം
 DocType: Production Plan Item,Pending Qty,തീർച്ചപ്പെടുത്തിയിട്ടില്ല Qty
 DocType: Budget,Ignore,അവഗണിക്കുക
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} സജീവമല്ല
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} സജീവമല്ല
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},താഴെക്കൊടുത്തിരിക്കുന്ന നമ്പറുകൾ അയയ്ക്കുന്ന എസ്എംഎസ്: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,അച്ചടിക്കുള്ള സെറ്റപ്പ് ചെക്ക് അളവുകൾ
 DocType: Salary Slip,Salary Slip Timesheet,ശമ്പള ജി Timesheet
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,ആകെ കമ്മീഷൻ
 DocType: Pricing Rule,Sales Partner,സെയിൽസ് പങ്കാളി
 DocType: Buying Settings,Purchase Receipt Required,വാങ്ങൽ രസീത് ആവശ്യമാണ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ഓപ്പണിങ് സ്റ്റോക്ക് നൽകിയിട്ടുണ്ടെങ്കിൽ മൂലധനം നിരക്ക് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ഓപ്പണിങ് സ്റ്റോക്ക് നൽകിയിട്ടുണ്ടെങ്കിൽ മൂലധനം നിരക്ക് നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ഇൻവോയിസ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,കുമിഞ്ഞു മൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ക്ഷമിക്കണം, സീരിയൽ ഒഴിവ് ലയിപ്പിക്കാൻ കഴിയില്ല"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,പുനരാരംഭിക്കുക അറ്റാച്ച്മെന്റ്
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ആവർത്തിക്കുക ഇടപാടുകാർ
 DocType: Leave Control Panel,Allocate,നീക്കിവയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ശ്രദ്ധിക്കുക: നീക്കിവെച്ചത് മൊത്തം ഇല {0} കാലയളവിൽ {1} ഇതിനകം അംഗീകാരം ഇല കുറവ് പാടില്ല
 DocType: Announcement,Posted By,പോസ്റ്റ് ചെയ്തത്
 DocType: Item,Delivered by Supplier (Drop Ship),വിതരണക്കാരൻ (ഡ്രോപ്പ് കപ്പൽ) നൽകുന്ന
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,വിൽപ്പന ഇൻവോയ്സ് Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},പരാമർശം ഇല്ല &amp; റഫറൻസ് തീയതി {0} ആവശ്യമാണ്
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ബാങ്ക് എൻട്രി ഉണ്ടാക്കുവാൻ പേയ്മെന്റ് അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ഇല, ചെലവിൽ വാദങ്ങളിൽ പേറോളിന് നിയന്ത്രിക്കാൻ ജീവനക്കാരൻ റെക്കോർഡുകൾ സൃഷ്ടിക്കുക"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ഇല, ചെലവിൽ വാദങ്ങളിൽ പേറോളിന് നിയന്ത്രിക്കാൻ ജീവനക്കാരൻ റെക്കോർഡുകൾ സൃഷ്ടിക്കുക"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ബേസ് ചേർക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Proposal എഴുത്ത്
 DocType: Payment Entry Deduction,Payment Entry Deduction,പേയ്മെന്റ് എൻട്രി കിഴിച്ചുകൊണ്ടു
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ഗുഅര്ദിഅന്൨ കൂടെ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,മാനേജർ
 DocType: Payment Entry,Payment From / To,/ To നിന്നുള്ള പേയ്മെന്റ്
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,തീയതി ശ്രേണി
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},പുതിയ ക്രെഡിറ്റ് പരിധി ഉപഭോക്താവിന് നിലവിലെ മുന്തിയ തുക കുറവാണ്. വായ്പാ പരിധി ആയിരിക്കും കുറഞ്ഞത് {0} ഉണ്ട്
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},പുതിയ ക്രെഡിറ്റ് പരിധി ഉപഭോക്താവിന് നിലവിലെ മുന്തിയ തുക കുറവാണ്. വായ്പാ പരിധി ആയിരിക്കും കുറഞ്ഞത് {0} ഉണ്ട്
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി ചെയ്തിട്ടുണ്ട്.
 DocType: SMS Settings,Receiver Parameter,റിസീവർ പാരാമീറ്റർ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;അടിസ്ഥാനമാക്കി&#39; എന്നതും &#39;ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,റെസല്യൂഷൻ തീയതി
 DocType: Student Batch Name,Batch Name,ബാച്ച് പേര്
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,പേരെഴുതുക
 DocType: Selling Settings,Customer Naming By,ഉപയോക്താക്കൾക്കായി നാമകരണ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,വിദ്യാർത്ഥി പ്രതിമാസ ഹാജർ റിപ്പോർട്ട് അവതരിപ്പിക്കുക പോലെ വിദ്യാർത്ഥി കാണിക്കും
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,വിദ്യാർത്ഥിയുടെ ഹാജർ
 DocType: Sales Invoice Timesheet,Time Sheet,സമയം ഷീറ്റ്
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush അസംസ്കൃത വസ്തുക്കൾ അടിസ്ഥാനത്തിൽ ഓൺ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ഐറ്റം വിശദാംശങ്ങൾ നൽകുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ഐറ്റം വിശദാംശങ്ങൾ നൽകുക
 DocType: Interest,Interest,പലിശ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,പ്രീ സെയിൽസ്
 DocType: Purchase Receipt,Other Details,മറ്റ് വിവരങ്ങൾ
@@ -739,7 +742,7 @@
 ,Absent Student Report,നിലവില്ല വിദ്യാർത്ഥി റിപ്പോർട്ട്
 DocType: Email Digest,Next email will be sent on:,അടുത്തത് ഇമെയിൽ ന് അയയ്ക്കും:
 DocType: Offer Letter Term,Offer Letter Term,കത്ത് ടേം ഓഫർ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ഇനം {0} കാണാനായില്ല
 DocType: Bin,Stock Value,സ്റ്റോക്ക് മൂല്യം
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,കമ്പനി {0} നിലവിലില്ല
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,വാറന്റി കാലഹരണ തീയതി
 DocType: Material Request Item,Quantity and Warehouse,അളവിലും വെയർഹൗസ്
 DocType: Sales Invoice,Commission Rate (%),കമ്മീഷൻ നിരക്ക് (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; നാമകരണം സീരീസ് വഴി {0} സീരീസ് പേര് സജ്ജീകരിക്കുക
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; നാമകരണം സീരീസ് വഴി {0} സീരീസ് പേര് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
 DocType: Project,Estimated Cost,കണക്കാക്കിയ ചെലവ്
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Mode of Payment Account,Default Account,സ്ഥിര അക്കൗണ്ട്
 DocType: Payment Entry,Received Amount (Company Currency),ലഭിച്ച തുകയുടെ (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,പ്രതിവാര അവധി ദിവസം തിരഞ്ഞെടുക്കുക
 DocType: Production Order Operation,Planned End Time,പ്ലാൻ ചെയ്തു അവസാനിക്കുന്ന സമയം
 ,Sales Person Target Variance Item Group-Wise,സെയിൽസ് പേഴ്സൺ ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനുമാണ്
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 DocType: Request for Quotation Supplier,Send Email,ഇമെയിൽ അയയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ഇല്ല അനുമതി
 DocType: Company,Default Bank Account,സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ജീവനക്കാരൻ കണ്ടെത്തിയില്ല
 DocType: Supplier Quotation,Stopped,നിർത്തി
 DocType: Item,If subcontracted to a vendor,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
 DocType: SMS Center,All Customer Contact,എല്ലാ കസ്റ്റമർ കോൺടാക്റ്റ്
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV വഴി സ്റ്റോക്ക് ബാലൻസ് അപ്ലോഡ് ചെയ്യുക.
 DocType: Warehouse,Tree Details,ട്രീ വിശദാംശങ്ങൾ
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,മിനിമം ഇൻവോയിസ് തുക
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: കോസ്റ്റ് സെന്റർ {2} കമ്പനി {3} സ്വന്തമല്ല
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: അക്കൗണ്ട് {2} ഒരു ഗ്രൂപ്പ് കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ഇനം വരി {IDX}: {doctype} {DOCNAME} മുകളിൽ &#39;{doctype}&#39; പട്ടികയിൽ നിലവിലില്ല
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ഇനം വരി {IDX}: {doctype} {DOCNAME} മുകളിൽ &#39;{doctype}&#39; പട്ടികയിൽ നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ടാസ്ക്കുകളൊന്നുമില്ല
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ഓട്ടോ ഇൻവോയ്സ് 05, 28 തുടങ്ങിയവ ഉദാ നിർമ്മിക്കപ്പെടും ഏതെല്ലാം മാസത്തിലെ ദിവസം"
 DocType: Asset,Opening Accumulated Depreciation,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,മാറുന്ന ശരാശരി റേറ്റ്
 DocType: Production Planning Tool,Select Items,ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ബിൽ {1} നേരെ {2} dated
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ
 DocType: Maintenance Visit,Completion Status,പൂർത്തീകരണവും അവസ്ഥ
 DocType: HR Settings,Enter retirement age in years,വർഷങ്ങളിൽ വിരമിക്കൽ പ്രായം നൽകുക
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ഈ ശതമാനം വരെ ഡെലിവറി അല്ലെങ്കിൽ രസീത് മേൽ അനുവദിക്കുക
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ഇംപോർട്ട് ഹാജർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
 DocType: Process Payroll,Activity Log,പ്രവർത്തന ലോഗ്
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,അറ്റാദായം / നഷ്ടം
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,യാന്ത്രികമായി ഇടപാടുകളുടെ സമർപ്പിക്കാനുള്ള സന്ദേശം എഴുതുക.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,പെയ്മെന്റ് നയിക്കുന്ന വാങ്ങുക
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,അനുമാനിക്കപ്പെടുന്ന Qty
 DocType: Sales Invoice,Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;തുറക്കുന്നു&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ചെയ്യാനുള്ളത് തുറക്കുക
 DocType: Notification Control,Delivery Note Message,ഡെലിവറി നോട്ട് സന്ദേശം
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,വീണ്ടും ഓർഡർ Qty
 DocType: Leave Block List Date,Leave Block List Date,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
 DocType: Pricing Rule,Price or Discount,വില അല്ലെങ്കിൽ ഡിസ്ക്കൌണ്ട്
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,വാങ്ങൽ രസീത് ഇനങ്ങൾ പട്ടികയിൽ ആകെ ബാധകമായ നിരക്കുകളും ആകെ നികുതി ചാർജുകളും തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,വാങ്ങൽ രസീത് ഇനങ്ങൾ പട്ടികയിൽ ആകെ ബാധകമായ നിരക്കുകളും ആകെ നികുതി ചാർജുകളും തുല്യമായിരിക്കണം
 DocType: Sales Team,Incentives,ഇൻസെന്റീവ്സ്
 DocType: SMS Log,Requested Numbers,അഭ്യർത്ഥിച്ചു സംഖ്യാപുസ്തകം
 DocType: Production Planning Tool,Only Obtain Raw Materials,അസംസ്കൃത വസ്തുക്കൾ മാത്രം ലഭ്യമാക്കുക
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട തുക
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Fee Structure,Components,ഘടകങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,വാങ്ങൽ ഇൻവോയിസ് അഡ്വാൻസ്
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,വരി {0}: / വാങ്ങൽ ഓർഡർ എപ്പോഴും മുൻകൂട്ടി എന്ന് അടയാളപ്പെടുത്തി വേണം സെയിൽസ് നേരെ പേയ്മെന്റ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,കെമിക്കൽ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ഈ മോഡ് തെരഞ്ഞെടുക്കുമ്പോഴും സ്വതേ ബാങ്ക് / ക്യാഷ് അംഗത്വം സ്വയം ശമ്പള ജേണൽ എൻട്രി ലെ അപ്ഡേറ്റ് ചെയ്യും.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","ഗ്രേഡ് കോഡ് {0} വേണ്ടി ഇടവേളകളിൽ മറ്റ് ഗ്രേഡിലും ഗ്രേഡ് ഇടവേളകളിൽ ഓവർലാപ്പുചെയ്യുന്നു. ഇടവേളകളിൽ {0}, {1} പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക"
 DocType: BOM,Raw Material Cost(Company Currency),അസംസ്കൃത വസ്തുക്കളുടെ വില (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},വരി # {0}: നിരക്ക് {1} {2} ഉപയോഗിക്കുന്ന നിരക്ക് അധികമാകരുത് കഴിയില്ല
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM ൽ വെബ്സൈറ്റ് ഇനം
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,നിങ്ങളുടെ കത്ത് തലയും ലോഗോ അപ്ലോഡ്. (നിങ്ങൾക്ക് പിന്നീട് എഡിറ്റ് ചെയ്യാൻ കഴിയും).
 DocType: Timesheet Detail,Bill,ബില്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,വൈറ്റ്
 DocType: SMS Center,All Lead (Open),എല്ലാ ലീഡ് (തുറക്കുക)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),വരി {0}: അളവ് ({2} {3}) വെയർഹൗസിൽ ലെ {4} ലഭ്യമല്ല {1} ചേരുന്ന സമയത്ത് പോസ്റ്റുചെയ്യുന്നതിൽ
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ഓർഡർ ടൈപ്പ് {0} ഒന്നാണ് ആയിരിക്കണം
 DocType: Lead,Next Contact Date,അടുത്തത് കോൺടാക്റ്റ് തീയതി
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty തുറക്കുന്നു
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
 DocType: Student Batch Name,Student Batch Name,വിദ്യാർത്ഥിയുടെ ബാച്ച് പേര്
 DocType: Holiday List,Holiday List Name,ഹോളിഡേ പട്ടിക പേര്
 DocType: Repayment Schedule,Balance Loan Amount,ബാലൻസ് വായ്പാ തുക
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ദയവായി ഒരു {0} വ്യക്തമാക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
 DocType: Delivery Note,Delivery To,ഡെലിവറി
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Planning Tool,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ഡിസ്കൗണ്ട്
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ഡിസ്കൗണ്ട്
 DocType: Asset,Total Number of Depreciations,Depreciations ആകെ എണ്ണം
 DocType: Sales Invoice Item,Rate With Margin,മാർജിൻ കൂടി നിരക്ക്
 DocType: Sales Invoice Item,Rate With Margin,മാർജിൻ കൂടി നിരക്ക്
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,സംഘടനയുടെ പേര്
 DocType: Tax Rule,Shipping State,ഷിപ്പിംഗ് സ്റ്റേറ്റ്
 ,Projected Quantity as Source,ഉറവിടം പ്രൊജക്റ്റുചെയ്തു ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,നോൺ-ഓഹരി ഇനങ്ങൾ ഉൾപ്പെടുത്തുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,സെയിൽസ് ചെലവുകൾ
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,സിപ്പ് കോഡ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,സിപ്പ് കോഡ്
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
 DocType: Opportunity,Contact Info,ബന്ധപ്പെടുന്നതിനുള്ള വിവരം
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ ഉണ്ടാക്കുന്നു
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,വിതരണക്കാരൻ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ഷോപ്പിംഗ് കാർട്ട് ഷിപ്പിംഗ് റൂൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,പ്രൊഡക്ഷൻ ഓർഡർ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
 ,Ordered Items To Be Billed,ബില്ല് ഉത്തരവിട്ടു ഇനങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,റേഞ്ച് നിന്നും പരിധി വരെ കുറവ് ഉണ്ട്
 DocType: Global Defaults,Global Defaults,ആഗോള സ്ഥിരസ്ഥിതികൾ
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ബാച്ച് നമ്പർ ലഭിക്കാൻ ദയവായി ഇനം കോഡ് നൽകുക
 DocType: Stock Settings,Default Item Group,സ്ഥിരസ്ഥിതി ഇനം ഗ്രൂപ്പ്
 DocType: Employee Loan,Partially Disbursed,ഭാഗികമായി വിതരണം
-DocType: Grading Structure,Grading System Name,ഗ്രേഡിംഗ് സിസ്റ്റം പേര്
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,വിതരണക്കാരൻ ഡാറ്റാബേസ്.
 DocType: Account,Balance Sheet,ബാലൻസ് ഷീറ്റ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,നിങ്ങളുടെ വിൽപ്പന വ്യക്തിയെ ഉപഭോക്തൃ ബന്ധപ്പെടാൻ ഈ തീയതി ഒരു ഓർമ്മപ്പെടുത്തൽ ലഭിക്കും
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","കൂടുതലായ അക്കൗണ്ടുകൾ ഗ്രൂപ്പ്സ് കീഴിൽ കഴിയും, പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,വർക്ക് ചെയ്തുകഴിഞ്ഞു
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,വിശേഷണങ്ങൾ പട്ടികയിൽ കുറഞ്ഞത് ഒരു ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Announcement,All Students,എല്ലാ വിദ്യാർത്ഥികൾക്കും
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,കാണുക ലെഡ്ജർ
 DocType: Grading Scale,Intervals,ഇടവേളകളിൽ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,പഴയവ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,വിദ്യാർത്ഥി മൊബൈൽ നമ്പർ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ലോകം റെസ്റ്റ്
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് പാടില്ല
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ശീതീകരിച്ച അക്കൗണ്ട് {0} എഡിറ്റുചെയ്യാൻ
 DocType: Journal Entry,Get Outstanding Invoices,മികച്ച ഇൻവോയിസുകൾ നേടുക
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,വാങ്ങൽ ഓർഡറുകൾ നിങ്ങളുടെ വാങ്ങലുകൾ ന് ആസൂത്രണം ഫോളോ അപ്പ് സഹായിക്കാൻ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,വാങ്ങൽ ഓർഡറുകൾ നിങ്ങളുടെ വാങ്ങലുകൾ ന് ആസൂത്രണം ഫോളോ അപ്പ് സഹായിക്കാൻ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ചെറുകിട
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
 DocType: Mode of Payment,Mode of Payment,അടക്കേണ്ട മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
 DocType: Student Applicant,AP,എ.പി.
 DocType: Purchase Invoice Item,BOM,BOM ൽ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഐറ്റം ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,ഗ്രൂപ്പ് റോൾ നമ്പർ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,എല്ലാ ടാസ്ക് തൂക്കം ആകെ 1. അതനുസരിച്ച് എല്ലാ പദ്ധതി ചുമതലകളുടെ തൂക്കം ക്രമീകരിക്കാൻ വേണം ദയവായി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","പ്രൈസിങ് റൂൾ ആദ്യം ഇനം, ഇനം ഗ്രൂപ്പ് അല്ലെങ്കിൽ ബ്രാൻഡ് ആകാം വയലിലെ &#39;പുരട്ടുക&#39; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} പുരോഗതിയിലാണ് ഇനങ്ങൾ
 DocType: Workstation,Workstation Name,വറ്ക്ക്സ്റ്റേഷൻ പേര്
-DocType: Grade Interval,Grade Code,ഗ്രേഡ് കോഡ്
+DocType: Grading Scale Interval,Grade Code,ഗ്രേഡ് കോഡ്
 DocType: POS Item Group,POS Item Group,POS ഇനം ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ഡൈജസ്റ്റ് ഇമെയിൽ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ഹാര്ഡ്വെയര്
 DocType: Sales Order,Recurring Upto,വരെയും ആവർത്തന
 DocType: Attendance,HR Manager,എച്ച് മാനേജർ
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,പ്രിവിലേജ് അവധി
 DocType: Purchase Invoice,Supplier Invoice Date,വിതരണക്കാരൻ ഇൻവോയിസ് തീയതി
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,നിങ്ങൾ ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ഭക്ഷ്യ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,എയ്ജിങ് ശ്രേണി 3
 DocType: Maintenance Schedule Item,No of Visits,സന്ദർശനങ്ങൾ ഒന്നും
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,മാർക്ക് Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,മാർക്ക് Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} നേരെ {1} നിലവിലുണ്ട്
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,എൻറോൾ വിദ്യാർത്ഥി
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},സമാപന അക്കൗണ്ട് കറൻസി {0} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},എല്ലാ ഗോളുകൾ വേണ്ടി പോയിന്റിന്റെ സം 100 ആയിരിക്കണം അത് {0} ആണ്
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട്
 DocType: Material Request,Terms and Conditions Content,നിബന്ധനകളും വ്യവസ്ഥകളും ഉള്ളടക്കം
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Detail,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
 DocType: Pricing Rule,"Higher the number, higher the priority","ഹയർ സംഖ്യ, ഉയർന്ന മുൻഗണന"
 ,Purchase Invoice Trends,വാങ്ങൽ ഇൻവോയിസ് ട്രെൻഡുകൾ
 DocType: Employee,Better Prospects,മെച്ചപ്പെട്ട സാദ്ധ്യതകളും
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","വരി # {0}: ബാച്ച് {1} മാത്രമേ {2} അളവ് ഉണ്ട്. ഉണ്ട് {3} ലഭ്യമായ അളവ് മറ്റൊരു ബാച്ച് തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ഒന്നിലധികം ബാച്ചുകൾ നിന്ന് / പ്രശ്നം വിടുവിപ്പാൻ, ഒന്നിലധികം വരികൾ കയറി വരി വേർതിരിക്കുക"
 DocType: Vehicle,License Plate,ലൈസൻസ് പ്ലേറ്റ്
 DocType: Appraisal,Goals,ലക്ഷ്യങ്ങൾ
 DocType: Warranty Claim,Warranty / AMC Status,വാറന്റി / എഎംസി അവസ്ഥ
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ജീവനക്കാർ തനിക്കായി റിപ്പോർട്ട് ചെയ്യാൻ കഴിയില്ല.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","അക്കൗണ്ട് മരവിപ്പിച്ചു എങ്കിൽ, എൻട്രികൾ നിയന്ത്രിത ഉപയോക്താക്കൾക്ക് അനുവദിച്ചിരിക്കുന്ന."
 DocType: Email Digest,Bank Balance,ബാങ്ക് ബാലൻസ്
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ഇയ്യോബ് പ്രൊഫൈൽ, യോഗ്യത തുടങ്ങിയവ ആവശ്യമാണ്"
 DocType: Journal Entry Account,Account Balance,അക്കൗണ്ട് ബാലൻസ്
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ഇടപാടുകൾക്ക് നികുതി റൂൾ.
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,അടയ്ക്കാത്ത സാമ്പത്തിക വർഷത്തെ പി &amp; എൽ തുലാസിൽ കാണിക്കുക
 DocType: Shipping Rule,Shipping Account,ഷിപ്പിംഗ് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: അക്കൗണ്ട് {2} സജ്ജമല്ല
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,നിങ്ങളുടെ പ്രവൃത്തി പദ്ധതിയും സഹായിക്കാൻ ഓൺ സമയം വിടുവിപ്പാൻ സെയിൽസ് ഓർഡറുകൾ നടത്തുക
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,നിങ്ങളുടെ പ്രവൃത്തി പദ്ധതിയും സഹായിക്കാൻ ഓൺ സമയം വിടുവിപ്പാൻ സെയിൽസ് ഓർഡറുകൾ നടത്തുക
 DocType: Quality Inspection,Readings,വായന
 DocType: Stock Entry,Total Additional Costs,ആകെ അധിക ചെലവ്
 DocType: Course Schedule,SH,എസ്.എച്ച്
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,മൂല്യത്തിലേക്ക്
 DocType: Asset Movement,Stock Manager,സ്റ്റോക്ക് മാനേജർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ഉറവിട വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ഓഫീസ് രെംട്
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,സെറ്റപ്പ് എസ്എംഎസ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ഇംപോർട്ട് പരാജയപ്പെട്ടു!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,ഉറവിടം
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,അടച്ചു കാണിക്കുക
 DocType: Leave Type,Is Leave Without Pay,ശമ്പള ഇല്ലാതെ തന്നെ തന്നു
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,അസറ്റ് വിഭാഗം ഫിക്സ്ഡ് അസറ്റ് ഇനം നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,അസറ്റ് വിഭാഗം ഫിക്സ്ഡ് അസറ്റ് ഇനം നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,പേയ്മെന്റ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ഈ {0} {2} {3} ഉപയോഗിച്ച് {1} വൈരുദ്ധ്യങ്ങൾ
 DocType: Student Attendance Tool,Students HTML,വിദ്യാർത്ഥികൾ എച്ച്ടിഎംഎൽ
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,വിടുന്നത് തീയതി
 DocType: Pricing Rule,For Price List,വില ലിസ്റ്റിനായി
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,എക്സിക്യൂട്ടീവ് തിരച്ചിൽ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,വിജയസാധ്യതയുള്ളത് സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,വിജയസാധ്യതയുള്ളത് സൃഷ്ടിക്കുക
 DocType: Maintenance Schedule,Schedules,സമയക്രമങ്ങൾ
 DocType: Purchase Invoice Item,Net Amount,ആകെ തുക
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM വിശദാംശം ഇല്ല
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,പ്രോഗ്രാം പ്രവേശനം
 DocType: Sales Invoice Item,Brand Name,ബ്രാൻഡ് പേര്
 DocType: Purchase Receipt,Transporter Details,ട്രാൻസ്പോർട്ടർ വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ബോക്സ്
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,സംഘടന
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} പദ്ധതി {1} കണ്ടില്ല സ്ഥിര യുഎഇ
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,കമ്പനി ചെലവിൽ വേണ്ടി ക്ലെയിമുകൾ.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","വിദ്യാർഥികൾ, സിസ്റ്റം ഹൃദയം അവസാനിക്കുന്നു എല്ലാ നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക് ചേർക്കുക"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","വിദ്യാർഥികൾ, സിസ്റ്റം ഹൃദയം അവസാനിക്കുന്നു എല്ലാ നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക് ചേർക്കുക"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},വരി # {0}: ക്ലിയറൻസ് തീയതി {1} {2} ചെക്ക് തിയതി ആകരുത്
 DocType: Company,Default Holiday List,സ്വതേ ഹോളിഡേ പട്ടിക
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},വരി {0}: സമയവും ചെയ്യുക കുറഞ്ഞ സമയത്തിനുള്ളില് {1} {2} ഓവർലാപ്പുചെയ്യുന്നു ആണ്
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,പേയ്മെന്റ് ഇമെയിൽ വീണ്ടും
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,പുതിയ ചുമതല
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ക്വട്ടേഷൻ നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ക്വട്ടേഷൻ നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,മറ്റ് റിപ്പോർട്ടുകളിൽ
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,മുൻകൂട്ടി എക്സ് ദിവസം വേണ്ടി ഓപ്പറേഷൻസ് ആസൂത്രണം ശ്രമിക്കുക.
 DocType: HR Settings,Stop Birthday Reminders,ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ നിർത്തുക
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: SMS Center,Receiver List,റിസീവർ പട്ടിക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,തിരയൽ ഇനം
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,തിരയൽ ഇനം
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ക്ഷയിച്ചിരിക്കുന്നു തുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,പണമായി നെറ്റ് മാറ്റുക
 DocType: Assessment Plan,Grading Scale,ഗ്രേഡിംഗ് സ്കെയിൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ഇതിനകം പൂർത്തിയായ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ഇഷ്യൂ ഇനങ്ങൾ ചെലവ്
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ശേഖരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,നിങ്ങൾ സാമ്പത്തിക വർഷത്തെ {0} ഇല്ലാതാക്കാൻ കഴിയില്ല. സാമ്പത്തിക വർഷത്തെ {0} ആഗോള ക്രമീകരണങ്ങൾ സ്വതവേ സജ്ജീകരിച്ച
 DocType: Journal Entry,Entry Type,എൻട്രി തരം
 ,Customer Credit Balance,കസ്റ്റമർ ക്രെഡിറ്റ് ബാലൻസ്
@@ -1686,8 +1685,6 @@
 DocType: Student Sibling,Studying in Same Institute,ഇതേ ഇൻസ്റ്റിറ്റ്യൂട്ട് പഠിക്കുന്ന
 DocType: Territory,Territory Manager,ടെറിട്ടറി മാനേജർ
 DocType: Packed Item,To Warehouse (Optional),സംഭരണശാല (ഓപ്ഷണൽ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Payment Entry,Paid Amount (Company Currency),തുക (കമ്പനി കറൻസി)
 DocType: Purchase Invoice,Additional Discount,അധിക ഡിസ്ക്കൌണ്ട്
 DocType: Selling Settings,Selling Settings,സജ്ജീകരണങ്ങൾ വിൽക്കുന്ന
@@ -1697,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,വണ്ടിയിൽ കാണുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
 ,Item Shortage Report,ഇനം ദൗർലഭ്യം റിപ്പോർട്ട്
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ഈ ഓഹരി എൻട്രി ചെയ്യുന്നതിനുപയോഗിക്കുന്ന മെറ്റീരിയൽ അഭ്യർത്ഥന
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,അടുത്ത മൂല്യത്തകർച്ച തീയതി പുതിയ അസറ്റ് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,അടുത്ത മൂല്യത്തകർച്ച തീയതി പുതിയ അസറ്റ് നിര്ബന്ധമാണ്
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പ് പ്രത്യേക കോഴ്സ് ഓരോ ബാച്ച് വേണ്ടി
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പ് പ്രത്യേക കോഴ്സ് ഓരോ ബാച്ച് വേണ്ടി
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ഒരു ഇനത്തിന്റെ സിംഗിൾ യൂണിറ്റ്.
@@ -1716,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,വെയിറ്റേജ്
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: കോസ്റ്റ് സെന്റർ &#39;ലാഭവും നഷ്ടവും&#39; അക്കൗണ്ട് {2} ആവശ്യമാണ്. കമ്പനി ഒരു സ്ഥിര കോസ്റ്റ് സെന്റർ സ്ഥാപിക്കും ദയവായി.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ഉപഭോക്താവിനെ ഗ്രൂപ്പ് സമാന പേരിൽ നിലവിലുണ്ട് കസ്റ്റമർ പേര് മാറ്റാനോ കസ്റ്റമർ ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ഉപഭോക്താവിനെ ഗ്രൂപ്പ് സമാന പേരിൽ നിലവിലുണ്ട് കസ്റ്റമർ പേര് മാറ്റാനോ കസ്റ്റമർ ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,പുതിയ കോൺടാക്റ്റ്
 DocType: Territory,Parent Territory,പാരന്റ് ടെറിട്ടറി
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1745,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,അനുരഞ്ജനം JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,വളരെയധികം നിരകൾ. റിപ്പോർട്ട് കയറ്റുമതി ഒരു സ്പ്രെഡ്ഷീറ്റ് ആപ്ലിക്കേഷൻ ഉപയോഗിച്ച് അത് പ്രിന്റ്.
 DocType: Purchase Invoice Item,Batch No,ബാച്ച് ഇല്ല
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ലേക്ക് {1} കീ തീയതിയിൽ {2} {0} വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,കസ്റ്റമറുടെ വാങ്ങൽ ഓർഡർ നേരെ ഒന്നിലധികം സെയിൽസ് ഉത്തരവുകൾ അനുവദിക്കുക
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,ഗുഅര്ദിഅന്൨ മൊബൈൽ ഇല്ല
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,പ്രധാന
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,മാറ്റമുള്ള
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,പ്രധാന
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,മാറ്റമുള്ള
 DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
 DocType: Employee Attendance Tool,Employees HTML,എംപ്ലോയീസ് എച്ച്ടിഎംഎൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
 DocType: Employee,Leave Encashed?,കാശാക്കാം വിടണോ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,വയലിൽ നിന്ന് ഓപ്പർച്യൂനിറ്റി നിർബന്ധമാണ്
 DocType: Email Digest,Annual Expenses,വാർഷിക ചെലവുകൾ
 DocType: Item,Variants,വകഭേദങ്ങളും
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
 DocType: SMS Center,Send To,അയക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
 DocType: Payment Reconciliation Payment,Allocated amount,പദ്ധതി തുക
@@ -1779,7 +1773,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,വിലയിരുത്തലുകളും
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},സീരിയൽ ഇല്ല ഇനം {0} നൽകിയ തനിപ്പകർപ്പെടുക്കുക
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ഒരു ഷിപ്പിംഗ് റൂൾ വ്യവസ്ഥ
-DocType: Grading Structure,Grading Intervals,ഗ്രേഡിംഗ് ഇടവേളകൾ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ദയവായി നൽകുക
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ഇനം {0} നിരയിൽ {1} അധികം {2} കൂടുതൽ വേണ്ടി ഒവെര്ബില്ല് കഴിയില്ല. മേൽ-ബില്ലിംഗ് അനുവദിക്കുന്നതിന്, ക്രമീകരണങ്ങൾ വാങ്ങാൻ ക്രമീകരിക്കുകയും ചെയ്യുക"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ഇനം അപാകതയുണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ സജ്ജീകരിക്കുക
@@ -1792,16 +1785,17 @@
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,പേയ്മെന്റ്
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,നിങ്ങളുടെ ഓർഡറുകൾ നിയന്ത്രിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,നിങ്ങളുടെ ഓർഡറുകൾ നിയന്ത്രിക്കുക
 DocType: Production Order Operation,Actual Time and Cost,യഥാർത്ഥ സമയവും ചെലവ്
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},പരമാവധി ഭൗതിക അഭ്യർത്ഥന {0} സെയിൽസ് ഓർഡർ {2} നേരെ ഇനം {1} വേണ്ടി കഴിയും
 DocType: Employee,Salutation,വന്ദനംപറച്ചില്
 DocType: Course,Course Abbreviation,കോഴ്സ് സംഗ്രഹം
 DocType: Student Leave Application,Student Leave Application,വിദ്യാർത്ഥി അനുവാദ അപ്ലിക്കേഷൻ
 DocType: Item,Will also apply for variants,കൂടാതെ മോഡലുകൾക്കാണ് ബാധകമാകും
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ന് {1} ജീവനക്കാർ {0} ഹാഫ് ദിവസം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ആകെ തൊഴിൽ സമയം ജോലി സമയം {0} MAX ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ഓൺ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,വില്പനയ്ക്ക് സമയത്ത് ഇനങ്ങളുടെ ചേർത്തുവെക്കുന്നു.
 DocType: Quotation Item,Actual Qty,യഥാർത്ഥ Qty
 DocType: Sales Invoice Item,References,അവലംബം
@@ -1811,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,നിങ്ങൾ ഡ്യൂപ്ലിക്കേറ്റ് ഇനങ്ങളുടെ പ്രവേശിച്ചിരിക്കുന്നു. പരിഹരിക്കാൻ വീണ്ടും ശ്രമിക്കുക.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,അസോസിയേറ്റ്
 DocType: Asset Movement,Asset Movement,അസറ്റ് പ്രസ്ഥാനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,പുതിയ കാർട്ട്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,പുതിയ കാർട്ട്
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ഇനം {0} ഒരു സീരിയൽ ഇനം അല്ല
 DocType: SMS Center,Create Receiver List,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
 DocType: Vehicle,Wheels,ചക്രങ്ങളും
@@ -1843,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,പ്രൊഡക്ഷൻ ഉത്തരവുകൾ നേരെ സമയം രേഖകൾ സൃഷ്ടി പ്രവർത്തനരഹിതമാക്കുന്നു. ഓപറേഷൻസ് പ്രൊഡക്ഷൻ ഓർഡർ നേരെ ട്രാക്ക് ചെയ്യപ്പെടാൻ വരികയുമില്ല
 DocType: Student,Student Mobile Number,സ്റ്റുഡന്റ് മൊബൈൽ നമ്പർ
 DocType: Item,Has Variants,രൂപഭേദങ്ങൾ ഉണ്ട്
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
 DocType: Monthly Distribution,Name of the Monthly Distribution,പ്രതിമാസ വിതരണം പേര്
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
 DocType: Sales Person,Parent Sales Person,പേരന്റ്ഫോള്ഡര് സെയിൽസ് വ്യാക്തി
 DocType: Purchase Invoice,Recurring Invoice,ആവർത്തക ഇൻവോയിസ്
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,മാനേജിംഗ് പ്രോജക്റ്റുകൾ
@@ -1854,7 +1848,7 @@
 DocType: Budget,Fiscal Year,സാമ്പത്തിക വർഷം
 DocType: Vehicle Log,Fuel Price,ഇന്ധന വില
 DocType: Budget,Budget,ബജറ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","അത് ഒരു ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ല പോലെ ബജറ്റ്, {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,കൈവരിച്ച
 DocType: Student Admission,Application Form Route,അപേക്ഷാ ഫോം റൂട്ട്
@@ -1885,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},തുക {0} {1} {2} നേരെ കുറച്ചുകൊണ്ടിരിക്കും
 DocType: Employee,Salary Information,ശമ്പളം വിവരങ്ങൾ
 DocType: Sales Person,Name and Employee ID,പേര് തൊഴിൽ ഐഡി
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
 DocType: Website Item Group,Website Item Group,വെബ്സൈറ്റ് ഇനം ഗ്രൂപ്പ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,"കടമകൾ, നികുതി"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
@@ -1944,7 +1938,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ആവർത്തിക്കുക കസ്റ്റമർ റവന്യൂ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) പങ്ക് &#39;ചിലവിടൽ Approver&#39; ഉണ്ടായിരിക്കണം
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ജോഡി
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
 DocType: Asset,Depreciation Schedule,മൂല്യത്തകർച്ച ഷെഡ്യൂൾ
 DocType: Bank Reconciliation Detail,Against Account,അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,അര ദിവസം തീയതി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള ആയിരിക്കണം
@@ -1961,13 +1955,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Shipping Rule Condition,Shipping Amount,ഷിപ്പിംഗ് തുക
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക
 DocType: Purchase Invoice Item,Conversion Factor,പരിവർത്തന ഫാക്ടർ
 DocType: Purchase Order,Delivered,കൈമാറി
 ,Vehicle Expenses,വാഹന ചെലവുകൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
+DocType: Serial No,Invoice Details,ഇൻവോയ്സ് വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
 DocType: Purchase Receipt,Vehicle Number,വാഹന നമ്പർ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ആവർത്തന ഇൻവോയ്സ് സ്റ്റോപ്പ് ആയിരിക്കും തീയതി
 DocType: Employee Loan,Loan Amount,വായ്പാ തുക
@@ -1991,7 +1986,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,അധിക ഡിസ്ക്കൌണ്ട് തുക
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,നോൺ-ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,സ്പോർട്സ്
 DocType: Loan Type,Loan Name,ലോൺ പേര്
@@ -2003,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,നിങ്ങൾ നിരസിച്ചു ഇനങ്ങളുടെ സ്റ്റോക്ക് നിലനിർത്തുന്നുവെന്നോ എവിടെ വെയർഹൗസ്
 DocType: Production Order,Skip Material Transfer,മെറ്റീരിയൽ ട്രാൻസ്ഫർ ഒഴിവാക്കുക
 DocType: Production Order,Skip Material Transfer,മെറ്റീരിയൽ ട്രാൻസ്ഫർ ഒഴിവാക്കുക
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,കീ തീയതി {2} വരെ {1} {0} വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല. സ്വയം ഒരു കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,നിങ്ങളുടെ സാമ്പത്തിക വർഷം ന് അവസാനിക്കും
 DocType: POS Profile,Price List,വിലവിവരപട്ടിക
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ഇപ്പോൾ സ്വതവേയുള്ള ധനകാര്യ വർഷം ആണ്. പ്രാബല്യത്തിൽ മാറ്റം നിങ്ങളുടെ ബ്രൗസർ പുതുക്കുക.
@@ -2040,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,ഇനം {0} ഇതിനകം മടങ്ങി ചെയ്തു
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** സാമ്പത്തിക വർഷത്തെ ** ഒരു സാമ്പത്തിക വർഷം പ്രതിനിധീകരിക്കുന്നത്. എല്ലാ അക്കൗണ്ടിങ് എൻട്രികൾ മറ്റ് പ്രധാന ഇടപാടുകൾ ** ** സാമ്പത്തിക വർഷത്തിൽ നേരെ അത്രകണ്ട്.
 DocType: Opportunity,Customer / Lead Address,കസ്റ്റമർ / ലീഡ് വിലാസം
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
 DocType: Student Admission,Eligibility,യോഗ്യത
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ലീഡുകൾ നിങ്ങളുടെ നയിക്കുന്നത് പോലെയും നിങ്ങളുടെ എല്ലാ ബന്ധങ്ങൾ കൂടുതൽ ചേർക്കുക, നിങ്ങൾ ബിസിനസ്സ് ലഭിക്കാൻ സഹായിക്കും"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ലീഡുകൾ നിങ്ങളുടെ നയിക്കുന്നത് പോലെയും നിങ്ങളുടെ എല്ലാ ബന്ധങ്ങൾ കൂടുതൽ ചേർക്കുക, നിങ്ങൾ ബിസിനസ്സ് ലഭിക്കാൻ സഹായിക്കും"
 DocType: Production Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Authorization Rule,Applicable To (User),(ഉപയോക്താവ്) ബാധകമായ
 DocType: Purchase Taxes and Charges,Deduct,കുറയ്ക്കാവുന്നതാണ്
@@ -2083,7 +2079,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,എല്ലാ വകുപ്പുകളുടെയും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
 DocType: Process Payroll,Fortnightly,രണ്ടാഴ്ചയിലൊരിക്കൽ
 DocType: Currency Exchange,From Currency,കറൻസി
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","കുറഞ്ഞത് ഒരു വരിയിൽ പദ്ധതി തുക, ഇൻവോയിസ് ടൈപ്പ് ഇൻവോയിസ് നമ്പർ തിരഞ്ഞെടുക്കുക"
@@ -2099,7 +2095,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ആദ്യവരിയിൽ &#39;മുൻ വരി തുകയ്ക്ക്&#39; അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ ന്&#39; ചുമതലയേറ്റു തരം തിരഞ്ഞെടുക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ശിശു ഇനം ഒരു ഉൽപ്പന്നം ബണ്ടിൽ പാടില്ല. ഇനം നീക്കംചെയ്യുക `{0}` സംരക്ഷിക്കാനുമാവും
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ബാങ്കിംഗ്
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,തിമെശെഎത്സ് ചേർക്കുക
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,തിമെശെഎത്സ് ചേർക്കുക
 DocType: Vehicle Service,Service Item,സേവന ഇനം
 DocType: Bank Guarantee,Bank Guarantee,ബാങ്ക് ഗ്യാരന്റി
 DocType: Bank Guarantee,Bank Guarantee,ബാങ്ക് ഗ്യാരന്റി
@@ -2149,8 +2145,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,വിലവിവര ലിസ്റ്റ് സജ്ജമാക്കിയിട്ടില്ലെങ്കിൽ വിലകൾ കാണിക്കില്ല
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ഈ ഷിപ്പിംഗ് റൂൾ ഒരു രാജ്യം വ്യക്തമാക്കൂ ലോകമൊട്ടാകെ ഷിപ്പിംഗ് പരിശോധിക്കുക
 DocType: Stock Entry,Total Incoming Value,ആകെ ഇൻകമിംഗ് മൂല്യം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,വാങ്ങൽ വില പട്ടിക
 DocType: Offer Letter Term,Offer Term,ആഫര് ടേം
 DocType: Quality Inspection,Quality Manager,ക്വാളിറ്റി മാനേജർ
@@ -2184,14 +2180,14 @@
 DocType: Opportunity,Lost Reason,നഷ്ടപ്പെട്ട കാരണം
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,പുതിയ വിലാസം
 DocType: Quality Inspection,Sample Size,സാമ്പിളിന്റെവലിപ്പം
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ദയവായി രസീത് പ്രമാണം നൽകുക
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,എല്ലാ ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ദയവായി രസീത് പ്രമാണം നൽകുക
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,എല്ലാ ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;കേസ് നമ്പർ നിന്നും&#39; ഒരു സാധുവായ വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,പ്രശ്നപരിഹാരത്തിനായി കുറഞ്ഞ കേന്ദ്രങ്ങൾ ഗ്രൂപ്പുകൾ കീഴിൽ കഴിയും പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും
 DocType: Project,External,പുറത്തേക്കുള്ള
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ഉപയോക്താക്കൾ അനുമതികളും
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},സൃഷ്ടിച്ചു പ്രൊഡക്ഷൻ ഓർഡറുകൾ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},സൃഷ്ടിച്ചു പ്രൊഡക്ഷൻ ഓർഡറുകൾ: {0}
 DocType: Branch,Branch,ബ്രാഞ്ച്
 DocType: Guardian,Mobile Number,മൊബൈൽ നമ്പർ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,"അച്ചടി, ബ്രാൻഡിംഗ്"
@@ -2200,7 +2196,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} കാണാനായില്ല സീരിയൽ ഇല്ല
 DocType: Scheduling Tool,Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച്
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,നിങ്ങളുടെ ഉപഭോക്താക്കളെ
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,കുട്ടിയാണെന്ന്
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,കുട്ടിയാണെന്ന്
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},നിങ്ങൾ പദ്ധതി സഹകരിക്കുക ക്ഷണിച്ചു: {0}
 DocType: Leave Block List Date,Block Date,ബ്ലോക്ക് തീയതി
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ഇപ്പോൾ പ്രയോഗിക്കുക
@@ -2224,8 +2220,9 @@
 DocType: SMS Log,Sent To,ലേക്ക് അയച്ചു
 DocType: Payment Request,Make Sales Invoice,സെയിൽസ് ഇൻവോയിസ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,സോഫ്റ്റ്വെയറുകൾ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,അടുത്ത ബന്ധപ്പെടുക തീയതി കഴിഞ്ഞ ലെ പാടില്ല
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,അടുത്ത ബന്ധപ്പെടുക തീയതി കഴിഞ്ഞ ലെ പാടില്ല
 DocType: Company,For Reference Only.,മാത്രം റഫറൻസിനായി.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,തിരഞ്ഞെടുക്കുക ബാച്ച് ഇല്ല
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},അസാധുവായ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,മുൻകൂർ തുക
@@ -2239,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,കേസ് നമ്പർ 0 ആയിരിക്കും കഴിയില്ല
 DocType: Item,Show a slideshow at the top of the page,പേജിന്റെ മുകളിൽ ഒരു സ്ലൈഡ്ഷോ കാണിക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,സ്റ്റോറുകൾ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,സ്റ്റോറുകൾ
 DocType: Serial No,Delivery Time,വിതരണ സമയം
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,എയ്ജിങ് അടിസ്ഥാനത്തിൽ ഓൺ
 DocType: Item,End of Life,ജീവിതാവസാനം
@@ -2255,8 +2252,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", ഓപ്പറേഷൻസ് വ്യക്തമാക്കുക ഓപ്പറേറ്റിങ് വില നിങ്ങളുടെ പ്രവർത്തനങ്ങൾക്ക് ഒരു അതുല്യമായ ഓപ്പറേഷൻ ഒന്നും തരും."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ഈ പ്രമാണം ഇനം {4} വേണ്ടി {0} {1} വഴി പരിധിക്കു. നിങ്ങൾ നിർമ്മിക്കുന്നത് ഒരേ {2} നേരെ മറ്റൊരു {3}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
@@ -2267,7 +2264,7 @@
 DocType: Budget Account,Budget Account,ബജറ്റ് അക്കൗണ്ട്
 DocType: Quality Inspection,Verified By,പരിശോധിച്ചു
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","നിലവിലുള്ള ഇടപാടുകൾ ഉള്ളതിനാൽ, കമ്പനിയുടെ സഹജമായ കറൻസി മാറ്റാൻ കഴിയില്ല. ഇടപാട് സ്വതവേയുള്ള കറൻസി മാറ്റാൻ റദ്ദാക്കി വേണം."
-DocType: Grade Interval,Grade Description,ഗ്രേഡ് വിവരണം
+DocType: Grading Scale Interval,Grade Description,ഗ്രേഡ് വിവരണം
 DocType: Stock Entry,Purchase Receipt No,വാങ്ങൽ രസീത് ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,അച്ചാരം മണി
 DocType: Process Payroll,Create Salary Slip,ശമ്പളം ജി സൃഷ്ടിക്കുക
@@ -2305,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,തീയതി ആരംഭിക്കുന്ന ഹാജർ
 DocType: Warranty Claim,Raised By,ഉന്നയിക്കുന്ന
 DocType: Payment Gateway Account,Payment Account,പേയ്മെന്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,അക്കൗണ്ടുകൾ സ്വീകാര്യം ലെ നെറ്റ് മാറ്റുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര
 DocType: Offer Letter,Accepted,സ്വീകരിച്ചു
@@ -2319,7 +2316,7 @@
 DocType: Shipping Rule,Shipping Rule Label,ഷിപ്പിംഗ് റൂൾ ലേബൽ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ഉപയോക്തൃ ഫോറം
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
 DocType: Employee,Previous Work Experience,മുമ്പത്തെ ജോലി പരിചയം
@@ -2333,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,നിബന്ധനകളും Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ഈ സിസ്റ്റത്തിൽ സജ്ജീകരിക്കുന്നത് ഏത് ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ഈ കാലികമായി മരവിപ്പിച്ചു അക്കൗണ്ടിംഗ് എൻട്രി, ആരും ചെയ്യാൻ കഴിയും / ചുവടെ വ്യക്തമാക്കിയ പങ്ക് ഒഴികെ എൻട്രി പരിഷ്ക്കരിക്കുക."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,അറ്റകുറ്റപ്പണി ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ മുമ്പ് പ്രമാണം സംരക്ഷിക്കുക ദയവായി
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,അറ്റകുറ്റപ്പണി ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ മുമ്പ് പ്രമാണം സംരക്ഷിക്കുക ദയവായി
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,പ്രോജക്ട് അവസ്ഥ
 DocType: UOM,Check this to disallow fractions. (for Nos),ഘടകാംശങ്ങൾ അനുമതി ഇല്ലാതാക്കുന്നത് ഇത് ചെക്ക്. (ഒഴിവ് വേണ്ടി)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,താഴെ പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിച്ചിട്ടില്ല:
@@ -2356,6 +2353,7 @@
 DocType: Email Digest,How frequently?,എത്ര ഇടവേളകളിലാണ്?
 DocType: Purchase Receipt,Get Current Stock,ഇപ്പോഴത്തെ സ്റ്റോക്ക് നേടുക
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,വസ്തുക്കളുടെ ബിൽ ട്രീ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Student,Joining Date,തീയതി ചേരുന്നു
 ,Employees working on a holiday,ഒരു അവധിക്കാലം പ്രവർത്തിക്കുന്ന ജീവനക്കാരിൽ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,മർക്കോസ് നിലവിലുള്ളജാലകങ്ങള്
@@ -2437,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ക്ലിയറൻസ് തീയതി പറഞ്ഞിട്ടില്ലാത്ത
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,പ്രൊഡക്ഷൻ
 DocType: Guardian,Occupation,തൊഴില്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,വരി {0}: ആരംഭ തീയതി അവസാന തീയതി മുമ്പ് ആയിരിക്കണം
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,വരി {0}: ആരംഭ തീയതി അവസാന തീയതി മുമ്പ് ആയിരിക്കണം
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ആകെ (Qty)
 DocType: Sales Invoice,This Document,ഈ പ്രമാണം
 DocType: Installation Note Item,Installed Qty,ഇൻസ്റ്റോൾ ചെയ്ത Qty
@@ -2460,8 +2458,8 @@
 DocType: Notification Control,Sales Order Message,സെയിൽസ് ഓർഡർ സന്ദേശം
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","കമ്പനി, കറൻസി, നടപ്പു സാമ്പത്തിക വർഷം, തുടങ്ങിയ സജ്ജമാക്കുക സ്വതേ മൂല്യങ്ങൾ"
 DocType: Payment Entry,Payment Type,പേയ്മെന്റ് തരം
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Process Payroll,Select Employees,എംപ്ലോയീസ് തിരഞ്ഞെടുക്കുക
 DocType: Opportunity,Potential Sales Deal,സാധ്യതയുള്ള സെയിൽസ് പ്രവർത്തിച്ചു
 DocType: Payment Entry,Cheque/Reference Date,ചെക്ക് / റഫറൻസ് തീയതി
@@ -2478,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},{0} ഇതിനകം കമ്പനി {1} വേണ്ടി സൃഷ്ടിച്ച ആഗോള POS പ്രൊഫൈൽ
 DocType: Purchase Order,Ref SQ,റഫറൻസ് ചതുരശ്ര
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,എല്ലാ BOMs ലെ ഇനം / BOM മാറ്റിസ്ഥാപിക്കുക
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,കൈപ്പറ്റുമ്പോൾ പ്രമാണം സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,കൈപ്പറ്റുമ്പോൾ പ്രമാണം സമർപ്പിക്കേണ്ടതാണ്
 DocType: Purchase Invoice Item,Received Qty,Qty ലഭിച്ചു
 DocType: Stock Entry Detail,Serial No / Batch,സീരിയൽ ഇല്ല / ബാച്ച്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,"പെയ്ഡ്, ഒരിക്കലും പാടില്ല കൈമാറിയില്ല"
@@ -2491,7 +2489,7 @@
 ,To Produce,ഉത്പാദിപ്പിക്കാൻ
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ശന്വളപ്പട്ടിക
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} ൽ {0} വരി വേണ്ടി. {2} ഇനം നിരക്ക്, വരികൾ {3} ഉൾപ്പെടുത്തും ഉണ്ടായിരിക്കണം ഉൾപ്പെടുത്തുന്നതിനായി"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ഉപയോക്താവിന്റെ നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ഉപയോക്താവിന്റെ നിർമ്മിക്കുക
 DocType: Packing Slip,Identification of the package for the delivery (for print),(പ്രിന്റ് വേണ്ടി) ഡെലിവറി പാക്കേജിന്റെ തിരിച്ചറിയൽ
 DocType: Bin,Reserved Quantity,സംരക്ഷിത ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ദയവായി സാധുവായ ഇമെയിൽ വിലാസം നൽകുക
@@ -2505,11 +2503,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,അപ്രാപ്തമാക്കി ടെംപ്ലേറ്റ് സ്ഥിരസ്ഥിതി ടെംപ്ലേറ്റ് പാടില്ല
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ഡെലിവറി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,ഡെലിവറി
 DocType: Stock Reconciliation Item,Current Qty,ഇപ്പോഴത്തെ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",വിഭാഗം ആറെണ്ണവും ലെ &quot;മെറ്റീരിയൽസ് അടിസ്ഥാനപ്പെടുത്തിയ ഓൺ നിരക്ക്&quot; കാണുക
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,മുമ്പത്തെ
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",സ്റ്റുഡന്റ് ബാച്ചുകൾ നിങ്ങൾ വിദ്യാർത്ഥികൾക്ക് ഹാജർ അസെസ്മെന്റുകൾ ഫീസും കണ്ടെത്താൻ സഹായിക്കുന്ന
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",സ്റ്റുഡന്റ് ബാച്ചുകൾ നിങ്ങൾ വിദ്യാർത്ഥികൾക്ക് ഹാജർ അസെസ്മെന്റുകൾ ഫീസും കണ്ടെത്താൻ സഹായിക്കുന്ന
 DocType: Payment Entry,Total Allocated Amount,ആകെ തുക
 DocType: Item Reorder,Material Request Type,മെറ്റീരിയൽ അഭ്യർത്ഥന തരം
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} ലേക്ക് {1} നിന്ന് ശമ്പളം വേണ്ടി Accural ജേണൽ എൻട്രി
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ട്രാക്ക് ഇൻഡസ്ട്രി തരം നയിക്കുന്നു.
 DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,എല്ലാ വിലാസങ്ങൾ.
 DocType: Company,Stock Settings,സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
@@ -2542,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',സ്റ്റാറ്റസ് ഉള്ള ജീവനക്കാർക്ക് അതെപ്പറ്റി ഒരു ഇമെയിൽ അയയ്ക്കും &#39;തുറക്കുക&#39;
 DocType: Task,Depends on Tasks,ചുമതലകൾ ആശ്രയിച്ചിരിക്കുന്നു
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,കസ്റ്റമർ ഗ്രൂപ്പ് ട്രീ നിയന്ത്രിക്കുക.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,അറ്റാച്ചുമെന്റുകൾ ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കാതെ കാണിക്കാൻ കഴിയും
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,പുതിയ ചെലവ് കേന്ദ്രം പേര്
 DocType: Leave Control Panel,Leave Control Panel,നിയന്ത്രണ പാനൽ വിടുക
@@ -2554,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,ഡെബിറ്റ് ചെയ്യുക
 DocType: Delivery Note,Required only for sample item.,മാത്രം സാമ്പിൾ ഇനത്തിന്റെ ആവശ്യമാണ്.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ഇടപാട് ശേഷം യഥാർത്ഥ Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},"ശമ്പളം സ്ലിപ്പ് ഇല്ല {0}, {1} തമ്മിലുള്ള കണ്ടെത്തി"
 ,Pending SO Items For Purchase Request,പർച്ചേസ് അഭ്യർത്ഥന അവശേഷിക്കുന്ന ഷൂട്ട്ഔട്ട് ഇനങ്ങൾ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,സ്റ്റുഡന്റ് പ്രവേശന
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 DocType: Supplier,Billing Currency,ബില്ലിംഗ് കറന്സി
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,അതിബൃഹത്തായ
@@ -2576,7 +2574,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ഹോംപേജ് ഫീച്ചർ ഉൽപ്പന്ന
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,എല്ലാ അസസ്മെന്റ് ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,പുതിയ വെയർഹൗസ് പേര്
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ആകെ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ആകെ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ടെറിട്ടറി
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ആവശ്യമായ സന്ദർശനങ്ങൾ യാതൊരു സൂചിപ്പിക്കുക
 DocType: Stock Settings,Default Valuation Method,സ്ഥിരസ്ഥിതി മൂലധനം രീതിയുടെ
@@ -2594,7 +2592,7 @@
 DocType: Price List,Price List Master,വില പട്ടിക മാസ്റ്റർ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,എല്ലാ സെയിൽസ് ഇടപാട് ഒന്നിലധികം ** സെയിൽസ് പേഴ്സൺസ് നേരെ ടാഗ് ചെയ്യാൻ കഴിയും ** നിങ്ങൾ ലക്ഷ്യങ്ങളിലൊന്നാണ് സജ്ജമാക്കാൻ നിരീക്ഷിക്കുവാനും കഴിയും.
 ,S.O. No.,ഷൂട്ട്ഔട്ട് നമ്പർ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
 DocType: Price List,Applicable for Countries,രാജ്യങ്ങൾ വേണ്ടി ബാധകമായ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,മാത്രം നില അപ്ലിക്കേഷനുകൾ വിടുക &#39;അംഗീകരിച്ചത്&#39; ഉം &#39;നിരസിച്ചു സമർപ്പിക്കാൻ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര് വരി {0} ലെ നിർബന്ധമായും
@@ -2675,7 +2673,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Vehicle Service,Engine Oil,എഞ്ചിൻ ഓയിൽ
 DocType: Sales Invoice,Sales Team1,സെയിൽസ് ടീം 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
 DocType: Sales Invoice,Customer Address,കസ്റ്റമർ വിലാസം
 DocType: Employee Loan,Loan Details,വായ്പ വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,വരി {0}: പൂർത്തിയായി അളവ് പൂജ്യം വലുതായിരിക്കണം.
@@ -2740,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Assessment Result Tool,Result HTML,ഫലം എച്ച്ടിഎംഎൽ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ഓൺ കാലഹരണപ്പെടുന്നു
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,വിദ്യാർത്ഥികൾ ചേർക്കുക
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,വിദ്യാർത്ഥികൾ ചേർക്കുക
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0} തിരഞ്ഞെടുക്കുക
 DocType: C-Form,C-Form No,സി-ഫോം ഇല്ല
 DocType: BOM,Exploded_items,Exploded_items
@@ -2805,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,പരിധി ക്രോസ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,വെഞ്ച്വർ ക്യാപ്പിറ്റൽ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"ഈ &#39;അക്കാദമിക് വർഷം&#39; {0}, {1} ഇതിനകം നിലവിലുണ്ട് &#39;ടേം പേര്&#39; ഒരു അക്കാദമിക് കാലാവധി. ഈ എൻട്രികൾ പരിഷ്ക്കരിച്ച് വീണ്ടും ശ്രമിക്കുക."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ഇനം {0} നേരെ നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് നിലയിൽ, {1} മൂല്യം മാറ്റാൻ കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ഇനം {0} നേരെ നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് നിലയിൽ, {1} മൂല്യം മാറ്റാൻ കഴിയില്ല"
 DocType: UOM,Must be Whole Number,മുഴുവനുമുള്ള നമ്പർ ആയിരിക്കണം
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(ദിവസങ്ങളിൽ) അനുവദിച്ചതായും പുതിയ ഇലകൾ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,സീരിയൽ ഇല്ല {0} നിലവിലില്ല
@@ -2849,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,അടുത്തത് മാസത്തിലെ അവസാന ദിവസം
 DocType: Support Settings,Auto close Issue after 7 days,7 ദിവസം കഴിഞ്ഞശേഷം ഓട്ടോ അടയ്ക്കൂ പ്രശ്നം
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് വിഹിതം കഴിയില്ല"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,സ്റ്റുഡന്റ് അപേക്ഷകന്
 DocType: Asset Category Account,Accumulated Depreciation Account,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച അക്കൗണ്ട്
 DocType: Stock Settings,Freeze Stock Entries,ഫ്രീസുചെയ്യുക സ്റ്റോക്ക് എൻട്രികളിൽ
@@ -2877,8 +2875,8 @@
 DocType: Asset,Item Code,ഇനം കോഡ്
 DocType: Production Planning Tool,Create Production Orders,പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 DocType: Serial No,Warranty / AMC Details,വാറന്റി / എഎംസി വിവരങ്ങൾ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
 DocType: Lead,Market Segment,മാർക്കറ്റ് സെഗ്മെന്റ്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
@@ -2897,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ സൃഷ്ടിക്കുക
 DocType: Employee Education,School/University,സ്കൂൾ / യൂണിവേഴ്സിറ്റി
 DocType: Payment Request,Reference Details,റഫറൻസ് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
 DocType: Sales Invoice Item,Available Qty at Warehouse,സംഭരണശാല ലഭ്യമാണ് Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ഈടാക്കൂ തുക
 DocType: Asset,Double Declining Balance,ഇരട്ട കുറയുന്ന
@@ -2918,19 +2916,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},വിതരണം തുക വായ്പാ തുക {0} അധികമാകരുത് കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമാണ് വാങ്ങൽ ഓർഡർ നമ്പർ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചിട്ടില്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചിട്ടില്ല
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ഈ തീയതി മുതൽ&#39; &#39;തീയതി ആരംഭിക്കുന്ന&#39; ശേഷം ആയിരിക്കണം
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ആയി വിദ്യാർഥി {0} വിദ്യാർഥി അപേക്ഷ {1} ലിങ്കുചെയ്തതിരിക്കുന്നതിനാൽ നില മാറ്റാൻ കഴിയില്ല
 DocType: Asset,Fully Depreciated,പൂർണ്ണമായി മൂല്യത്തകർച്ചയുണ്ടായ
 ,Stock Projected Qty,ഓഹരി Qty അനുമാനിക്കപ്പെടുന്ന
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
 DocType: Employee Attendance Tool,Marked Attendance HTML,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ എച്ച്ടിഎംഎൽ
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ഉദ്ധരണികൾ നിർദേശങ്ങൾ, നിങ്ങളുടെ ഉപഭോക്താക്കൾക്ക് അയച്ചിരിക്കുന്നു ബിഡ്ഡുകൾ ആകുന്നു"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ഉദ്ധരണികൾ നിർദേശങ്ങൾ, നിങ്ങളുടെ ഉപഭോക്താക്കൾക്ക് അയച്ചിരിക്കുന്നു ബിഡ്ഡുകൾ ആകുന്നു"
 DocType: Sales Order,Customer's Purchase Order,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച്
 DocType: Warranty Claim,From Company,കമ്പനി നിന്നും
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,വിലയിരുത്തിയശേഷം മാനദണ്ഡം സ്കോററായ സം {0} വേണം.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം ക്രമീകരിക്കുക ദയവായി
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം ക്രമീകരിക്കുക ദയവായി
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,മൂല്യം അഥവാ Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,മിനിറ്റ്
@@ -3061,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,സ്റ്റുഡന്റ് ഗ്രൂപ്പ്
 DocType: Shopping Cart Settings,Quotation Series,ക്വട്ടേഷൻ സീരീസ്
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ഒരു ഇനം ഇതേ പേര് ({0}) നിലവിലുണ്ട്, ഐറ്റം ഗ്രൂപ്പിന്റെ പേര് മാറ്റാനോ ഇനം പുനർനാമകരണം ദയവായി"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
 DocType: C-Form,I,ഞാന്
 DocType: Company,Asset Depreciation Cost Center,അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ
 DocType: Sales Order Item,Sales Order Date,സെയിൽസ് ഓർഡർ തീയതി
@@ -3080,19 +3078,18 @@
 DocType: Vehicle,Insurance Details,ഇൻഷുറൻസ് വിശദാംശങ്ങൾ
 DocType: Account,Payable,അടയ്ക്കേണ്ട
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ദയവായി തിരിച്ചടവ് ഭരണവും നൽകുക
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),കടക്കാർ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),കടക്കാർ ({0})
 DocType: Pricing Rule,Margin,മാർജിൻ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,പുതിയ ഉപഭോക്താക്കളെ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,മൊത്തം ലാഭം %
 DocType: Appraisal Goal,Weightage (%),വെയിറ്റേജ് (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ക്ലിയറൻസ് തീയതി
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
 DocType: Lead,Address Desc,DESC വിലാസ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,പാർട്ടി നിർബന്ധമായും
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,വിഷയം പേര്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,കച്ചവടവും അല്ലെങ്കിൽ വാങ്ങുന്നതിനു കുറഞ്ഞത് ഒരു തിരഞ്ഞെടുത്ത വേണം
-DocType: Grading Structure,Grade Intervals,ഗ്രേഡ് ഇടവേളകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,നിങ്ങളുടെ ബിസിനസ്സ് സ്വഭാവം തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,എവിടെ നിർമാണ ഓപ്പറേഷനുകൾ നടപ്പിലാക്കുന്നത്.
 DocType: Asset Movement,Source Warehouse,ഉറവിട വെയർഹൗസ്
@@ -3121,6 +3118,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,പ്രതിമാസ വിതരണ ശതമാനം
 DocType: Territory,Territory Targets,ടെറിറ്ററി ടാർഗെറ്റ്
 DocType: Delivery Note,Transporter Info,ട്രാൻസ്പോർട്ടർ വിവരം
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},കമ്പനി {1} ൽ സ്ഥിര {0} സജ്ജമാക്കുക
 DocType: Cheque Print Template,Starting position from top edge,ആരംഭിക്കുന്നു മുകളിൽ അരികിൽ നിന്നും സ്ഥാനം
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ഒരേ വിതരണക്കമ്പനിയായ ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
@@ -3174,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,പുനഃക്രമീകരിക്കുക Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,നിലവിൽ ജോലികൾ
 DocType: Company,Stock Adjustment Account,സ്റ്റോക്ക് ക്രമീകരണ അക്കൗണ്ട്
-DocType: Journal Entry,Write Off,എഴുതുക
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,എഴുതുക
 DocType: Timesheet Detail,Operation ID,ഓപ്പറേഷൻ ഐഡി
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","സിസ്റ്റം ഉപയോക്താവ് (ലോഗിൻ) ഐഡി. സജ്ജമാക്കിയാൽ, അത് എല്ലാ എച്ച് ഫോമുകൾ ഡീഫോൾട്ട് മാറും."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} നിന്ന്
@@ -3185,8 +3183,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,വിതരണക്കമ്പനിയായ ഉപയോക്താക്കൾക്കായി വിടുവിക്കുന്നു
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ഫോം / ഇനം / {0}) സ്റ്റോക്കില്ല
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,അടുത്ത തീയതി തീയതി നോട്സ് വലുതായിരിക്കണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ഡാറ്റാ ഇറക്കുമതി എക്സ്പോർട്ട്
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ഓഹരി എൻട്രികൾ, വെയർഹൗസ് {0} നേരെ നിലവിലില്ല ഇവിടെനിന്നു നിങ്ങൾ വീണ്ടും നിയോഗിക്കുകയോ അല്ലെങ്കിൽ പരിഷ്കരിക്കുന്നതിനായി"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ഇല്ല വിദ്യാർത്ഥികൾ കണ്ടെത്തിയില്ല
@@ -3198,14 +3196,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Program Enrollment,School House,സ്കൂൾ ഹൗസ്
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
 DocType: Company,Default Cash Account,സ്ഥിരസ്ഥിതി ക്യാഷ് അക്കൗണ്ട്
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,കമ്പനി (അല്ല കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ) മാസ്റ്റർ.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ഇത് ഈ വിദ്യാർത്ഥി ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,ഇല്ല വിദ്യാർത്ഥികൾ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,കൂടുതൽ ഇനങ്ങൾ അല്ലെങ്കിൽ തുറക്കാറുണ്ട് ഫോം ചേർക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി&#39; നൽകുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ഡെലിവറി കുറിപ്പുകൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
@@ -3252,9 +3251,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,"നിരപ്പു മുമ്പ്,"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} ചെയ്യുക
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ചേർത്തു നികുതി ചാർജുകളും (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ഇനം നികുതി റോ {0} ടൈപ്പ് നികുതി അഥവാ ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ലെങ്കിൽ ഈടാക്കുന്നതല്ല എന്ന അക്കൗണ്ട് ഉണ്ടായിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ഇനം നികുതി റോ {0} ടൈപ്പ് നികുതി അഥവാ ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ലെങ്കിൽ ഈടാക്കുന്നതല്ല എന്ന അക്കൗണ്ട് ഉണ്ടായിരിക്കണം
 DocType: Sales Order,Partly Billed,ഭാഗികമായി ഈടാക്കൂ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ഇനം {0} ഒരു നിശ്ചിത അസറ്റ് ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ഇനം {0} ഒരു നിശ്ചിത അസറ്റ് ഇനം ആയിരിക്കണം
 DocType: Item,Default BOM,സ്വതേ BOM ലേക്ക്
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,സ്ഥിരീകരിക്കാൻ കമ്പനിയുടെ പേര്-തരം റീ ദയവായി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,മൊത്തം ശാരീരിക
@@ -3277,7 +3276,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,വില പട്ടിക എക്സ്ചേഞ്ച് റേറ്റ്
 DocType: Purchase Invoice Item,Rate,റേറ്റ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,തടവുകാരി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,വിലാസം പേര്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,വിലാസം പേര്
 DocType: Stock Entry,From BOM,BOM നിന്നും
 DocType: Assessment Code,Assessment Code,അസസ്മെന്റ് കോഡ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,അടിസ്ഥാന
@@ -3302,7 +3301,7 @@
 DocType: Purchase Invoice,Print Language,പ്രിന്റ് ഭാഷ
 DocType: Salary Slip,Total Working Hours,ആകെ ജോലി മണിക്കൂർ
 DocType: Stock Entry,Including items for sub assemblies,സബ് സമ്മേളനങ്ങൾ ഇനങ്ങൾ ഉൾപ്പെടെ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,എല്ലാ പ്രദേശങ്ങളും
 DocType: Purchase Invoice,Items,ഇനങ്ങൾ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,വിദ്യാർത്ഥി ഇതിനകം എൻറോൾ ചെയ്തു.
@@ -3322,17 +3321,15 @@
 DocType: Issue,Opening Time,സമയം തുറക്കുന്നു
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,നിന്ന് ആവശ്യമായ തീയതികൾ ചെയ്യുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,സെക്യൂരിറ്റീസ് &amp; ചരക്ക് കൈമാറ്റ
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
 DocType: Assessment Plan,Supervisor Name,സൂപ്പർവൈസർ പേര്
 DocType: Program Enrollment Course,Program Enrollment Course,പ്രോഗ്രാം എൻറോൾമെന്റ് കോഴ്സ്
 DocType: Program Enrollment Course,Program Enrollment Course,പ്രോഗ്രാം എൻറോൾമെന്റ് കോഴ്സ്
-DocType: Grading Structure,Grading Structure,ഗ്രേഡിംഗ് ഘടന
 DocType: Purchase Taxes and Charges,Valuation and Total,"മൂലധനം, മൊത്ത"
 DocType: Tax Rule,Shipping City,ഷിപ്പിംഗ് സിറ്റി
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ഈ ഇനം {0} (ഫലകം) ഒരു വേരിയന്റാകുന്നു. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ വിശേഷണങ്ങൾ ടെംപ്ലേറ്റ് നിന്നും മേൽ പകർത്തുന്നു
 DocType: Notification Control,Customize the Notification,അറിയിപ്പ് ഇഷ്ടാനുസൃതമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
 DocType: Sales Invoice,Shipping Rule,ഷിപ്പിംഗ് റൂൾ
@@ -3355,6 +3352,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,തീയതി തുറക്കുന്നു തീയതി അടയ്ക്കുന്നത് മുമ്പ് ആയിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
 DocType: Leave Control Panel,Carry Forward,മുന്നോട്ട് കൊണ്ടുപോകും
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: Department,Days for which Holidays are blocked for this department.,അവധിദിനങ്ങൾ ഈ വകുപ്പിന്റെ വേണ്ടി തടഞ്ഞ ചെയ്തിട്ടുളള ദിനങ്ങൾ.
@@ -3383,7 +3381,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ആകെ (ശാരീരിക)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,വിനോദം &amp; ഒഴിവുസമയ
 DocType: Quality Inspection,Item Serial No,ഇനം സീരിയൽ പോസ്റ്റ്
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ജീവനക്കാരുടെ റെക്കോർഡ്സ് സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ജീവനക്കാരുടെ റെക്കോർഡ്സ് സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ആകെ നിലവിലുള്ളജാലകങ്ങള്
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,അക്കൗണ്ടിംഗ് പ്രസ്താവനകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,അന്ത്യസമയം
@@ -3398,8 +3396,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,പകരക്കാരനെ ശേഷം പുതിയ BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,വിൽപ്പന പോയിന്റ്
 DocType: Payment Entry,Received Amount,ലഭിച്ച തുകയുടെ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",", പൂർണ്ണ അളവ് വേണ്ടി സൃഷ്ടിക്കുക ഓർഡർ ഇതിനകം അളവ് അവഗണിക്കുന്നതിൽ"
 DocType: Account,Tax,നികുതി
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,അടയാളപ്പെടുത്തി
@@ -3412,7 +3408,7 @@
 DocType: Batch,Source Document Name,ഉറവിട പ്രമാണം പേര്
 DocType: Batch,Source Document Name,ഉറവിട പ്രമാണം പേര്
 DocType: Job Opening,Job Title,തൊഴില് പേര്
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ഉപയോക്താക്കളെ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ഉപയോക്താക്കളെ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,പയറ്
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,അറ്റകുറ്റപ്പണി കോൾ വേണ്ടി റിപ്പോർട്ട് സന്ദർശിക്കുക.
@@ -3424,8 +3420,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
 DocType: BOM,Website Description,വെബ്സൈറ്റ് വിവരണം
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,രസീത്
 ,Sales Register,സെയിൽസ് രജിസ്റ്റർ
@@ -3436,16 +3432,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,തിരുത്തിയെഴുതുന്നത് ഒന്നുമില്ല.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
 DocType: Customer Group,Customer Group Name,കസ്റ്റമർ ഗ്രൂപ്പ് പേര്
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ഇതുവരെ ഉപഭോക്താക്കൾ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,അനുമതി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,നിങ്ങൾക്ക് മുൻ സാമ്പത്തിക വർഷത്തെ ബാലൻസ് ഈ സാമ്പത്തിക വർഷം വിട്ടുതരുന്നു ഉൾപ്പെടുത്താൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ മുന്നോട്ട് തിരഞ്ഞെടുക്കുക
 DocType: GL Entry,Against Voucher Type,വൗച്ചർ തരം എഗെൻസ്റ്റ്
 DocType: Item,Attributes,വിശേഷണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,അവസാന ഓർഡർ തീയതി
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
 DocType: Student,Guardian Details,ഗാർഡിയൻ വിവരങ്ങൾ
 DocType: C-Form,C-Form,സി-ഫോം
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ഒന്നിലധികം ജീവനക്കാരുടെ അടയാളപ്പെടുത്തുക ഹാജർ
@@ -3470,14 +3468,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',&#39;നിശ്ചിത അസറ്റ്&#39; വരിയുടെ {0} # അക്കൗണ്ട് തരം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty ഔട്ട്
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ഒരു വില്പനയ്ക്ക് ഷിപ്പിംഗ് തുക കണക്കുകൂട്ടാൻ നിയമങ്ങൾ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,സാമ്പത്തിക സേവനങ്ങൾ
 DocType: Student Sibling,Student ID,സ്റ്റുഡന്റ് ഐഡി
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,സമയം ലോഗുകൾക്കായി പ്രവർത്തനങ്ങൾ തരങ്ങൾ
 DocType: Tax Rule,Sales,സെയിൽസ്
 DocType: Stock Entry Detail,Basic Amount,അടിസ്ഥാന തുക
 DocType: Training Event,Exam,പരീക്ഷ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,കോടിയുടെ
 DocType: Tax Rule,Billing State,ബില്ലിംഗ് സ്റ്റേറ്റ്
@@ -3510,7 +3508,7 @@
 DocType: Payment Entry,Account Paid From,അക്കൗണ്ടിൽ നിന്ന് പണമടച്ചു
 DocType: Purchase Order Item Supplied,Raw Material Item Code,അസംസ്കൃത വസ്തുക്കളുടെ ഇനം കോഡ്
 DocType: Journal Entry,Write Off Based On,അടിസ്ഥാനത്തിൽ ന് എഴുതുക
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ലീഡ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ലീഡ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,അച്ചടിച്ച് സ്റ്റേഷനറി
 DocType: Stock Settings,Show Barcode Field,കാണിക്കുക ബാർകോഡ് ഫീൽഡ്
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
@@ -3526,6 +3524,7 @@
 DocType: Offer Letter,Awaiting Response,കാത്തിരിക്കുന്നു പ്രതികരണത്തിന്റെ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,മുകളിൽ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
+DocType: Supplier,Mention if non-standard payable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത മാറാവുന്ന അക്കൗണ്ട് എങ്കിൽ പരാമർശിക്കുക
 DocType: Salary Slip,Earning & Deduction,സമ്പാദിക്കാനുള്ള &amp; കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ഓപ്ഷണൽ. ഈ ക്രമീകരണം വിവിധ വ്യവഹാരങ്ങളിൽ ഫിൽട്ടർ ഉപയോഗിക്കും.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
@@ -3562,7 +3561,7 @@
 DocType: Program Enrollment Tool,Get Students From,വിദ്യാർത്ഥികൾ നേടുക
 DocType: Hub Settings,Seller Country,വില്പനക്കാരന്റെ രാജ്യം
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,വെബ്സൈറ്റ് ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ബാച്ചുകളായി ഗ്രൂപ്പ് നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക്
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ബാച്ചുകളായി ഗ്രൂപ്പ് നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക്
 DocType: Authorization Rule,Authorization Rule,അംഗീകാര റൂൾ
 DocType: Sales Invoice,Terms and Conditions Details,നിബന്ധനകളും വ്യവസ്ഥകളും വിവരങ്ങള്
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,വ്യതിയാനങ്ങൾ
@@ -3622,7 +3621,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,പരീക്ഷണകാലഘട്ടം
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ശമ്പള ഘടകങ്ങൾ
 DocType: Program Enrollment Tool,New Academic Year,ന്യൂ അക്കാദമിക് വർഷം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,മടക്ക / ക്രെഡിറ്റ് നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,മടക്ക / ക്രെഡിറ്റ് നോട്ട്
 DocType: Stock Settings,Auto insert Price List rate if missing,ഓട്ടോ insert വില പട്ടിക നിരക്ക് കാണാനില്ല എങ്കിൽ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ആകെ തുക
 DocType: Production Order Item,Transferred Qty,മാറ്റിയത് Qty
@@ -3663,6 +3662,7 @@
 ,Sales Funnel,സെയിൽസ് നാലുവിക്കറ്റ്
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ചുരുക്കെഴുത്ത് നിർബന്ധമാണ്
 DocType: Project,Task Progress,ടാസ്ക് പുരോഗതി
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,കാർട്ട്
 ,Qty to Transfer,ട്രാൻസ്ഫർ ചെയ്യാൻ Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,നയിക്കുന്നു അല്ലെങ്കിൽ ഉപഭോക്താക്കൾക്ക് ഉദ്ധരണികൾ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ശീതീകരിച്ച സ്റ്റോക്ക് തിരുത്തിയെഴുതുന്നത് അനുവദനീയം റോൾ
@@ -3696,7 +3696,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ഫീസ് ശേഖരിക്കുക
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
 DocType: Lead,Add to calendar on this date,ഈ തീയതി കലണ്ടർ ചേർക്കുക
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ഷിപ്പിംഗ് ചിലവും ചേർത്ത് നിയമങ്ങൾ.
 DocType: Item,Opening Stock,ഓഹരി തുറക്കുന്നു
@@ -3714,7 +3714,7 @@
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ഉത്പാദനത്തിന് പുറത്തുവിട്ട ഉത്തരവ്.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
 DocType: Program Enrollment Tool,Enroll Students,വിദ്യാർഥികൾ എൻറോൾ
 DocType: Hub Settings,Name Token,ടോക്കൺ പേര്
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
@@ -3725,7 +3725,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} സെയിൽസ് ഇൻവോയിസ് {1} നേരെ
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,പ്രോജക്ട് പേര്
-DocType: Supplier,Mention if non-standard receivable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് എങ്കിൽ പ്രസ്താവിക്കുക
+DocType: Customer,Mention if non-standard receivable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് എങ്കിൽ പ്രസ്താവിക്കുക
 DocType: Journal Entry Account,If Income or Expense,ആദായ അല്ലെങ്കിൽ ചിലവേറിയ ചെയ്താൽ
 DocType: Production Order,Required Items,ആവശ്യമായ ഇനങ്ങൾ
 DocType: Stock Ledger Entry,Stock Value Difference,സ്റ്റോക്ക് മൂല്യം വ്യത്യാസം
@@ -3756,6 +3756,7 @@
 DocType: Item,Taxes,നികുതികൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,"പെയ്ഡ്, ഒരിക്കലും പാടില്ല കൈമാറി"
 DocType: Project,Default Cost Center,സ്ഥിരസ്ഥിതി ചെലവ് കേന്ദ്രം
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; നാമകരണം സീരീസ് വഴി {0} സീരീസ് പേര് സജ്ജീകരിക്കുക
 DocType: Bank Guarantee,End Date,അവസാന ദിവസം
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ഓഹരി ഇടപാടുകൾ
 DocType: Budget,Budget Accounts,ബജറ്റ് അക്കൗണ്ടുകൾ
@@ -3820,7 +3821,7 @@
 DocType: Customer,Sales Partner and Commission,"സെയിൽസ് പങ്കാളി, കമ്മീഷൻ"
 DocType: Employee Loan,Rate of Interest (%) / Year,പലിശ നിരക്ക് (%) / വർഷം
 ,Project Quantity,പദ്ധതി ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ആകെ {0} എല്ലാ ഇനങ്ങൾ, പൂജ്യമാണ് നിങ്ങൾ &#39;അടിസ്ഥാനമാക്കി ചുമത്തിയിട്ടുള്ള വിതരണം&#39; മാറേണ്ടത് വരാം"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ആകെ {0} എല്ലാ ഇനങ്ങൾ, പൂജ്യമാണ് നിങ്ങൾ &#39;അടിസ്ഥാനമാക്കി ചുമത്തിയിട്ടുള്ള വിതരണം&#39; മാറേണ്ടത് വരാം"
 DocType: Opportunity,To Discuss,ചർച്ച ചെയ്യാൻ
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
 DocType: Loan Type,Rate of Interest (%) Yearly,പലിശ നിരക്ക് (%) വാർഷികം
@@ -3843,7 +3844,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,മാർക് േചാദി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},വരി {0}: കറന്സി BOM ൽ # ന്റെ {1} {2} തിരഞ്ഞെടുത്തു കറൻസി തുല്യമോ വേണം
 DocType: Journal Entry Account,Exchange Rate,വിനിമയ നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Homepage,Tag Line,ടാഗ് ലൈൻ
 DocType: Fee Component,Fee Component,ഫീസ്
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
@@ -3860,7 +3861,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,വെയർഹൗസ് {0} നിലവിലില്ല
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext ഹബ് രജിസ്റ്റർ
 DocType: Monthly Distribution,Monthly Distribution Percentages,പ്രതിമാസ വിതരണ ശതമാനങ്ങൾ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,തിരഞ്ഞെടുത്ത ഐറ്റം ബാച്ച് പാടില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,തിരഞ്ഞെടുത്ത ഐറ്റം ബാച്ച് പാടില്ല
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","മൂലധനം നിരക്ക് ഇനം {0}, വേണ്ടി {2} {1} അക്കൗണ്ടിങ് എൻട്രികൾ ചെയ്യാൻ ആവശ്യമായ കണ്ടില്ല. ഇനത്തിൽ {1} ഒരു സാമ്പിൾ ഇനമായി transacting എങ്കിൽ, {1} ഇനം പട്ടികയിലെ ആ പരാമർശിക്കുക. അല്ലാത്തപക്ഷം, ഒരു ഇൻകമിംഗ് സ്റ്റോക്ക് ഇടപാട് ഇനം റെക്കോർഡിൽ മൂലധനം നിരക്ക് ഇനം വേണ്ടി സൃഷ്ടിക്കുക പരാമർശിക്കാനോ, തുടർന്ന് submiting / ഈ എൻട്രി റദ്ദാക്കുന്നതിൽ ശ്രമിക്കുക"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ഈ ഡെലിവറി നോട്ട് നേരെ ഏല്പിച്ചു വസ്തുക്കൾ%
 DocType: Project,Customer Details,ഉപഭോക്തൃ വിശദാംശങ്ങൾ
@@ -3877,7 +3878,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,സമർപ്പിച്ച ഓർഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ഡെബിറ്റ് ഇതിനകം അക്കൗണ്ട് ബാലൻസ്, നിങ്ങൾ &#39;ക്രെഡിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39; സജ്ജീകരിക്കാൻ അനുവാദമില്ലാത്ത"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ഇനം {0} അപ്രാപ്തമാക്കി
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ഇനം {0} അപ്രാപ്തമാക്കി
 DocType: Employee Loan,Repay Fixed Amount per Period,കാലയളവ് അനുസരിച്ച് നിശ്ചിത പകരം
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ഇനം {0} വേണ്ടി അളവ് നൽകുക
 DocType: Employee External Work History,Employee External Work History,ജീവനക്കാർ പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
@@ -3904,7 +3905,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ ഐഡി
 DocType: Employee,Notice (days),അറിയിപ്പ് (ദിവസം)
 DocType: Tax Rule,Sales Tax Template,സെയിൽസ് ടാക്സ് ഫലകം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Employee,Encashment Date,ലീവ് തീയതി
 DocType: Training Event,Internet,ഇന്റർനെറ്റ്
 DocType: Account,Stock Adjustment,സ്റ്റോക്ക് ക്രമീകരണം
@@ -3938,6 +3939,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ഡെബിറ്റ് കുറിപ്പ് നൽകിയത്
 DocType: Production Order,Warehouses,അബദ്ധങ്ങളും
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} അസറ്റ് കൈമാറാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ഈ ഇനം {0} (ഫലകം) ഒരു പാഠം.
 DocType: Workstation,per hour,മണിക്കൂറിൽ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,പർച്ചേസിംഗ്
 DocType: Announcement,Announcement,അറിയിപ്പ്
@@ -3953,7 +3955,7 @@
 DocType: Account,Receivable,സ്വീകാ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,വരി # {0}: പർച്ചേസ് ഓർഡർ ഇതിനകം നിലവിലുണ്ട് പോലെ വിതരണക്കാരൻ മാറ്റാൻ അനുവദനീയമല്ല
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,സജ്ജമാക്കാൻ ക്രെഡിറ്റ് പരിധി ഇടപാടുകള് സമർപ്പിക്കാൻ അനുവാദമുള്ളൂ ആ റോൾ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
 DocType: Item,Material Issue,മെറ്റീരിയൽ പ്രശ്നം
 DocType: Hub Settings,Seller Description,വില്പനക്കാരന്റെ വിവരണം
@@ -3966,7 +3968,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ഉത്തരവിട്ടു
 DocType: Salary Detail,Component,ഘടകം
 DocType: Assessment Criteria,Assessment Criteria Group,അസസ്മെന്റ് മാനദണ്ഡം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു {0} തുല്യമോ കുറവായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു {0} തുല്യമോ കുറവായിരിക്കണം
 DocType: Warehouse,Warehouse Name,വെയർഹൗസ് പേര്
 DocType: Naming Series,Select Transaction,ഇടപാട് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,റോൾ അംഗീകരിക്കുന്നു അല്ലെങ്കിൽ ഉപയോക്താവ് അംഗീകരിക്കുന്നു നൽകുക
@@ -4001,7 +4003,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","സഹജമായിസജ്ജീകരിയ്ക്കുക സാമ്പത്തിക വർഷം സജ്ജമാക്കാൻ, &#39;സഹജമായിസജ്ജീകരിയ്ക്കുക&#39; ക്ലിക്ക് ചെയ്യുക"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ചേരുക
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ദൌർലഭ്യം Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 DocType: Employee Loan,Repay from Salary,ശമ്പളത്തിൽ നിന്ന് പകരം
 DocType: Leave Application,LAP/,ലാപ് /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},തുക {0} {1} നേരെ പേയ്മെന്റ് അഭ്യർത്ഥിക്കുന്നു {2}
@@ -4019,7 +4021,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,അസസ്മെന്റ് ഫലം വിശദാംശം
 DocType: Employee Education,Employee Education,ജീവനക്കാരുടെ വിദ്യാഭ്യാസം
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ഇനം ഗ്രൂപ്പ് പട്ടികയിൽ കണ്ടെത്തി തനിപ്പകർപ്പ് ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
 DocType: Salary Slip,Net Pay,നെറ്റ് വേതനം
 DocType: Account,Account,അക്കൗണ്ട്
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,സീരിയൽ ഇല്ല {0} ഇതിനകം ലഭിച്ചു ചെയ്തു
@@ -4028,7 +4030,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","വെയർഹൗസ് {0} ഏതെങ്കിലും അക്കൗണ്ട് ലിങ്കുചെയ്തിട്ടില്ല, ദയവായി സൃഷ്ടിക്കുക / പൊരുത്തപ്പെടുന്ന (അസറ്റ്) അക്കൗണ്ട് വെയർഹൗസ് ലിങ്ക്."
 DocType: Purchase Invoice,Recurring Id,ആവർത്തക ഐഡി
 DocType: Customer,Sales Team Details,സെയിൽസ് ടീം വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ശാശ്വതമായി ഇല്ലാതാക്കുക?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,ശാശ്വതമായി ഇല്ലാതാക്കുക?
 DocType: Expense Claim,Total Claimed Amount,ആകെ ക്ലെയിം ചെയ്ത തുക
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,വില്ക്കുകയും വരാവുന്ന അവസരങ്ങൾ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},അസാധുവായ {0}
@@ -4039,13 +4041,14 @@
 DocType: Warehouse,PIN,പിൻ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,സജ്ജീകരണം എര്പ്നെക്സത് നിങ്ങളുടെ സ്കൂൾ
 DocType: Sales Invoice,Base Change Amount (Company Currency),തുക ബേസ് മാറ്റുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ആദ്യം പ്രമാണം സംരക്ഷിക്കുക.
 DocType: Account,Chargeable,ഈടാക്കുന്നതല്ല
 DocType: Company,Change Abbreviation,മാറ്റുക സംഗ്രഹ
 DocType: Expense Claim Detail,Expense Date,ചിലവേറിയ തീയതി
 DocType: Item,Max Discount (%),മാക്സ് കിഴിവും (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,കഴിഞ്ഞ ഓർഡർ തുക
+DocType: Task,Is Milestone,Milestone ആണോ
 DocType: Daily Work Summary,Email Sent To,അയച്ച ഇമെയിൽ
 DocType: Budget,Warn,മുന്നറിയിപ്പുകൊടുക്കുക
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","മറ്റേതെങ്കിലും പരാമർശമാണ്, റെക്കോർഡുകൾ ചെല്ലേണ്ടതിന്നു ശ്രദ്ധേയമാണ് ശ്രമം."
@@ -4078,11 +4081,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ഫ്രീസുചെയ്യുക സ്റ്റോക്കുകൾ പഴയ Than`% d ദിവസം കുറവായിരിക്കണം.
 DocType: Tax Rule,Purchase Tax Template,വാങ്ങൽ നികുതി ഫലകം
 ,Project wise Stock Tracking,പ്രോജക്ട് ജ്ഞാനികൾ സ്റ്റോക്ക് ട്രാക്കിംഗ്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} {0} നേരെ നിലവിലുണ്ട്
 DocType: Stock Entry Detail,Actual Qty (at source/target),(ഉറവിടം / ലക്ഷ്യം ന്) യഥാർത്ഥ Qty
 DocType: Item Customer Detail,Ref Code,റഫറൻസ് കോഡ്
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ജീവനക്കാരുടെ റെക്കോർഡുകൾ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
 DocType: HR Settings,Payroll Settings,ശമ്പളപ്പട്ടിക ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,നോൺ-ലിങ്ക്ഡ് ഇൻവോയ്സുകളും പേയ്മെൻറുകൾ ചേരു.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,സ്ഥല ഓർഡർ
@@ -4105,7 +4107,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,തെറ്റായി മായ്ച്ചു ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,അക്കൗണ്ട് {0}: നിങ്ങൾ പാരന്റ് അക്കൌണ്ട് സ്വയം നിശ്ചയിക്കാന് കഴിയില്ല
 DocType: Purchase Invoice Item,Price List Rate,വില പട്ടിക റേറ്റ്
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ഉപഭോക്തൃ ഉദ്ധരണികൾ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ഉപഭോക്തൃ ഉദ്ധരണികൾ സൃഷ്ടിക്കുക
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","ഈ ഗോഡൗണിലെ ലഭ്യമാണ് സ്റ്റോക്ക് അടിസ്ഥാനമാക്കി &#39;കണ്ടില്ലേ, ഓഹരി ലെ &quot;&quot; സ്റ്റോക്കുണ്ട് &quot;കാണിക്കുക അല്ലെങ്കിൽ."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),വസ്തുക്കളുടെ ബിൽ (DEL)
 DocType: Item,Average time taken by the supplier to deliver,ശരാശരി സമയം വിടുവിപ്പാൻ വിതരണക്കാരൻ എടുത്ത
@@ -4127,7 +4129,7 @@
 DocType: Asset,Disposal Date,തീർപ്പ് തീയതി
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ഇമെയിലുകൾ അവർ അവധി ഇല്ലെങ്കിൽ, തന്നിരിക്കുന്ന നാഴിക കമ്പനിയുടെ എല്ലാ സജീവ ജീവനക്കാർക്ക് അയയ്ക്കും. പ്രതികരണങ്ങളുടെ സംഗ്രഹം അർദ്ധരാത്രിയിൽ അയയ്ക്കും."
 DocType: Employee Leave Approver,Employee Leave Approver,ജീവനക്കാരുടെ അവധി Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,പരിശീലന പ്രതികരണം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
@@ -4135,7 +4137,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},കോഴ്സ് വരി {0} ലെ നിർബന്ധമായും
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
 DocType: Batch,Parent Batch,പാരന്റ് ബാച്ച്
 DocType: Batch,Parent Batch,പാരന്റ് ബാച്ച്
 DocType: Cheque Print Template,Cheque Print Template,ചെക്ക് പ്രിന്റ് ഫലകം
@@ -4180,7 +4182,7 @@
 DocType: Item,Variant Based On,വേരിയന്റ് അടിസ്ഥാനമാക്കിയുള്ള
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},അസൈൻ ആകെ വെയിറ്റേജ് 100% ആയിരിക്കണം. ഇത് {0} ആണ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,നിങ്ങളുടെ വിതരണക്കാരും
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
 DocType: Request for Quotation Item,Supplier Part No,വിതരണക്കാരൻ ഭാഗം ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',വർഗ്ഗം &#39;മൂലധനം&#39; അല്ലെങ്കിൽ &#39;Vaulation മൊത്തം&#39; എന്ന എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,നിന്നു ലഭിച്ച
@@ -4190,7 +4192,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} {1} വേണ്ടി നിന്ന്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,വരി {0}: മണിക്കൂറുകൾ മൂല്യം പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
 DocType: Issue,Content Type,ഉള്ളടക്ക തരം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,കമ്പ്യൂട്ടർ
 DocType: Item,List this Item in multiple groups on the website.,വെബ്സൈറ്റിൽ ഒന്നിലധികം സംഘങ്ങളായി ഈ ഇനം കാണിയ്ക്കുക.
@@ -4199,20 +4201,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,നിങ്ങൾ ശീതീകരിച്ച മൂല്യം സജ്ജീകരിക്കാൻ അംഗീകാരമില്ല
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled എൻട്രികൾ നേടുക
 DocType: Payment Reconciliation,From Invoice Date,ഇൻവോയിസ് തീയതി മുതൽ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ബില്ലിംഗ് കറൻസി ഒന്നുകിൽ സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി അക്കൗണ്ട് കറൻസി തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ബില്ലിംഗ് കറൻസി ഒന്നുകിൽ സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി അക്കൗണ്ട് കറൻസി തുല്യമായിരിക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ലീവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,അത് എന്തു ചെയ്യുന്നു?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,വെയർഹൗസ് ചെയ്യുക
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,എല്ലാ സ്റ്റുഡന്റ് പ്രവേശന
 ,Average Commission Rate,ശരാശരി കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ഹാജർ ഭാവി തീയതി വേണ്ടി അടയാളപ്പെടുത്തും കഴിയില്ല
 DocType: Pricing Rule,Pricing Rule Help,പ്രൈസിങ് റൂൾ സഹായം
 DocType: School House,House Name,ഹൗസ് പേര്
 DocType: Purchase Taxes and Charges,Account Head,അക്കൗണ്ട് ഹെഡ്
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ഇനങ്ങളുടെ വന്നിറങ്ങി ചെലവ് കണക്കാക്കാൻ അധിക ചെലവ് അപ്ഡേറ്റ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ഇലക്ട്രിക്കൽ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,നിങ്ങളുടെ ഉപയോക്താക്കളെ നിങ്ങളുടെ ഓർഗനൈസേഷന്റെ ബാക്കി ചേർക്കുക. നിങ്ങൾക്ക് ബന്ധങ്ങൾ നിന്ന് ചേർത്തുകൊണ്ട് നിങ്ങളുടെ പോർട്ടൽ ഉപയോക്താക്കളെ ക്ഷണിക്കാൻ ചേർക്കാൻ കഴിയും
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,നിങ്ങളുടെ ഉപയോക്താക്കളെ നിങ്ങളുടെ ഓർഗനൈസേഷന്റെ ബാക്കി ചേർക്കുക. നിങ്ങൾക്ക് ബന്ധങ്ങൾ നിന്ന് ചേർത്തുകൊണ്ട് നിങ്ങളുടെ പോർട്ടൽ ഉപയോക്താക്കളെ ക്ഷണിക്കാൻ ചേർക്കാൻ കഴിയും
 DocType: Stock Entry,Total Value Difference (Out - In),(- ഔട്ട്) ആകെ മൂല്യം വ്യത്യാസം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,വരി {0}: വിനിമയ നിരക്ക് നിർബന്ധമായും
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ഉപയോക്തൃ ഐഡി ജീവനക്കാരുടെ {0} വെച്ചിരിക്കുന്നു അല്ല
@@ -4221,7 +4223,7 @@
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Buying Settings,Naming Series,സീരീസ് നാമകരണം
 DocType: Leave Block List,Leave Block List Name,ബ്ലോക്ക് പട്ടിക പേര് വിടുക
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ഇൻഷുറൻസ് ആരംഭ തീയതി ഇൻഷുറൻസ് അവസാന തീയതി കുറവായിരിക്കണം
@@ -4236,7 +4238,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
 DocType: Vehicle Log,Odometer,ഓഡോമീറ്റർ
 DocType: Sales Order Item,Ordered Qty,ഉത്തരവിട്ടു Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},നിന്നും കാലഘട്ടം {0} ആവർത്ത വേണ്ടി നിർബന്ധമായി തീയതി വരെയുള്ള
@@ -4249,7 +4251,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ഓഫാക്കുക എഴുതുക തുക (കമ്പനി കറൻസി)
 DocType: Sales Invoice Timesheet,Billing Hours,ബില്ലിംഗ് മണിക്കൂർ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} കണ്ടെത്തിയില്ല സ്ഥിര BOM ൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ഇവിടെ ചേർക്കാൻ ഇനങ്ങൾ ടാപ്പ്
 DocType: Fees,Program Enrollment,പ്രോഗ്രാം എൻറോൾമെന്റ്
 DocType: Landed Cost Voucher,Landed Cost Voucher,ചെലവ് വൗച്ചർ റജിസ്റ്റർ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} സജ്ജീകരിക്കുക
@@ -4350,7 +4353,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,"ലാഭേച്ചയില്ലാത്തതും, ചാരിറ്റിയും"
 DocType: Issue,First Responded On,ആദ്യം പ്രതികരിച്ചു
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ഒന്നിലധികം സംഘങ്ങളായി ഇനത്തിന്റെ ലിസ്റ്റിങ്
-DocType: Grade Interval,Grade Interval,ഗ്രേഡ് ഇടവേള
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി ഇതിനകം സാമ്പത്തിക വർഷം {0} സജ്ജമാക്കിയിരിക്കുന്നുവെങ്കിലും
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ക്ലിയറൻസ് തീയതി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,സ്പ്ലിറ്റ് ബാച്ച്
@@ -4359,6 +4361,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF ഡൗൺലോഡ്
 DocType: Production Order,Planned End Date,ആസൂത്രണം ചെയ്ത അവസാന തീയതി
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,എവിടെ ഇനങ്ങളുടെ സൂക്ഷിച്ചിരിക്കുന്നു.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 DocType: Request for Quotation,Supplier Detail,വിതരണക്കാരൻ വിശദാംശം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ പിശക്: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Invoiced തുക
@@ -4404,7 +4407,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,സെറ്റപ്പ് എന്റെ ഓർഗനൈസേഷന് ഒരു ലളിതമായ വെബ്സൈറ്റ്
 DocType: Payment Reconciliation,Receivable / Payable Account,സ്വീകാ / അടയ്ക്കേണ്ട അക്കൗണ്ട്
 DocType: Delivery Note Item,Against Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം എഗെൻസ്റ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Item,Default Warehouse,സ്ഥിരസ്ഥിതി വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ബജറ്റ് ഗ്രൂപ്പ് അക്കൗണ്ട് {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,പാരന്റ് കോസ്റ്റ് സെന്റർ നൽകുക
@@ -4464,7 +4467,7 @@
 ,Items To Be Requested,അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
 DocType: Purchase Order,Get Last Purchase Rate,അവസാനം വാങ്ങൽ റേറ്റ് നേടുക
 DocType: Company,Company Info,കമ്പനി വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,കോസ്റ്റ് സെന്റർ ഒരു ചെലവിൽ ക്ലെയിം ബുക്ക് ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ഫണ്ട് അപേക്ഷാ (ആസ്തികൾ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ഈ ജോലിയില് ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
@@ -4477,13 +4480,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,താഴെ ദിവസങ്ങളിൽ അവധി അപേക്ഷിക്കുന്നതിനുള്ള നിന്നും ഉപയോക്താക്കളെ നിർത്തുക.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,വാങ്ങൽ തുക
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},ചിലരാകട്ടെ അളവ് വരി {1} ൽ ഇനം {0} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
 DocType: Production Order,Manufactured Qty,മാന്യുഫാക്ച്ചേർഡ് Qty
 DocType: Purchase Receipt Item,Accepted Quantity,അംഗീകരിച്ചു ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} നിലവിലുണ്ട് ഇല്ല
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} നിലവിലുണ്ട് ഇല്ല
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ഉപഭോക്താക്കൾക്ക് ഉയർത്തുകയും ബില്ലുകള്.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,പ്രോജക്ട് ഐഡി
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
@@ -4492,15 +4495,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ഹബ്
 DocType: GL Entry,Voucher Type,സാക്ഷപ്പെടുത്തല് തരം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
 DocType: Employee Loan Application,Approved,അംഗീകരിച്ചു
 DocType: Pricing Rule,Price,വില
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
 DocType: Guardian,Guardian,ഗാർഡിയൻ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,മൂല്യനിർണയം {0} നൽകിയ തീയതി പരിധി എംപ്ലോയിസ് {1} വേണ്ടി സൃഷ്ടിച്ചു
 DocType: Employee,Education,വിദ്യാഭ്യാസം
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,ആയപ്പോഴേക്കും നാമകരണം കാമ്പെയ്ൻ
 DocType: Employee,Current Address Is,ഇപ്പോഴത്തെ വിലാസമാണിത്
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,തിരുത്തപ്പെട്ടത്
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ഓപ്ഷണൽ. വ്യക്തമാക്കിയിട്ടില്ല എങ്കിൽ കമ്പനിയുടെ സ്വതവേ കറൻസി, സജ്ജമാക്കുന്നു."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,അക്കൗണ്ടിംഗ് എൻട്രികൾ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ Qty
@@ -4537,7 +4542,7 @@
 DocType: Hub Settings,Hub Settings,ഹബ് ക്രമീകരണങ്ങൾ
 DocType: Project,Gross Margin %,മൊത്തം മാർജിൻ%
 DocType: BOM,With Operations,പ്രവർത്തനവുമായി
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇതിനകം കമ്പനി {1} വേണ്ടി കറൻസി {0} ഉണ്ടായിട്ടുണ്ട്. കറൻസി {0} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇതിനകം കമ്പനി {1} വേണ്ടി കറൻസി {0} ഉണ്ടായിട്ടുണ്ട്. കറൻസി {0} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
 DocType: Asset,Is Existing Asset,നിലവിലുള്ള സ്വത്ത്
 DocType: Salary Detail,Statistical Component,സ്റ്റാറ്റിസ്റ്റിക്കൽ ഘടക
 DocType: Salary Detail,Statistical Component,സ്റ്റാറ്റിസ്റ്റിക്കൽ ഘടക
@@ -4593,7 +4598,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ലോഗോ അറ്റാച്ച്
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ഓഹരി ലെവലുകൾ
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,വകുപ്പിന്റെ ലീവ് പ്രയോഗങ്ങൾ തടയുക.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","പേയ്മെന്റ് ഇനം, സ്വീകരിക്കുക ഒന്ന് ആയിരിക്കണം അടച്ച് ആന്തരിക ട്രാൻസ്ഫർ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,അനലിറ്റിക്സ്
@@ -4606,6 +4611,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,അവധിദിനങ്ങളിൽ പ്രൊഡക്ഷൻ അനുവദിക്കുക
 DocType: Sales Order,Customer's Purchase Order Date,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ തീയതി
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
+DocType: Shopping Cart Settings,Show Public Attachments,പൊതു അറ്റാച്മെന്റ് കാണിക്കുക
 DocType: Packing Slip,Package Weight Details,പാക്കേജ് ഭാരം വിശദാംശങ്ങൾ
 DocType: Payment Gateway Account,Payment Gateway Account,പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട്
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,പേയ്മെന്റ് പൂർത്തിയായ ശേഷം തിരഞ്ഞെടുത്ത പേജിലേക്ക് ഉപയോക്താവിനെ തിരിച്ചുവിടൽ.
@@ -4630,7 +4636,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,കറൻസികൾ വരെ തുടങ്ങിയവ $ പോലുള്ള ഏതെങ്കിലും ചിഹ്നം അടുത്ത കാണിക്കരുത്.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(അര ദിവസം)
 DocType: Supplier,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച് നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച് നിർമ്മിക്കുക
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ലീഡ് സമയം ദിനങ്ങൾ
@@ -4649,8 +4655,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,അനുവദിക്കപ്പെട്ട തുക
 DocType: GL Entry,Is Opening,തുറക്കുകയാണ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},വരി {0}: ഡെബിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,അക്കൗണ്ട് {0} നിലവിലില്ല
 DocType: Account,Cash,ക്യാഷ്
 DocType: Employee,Short biography for website and other publications.,വെബ്സൈറ്റ് മറ്റ് പ്രസിദ്ധീകരണങ്ങളിൽ ഷോർട്ട് ജീവചരിത്രം.
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 2661c50..b78e190 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,बॅच बाबींचा कालावधी समाप्ती स्थिती
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,बँक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खात्याचे  मोड
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,रूपे दर्शवा
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,रूपे दर्शवा
 DocType: Academic Term,Academic Term,शैक्षणिक मुदत
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,साहित्य
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,प्रमाण
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,हेल्थ केअर
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भरणा विलंब (दिवस)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा खर्च
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,आर्थिक वर्ष {0} आवश्यक आहे
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,जाहिरात
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,त्याच कंपनीने  एका  पेक्षा अधिक प्रवेश केला आहे
 DocType: Employee,Married,लग्न
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ला परवानगी नाही
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} ला परवानगी नाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पादन {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोणतेही आयटम सूचीबद्ध
 DocType: Payment Reconciliation,Reconcile,समेट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराणा
 DocType: Quality Inspection Reading,Reading 1,1 वाचन
 DocType: Process Payroll,Make Bank Entry,बँक प्रवेश करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेन्शन फंड्स
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** आपण आपल्या व्यवसायात हंगामी असेल तर बजेट / लक्ष्य महिने ओलांडून वितरण मदत करते.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,नाही आयटम आढळला
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,नाही आयटम आढळला
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,पगार संरचना गहाळ
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Invoice Item,Sales Invoice Item,विक्री चलन आयटम
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",उदा &quot;प्राथमिक शाळा&quot; किंवा &quot;युनिव्हर्सिटी&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,शेअर अहवाल
 DocType: Warehouse,Warehouse Detail,वखार तपशील
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,मुदत समाप्ती तारीख नंतर जे मुदत लिंक आहे शैक्षणिक वर्ष वर्ष अंतिम तारीख पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;मुदत मालमत्ता आहे&quot; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;मुदत मालमत्ता आहे&quot; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
 DocType: Tax Rule,Tax Type,कर प्रकार
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},आपल्याला आधी नोंदी जमा करण्यासाठी  किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
 DocType: BOM,Item Image (if not slideshow),आयटम प्रतिमा (स्लाईड शो नसेल  तर)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक समान नाव अस्तित्वात
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(तास रेट / 60) * प्रत्यक्ष ऑपरेशन वेळ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOM निवडा
 DocType: SMS Log,SMS Log,एसएमएस लॉग
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित केले आयटम खर्च
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} वरील  सुट्टी तारखेपासून आणि तारखेपर्यंत  च्या दरम्यान नाही
@@ -192,11 +195,11 @@
 DocType: Training Result Employee,Grade,ग्रेड
 DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: SMS Center,All Contact,सर्व संपर्क
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,उत्पादन ऑर्डर BOM सर्व आयटम आधीपासूनच तयार
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,उत्पादन ऑर्डर BOM सर्व आयटम आधीपासूनच तयार
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,वार्षिक पगार
 DocType: Daily Work Summary,Daily Work Summary,दररोज काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,आर्थिक वर्ष बंद
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} गोठविले
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} गोठविले
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,कृपया खाती चार्ट तयार करण्यासाठी विद्यमान कंपनी निवडा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,शेअर खर्च
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,लक्ष्य वखार निवडा
@@ -205,12 +208,12 @@
 DocType: Journal Entry,Contra Entry,विरुद्ध प्रवेश
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी चलन क्रेडिट
 DocType: Delivery Note,Installation Status,प्रतिष्ठापन स्थिती
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",आपण उपस्थिती अद्यतनित करू इच्छिता का? <br> सादर करा: {0} \ <br> अनुपस्थित: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},प्रमाण नाकारलेले + स्वीकारले आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक आहे {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,पुरवठा कच्चा माल खरेदी
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,पैसे किमान एक मोड POS चलन आवश्यक आहे.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,पैसे किमान एक मोड POS चलन आवश्यक आहे.
 DocType: Products Settings,Show Products as a List,उत्पादने शो सूची
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","टेम्पलेट डाउनलोड करा , योग्य डेटा भरा आणि संचिकेशी संलग्न करा . निवडलेल्या कालावधीत मध्ये सर्व तारखा आणि कर्मचारी संयोजन , विद्यमान उपस्थिती रेकॉर्ड सह टेम्पलेट मधे येइल"
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,घसारा प्रवेश करा
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,विनंती प्रकार
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,कर्मचारी करा
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,कर्मचारी करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,कार्यवाही
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ऑपरेशन तपशील चालते.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,देखभाल भेटींसाठी योजना.
 DocType: SMS Settings,Enter url parameter for message,संदेश साठी मापदंड प्रविष्ट करा
 DocType: POS Profile,Customer Groups,ग्राहक गट
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,आर्थिक विवरणपत्रे
 DocType: Guardian,Students,विद्यार्थी
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,किंमत आणि सवलत लागू नियम.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,किंमत सूची खरेदी किंवा विक्रीसाठी  लागू असणे आवश्यक आहे
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
 DocType: Naming Series,Series List for this Transaction,या व्यवहारासाठी मालिका यादी
 DocType: Company,Default Payroll Payable Account,डीफॉल्ट वेतनपट देय खाते
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ईमेल गट सुधारणा
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ईमेल गट सुधारणा
 DocType: Sales Invoice,Is Opening Entry,प्रवेश उघडत आहे
 DocType: Customer Group,Mention if non-standard receivable account applicable,गैर-मानक प्राप्त खाते लागू असल्यास उल्लेख करावा
 DocType: Course Schedule,Instructor Name,प्रशिक्षक नाव
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,विक्री चलन आयटम विरुद्ध
 ,Production Orders in Progress,प्रगती उत्पादन आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,आर्थिक निव्वळ रोख
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
 DocType: Lead,Address & Contact,पत्ता व संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},पुढील आवर्ती {1} {0} वर तयार केले जाईल
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),एकूण कोस्टींग रक्कम (वेळ पत्रक द्वारे)
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,रजा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,बँक नोंदी
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 DocType: Student Admission,Student Admission,विद्यार्थी प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} आयटम रद्द
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 DocType: Item,Purchase Details,खरेदी तपशील
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वयंचलित साहित्य विनंती निर्माण ईमेल द्वारे सूचित करा
 DocType: Journal Entry,Multi Currency,मल्टी चलन
 DocType: Payment Reconciliation Invoice,Invoice Type,चलन प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,डिलिव्हरी टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,डिलिव्हरी टीप
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,विक्री मालमत्ता खर्च
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो pull केल्यानंतर भरणा प्रवेशात   सुधारणा करण्यात आली आहे. तो पुन्हा  खेचा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
-DocType: Grade Interval,Min Score,मि धावसंख्या
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,या आठवड्यासाठी  आणि प्रलंबित उपक्रम सारांश
 DocType: Student Applicant,Admitted,दाखल
 DocType: Workstation,Rent Cost,भाडे खर्च
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,क्रम मूल्य
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,बँक / रोख पक्ष विरोधात किंवा अंतर्गत हस्तांतरण व्यवहार
 DocType: Shipping Rule,Valid for Countries,देश वैध
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहारात  वापरला  जाऊ शकत नाही. 'प्रत बनवू नका ' वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहारात  वापरला  जाऊ शकत नाही. 'प्रत बनवू नका ' वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,मानलेली  एकूण ऑर्डर
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,फील्ड मूल्य दिन 'म्हणून महिन्याच्या दिवसाची  पुनरावृत्ती' प्रविष्ट करा
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,कर दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} आधीच कर्मचार्यांसाठी वाटप {1} काळात {2} साठी {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,आयटम निवडा
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच क्रमांक  {1} {2} ला  समान असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,नॉन-गट रूपांतरित करा
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,एक आयटम बॅच (भरपूर).
 DocType: C-Form Invoice Detail,Invoice Date,चलन तारीख
 DocType: GL Entry,Debit Amount,डेबिट रक्कम
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,कृपया संलग्नक पहा
 DocType: Purchase Order,% Received,% मिळाले
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,विद्यार्थी गट तयार करा
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,कोटेशन विनंती
 DocType: Salary Slip Timesheet,Working Hours,कामाचे तास
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,विद्यमान मालिकेत सुरू / वर्तमान क्रम संख्या बदला.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,एक नवीन ग्राहक तयार करा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,एक नवीन ग्राहक तयार करा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","अनेक किंमत नियम विजय सुरू केल्यास, वापरकर्त्यांना संघर्षाचे निराकरण करण्यासाठी स्वतः प्राधान्य सेट करण्यास सांगितले जाते."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,खरेदी ऑर्डर तयार करा
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,खरेदी ऑर्डर तयार करा
 ,Purchase Register,खरेदी नोंदणी
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया साठीचे ग्लोबल सेटिंग्ज.
 DocType: Accounts Settings,Accounts Frozen Upto,खाती फ्रोजन पर्यंत
 DocType: SMS Log,Sent On,रोजी पाठविले
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडलेले  फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,सुट्टी मास्टर.
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,संकुल क्रमांक पासून
 DocType: Item Attribute,To Range,श्रेणी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,सिक्युरिटीज आणि ठेवी
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", बदलू शकत नाही मूल्यांकन पद्धत काही आयटम विरुद्ध व्यवहार जे नाही आहेत म्हणून स्वत: च्या मूल्यांकन पद्धत आहे"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,वाटप एकूण रजा  अनिवार्य आहे
 DocType: Job Opening,Description of a Job Opening,एक जॉब ओपनिंग वर्णन
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज प्रलंबित उपक्रम
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ज्या  वखाराविरुद्ध साहित्य विनंती उठविली  जाईल ते  प्रविष्ट करा
 DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,खरेदी
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,सुरूवातीचे 0% ग्रेड व्याख्या करा
 DocType: Sales Order,To Deliver,वितरीत करण्यासाठी
 DocType: Purchase Invoice Item,Item,आयटम
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
 DocType: Journal Entry,Difference (Dr - Cr),फरक  (Dr - Cr)
 DocType: Account,Profit and Loss,नफा व तोटा
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,व्यवस्थापकीय Subcontracting
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 DocType: Production Plan Item,Pending Qty,प्रलंबित Qty
 DocType: Budget,Ignore,दुर्लक्ष करा
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} सक्रिय नाही
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} सक्रिय नाही
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},एसएमएस खालील संख्येला  पाठविले: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,मुद्रणासाठी सेटअप तपासणी परिमाणे
 DocType: Salary Slip,Salary Slip Timesheet,पगाराच्या स्लिप्स Timesheet
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,एकूण आयोग
 DocType: Pricing Rule,Sales Partner,विक्री भागीदार
 DocType: Buying Settings,Purchase Receipt Required,खरेदी पावती आवश्यक
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,शेअर उघडत प्रविष्ट केले असतील तर मूल्यांकन दर अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,शेअर उघडत प्रविष्ट केले असतील तर मूल्यांकन दर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चलन टेबल मधे  रेकॉर्ड आढळले नाहीत
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,कृपया पहिले कंपनी आणि पक्षाचे प्रकार निवडा
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,जमा मूल्ये
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,विक्री ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,विक्री ऑर्डर करा
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,सारांश संलग्नक
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहक पुन्हा करा
 DocType: Leave Control Panel,Allocate,वाटप
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,विक्री परत
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,विक्री परत
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,टीप: एकूण वाटप पाने {0} आधीच मंजूर पाने कमी असू नये {1} कालावधीसाठी
 DocType: Announcement,Posted By,द्वारा पोस्ट केलेले
 DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),उघडणे (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आपण अगोदरच काही व्यवहार (चे) दुसर्या UOM केलेल्या कारण {0} थेट बदलले करू शकत नाही आयटम माप मुलभूत युनिट जाईल. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी एक नवीन आयटम तयार करणे आवश्यक आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आपण अगोदरच काही व्यवहार (चे) दुसर्या UOM केलेल्या कारण {0} थेट बदलले करू शकत नाही आयटम माप मुलभूत युनिट जाईल. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी एक नवीन आयटम तयार करणे आवश्यक आहे.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,कंपनी सेट करा
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,कंपनी सेट करा
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,विक्री चलन Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0} साठी  संदर्भ क्रमांक  आणि संदर्भ तारीख आवश्यक आहे
 DocType: Process Payroll,Select Payment Account to make Bank Entry,भरणा खाते निवडा बँक प्रवेश करण्यासाठी
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","पाने, खर्च दावे आणि उपयोग पे रोल व्यवस्थापित करण्यासाठी कर्मचारी रेकॉर्ड तयार"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","पाने, खर्च दावे आणि उपयोग पे रोल व्यवस्थापित करण्यासाठी कर्मचारी रेकॉर्ड तयार"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,नॉलेज बेस जोडा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भरणा प्रवेश कापून
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 संबंध
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,व्यवस्थापक
 DocType: Payment Entry,Payment From / To,भरणा / मधून
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,तारीख श्रेणी
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नवीन क्रेडिट मर्यादा ग्राहक वर्तमान थकबाकी रक्कम कमी आहे. क्रेडिट मर्यादा किमान असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नवीन क्रेडिट मर्यादा ग्राहक वर्तमान थकबाकी रक्कम कमी आहे. क्रेडिट मर्यादा किमान असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,समान आयटम अनेक वेळा गेलेला  आहे.
 DocType: SMS Settings,Receiver Parameter,स्वीकारणारा मापदंड
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'आधारीत' आणि 'गट करून' समान असू शकत नाही
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,ठराव तारीख
 DocType: Student Batch Name,Batch Name,बॅच नाव
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet तयार:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,नाव नोंदणी करा
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,विद्यार्थी मासिक उपस्थिती अहवाल म्हणून सादर विद्यार्थी दर्शवेल
@@ -722,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,विद्यार्थी उपस्थिती
 DocType: Sales Invoice Timesheet,Time Sheet,वेळ पत्रक
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush कच्चा माल आधारित रोजी
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,आयटम तपशील प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आयटम तपशील प्रविष्ट करा
 DocType: Interest,Interest,व्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,पूर्व विक्री
 DocType: Purchase Receipt,Other Details,इतर तपशील
@@ -740,7 +743,7 @@
 ,Absent Student Report,अनुपस्थित विद्यार्थी अहवाल
 DocType: Email Digest,Next email will be sent on:,पुढील ई-मेल वर पाठविण्यात येईल:
 DocType: Offer Letter Term,Offer Letter Term,पत्र मुदत ऑफर
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,आयटमला रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,आयटमला रूपे आहेत.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आयटम {0} आढळला नाही
 DocType: Bin,Stock Value,शेअर मूल्य
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,कंपनी {0} अस्तित्वात नाही
@@ -749,8 +752,6 @@
 DocType: Serial No,Warranty Expiry Date,हमी कालावधी समाप्ती तारीख
 DocType: Material Request Item,Quantity and Warehouse,प्रमाण आणि कोठार
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया निवडा कार्यक्रम
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया निवडा कार्यक्रम
 DocType: Project,Estimated Cost,अंदाजे खर्च
@@ -769,7 +770,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} एक स्टॉक आयटम नाही
 DocType: Mode of Payment Account,Default Account,मुलभूत खाते
 DocType: Payment Entry,Received Amount (Company Currency),प्राप्त केलेली रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,कृपया साप्ताहिक बंद दिवस निवडा
 DocType: Production Order Operation,Planned End Time,नियोजनबद्ध समाप्ती वेळ
 ,Sales Person Target Variance Item Group-Wise,आयटम गट निहाय विक्री व्यक्ती लक्ष्य फरक
@@ -833,7 +834,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,किंमत सूची निवडलेली  नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Request for Quotation Supplier,Send Email,ईमेल पाठवा
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,कोणतीही परवानगी नाही
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी,   पहिले पार्टी पयायय टाइप करा"
@@ -846,8 +847,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,कर्मचारी आढळले  नाहीत
 DocType: Supplier Quotation,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted असेल  तर
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
 DocType: SMS Center,All Customer Contact,सर्व ग्राहक संपर्क
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,csv द्वारे स्टॉक शिल्लक अपलोड करा.
 DocType: Warehouse,Tree Details,झाड तपशील
@@ -858,8 +859,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,किमान चलन रक्कम
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: खर्च केंद्र {2} कंपनी संबंधित नाही {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाते {2} एक गट असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आयटम रो {idx}: {doctype} {docName} वरील अस्तित्वात नाही &#39;{doctype}&#39; टेबल
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आयटम रो {idx}: {doctype} {docName} वरील अस्तित्वात नाही &#39;{doctype}&#39; टेबल
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोणतीही कार्ये
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो अशी यादी तयार करणे 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 DocType: Asset,Opening Accumulated Depreciation,जमा घसारा उघडत
@@ -875,7 +876,7 @@
 DocType: Bin,Moving Average Rate,हलवित/Moving सरासरी  दर
 DocType: Production Planning Tool,Select Items,निवडा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,अर्थात वेळापत्रक
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,अर्थात वेळापत्रक
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: HR Settings,Enter retirement age in years,वर्षांत निवृत्तीचे वय प्रविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,लक्ष्य कोठार
@@ -883,7 +884,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत डिलिव्हरी किंवा पावती अनुमती द्या
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,सर्व आयटम गट
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,सर्व आयटम गट
 DocType: Process Payroll,Activity Log,क्रियाकलाप लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,निव्वळ नफा / तोटा
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
@@ -894,7 +895,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;उघडणे&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,का मुक्त
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
@@ -910,7 +911,7 @@
 DocType: Item Reorder,Re-Order Qty,पुन्हा-क्रम Qty
 DocType: Leave Block List Date,Leave Block List Date,रजा ब्लॉक यादी तारीख
 DocType: Pricing Rule,Price or Discount,किंमत किंवा सवलत
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरेदी पावती आयटम टेबल एकूण लागू शुल्क एकूण कर आणि शुल्क म्हणून समान असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरेदी पावती आयटम टेबल एकूण लागू शुल्क एकूण कर आणि शुल्क म्हणून समान असणे आवश्यक आहे
 DocType: Sales Team,Incentives,प्रोत्साहन
 DocType: SMS Log,Requested Numbers,विनंती संख्या
 DocType: Production Planning Tool,Only Obtain Raw Materials,फक्त कच्चा माल प्राप्त
@@ -968,8 +969,7 @@
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Fee Structure,Components,घटक
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,आयटम रूपे {0} सुधारित
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
@@ -1021,8 +1021,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,मुलभूत बँक / रोख खाते आपोआप या मोडमध्ये निवडलेले असताना पगार जर्नल प्रवेश मध्ये सुधारीत केले जाईल.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ग्रेड कोड कालांतराने {0} इतर ग्रेड ग्रेड कालांतराने ओव्हरलॅप करत आहे. कालांतराने कृपया तपासा {0} आणि {1} आणि पुन्हा प्रयत्न करा
 DocType: BOM,Raw Material Cost(Company Currency),कच्चा माल खर्च (कंपनी चलन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},पंक्ती # {0}: दर वापरले दर पेक्षा जास्त असू शकत नाही {1} {2}
@@ -1035,7 +1033,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM वेबसाइट बाबींचा
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
 DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,व्हाइट
 DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),सलग {0}: प्रमाण उपलब्ध नाही {4} कोठार मध्ये {1} नोंद वेळ पोस्ट करण्यात ({2} {3})
@@ -1050,7 +1048,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ऑर्डर प्रकार {0} पैकी एक असणे आवश्यक आहे
 DocType: Lead,Next Contact Date,पुढील संपर्क तारीख
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty उघडणे
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
 DocType: Student Batch Name,Student Batch Name,विद्यार्थी बॅच नाव
 DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
 DocType: Repayment Schedule,Balance Loan Amount,शिल्लक कर्ज रक्कम
@@ -1070,10 +1068,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},निर्दिष्ट करा एक {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्यात बदल नसलेले   आयटम काढले    .
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,सवलत
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,सवलत
 DocType: Asset,Total Number of Depreciations,Depreciations एकूण क्रमांक
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन दर
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन दर
@@ -1102,7 +1100,7 @@
 DocType: Lead,Organization Name,संस्थेचे नाव
 DocType: Tax Rule,Shipping State,शिपिंग राज्य
 ,Projected Quantity as Source,स्रोत म्हणून प्रक्षेपित प्रमाण
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,आयटम ' खरेदी पावत्यापासून  आयटम मिळवा' या बटणाचा   वापर करून समाविष्ट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,आयटम ' खरेदी पावत्यापासून  आयटम मिळवा' या बटणाचा   वापर करून समाविष्ट करणे आवश्यक आहे
 DocType: Employee,A-,अ-
 DocType: Production Planning Tool,Include non-stock items,नॉन-स्टॉक आयटम समाविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,विक्री खर्च
@@ -1110,7 +1108,7 @@
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,पिनकोड
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,पिनकोड
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
 DocType: Opportunity,Contact Info,संपर्क माहिती
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,शेअर नोंदी करून देणे
@@ -1154,7 +1152,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डरआधी  रद्द आधी रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',कृपया 'वर अतिरिक्त सवलत लागू करा'  सेट  करा
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',कृपया 'वर अतिरिक्त सवलत लागू करा'  सेट  करा
 ,Ordered Items To Be Billed,आदेश दिलेले  आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,श्रेणी पासून श्रेणी पर्यंत कमी असली पाहिजे
 DocType: Global Defaults,Global Defaults,ग्लोबल डीफॉल्ट
@@ -1189,11 +1187,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,बॅच क्रमांक आयटम कोड प्रविष्ट करा
 DocType: Stock Settings,Default Item Group,मुलभूत आयटम गट
 DocType: Employee Loan,Partially Disbursed,अंशत: वाटप
-DocType: Grading Structure,Grading System Name,ग्रेडिंग प्रणाली नाव
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,पुरवठादार डेटाबेस.
 DocType: Account,Balance Sheet,ताळेबंद
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",भरणा मोड कॉन्फिगर केलेली नाही. खाते मोड ऑफ पेमेंट्स किंवा पीओएस प्रोफाइल वर सेट केली गेली आहे का ते कृपया तपासा.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",भरणा मोड कॉन्फिगर केलेली नाही. खाते मोड ऑफ पेमेंट्स किंवा पीओएस प्रोफाइल वर सेट केली गेली आहे का ते कृपया तपासा.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,आपल्या  विक्री व्यक्तीला  ग्राहक संपर्क साधण्यासाठी या तारखेला एक स्मरणपत्र मिळेल
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,सारख्या आयटमचा एकाधिक वेळा प्रविष्ट करणे शक्य नाही.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट  करू शकता"
@@ -1232,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,कार्य पूर्ण झाले
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,विशेषता टेबल मध्ये किमान एक गुणधर्म निर्दिष्ट करा
 DocType: Announcement,All Students,सर्व विद्यार्थी
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,लेजर पहा
 DocType: Grading Scale,Intervals,कालांतराने
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","आयटम त्याच नावाने अस्तित्वात  असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","आयटम त्याच नावाने अस्तित्वात  असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,विद्यार्थी भ्रमणध्वनी क्रमांक
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
@@ -1277,8 +1274,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},गोठविलेले खाते   {0}  संपादित करण्यासाठी आपण अधिकृत नाही
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,खरेदी आदेश योजना मदत आणि आपल्या खरेदी पाठपुरावा
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,खरेदी आदेश योजना मदत आणि आपल्या खरेदी पाठपुरावा
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये  \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी    जास्त असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,लहान
@@ -1302,7 +1299,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,समक्रमण मास्टर डेटा
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
 DocType: Student Applicant,AP,आंध्र प्रदेश
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
@@ -1320,7 +1317,7 @@
 DocType: Student Group Student,Group Roll Number,गट आसन क्रमांक
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सर्व कार्य वजन एकूण असू 1. त्यानुसार सर्व प्रकल्प कार्ये वजन समायोजित करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,कॅपिटल उपकरणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम 'रोजी लागू करा' field वर  आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
@@ -1347,7 +1344,7 @@
 DocType: Depreciation Schedule,Journal Entry,जर्नल प्रवेश
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} प्रगतीपथावर आयटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाव
-DocType: Grade Interval,Grade Code,ग्रेड कोड
+DocType: Grading Scale Interval,Grade Code,ग्रेड कोड
 DocType: POS Item Group,POS Item Group,POS बाबींचा गट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ई-मेल सारांश:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
@@ -1364,7 +1361,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,हार्डवेअर
 DocType: Sales Order,Recurring Upto,आवर्ती पर्यंत
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,कृपया कंपनी निवडा
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,कृपया कंपनी निवडा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,रजा
 DocType: Purchase Invoice,Supplier Invoice Date,पुरवठादार चलन तारीख
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक आहे
@@ -1380,7 +1377,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,अन्न
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing श्रेणी 3
 DocType: Maintenance Schedule Item,No of Visits,भेटी क्रमांक
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,मार्क हजेरी
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,मार्क हजेरी
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},देखभाल वेळापत्रक {0} विरुद्ध अस्तित्वात {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,नोंदणी विद्यार्थी
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},बंद खात्याचे चलन {0} असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सर्व goalsसाठी  गुणांची  सम 100 असावी.  हे  {0} आहे
@@ -1429,13 +1427,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,लेखा चार्ट
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Detail,Depends on Leave Without Pay,वेतन न करता सोडा अवलंबून असते
 DocType: Pricing Rule,"Higher the number, higher the priority","उच्च संख्या, जास्त प्राधान्य"
 ,Purchase Invoice Trends,चलन  खरेदी ट्रेन्ड्स
 DocType: Employee,Better Prospects,उत्तम प्रॉस्पेक्ट
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ती # {0}: बॅच {1} फक्त {2} प्रमाण आहे. कृपया {3} प्रमाण उपलब्ध आहे, जे आणखी एक बॅच निवडा किंवा अनेक बॅचेस पासून / वितरीत करण्यासाठी समस्या, अनेक पंक्ती मध्ये सलग विभाजन"
 DocType: Vehicle,License Plate,परवाना प्लेट
 DocType: Appraisal,Goals,गोल
 DocType: Warranty Claim,Warranty / AMC Status,हमी / जेथे एएमसी स्थिती
@@ -1453,7 +1452,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी स्वत: ला तक्रार करू शकत नाही.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाते गोठविले तर, नोंदी मर्यादित वापरकर्त्यांना परवानगी आहे."
 DocType: Email Digest,Bank Balance,बँक बॅलन्स
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
 DocType: Job Opening,"Job profile, qualifications required etc.","कामाचे, पात्रता आवश्यक इ"
 DocType: Journal Entry Account,Account Balance,खाते शिल्लक
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,व्यवहार कर नियम.
@@ -1464,7 +1463,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,बंद न केलेली आथिर्क वर्षात पी &amp; एल शिल्लक दर्शवा
 DocType: Shipping Rule,Shipping Account,शिपिंग खाते
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: खाते {2} निष्क्रिय आहे
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,विक्री आदेश आपण आपले कार्य योजना आणि मदत ऑन वेळ वितरीत करण्यासाठी करा
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,विक्री आदेश आपण आपले कार्य योजना आणि मदत ऑन वेळ वितरीत करण्यासाठी करा
 DocType: Quality Inspection,Readings,वाचन
 DocType: Stock Entry,Total Additional Costs,एकूण अतिरिक्त खर्च
 DocType: Course Schedule,SH,एस एच
@@ -1475,7 +1474,7 @@
 DocType: Shipping Rule Condition,To Value,मूल्य
 DocType: Asset Movement,Stock Manager,शेअर व्यवस्थापक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत कोठार सलग  {0} साठी  अनिवार्य आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,पॅकिंग स्लिप्स
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,पॅकिंग स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,कार्यालय भाडे
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात अयशस्वी!
@@ -1501,7 +1500,7 @@
 DocType: Sales Invoice,Source,स्रोत
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,बंद शो
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,मालमत्ता वर्ग मुदत मालमत्ता आयटम अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,मालमत्ता वर्ग मुदत मालमत्ता आयटम अनिवार्य आहे
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,भरणा टेबल मधे रेकॉर्ड आढळले नाहीत
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},या {0} संघर्ष {1} साठी {2} {3}
 DocType: Student Attendance Tool,Students HTML,विद्यार्थी HTML
@@ -1519,7 +1518,7 @@
 DocType: Student,Date of Leaving,सोडून दिनांक
 DocType: Pricing Rule,For Price List,किंमत सूची
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी शोध
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,निष्पन्न तयार करा
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,निष्पन्न तयार करा
 DocType: Maintenance Schedule,Schedules,वेळापत्रक
 DocType: Purchase Invoice Item,Net Amount,निव्वळ रक्कम
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM तपशील नाही
@@ -1547,7 +1546,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,कार्यक्रम नामांकनाची
 DocType: Sales Invoice Item,Brand Name,ब्रँड नाव
 DocType: Purchase Receipt,Transporter Details,वाहतुक तपशील
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,बॉक्स
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,शक्य पुरवठादार
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,संघटना
@@ -1581,7 +1580,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},साठी {0} प्रकल्प आढळले नाही डीफॉल्ट BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,कंपनी खर्च दावे.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","विद्यार्थी प्रणाली हृदय आहात, आपली सर्व विद्यार्थ्यांना जोडा"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","विद्यार्थी प्रणाली हृदय आहात, आपली सर्व विद्यार्थ्यांना जोडा"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},सलग # {0}: निपटारा तारीख {1} धनादेश तारीख असू शकत नाही {2}
 DocType: Company,Default Holiday List,सुट्टी यादी डीफॉल्ट
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},सलग {0}: कडून वेळ आणि वेळ {1} आच्छादित आहे {2}
@@ -1593,20 +1592,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण ज्या दिवशी रजेचे  अर्ज करत आहात  ते दिवस  सुटीचे  आहेत. आपण रजा अर्ज करण्याची गरज नाही.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भरणा ईमेल पुन्हा पाठवा
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,नवीन कार्य
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,कोटेशन करा
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,कोटेशन करा
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,इतर अहवाल
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} प्रकारच्या रजा  {1} पेक्षा  जास्त असू शकत नाही
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,आगाऊ एक्स दिवस ऑपरेशन नियोजन प्रयत्न करा.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
 DocType: SMS Center,Receiver List,स्वीकारण्याची  यादी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,आयटम शोध
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,आयटम शोध
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,नाश रक्कम
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,रोख निव्वळ बदला
 DocType: Assessment Plan,Grading Scale,प्रतवारी स्केल
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,आधीच पूर्ण
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},भरणा विनंती आधीपासूनच अस्तित्वात {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
@@ -1644,7 +1643,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,गोळा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आपण हटवू शकत नाही आर्थिक वर्ष {0}. आर्थिक वर्ष {0} वैश्विक सेटिंग्ज मध्ये डीफॉल्ट म्हणून सेट केले आहे
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट शिल्लक
@@ -1687,8 +1686,6 @@
 DocType: Student Sibling,Studying in Same Institute,याच संस्थेचे शिकत
 DocType: Territory,Territory Manager,प्रदेश व्यवस्थापक
 DocType: Packed Item,To Warehouse (Optional),गुदाम (पर्यायी)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Payment Entry,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
@@ -1698,9 +1695,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,टाका पहा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,साहित्य विनंती या शेअर नोंद करण्यासाठी   वापरले
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,पुढील घसारा तारीख नवीन मालमत्ता अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,पुढील घसारा तारीख नवीन मालमत्ता अनिवार्य आहे
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बॅच स्वतंत्र अभ्यासक्रम आधारित गट
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बॅच स्वतंत्र अभ्यासक्रम आधारित गट
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,एका  आयटम एकच एकक.
@@ -1717,9 +1714,7 @@
 DocType: Course Assessment Criteria,Weightage,वजन
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: &#39;नफा व तोटा&#39; खात्यासाठी खर्च केंद्र आवश्यक आहे {2}. कंपनी साठी डीफॉल्ट खर्च केंद्र सेट करा.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट त्याच नावाने अस्तित्वात असेल तर ग्राहक नाव बदला किंवा ग्राहक गट नाव बदला
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट त्याच नावाने अस्तित्वात असेल तर ग्राहक नाव बदला किंवा ग्राहक गट नाव बदला
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,नवीन संपर्क
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
@@ -1746,21 +1741,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,मेळ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 DocType: Purchase Invoice Item,Batch No,बॅच नाही
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},विनिमय दर शोधण्यात अक्षम {0} करण्यासाठी {1} की तारीख {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक पर्चेस विरुद्ध अनेक विक्री आदशची परवानगी द्या
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,मुख्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,जिच्यामध्ये variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,मुख्य
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,जिच्यामध्ये variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारी एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
 DocType: Employee,Leave Encashed?,रजा  मिळविता?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,field पासून संधी अनिवार्य आहे
 DocType: Email Digest,Annual Expenses,वार्षिक खर्च
 DocType: Item,Variants,रूपे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
 DocType: Payment Reconciliation Payment,Allocated amount,रक्कम
@@ -1780,7 +1774,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,त्यावेळच्या
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},आयटम  {0} साठी  डुप्लिकेट सिरियल क्रमांक प्रविष्ट केला नाही
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक शिपिंग नियम एक अट
-DocType: Grading Structure,Grading Intervals,प्रतवारी मध्यांतरे
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,प्रविष्ट करा
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. प्रती-बिलिंग परवानगी करण्यासाठी, सेटिंग्ज खरेदी सेट करा"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,आयटम किंवा वखार आधारित फिल्टर सेट करा
@@ -1793,16 +1786,17 @@
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: नाकारलेले वखार नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,भरणा
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,आपल्या ऑर्डर व्यवस्थापित करा
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,आपल्या ऑर्डर व्यवस्थापित करा
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक वेळ आणि खर्च
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},जास्तीत जास्त {0} साहित्याची  विनंती आयटम {1} साठी  विक्री आदेशा विरुद्ध केली  जाऊ शकते {2}
 DocType: Employee,Salutation,नमस्कार
 DocType: Course,Course Abbreviation,अर्थात संक्षेप
 DocType: Student Leave Application,Student Leave Application,विद्यार्थी रजेचा अर्ज
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},वर अर्धा दिवशी कर्मचारी {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},एकूण कामाचे तास कमाल कामाचे तास पेक्षा जास्त असू नये {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,रोजी
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,विक्रीच्या वेळी बंडल आयटम.
 DocType: Quotation Item,Actual Qty,वास्तविक Qty
 DocType: Sales Invoice Item,References,संदर्भ
@@ -1812,7 +1806,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आपण ड्युप्लिकेट आयटम केला आहे. कृपया सरळ आणि पुन्हा प्रयत्न करा.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,सहकारी
 DocType: Asset Movement,Asset Movement,मालमत्ता चळवळ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,नवीन टाका
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,नवीन टाका
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} आयटम सिरीयलाइज आयटम नाही
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
 DocType: Vehicle,Wheels,रणधुमाळी
@@ -1844,10 +1838,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,उत्पादन आदेश विरुद्ध वेळ नोंदी तयार करणे अक्षम करते .ऑपरेशन उत्पादन ऑर्डर विरुद्ध मागे काढला जाऊ नये
 DocType: Student,Student Mobile Number,विद्यार्थी मोबाइल क्रमांक
 DocType: Item,Has Variants,रूपे आहेत
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण नाव
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
 DocType: Sales Person,Parent Sales Person,पालक विक्री व्यक्ती
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चलन
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,प्रकल्प व्यवस्थापकीय
@@ -1855,7 +1849,7 @@
 DocType: Budget,Fiscal Year,आर्थिक वर्ष
 DocType: Vehicle Log,Fuel Price,इंधन किंमत
 DocType: Budget,Budget,अर्थसंकल्प
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",प्राप्तिकर किंवा खर्च खाते नाही म्हणून बजेट विरुद्ध {0} नियुक्त केले जाऊ शकत नाही
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,साध्य
 DocType: Student Admission,Application Form Route,अर्ज मार्ग
@@ -1886,7 +1880,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},रक्कम {0} {1} विरुद्ध वजा {2}
 DocType: Employee,Salary Information,पगार माहिती
 DocType: Sales Person,Name and Employee ID,नाव आणि कर्मचारी आयडी
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
 DocType: Website Item Group,Website Item Group,वेबसाइट आयटम गट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,कर आणि कर्तव्ये
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
@@ -1945,7 +1939,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ग्राहक महसूल पुन्हा करा
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'खर्च मंजूर' भूमिका असणे आवश्यक आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,जोडी
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
 DocType: Asset,Depreciation Schedule,घसारा वेळापत्रक
 DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,अर्धा दिवस तारीख पासून आणि तारिक करण्यासाठी दरम्यान असावे
@@ -1962,13 +1956,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम  {0} मधे  नमूद केलेला नाही
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,प्रलंबित रक्कम
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
 DocType: Purchase Order,Delivered,वितरित केले
 ,Vehicle Expenses,वाहन खर्च
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
+DocType: Serial No,Invoice Details,चलन तपशील
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,आवर्ती अशी यादी तयार करणे बंद होणार तारीख
 DocType: Employee Loan,Loan Amount,कर्ज रक्कम
@@ -1992,7 +1987,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
 DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,गट  पासून नॉन-गट पर्यंत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,क्रीडा
 DocType: Loan Type,Loan Name,कर्ज नाव
@@ -2004,6 +1999,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,तुम्ही नाकारलेले  आयटम राखण्यासाठी आहेत ते  कोठार
 DocType: Production Order,Skip Material Transfer,साहित्य हस्तांतरण जा
 DocType: Production Order,Skip Material Transfer,साहित्य हस्तांतरण जा
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,विनिमय दर शोधण्यात अक्षम {0} करण्यासाठी {1} की तारीख {2}. स्वतः एक चलन विनिमय रेकॉर्ड तयार करा
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,आपले आर्थिक वर्ष रोजी संपत आहे
 DocType: POS Profile,Price List,किंमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} मुलभूत आर्थिक वर्ष आहे. बदल प्रभावाखाली येण्यासाठी आपल्या ब्राउझर रीफ्रेश करा.
@@ -2041,9 +2037,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,आयटम {0} आधीच परत आला  आहे
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**आर्थिक वर्ष** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार **आर्थिक वर्ष** विरुद्ध नियंत्रीत केले जाते.
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पत्ता
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
 DocType: Student Admission,Eligibility,पात्रता
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","निष्पन्न आपल्याला प्राप्त व्यवसाय, आपल्या निष्पन्न म्हणून सर्व आपले संपर्क जोडू शकता आणि अधिक मदत"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","निष्पन्न आपल्याला प्राप्त व्यवसाय, आपल्या निष्पन्न म्हणून सर्व आपले संपर्क जोडू शकता आणि अधिक मदत"
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
@@ -2084,7 +2080,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,कंपनी निवडा ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी विचारल्यास रिक्त सोडा
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,चलन पासून
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
@@ -2100,7 +2096,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,पहिल्या रांगेत साठी 'मागील पंक्ती एकूण रोजी' किंवा  'मागील पंक्ती रकमेवर' म्हणून जबाबदारी प्रकार निवडू शकत नाही
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child आयटम उत्पादन बंडल मधे असू नये. आयटम  '{0}' काढा आणि जतन करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बँकिंग
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets जोडा
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets जोडा
 DocType: Vehicle Service,Service Item,सेवा बाबींचा
 DocType: Bank Guarantee,Bank Guarantee,बँक हमी
 DocType: Bank Guarantee,Bank Guarantee,बँक हमी
@@ -2150,8 +2146,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दर सूची सेट केले नसल्यास दर दर्शविली जाणार नाही
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,या शिपिंग नियमासाठी देश निर्दिष्ट करा किंवा जगभरातील शिपिंग तपासा
 DocType: Stock Entry,Total Incoming Value,एकूण येणारी  मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,डेबिट करणे आवश्यक आहे
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,डेबिट करणे आवश्यक आहे
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरेदी दर सूची
 DocType: Offer Letter Term,Offer Term,ऑफर मुदत
 DocType: Quality Inspection,Quality Manager,गुणवत्ता व्यवस्थापक
@@ -2185,14 +2181,14 @@
 DocType: Opportunity,Lost Reason,कारण गमावले
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नवीन पत्ता
 DocType: Quality Inspection,Sample Size,नमुना आकार
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,पावती दस्तऐवज प्रविष्ट करा
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,पावती दस्तऐवज प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;प्रकरण क्रमांक पासून&#39; एक वैध निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट करू शकता
 DocType: Project,External,बाह्य
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,वापरकर्ते आणि परवानग्या
 DocType: Vehicle Log,VLOG.,व्हिलॉग.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},उत्पादन आदेश तयार केलेले: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},उत्पादन आदेश तयार केलेले: {0}
 DocType: Branch,Branch,शाखा
 DocType: Guardian,Mobile Number,मोबाइल क्रमांक
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण आणि ब्रांडिंग
@@ -2201,7 +2197,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,सिरियल क्रमांक {0} आढळला  नाही
 DocType: Scheduling Tool,Student Batch,विद्यार्थी बॅच
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,आपले ग्राहक
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,विद्यार्थी करा
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,विद्यार्थी करा
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},आपण प्रकल्प सहयोग करण्यासाठी आमंत्रित आहेत: {0}
 DocType: Leave Block List Date,Block Date,ब्लॉक तारीख
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,आता लागू
@@ -2225,8 +2221,9 @@
 DocType: SMS Log,Sent To,करण्यासाठी पाठविले
 DocType: Payment Request,Make Sales Invoice,विक्री चलन करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,सॉफ्टवेअर
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,पुढील संपर्क तारीख भूतकाळातील असू शकत नाही
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,पुढील संपर्क तारीख भूतकाळातील असू शकत नाही
 DocType: Company,For Reference Only.,संदर्भ केवळ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,बॅच निवडा कोणत्याही
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,आगाऊ रक्कम
@@ -2240,7 +2237,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,प्रकरण क्रमांक 0 असू शकत नाही
 DocType: Item,Show a slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी स्लाईड शो दर्शवा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,स्टोअर्स
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,स्टोअर्स
 DocType: Serial No,Delivery Time,वितरण वेळ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,आधारित Ageing
 DocType: Item,End of Life,आयुष्याच्या शेवटी
@@ -2256,8 +2253,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ट्रान्सफर साहित्य
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च  आणि आपल्या ऑपरेशनसाठी    एक अद्वितीय ऑपरेशन क्रमांक निर्देशीत करा ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,हा दस्तऐवज करून मर्यादेपेक्षा अधिक {0} {1} आयटम {4}. आपण करत आहेत दुसर्या {3} त्याच विरुद्ध {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,बदल निवडा रक्कम खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,बदल निवडा रक्कम खाते
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
@@ -2268,7 +2265,7 @@
 DocType: Budget Account,Budget Account,बजेट खाते
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","विद्यमान व्यवहार आहेत कारण, कंपनीच्या मुलभूत चलन बदलू शकत नाही. व्यवहार मुलभूत चलन बदलण्यासाठी रद्द करणे आवश्यक आहे."
-DocType: Grade Interval,Grade Description,ग्रेड वर्णन
+DocType: Grading Scale Interval,Grade Description,ग्रेड वर्णन
 DocType: Stock Entry,Purchase Receipt No,खरेदी पावती नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,इसा-याची रक्कम
 DocType: Process Payroll,Create Salary Slip,पगाराच्या स्लिप्स तयार करा
@@ -2306,7 +2303,7 @@
 DocType: Upload Attendance,Attendance To Date,उपस्थिती पासून तारीख
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Gateway Account,Payment Account,भरणा खाते
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,खाते प्राप्तीयोग्य निव्वळ बदला
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,भरपाई देणारा बंद
 DocType: Offer Letter,Accepted,स्वीकारले
@@ -2320,7 +2317,7 @@
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,वापरकर्ता मंच
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
 DocType: Employee,Previous Work Experience,मागील कार्य अनुभव
@@ -2334,7 +2331,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,संस्था नाव साठी आपण या प्रणाली सेट आहेत.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Accounting प्रवेश गोठविली लेखा नोंद, कोणीही करून  / सुधारुन खालील  निर्दिष्ट भूमिका वगळता नोंद संपादीत करताू शकतात ."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,देखभाल वेळापत्रक निर्मिती करण्यापूर्वी दस्तऐवज जतन करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,देखभाल वेळापत्रक निर्मिती करण्यापूर्वी दस्तऐवज जतन करा
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,प्रकल्प स्थिती
 DocType: UOM,Check this to disallow fractions. (for Nos),अपूर्णांक अनुमती रद्द करण्यासाठी हे तपासा. (क्रमांकासाठी)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,खालील उत्पादन आदेश तयार केले होते:
@@ -2357,6 +2354,7 @@
 DocType: Email Digest,How frequently?,किती वारंवार?
 DocType: Purchase Receipt,Get Current Stock,वर्तमान शेअर मिळवा
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,साहित्य बिल झाडाकडे
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Student,Joining Date,सामील होत तारीख
 ,Employees working on a holiday,सुट्टी काम कर्मचारी
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,मार्क सध्याची
@@ -2438,7 +2436,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,उत्पादन
 DocType: Guardian,Occupation,व्यवसाय
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),एकूण (Qty)
 DocType: Sales Invoice,This Document,हा दस्तऐवज
 DocType: Installation Note Item,Installed Qty,स्थापित Qty
@@ -2461,8 +2459,8 @@
 DocType: Notification Control,Sales Order Message,विक्री ऑर्डर संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","कंपनी, चलन, वर्तमान आर्थिक वर्ष इ  मुलभूत मुल्य  सेट करा"
 DocType: Payment Entry,Payment Type,भरणा प्रकार
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
 DocType: Process Payroll,Select Employees,निवडा कर्मचारी
 DocType: Opportunity,Potential Sales Deal,संभाव्य विक्री करार
 DocType: Payment Entry,Cheque/Reference Date,धनादेश / संदर्भ तारीख
@@ -2479,7 +2477,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ग्लोबल पीओएस प्रोफाइल {0}  कंपनी {1} साठी आधीच निर्माण केली आहे
 DocType: Purchase Order,Ref SQ,संदर्भ SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,सर्व BOMs मधले  आयटम / BOM बदला
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,पावती दस्तऐवज सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,पावती दस्तऐवज सादर करणे आवश्यक आहे
 DocType: Purchase Invoice Item,Received Qty,प्राप्त Qty
 DocType: Stock Entry Detail,Serial No / Batch,सिरियल क्रमांक/  बॅच
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,अदा केलेला नाही  आणि वितरित नाही
@@ -2492,7 +2490,7 @@
 ,To Produce,उत्पन्न करण्यासाठी
 apps/erpnext/erpnext/config/hr.py +93,Payroll,उपयोग पे रोल
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","सलग {0} मधील {1} साठी . आयटम दर {2} समाविष्ट करण्यासाठी, पंक्ति {3} समाविष्ट करणे आवश्यक आहे"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,वापरकर्ता करा
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,वापरकर्ता करा
 DocType: Packing Slip,Identification of the package for the delivery (for print),डिलिव्हरी संकुल ओळख (मुद्रण)
 DocType: Bin,Reserved Quantity,राखीव प्रमाण
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,वैध ईमेल पत्ता प्रविष्ट करा
@@ -2506,11 +2504,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,अक्षम साचा डीफॉल्ट टेम्पलेट असणे आवश्यक नाही
 DocType: Account,Income Account,उत्पन्न खाते
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,डिलिव्हरी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","कोटीच्या विभागमधे  ""सामुग्री आधारित रोजी दर"" पहा"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,मागील
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","विद्यार्थी बॅचेस आपण उपस्थिती, विद्यार्थ्यांना आकलन आणि शुल्क ठेवण्यात मदत"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","विद्यार्थी बॅचेस आपण उपस्थिती, विद्यार्थ्यांना आकलन आणि शुल्क ठेवण्यात मदत"
 DocType: Payment Entry,Total Allocated Amount,एकूण रक्कम
 DocType: Item Reorder,Material Request Type,साहित्य विनंती प्रकार
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},पासून {0} करण्यासाठी वेतन Accural जर्नल प्रवेश {1}
@@ -2533,7 +2532,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड मधे  समान आहेत तर, विलीन फक्त शक्य आहे. गट आहे, रूट प्रकार, कंपनी"
@@ -2543,6 +2542,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',दर्जा कर्मचार्यांना घटना एक ईमेल पाठवू &#39;उघडा&#39;
 DocType: Task,Depends on Tasks,कार्ये अवलंबून
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ग्राहक गट वृक्ष व्यवस्थापित करा.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,संलग्नक हे खरेदी सूचीत टाका सक्षम न दर्शविला जाऊ शकतो
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,नवी खर्च केंद्र नाव
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण पॅनेल सोडा
@@ -2555,12 +2555,10 @@
 DocType: Sales Invoice,Debit To,करण्यासाठी डेबिट
 DocType: Delivery Note,Required only for sample item.,फक्त नमुन्यासाठी  आवश्यक आयटम .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष प्रमाण
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},पगारपत्रक दरम्यान आढळले नाही {0} आणि {1}
 ,Pending SO Items For Purchase Request,खरेदी विनंती म्हणून प्रलंबित आयटम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} अक्षम आहे
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} अक्षम आहे
 DocType: Supplier,Billing Currency,बिलिंग चलन
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,अधिक मोठे
@@ -2577,7 +2575,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,मुख्यपृष्ठ वैशिष्ट्यीकृत उत्पादन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,सर्व मूल्यांकन गट
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,नवीन वखार नाव
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),एकूण {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),एकूण {0} ({1})
 DocType: C-Form Invoice Detail,Territory,प्रदेश
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,आवश्यक भेटी क्रमांकाचा उल्लेख करा
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
@@ -2595,7 +2593,7 @@
 DocType: Price List,Price List Master,किंमत सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते यासाठी की, तुम्ही सेट आणि लक्ष्य निरीक्षण करू शकता"
 ,S.O. No.,S.O.  क्रमांक
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},लीडपासून  ग्राहक तयार करा {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},लीडपासून  ग्राहक तयार करा {0}
 DocType: Price List,Applicable for Countries,देशांसाठी  लागू
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,फक्त स्थिती सह अनुप्रयोग सोडा &#39;मंजूर&#39; आणि &#39;रिजेक्टेड&#39; सादर केला जाऊ शकतो
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},विद्यार्थी गट नाव सलग आवश्यक आहे {0}
@@ -2676,7 +2674,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 DocType: Vehicle Service,Engine Oil,इंजिन तेल
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
 DocType: Employee Loan,Loan Details,कर्ज तपशील
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,सलग {0}: पूर्ण प्रमाण शून्य पेक्षा जास्त असणे आवश्यक आहे.
@@ -2741,7 +2739,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,विद्यमान व्यवहार गोदामे गट रूपांतरीत केले जाऊ शकत नाही.
 DocType: Assessment Result Tool,Result HTML,HTML निकाल
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,रोजी कालबाह्य
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,विद्यार्थी जोडा
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,विद्यार्थी जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},कृपया  {0} निवडा
 DocType: C-Form,C-Form No,सी-फॉर्म नाही
 DocType: BOM,Exploded_items,Exploded_items
@@ -2806,7 +2804,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,मर्यादा क्रॉस
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,या &#39;शैक्षणिक वर्ष&#39; एक शैक्षणिक मुदत {0} आणि &#39;मुदत नाव&#39; {1} आधीच अस्तित्वात आहे. या नोंदी सुधारित आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","आयटम {0} विरुद्ध विद्यमान व्यवहार आहेत, तुम्ही मूल्य बदलू शकत नाही {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","आयटम {0} विरुद्ध विद्यमान व्यवहार आहेत, तुम्ही मूल्य बदलू शकत नाही {1}"
 DocType: UOM,Must be Whole Number,संपूर्ण क्रमांक असणे आवश्यक आहे
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नवी पाने वाटप (दिवस मध्ये)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,सिरियल क्रमांक {0} अस्तित्वात नाही
@@ -2850,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,पुढील महिन्याच्या शेवटच्या दिवशी
 DocType: Support Settings,Auto close Issue after 7 days,7 दिवस स्वयं अंक बंद
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजेचे  {0} च्या आधी वाटप जाऊ शकत नाही, कारण  रजा शिल्लक आधीच वाहून-अग्रेषित भविष्यात रजा वाटप रेकॉर्ड केले आहे {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,विद्यार्थी अर्जदाराचे
 DocType: Asset Category Account,Accumulated Depreciation Account,जमा घसारा खाते
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
@@ -2878,8 +2876,8 @@
 DocType: Asset,Item Code,आयटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन ऑर्डर तयार करा
 DocType: Serial No,Warranty / AMC Details,हमी / जेथे एएमसी तपशील
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
 DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
@@ -2898,7 +2896,7 @@
 DocType: Production Planning Tool,Create Material Requests,साहित्य विनंत्या तयार करा
 DocType: Employee Education,School/University,शाळा / विद्यापीठ
 DocType: Payment Request,Reference Details,संदर्भ तपशील
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
 DocType: Sales Invoice Item,Available Qty at Warehouse,कोठार वर उपलब्ध आहे Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,बिल केलेली रक्कम
 DocType: Asset,Double Declining Balance,दुहेरी नाकारून शिल्लक
@@ -2919,19 +2917,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे कारण  शेअर मेळ हे उदघाटन नोंद आहे"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित करण्यात आलेल्या रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},आयटम आवश्यक मागणीसाठी  क्रमांक खरेदी {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,उत्पादन ऑर्डर तयार नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,उत्पादन ऑर्डर तयार नाही
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तारीख पासून' नंतर 'तारखेपर्यंत' असणे आवश्यक आहे
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},विद्यार्थी म्हणून स्थिती बदलू शकत नाही {0} विद्यार्थी अर्ज लिंक आहे {1}
 DocType: Asset,Fully Depreciated,पूर्णपणे अवमूल्यन
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
 DocType: Employee Attendance Tool,Marked Attendance HTML,चिन्हांकित उपस्थिती एचटीएमएल
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","आंतरशालेय, प्रस्ताव आपण आपल्या ग्राहकांना पाठवले आहे बोली"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","आंतरशालेय, प्रस्ताव आपण आपल्या ग्राहकांना पाठवले आहे बोली"
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,सिरियल क्रमांक आणि बॅच
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,मूल्यांकन निकष स्कोअर बेरीज {0} असणे आवश्यक आहे.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations संख्या बुक सेट करा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations संख्या बुक सेट करा
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,मूल्य किंवा Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,मिनिट
@@ -3062,7 +3060,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,विद्यार्थी गट
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन मालिका
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","आयटम त्याच नावाने अस्तित्वात ( {0} ) असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,कृपया ग्राहक निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,कृपया ग्राहक निवडा
 DocType: C-Form,I,मी
 DocType: Company,Asset Depreciation Cost Center,मालमत्ता घसारा खर्च केंद्र
 DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
@@ -3081,19 +3079,18 @@
 DocType: Vehicle,Insurance Details,विमा तपशील
 DocType: Account,Payable,देय
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,परतफेड कालावधी प्रविष्ट करा
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),कर्जदार ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),कर्जदार ({0})
 DocType: Pricing Rule,Margin,मार्जिन
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नवीन ग्राहक
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,निव्वळ नफा%
 DocType: Appraisal Goal,Weightage (%),वजन (%)
 DocType: Bank Reconciliation Detail,Clearance Date,मंजुरी तारीख
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,एकूण खरेदी रक्कम अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,एकूण खरेदी रक्कम अनिवार्य आहे
 DocType: Lead,Address Desc,Desc पत्ता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,पक्ष अनिवार्य आहे
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,विषय नाव
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,विक्री किंवा खरेदी कमीत कमी एक निवडणे आवश्यक आहे
-DocType: Grading Structure,Grade Intervals,ग्रेड मध्यांतरे
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,आपल्या व्यवसाय स्वरूप निवडा.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,उत्पादन ऑपरेशन कोठे नेले जातात.
 DocType: Asset Movement,Source Warehouse,स्त्रोत कोठार
@@ -3122,6 +3119,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण टक्केवारी
 DocType: Territory,Territory Targets,प्रदेश लक्ष्य
 DocType: Delivery Note,Transporter Info,वाहतुक माहिती
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},कंपनी मध्ये डीफॉल्ट {0} सेट करा {1}
 DocType: Cheque Print Template,Starting position from top edge,शीर्ष किनार पासून स्थान सुरू करत आहे
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,त्याच पुरवठादार अनेक वेळा प्रविष्ट केले गेले आहे
@@ -3175,7 +3173,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qty पुनर्क्रमित करा
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,वर्तमान नोकरी संबंधी
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
-DocType: Journal Entry,Write Off,बंद लिहा
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,बंद लिहा
 DocType: Timesheet Detail,Operation ID,ऑपरेशन आयडी
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","प्रणाली वापरकर्ता (लॉग-इन) आयडी. सेट केल्यास, हे सर्व एचआर फॉर्मसाठी  मुलभूत होईल."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: पासून {1}
@@ -3186,8 +3184,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,पुरवठादार ग्राहक वितरण
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# फॉर्म / आयटम / {0}) स्टॉक बाहेर आहे
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,पुढील तारीख पोस्ट दिनांक पेक्षा जास्त असणे आवश्यक
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,ब्रेक अप कर शो
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख  {0} नंतर असू शकत नाही
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,ब्रेक अप कर शो
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख  {0} नंतर असू शकत नाही
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डेटा आयात आणि निर्यात
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","शेअर नोंदी, {0} वखार विरुद्ध अस्तित्वात त्यामुळे आपण पुन्हा नियुक्त किंवा फेरफार करणे शक्य नाही"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,नाही विद्यार्थ्यांनी सापडले
@@ -3199,14 +3197,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
 DocType: Program Enrollment,School House,शाळा हाऊस
 DocType: Serial No,Out of AMC,एएमसी पैकी
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,कृपया अवतरणे निवडा
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,कृपया अवतरणे निवडा
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,देखभाल भेट करा
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची  विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,कृपया अवतरणे निवडा
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,कृपया अवतरणे निवडा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,देखभाल भेट करा
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची  विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
 DocType: Company,Default Cash Account,मुलभूत रोख खाते
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,कंपनी ( ग्राहक किंवा पुरवठादार नाही) मास्टर.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,हे या विद्यार्थी पोषाख आधारित आहे
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,नाही विद्यार्थी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,अधिक आयटम किंवा ओपन पूर्ण फॉर्म जोडा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
@@ -3253,9 +3252,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,समेट करण्यापूर्वी
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},करण्यासाठी {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),कर आणि शुल्क जोडले (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0}  कर  किंवा उत्पन्न किंवा खर्चाचे किंवा भार प्रकारचे खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0}  कर  किंवा उत्पन्न किंवा खर्चाचे किंवा भार प्रकारचे खाते असणे आवश्यक आहे
 DocType: Sales Order,Partly Billed,अंशतः बिल आकारले
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,आयटम {0} मुदत मालमत्ता आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,आयटम {0} मुदत मालमत्ता आयटम असणे आवश्यक आहे
 DocType: Item,Default BOM,मुलभूत BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,कंपनीचे नाव  पुष्टी करण्यासाठी पुन्हा-टाइप करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,एकूण थकबाकी रक्कम
@@ -3278,7 +3277,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,हद्दीच्या
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,पत्ता नाव
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,पत्ता नाव
 DocType: Stock Entry,From BOM,BOM पासून
 DocType: Assessment Code,Assessment Code,मूल्यांकन कोड
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,मूलभूत
@@ -3303,7 +3302,7 @@
 DocType: Purchase Invoice,Print Language,मुद्रण भाषा
 DocType: Salary Slip,Total Working Hours,एकूण कार्याचे तास
 DocType: Stock Entry,Including items for sub assemblies,उप विधानसभा आयटम समावेश
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,सर्व प्रदेश
 DocType: Purchase Invoice,Items,आयटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,विद्यार्थी आधीच नोंदणी केली आहे.
@@ -3323,17 +3322,15 @@
 DocType: Issue,Opening Time,उघडण्याची  वेळ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,पासून आणि  पर्यंत तारखा आवश्यक आहेत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक नाव
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नावनोंदणी कोर्स
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नावनोंदणी कोर्स
-DocType: Grading Structure,Grading Structure,प्रतवारी संरचना
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
 DocType: Tax Rule,Shipping City,शिपिंग शहर
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,या आयटम {0}च्या  (साचा) चा एक प्रकार आहे. 'नाही प्रत बनवा' वर सेट केले नसेल विशेषता टेम्पलेट प्रती कॉपी होईल
 DocType: Notification Control,Customize the Notification,सूचना सानुकूलित करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ऑपरेशन्स रोख प्रवाह
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
@@ -3356,6 +3353,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,कृपया पहले पोस्टिंग तारीख निवडा
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे उपस्थिती मालिका संख्या करा&gt; क्रमांकन मालिका
 DocType: Leave Control Panel,Carry Forward,कॅरी फॉरवर्ड
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,विद्यमान व्यवहार खर्चाच्या केंद्र लेजर मधे रूपांतरीत केले जाऊ शकत नाही
 DocType: Department,Days for which Holidays are blocked for this department.,दिवस जे सुट्ट्या या विभागात अवरोधित केलेली आहेत.
@@ -3384,7 +3382,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),एकूण (रक्कम)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
 DocType: Quality Inspection,Item Serial No,आयटम सिरियल क्रमांक
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,कर्मचारी रेकॉर्ड तयार करा
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,कर्मचारी रेकॉर्ड तयार करा
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,एकूण उपस्थित
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,लेखा स्टेटमेन्ट
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,तास
@@ -3399,8 +3397,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,बदली नवीन BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,विक्री पॉइंट
 DocType: Payment Entry,Received Amount,प्राप्त केलेली रक्कम
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ऑर्डर आधीच प्रमाणात दुर्लक्ष करून, पूर्ण प्रमाणात साठी तयार करा"
 DocType: Account,Tax,कर
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,चिन्हांकित नाही
@@ -3413,7 +3409,7 @@
 DocType: Batch,Source Document Name,स्रोत दस्तऐवज नाव
 DocType: Batch,Source Document Name,स्रोत दस्तऐवज नाव
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,वापरकर्ते तयार करा
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,वापरकर्ते तयार करा
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ग्राम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,उत्पादनासाठीचे  प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,देखभाल कॉल अहवाल भेट द्या.
@@ -3425,8 +3421,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},खर्च खाते आयटम  {0} साठी अनिवार्य आहे
 DocType: BOM,Website Description,वेबसाइट वर्णन
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी निव्वळ बदला
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,पावती
 ,Sales Register,विक्री नोंदणी
@@ -3437,16 +3433,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करण्यासाठी काहीही नाही.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,अद्याप कोणत्याही ग्राहक!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,रोख फ्लो स्टेटमेंट
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,परवाना
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,आपण देखील मागील आर्थिक वर्षातील शिल्लक रजा या आर्थिक वर्षात समाविष्ट करू इच्छित असल्यास कृपया कॅरी फॉरवर्ड निवडा
 DocType: GL Entry,Against Voucher Type,व्हाउचर प्रकार विरुद्ध
 DocType: Item,Attributes,विशेषता
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Write Off खाते प्रविष्ट करा
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,गेल्या ऑर्डर तारीख
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाते {0} ला  कंपनी {1} मालकीचे नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
 DocType: Student,Guardian Details,पालक तपशील
 DocType: C-Form,C-Form,सी-फॉर्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,अनेक कर्मचाऱ्यांना उपस्थिती चिन्ह
@@ -3471,14 +3469,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',सलग {0} # खाते प्रकार असणे आवश्यक आहे &#39;निश्चित मालमत्ता&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,आउट Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,नियम विक्रीसाठी शिपिंग रक्कम गणना
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,मालिका अनिवार्य आहे
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,मालिका अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवा
 DocType: Student Sibling,Student ID,विद्यार्थी ओळखपत्र
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,वेळ नोंदी उपक्रम प्रकार
 DocType: Tax Rule,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
 DocType: Training Event,Exam,परीक्षा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
 DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,कोटी
 DocType: Tax Rule,Billing State,बिलिंग राज्य
@@ -3511,7 +3509,7 @@
 DocType: Payment Entry,Account Paid From,पासून खाते सशुल्क
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चा माल आयटम कोड
 DocType: Journal Entry,Write Off Based On,आधारित Write Off
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,लीड करा
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,लीड करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,प्रिंट आणि स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,बारकोड फिल्ड दर्शवा
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
@@ -3527,6 +3525,7 @@
 DocType: Offer Letter,Awaiting Response,प्रतिसाद प्रतीक्षा करत आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,वर
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
+DocType: Supplier,Mention if non-standard payable account,उल्लेख मानक-नसलेला देय खाते तर
 DocType: Salary Slip,Earning & Deduction,कमाई आणि कपात
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरले  जाईल.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
@@ -3563,7 +3562,7 @@
 DocType: Program Enrollment Tool,Get Students From,पासून विद्यार्थी मिळवा
 DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,वेबसाइट वर प्रकाशित आयटम
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,बॅच मध्ये आपल्या विद्यार्थ्यांना गट
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,बॅच मध्ये आपल्या विद्यार्थ्यांना गट
 DocType: Authorization Rule,Authorization Rule,प्राधिकृत नियम
 DocType: Sales Invoice,Terms and Conditions Details,अटी आणि शर्ती तपशील
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,वैशिष्ट्य
@@ -3623,7 +3622,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,उमेदवारीचा काळ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,पगार घटक
 DocType: Program Enrollment Tool,New Academic Year,नवीन शैक्षणिक वर्ष
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,परत / क्रेडिट टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,परत / क्रेडिट टीप
 DocType: Stock Settings,Auto insert Price List rate if missing,दर सूची दर गहाळ असेल तर आपोआप घाला
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,एकूण देय रक्कम
 DocType: Production Order Item,Transferred Qty,हस्तांतरित Qty
@@ -3664,6 +3663,7 @@
 ,Sales Funnel,विक्री धुराचा
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
 DocType: Project,Task Progress,कार्य प्रगती
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,कार्ट
 ,Qty to Transfer,हस्तांतरित करण्याची Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेला  स्टॉक संपादित करण्याची परवानगी
@@ -3697,7 +3697,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,शुल्क गोळा
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
 DocType: Lead,Add to calendar on this date,या तारखेला कॅलेंडरमध्ये समाविष्ट करा
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग खर्च जोडून नियम.
 DocType: Item,Opening Stock,शेअर उघडत
@@ -3715,7 +3715,7 @@
 DocType: Customer,From Lead,लीड पासून
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ऑर्डर उत्पादनासाठी  प्रकाशीत.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,विद्यार्थी ची नोंदणी करा
 DocType: Hub Settings,Name Token,नाव टोकन
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक विक्री
@@ -3726,7 +3726,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,प्रकल्प नाव
-DocType: Supplier,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
+DocType: Customer,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
 DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च असेल तर
 DocType: Production Order,Required Items,आवश्यक आयटम
 DocType: Stock Ledger Entry,Stock Value Difference,शेअर मूल्य फरक
@@ -3757,6 +3757,7 @@
 DocType: Item,Taxes,कर
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,दिले आणि वितरित नाही
 DocType: Project,Default Cost Center,मुलभूत खर्च केंद्र
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 DocType: Bank Guarantee,End Date,शेवटची तारीख
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,शेअर व्यवहार
 DocType: Budget,Budget Accounts,बजेट खाती
@@ -3821,7 +3822,7 @@
 DocType: Customer,Sales Partner and Commission,विक्री भागीदार व आयोगाच्या
 DocType: Employee Loan,Rate of Interest (%) / Year,व्याज (%) / वर्ष दर
 ,Project Quantity,प्रकल्प प्रमाण
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम शून्य आहे, आपण &#39;वर आधारित शुल्क वितरण&#39; बदलू पाहिजे"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम शून्य आहे, आपण &#39;वर आधारित शुल्क वितरण&#39; बदलू पाहिजे"
 DocType: Opportunity,To Discuss,चर्चा करण्यासाठी
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} युनिट {1} {2} हा व्यवहार पूर्ण करण्यासाठी आवश्यक.
 DocType: Loan Type,Rate of Interest (%) Yearly,व्याज दर (%) वार्षिक
@@ -3844,7 +3845,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपिस्थत
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},सलग {0}: BOM # चलन {1} निवडले चलन समान असावी {2}
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 DocType: Homepage,Tag Line,टॅग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,वेगवान व्यवस्थापन
@@ -3861,7 +3862,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,कोठार {0} अस्तित्वात नाही
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext हबसाठी  नोंदणी
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण टक्केवारी
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,निवडलेले आयटमला  बॅच असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,निवडलेले आयटमला  बॅच असू शकत नाही
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","मूल्यांकन दर बाबींचा {0}, जे लेखा नोंदी करणे आवश्यक आहे आढळले नाही {1} {2}. आयटम एक नमुना आयटम म्हणून व्यवहार असेल, तर {1}, {1} बाबींचा टेबल की उल्लेख करा. अन्यथा, लेखाचे रेकॉर्ड आयटम किंवा त्याचा उल्लेख मूल्यांकन दर येणाऱ्या स्टॉक व्यवहार एक तयार करा, आणि नंतर / submiting प्रयत्न नोंद रद्द"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,साहित्याचे % या पोच पावती विरोधात वितरित केले आहे
 DocType: Project,Customer Details,ग्राहक तपशील
@@ -3878,7 +3879,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,सबमिट आदेश हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट मध्ये खाते शिल्लक आहे , आपल्याला ' क्रेडिट ' म्हणून ' शिल्लक असणे आवश्यक आहे ' सेट करण्याची परवानगी नाही"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,गुणवत्ता व्यवस्थापन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} आयटम अक्षम केले गेले आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} आयटम अक्षम केले गेले आहे
 DocType: Employee Loan,Repay Fixed Amount per Period,प्रति कालावधी मुदत रक्कम परतफेड
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},आयटम {0} साठी  संख्या प्रविष्ट करा
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
@@ -3905,7 +3906,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,विद्यार्थी ईमेल आयडी
 DocType: Employee,Notice (days),सूचना (दिवस)
 DocType: Tax Rule,Sales Tax Template,विक्री कर साचा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
 DocType: Training Event,Internet,इंटरनेट
 DocType: Account,Stock Adjustment,शेअर समायोजन
@@ -3939,6 +3940,7 @@
 DocType: Purchase Invoice,Debit Note Issued,डेबिट टीप जारी
 DocType: Production Order,Warehouses,गोदामे
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} मालमत्ता हस्तांतरित केली जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,हा आयटम {0} (साचा) एक प्रकार आहे.
 DocType: Workstation,per hour,प्रती तास
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,खरेदी
 DocType: Announcement,Announcement,घोषणा
@@ -3954,7 +3956,7 @@
 DocType: Account,Receivable,प्राप्त
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,रो # {0}: पर्चेस आधिपासूनच अस्तित्वात आहे म्हणून पुरवठादार बदलण्याची परवानगी नाही
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,भूमिका ज्याला सेट क्रेडिट मर्यादा ओलांडत व्यवहार सादर करण्याची परवानगी आहे .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
 DocType: Item,Material Issue,साहित्य अंक
 DocType: Hub Settings,Seller Description,विक्रेता वर्णन
@@ -3967,7 +3969,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेश दिले
 DocType: Salary Detail,Component,घटक
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन निकष गट
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},जमा घसारा उघडत समान पेक्षा कमी असणे आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},जमा घसारा उघडत समान पेक्षा कमी असणे आवश्यक {0}
 DocType: Warehouse,Warehouse Name,वखार नाव
 DocType: Naming Series,Select Transaction,निवडक व्यवहार
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,भूमिका मंजूर किंवा सदस्य मंजूर प्रविष्ट करा
@@ -4002,7 +4004,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी, 'डीफॉल्ट म्हणून सेट करा' वर क्लिक करा"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,सामील व्हा
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
 DocType: Employee Loan,Repay from Salary,पगार पासून परत फेड करा
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},विरुद्ध पैसे विनंती {0} {1} रक्कम {2}
@@ -4020,7 +4022,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,मूल्यांकन निकाल तपशील
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,आयटम गट टेबल मध्ये आढळले डुप्लिकेट आयटम गट
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
 DocType: Salary Slip,Net Pay,नेट पे
 DocType: Account,Account,खाते
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,सिरियल क्रमांक {0} आधीच प्राप्त झाला  आहे
@@ -4029,7 +4031,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","वखार {0} कोणत्याही खात्यावर दुवा साधला गेला नाही, संबंधित (मालमत्ता) खाते / निर्देशित पानाशी जोडले आहेत कोठार तयार करा."
 DocType: Purchase Invoice,Recurring Id,आवर्ती आयडी
 DocType: Customer,Sales Team Details,विक्री कार्यसंघ तपशील
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,कायमचे हटवा?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,कायमचे हटवा?
 DocType: Expense Claim,Total Claimed Amount,एकूण हक्क सांगितला रक्कम
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,विक्री संभाव्य संधी.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},अवैध {0}
@@ -4040,13 +4042,14 @@
 DocType: Warehouse,PIN,पिन
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext आपल्या शाळा सेटअप
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस बदला रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,पहिला  दस्तऐवज जतन करा.
 DocType: Account,Chargeable,आकारण्यास
 DocType: Company,Change Abbreviation,बदला Abbreviation
 DocType: Expense Claim Detail,Expense Date,खर्च तारीख
 DocType: Item,Max Discount (%),कमाल सवलत (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,गेल्या ऑर्डर रक्कम
+DocType: Task,Is Milestone,मैलाचा दगड आहे
 DocType: Daily Work Summary,Email Sent To,ई-मेल पाठविले
 DocType: Budget,Warn,चेतावणी द्या
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न."
@@ -4079,11 +4082,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
 DocType: Tax Rule,Purchase Tax Template,कर साचा खरेदी
 ,Project wise Stock Tracking,प्रकल्प शहाणा शेअर ट्रॅकिंग
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},देखभाल वेळापत्रक {0} विरुद्ध अस्तित्वात {0} आहे
 DocType: Stock Entry Detail,Actual Qty (at source/target),प्रत्यक्ष प्रमाण (स्त्रोत / लक्ष्य येथे)
 DocType: Item Customer Detail,Ref Code,संदर्भ कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रेकॉर्ड.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
 DocType: HR Settings,Payroll Settings,पे रोल सेटिंग्ज
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,नॉन-लिंक्ड पावत्या आणि देयके जुळत.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,मागणी नोंद करा
@@ -4106,7 +4108,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,चेक आणि ठेवी चुकीचे  साफ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
 DocType: Purchase Invoice Item,Price List Rate,किंमत सूची दर
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ग्राहक कोट तयार करा
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ग्राहक कोट तयार करा
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""स्टॉक मध्ये"" किंवा या कोठारमधे  उपलब्ध स्टॉक आधारित "" स्टॉक मध्ये नाही"" दर्शवा."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),साहित्य बिल (DEL)
 DocType: Item,Average time taken by the supplier to deliver,पुरवठादार घेतलेल्या सरासरी वेळ वितरीत करण्यासाठी
@@ -4128,7 +4130,7 @@
 DocType: Asset,Disposal Date,विल्हेवाट दिनांक
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ई-मेल ते सुट्टी नसेल तर दिले क्षणी कंपनी सर्व सक्रिय कर्मचारी पाठवला जाईल. प्रतिसादांचा सारांश मध्यरात्री पाठवला जाईल.
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी रजा मंजुरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण अभिप्राय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,उत्पादन ऑर्डर {0} सादर करणे आवश्यक आहे
@@ -4136,7 +4138,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},अर्थात सलग आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीखे पर्यंत  तारखेपासूनच्या  आधी असू शकत नाही
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ संपादित करा किंमती जोडा
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ संपादित करा किंमती जोडा
 DocType: Batch,Parent Batch,पालक बॅच
 DocType: Batch,Parent Batch,पालक बॅच
 DocType: Cheque Print Template,Cheque Print Template,धनादेश प्रिंट साचा
@@ -4181,7 +4183,7 @@
 DocType: Item,Variant Based On,चल आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},एकूण नियुक्त वजन 100% असावे. हे  {0} आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,आपले पुरवठादार
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,विक्री आदेश केली आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,विक्री आदेश केली आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
 DocType: Request for Quotation Item,Supplier Part No,पुरवठादार भाग नाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',गटात मूल्यांकन &#39;किंवा&#39; Vaulation आणि एकूण &#39;करिता वजा करू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,पासून प्राप्त
@@ -4191,7 +4193,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} पासून {1} साठी
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},रो # {0}: पुरवठादार {1} साठी  आयटम सेट करा
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,सलग {0}: तास मूल्य शून्य पेक्षा जास्त असणे आवश्यक आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट वर अनेक गट मधे हे  आयटम सूचीबद्ध .
@@ -4200,20 +4202,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,आपल्याला गोठविलेले  मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
 DocType: Payment Reconciliation,From Invoice Date,चलन तारखेपासून
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्ष खाते चलन समान असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्ष खाते चलन समान असणे आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,एनकॅशमेंट द्या
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ती काय करते?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,गुदाम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,सर्व विद्यार्थी प्रवेश
 ,Average Commission Rate,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिती भविष्यात तारखा चिन्हांकित केला जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
 DocType: School House,House Name,घर नाव
 DocType: Purchase Taxes and Charges,Account Head,खाते प्रमुख
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,आयटम अतिरिक्त खर्चाची  सुधारणा करण्यासाठी  अतिरिक्त खर्च अद्यतनित करा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,इलेक्ट्रिकल
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,आपल्या वापरकर्त्यांना आपल्या संस्थेसाठी उर्वरित जोडा. आपण संपर्क जोडून त्यांना आपले पोर्टल ग्राहकांना आमंत्रित करा जोडू शकता
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,आपल्या वापरकर्त्यांना आपल्या संस्थेसाठी उर्वरित जोडा. आपण संपर्क जोडून त्यांना आपले पोर्टल ग्राहकांना आमंत्रित करा जोडू शकता
 DocType: Stock Entry,Total Value Difference (Out - In),एकूण मूल्य फरक (आउट - मध्ये)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},वापरकर्ता आयडी कर्मचारी  {0}साठी सेट नाही
@@ -4222,7 +4224,7 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Buying Settings,Naming Series,नामांकन मालिका
 DocType: Leave Block List,Leave Block List Name,रजा ब्लॉक यादी नाव
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,विमा प्रारंभ तारखेच्या विमा समाप्ती तारीख कमी असावे
@@ -4237,7 +4239,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Sales Order Item,Ordered Qty,आदेश दिलेली  Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},कालावधी पासून आणि कालावधी   पर्यंत  तारखा  कालावधी  आवर्ती {0} साठी बंधनकारक
@@ -4250,7 +4252,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off रक्कम (कंपनी चलन)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग तास
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,साठी {0} आढळले नाही मुलभूत BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,त्यांना येथे जोडण्यासाठी आयटम टॅप करा
 DocType: Fees,Program Enrollment,कार्यक्रम नावनोंदणी
 DocType: Landed Cost Voucher,Landed Cost Voucher,स्थावर खर्च व्हाउचर
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} सेट करा
@@ -4351,7 +4354,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
 DocType: Issue,First Responded On,प्रथम रोजी प्रतिसाद
 DocType: Website Item Group,Cross Listing of Item in multiple groups,अनेक गटामध्ये आयटम च्या क्रॉस यादी
-DocType: Grade Interval,Grade Interval,ग्रेड मध्यांतर
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख आधीच आर्थिक वर्षात सेट केल्या आहेत {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,सुधारित मंजुरी दिनांक
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,स्प्लिट बॅच
@@ -4360,6 +4362,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF डाउनलोड करा
 DocType: Production Order,Planned End Date,नियोजनबद्ध अंतिम तारीख
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,आयटम कोठे साठवले जातात.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 DocType: Request for Quotation,Supplier Detail,पुरवठादार तपशील
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},सूत्र किंवा अट त्रुटी: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Invoiced रक्कम
@@ -4405,7 +4408,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,सेटअप माझ्या संस्थेसाठी एक साधी वेबसाइट
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
 DocType: Item,Default Warehouse,मुलभूत कोठार
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},अर्थसंकल्प गट खाते विरुद्ध नियुक्त केला जाऊ शकत नाही {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,पालक खर्च केंद्र प्रविष्ट करा
@@ -4465,7 +4468,7 @@
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
 DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Company,Company Info,कंपनी माहिती
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,खर्च केंद्र खर्च दावा बुक करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,हे या कर्मचा उपस्थिती आधारित आहे
@@ -4478,13 +4481,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,खालील दिवस रजा अनुप्रयोग बनवण्यासाठी वापरकर्त्यांना थांबवा.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,खरेदी रक्कम
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,कर्मचारी फायदे
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} ची  संख्या समान असणे आवश्यक आहे {1}
 DocType: Production Order,Manufactured Qty,उत्पादित Qty
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकृत प्रमाण
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} अस्तित्वात नाही
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ग्राहक असण्याचा बिले.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,प्रकल्प आयडी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम  {2} आहे
@@ -4493,15 +4496,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 वाचन
 ,Hub,हब
 DocType: GL Entry,Voucher Type,प्रमाणक प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
 DocType: Employee Loan Application,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
 DocType: Guardian,Guardian,पालक
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यमापन {0} {1} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
 DocType: Employee,Education,शिक्षण
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,देल
 DocType: Selling Settings,Campaign Naming By,करून मोहीम नामांकन
 DocType: Employee,Current Address Is,सध्याचा पत्ता आहे
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,सुधारित
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरावा ."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
@@ -4538,7 +4543,7 @@
 DocType: Hub Settings,Hub Settings,हब सेटिंग्ज
 DocType: Project,Gross Margin %,एकूण मार्जिन%
 DocType: BOM,With Operations,ऑपरेशन
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलन {0} मधे कंपनी {1} साठी केले गेले आहेत. कृपया चलन एक प्राप्त किंवा देय खाते निवडा {0} .
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलन {0} मधे कंपनी {1} साठी केले गेले आहेत. कृपया चलन एक प्राप्त किंवा देय खाते निवडा {0} .
 DocType: Asset,Is Existing Asset,मालमत्ता अस्तित्वात आहे
 DocType: Salary Detail,Statistical Component,सांख्यिकी घटक
 DocType: Salary Detail,Statistical Component,सांख्यिकी घटक
@@ -4594,7 +4599,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,लोगो संलग्न
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,शेअर स्तर
 DocType: Customer,Commission Rate,आयोगाने दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,व्हेरियंट करा
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",भरणा प्रकार मिळतील एक द्या आणि अंतर्गत ट्रान्सफर करणे आवश्यक आहे
 apps/erpnext/erpnext/config/selling.py +179,Analytics,विश्लेषण
@@ -4607,6 +4612,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,सुट्टीच्या दिवशी उत्पादन परवानगी द्या
 DocType: Sales Order,Customer's Purchase Order Date,ग्राहकाच्या पर्चेस तारीख
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,कॅपिटल शेअर
+DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक संलग्नक दर्शवा
 DocType: Packing Slip,Package Weight Details,संकुल वजन तपशील
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,पैसे पूर्ण भरल्यानंतर  वापरकर्ता निवडलेल्या पृष्ठला  पुनर्निर्देशित झाला पाहिजे
@@ -4631,7 +4637,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,चलने इ $ असे कोणत्याही प्रतीक पुढील दर्शवू नका.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,विद्यार्थी बॅच करा
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,विद्यार्थी बॅच करा
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM चे आयटम मिळवा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,आघाडी  वेळ दिवस
@@ -4650,8 +4656,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,मंजूर रक्कम
 DocType: GL Entry,Is Opening,उघडत आहे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद  {1} सोबत लिंक केले जाऊ शकत नाही
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे उपस्थिती मालिका संख्या करा&gt; क्रमांकन मालिका
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे उपस्थिती मालिका संख्या करा&gt; क्रमांकन मालिका
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,खाते {0} अस्तित्वात नाही
 DocType: Account,Cash,रोख
 DocType: Employee,Short biography for website and other publications.,वेबसाइट आणि इतर प्रकाशनासठी  लहान चरित्र.
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index ec3cf15..f4f0a99 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Perkara Status luput
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draf
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show Kelainan
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Kelainan
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,bahan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kuantiti
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Penjagaan Kesihatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kelewatan dalam pembayaran (Hari)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Perbelanjaan perkhidmatan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Invois
 DocType: Maintenance Schedule Item,Periodicity,Jangka masa
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Pengiklanan
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Syarikat yang sama memasuki lebih daripada sekali
 DocType: Employee,Married,Berkahwin
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak dibenarkan untuk {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Tidak dibenarkan untuk {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Mendapatkan barangan dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tiada perkara yang disenaraikan
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Barang runcit
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 DocType: Process Payroll,Make Bank Entry,Buat Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pencen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Selepas Tarikh Susut nilai tidak boleh sebelum Tarikh Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Selepas Tarikh Susut nilai tidak boleh sebelum Tarikh Pembelian
 DocType: SMS Center,All Sales Person,Semua Orang Jualan
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Pengagihan Bulanan ** membantu anda mengedarkan Bajet / sasaran seluruh bulan jika anda mempunyai bermusim dalam perniagaan anda.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Bukan perkakas yang terdapat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Bukan perkakas yang terdapat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama Orang
 DocType: Sales Invoice Item,Sales Invoice Item,Perkara Invois Jualan
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",contohnya &quot;Sekolah Rendah&quot; atau &quot;Universiti&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Laporan saham
 DocType: Warehouse,Warehouse Detail,Detail Gudang
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarikh Akhir Term tidak boleh lewat daripada Tarikh Akhir Tahun Akademik Tahun yang istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Adakah Aset Tetap&quot; tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Adakah Aset Tetap&quot; tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
 DocType: Vehicle Service,Brake Oil,Brek Minyak
 DocType: Tax Rule,Tax Type,Jenis Cukai
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Perkara imej (jika tidak menayang)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Satu Pelanggan wujud dengan nama yang sama
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kadar sejam / 60) * Masa Operasi Sebenar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Pilih BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kos Item Dihantar
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Cuti pada {0} bukan antara Dari Tarikh dan To Date
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,gred
 DocType: Sales Invoice Item,Delivered By Supplier,Dihantar Oleh Pembekal
 DocType: SMS Center,All Contact,Semua Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Order Production telah dicipta untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Order Production telah dicipta untuk semua item dengan BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Kerja Harian
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} dibekukan
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Sila pilih Syarikat Sedia Ada untuk mewujudkan Carta Akaun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Perbelanjaan saham
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pilih Warehouse sasaran
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kredit dalam Mata Wang Syarikat
 DocType: Delivery Note,Installation Status,Pemasangan Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Adakah anda mahu untuk mengemaskini kehadiran? <br> Turut hadir: {0} \ <br> Tidak hadir: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty Diterima + Ditolak mestilah sama dengan kuantiti yang Diterima untuk Perkara {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Bahan mentah untuk bekalan Pembelian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Sekurang-kurangnya satu cara pembayaran adalah diperlukan untuk POS invois.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Sekurang-kurangnya satu cara pembayaran adalah diperlukan untuk POS invois.
 DocType: Products Settings,Show Products as a List,Show Produk sebagai Senarai yang
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Muat Template, isikan data yang sesuai dan melampirkan fail yang diubah suai. Semua tarikh dan pekerja gabungan dalam tempoh yang dipilih akan datang dalam template, dengan rekod kehadiran yang sedia ada"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Buat Entry Susutnilai
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Jenis Permintaan
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,membuat pekerja
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,membuat pekerja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Pelaksanaan
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Butiran operasi dijalankan.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Rancangan untuk lawatan penyelenggaraan.
 DocType: SMS Settings,Enter url parameter for message,Masukkan parameter url untuk mesej
 DocType: POS Profile,Customer Groups,Kumpulan Pelanggan
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Penyata kewangan
 DocType: Guardian,Students,pelajar
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Peraturan untuk menggunakan penentuan harga dan diskaun.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Senarai Harga mesti pakai untuk Membeli atau Menjual
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
 DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
 DocType: Company,Default Payroll Payable Account,Lalai Payroll Akaun Kena Bayar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update E-mel Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update E-mel Group
 DocType: Sales Invoice,Is Opening Entry,Apakah Membuka Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebut jika akaun belum terima tidak standard yang diguna pakai
 DocType: Course Schedule,Instructor Name,pengajar Nama
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Jualan Invois Perkara
 ,Production Orders in Progress,Pesanan Pengeluaran di Kemajuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Tunai bersih daripada Pembiayaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
 DocType: Lead,Address & Contact,Alamat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak digunakan dari peruntukan sebelum
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Seterusnya berulang {0} akan diwujudkan pada {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Jumlah Kos Jumlah (melalui Lembaran Time)
 DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Penyertaan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
 DocType: Student Admission,Student Admission,Kemasukan pelajar
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Perkara {0} dibatalkan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Permintaan bahan
 DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
 DocType: Item,Purchase Details,Butiran Pembelian
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui e-mel pada penciptaan Permintaan Bahan automatik
 DocType: Journal Entry,Multi Currency,Mata Multi
 DocType: Payment Reconciliation Invoice,Invoice Type,Jenis invois
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Penghantaran Nota
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Menubuhkan Cukai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kos Aset Dijual
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Entry pembayaran telah diubah suai selepas anda ditarik. Sila tarik lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
-DocType: Grade Interval,Min Score,min Skor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
 DocType: Student Applicant,Admitted,diterima Masuk
 DocType: Workstation,Rent Cost,Kos sewa
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Order Nilai
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,transaksi Bank / Tunai terhadap pihak atau untuk pemindahan dalaman
 DocType: Shipping Rule,Valid for Countries,Sah untuk Negara
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Jumlah Pesanan Dianggap
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Sila masukkan &#39;Ulangi pada hari Bulan&#39; nilai bidang
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Kadar Cukai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} kepada {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Pilih Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Tukar ke Kumpulan bukan-
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (banyak) dari Perkara yang.
 DocType: C-Form Invoice Detail,Invoice Date,Tarikh invois
 DocType: GL Entry,Debit Amount,Jumlah Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Sila lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Cipta Kumpulan Pelajar
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Permintaan untuk sebut harga
 DocType: Salary Slip Timesheet,Working Hours,Waktu Bekerja
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Buat Pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Buat Pelanggan baru
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Peraturan Harga terus diguna pakai, pengguna diminta untuk menetapkan Keutamaan secara manual untuk menyelesaikan konflik."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Buat Pesanan Pembelian
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Buat Pesanan Pembelian
 ,Purchase Register,Pembelian Daftar
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Caj yang dikenakan
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
 DocType: SMS Log,Sent On,Dihantar Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
 DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
 DocType: Sales Order,Not Applicable,Tidak Berkenaan
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master bercuti.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Dari Pakej No.
 DocType: Item Attribute,To Range,Untuk Julat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriti dan Deposit
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak boleh menukar kaedah penilaian, kerana terdapat urus niaga terhadap beberapa item yang tidak mempunyai ia kaedah penilaian sendiri"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah daun diperuntukkan adalah wajib
 DocType: Job Opening,Description of a Job Opening,Keterangan yang Lowongan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Kos Operasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telefon Kecemasan
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Beli
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Sila menentukan gred bagi Ambang 0%
 DocType: Sales Order,To Deliver,Untuk Menyampaikan
 DocType: Purchase Invoice Item,Item,Perkara
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
 DocType: Journal Entry,Difference (Dr - Cr),Perbezaan (Dr - Cr)
 DocType: Account,Profit and Loss,Untung dan Rugi
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Urusan subkontrak
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Pemasangan Nota Perkara
 DocType: Production Plan Item,Pending Qty,Menunggu Kuantiti
 DocType: Budget,Ignore,Abaikan
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} tidak aktif
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS yang dihantar ke nombor berikut: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensi Persediaan cek percetakan
 DocType: Salary Slip,Salary Slip Timesheet,Slip Gaji Timesheet
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Jumlah Suruhanjaya
 DocType: Pricing Rule,Sales Partner,Rakan Jualan
 DocType: Buying Settings,Purchase Receipt Required,Resit pembelian Diperlukan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Kadar Penilaian adalah wajib jika Stok Awal memasuki
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Kadar Penilaian adalah wajib jika Stok Awal memasuki
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Tiada rekod yang terdapat dalam jadual Invois yang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Tahun kewangan / perakaunan.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nilai terkumpul
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Buat Jualan Pesanan
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Buat Jualan Pesanan
 DocType: Project Task,Project Task,Projek Petugas
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Jumlah Besar
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,resume Lampiran
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulang Pelanggan
 DocType: Leave Control Panel,Allocate,Memperuntukkan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Jualan Pulangan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Jualan Pulangan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Jumlah daun diperuntukkan {0} hendaklah tidak kurang daripada daun yang telah pun diluluskan {1} untuk tempoh yang
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Dihantar oleh Pembekal (Drop Ship)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Sila tetapkan Syarikat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Sila tetapkan Syarikat
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Invois Jualan Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Rujukan &amp; Tarikh Rujukan diperlukan untuk {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Pilih Akaun Pembayaran untuk membuat Bank Kemasukan
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Mencipta rekod pekerja untuk menguruskan daun, tuntutan perbelanjaan dan gaji"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Mencipta rekod pekerja untuk menguruskan daun, tuntutan perbelanjaan dan gaji"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tambahkan ke Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Penulisan Cadangan
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Potongan Kemasukan
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Berhubung dengan Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Pengurus
 DocType: Payment Entry,Payment From / To,Pembayaran Dari / Ke
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Julat tarikh
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},had kredit baru adalah kurang daripada amaun tertunggak semasa untuk pelanggan. had kredit perlu atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},had kredit baru adalah kurang daripada amaun tertunggak semasa untuk pelanggan. had kredit perlu atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Perkara sama telah dibuat beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Penerima Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan Kepada' dan 'Kumpul Mengikut' tidak boleh sama
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,Resolusi Tarikh
 DocType: Student Batch Name,Batch Name,Batch Nama
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet dicipta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,mendaftar
 DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Akan menunjukkan pelajar sebagai Turut hadir dalam Laporan Kehadiran Bulanan Pelajar
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,Kehadiran pelajar
 DocType: Sales Invoice Timesheet,Time Sheet,Lembaran masa
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Mentah Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Sila masukkan butiran item
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Sila masukkan butiran item
 DocType: Interest,Interest,Faedah
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Jualan pra
 DocType: Purchase Receipt,Other Details,Butiran lain
@@ -739,7 +742,7 @@
 ,Absent Student Report,Tidak hadir Laporan Pelajar
 DocType: Email Digest,Next email will be sent on:,E-mel seterusnya akan dihantar pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Jangka
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Perkara mempunyai varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Perkara {0} tidak dijumpai
 DocType: Bin,Stock Value,Nilai saham
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Syarikat {0} tidak wujud
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,Waranti Tarikh Luput
 DocType: Material Request Item,Quantity and Warehouse,Kuantiti dan Gudang
 DocType: Sales Invoice,Commission Rate (%),Kadar komisen (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sila pilih Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sila pilih Program
 DocType: Project,Estimated Cost,Anggaran kos
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} bukan perkara stok
 DocType: Mode of Payment Account,Default Account,Akaun Default
 DocType: Payment Entry,Received Amount (Company Currency),Pendapatan daripada (Syarikat Mata Wang)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Sila pilih hari cuti mingguan
 DocType: Production Order Operation,Planned End Time,Dirancang Akhir Masa
 ,Sales Person Target Variance Item Group-Wise,Orang Jualan Sasaran Varian Perkara Kumpulan Bijaksana
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Senarai Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Hantar E-mel
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Tiada Kebenaran
 DocType: Company,Default Bank Account,Akaun Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tiada pekerja didapati
 DocType: Supplier Quotation,Stopped,Berhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
 DocType: SMS Center,All Customer Contact,Semua Hubungi Pelanggan
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Memuat naik keseimbangan saham melalui csv.
 DocType: Warehouse,Tree Details,Tree Butiran
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Amaun Invois Minimum
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: PTJ {2} bukan milik Syarikat {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akaun {2} tidak boleh menjadi Kumpulan
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Perkara Row {IDX}: {DOCTYPE} {} DOCNAME tidak wujud dalam di atas &#39;{DOCTYPE}&#39; meja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Perkara Row {IDX}: {DOCTYPE} {} DOCNAME tidak wujud dalam di atas &#39;{DOCTYPE}&#39; meja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tiada tugasan
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari dalam bulan di mana invois automatik akan dijana contohnya 05, 28 dan lain-lain"
 DocType: Asset,Opening Accumulated Depreciation,Membuka Susut Nilai Terkumpul
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,Bergerak Kadar Purata
 DocType: Production Planning Tool,Select Items,Pilih Item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Jadual kursus
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Jadual kursus
 DocType: Maintenance Visit,Completion Status,Siap Status
 DocType: HR Settings,Enter retirement age in years,Masukkan umur persaraan pada tahun-tahun
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Sasaran Gudang
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import Kehadiran
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Semua Kumpulan Perkara
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Semua Kumpulan Perkara
 DocType: Process Payroll,Activity Log,Log Aktiviti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Keuntungan bersih / Rugi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Membeli Perintah untuk Pembayaran
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Unjuran Qty
 DocType: Sales Invoice,Payment Due Date,Tarikh Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Pembukaan&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka To Do
 DocType: Notification Control,Delivery Note Message,Penghantaran Nota Mesej
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Sekat Senarai Tarikh
 DocType: Pricing Rule,Price or Discount,Harga atau diskaun
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Jumlah Caj Terpakai di Purchase meja Resit Item mesti sama dengan Jumlah Cukai dan Caj
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Jumlah Caj Terpakai di Purchase meja Resit Item mesti sama dengan Jumlah Cukai dan Caj
 DocType: Sales Team,Incentives,Insentif
 DocType: SMS Log,Requested Numbers,Nombor diminta
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanya Dapatkan Bahan Mentah
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
 DocType: Fee Structure,Components,komponen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pembayaran terhadap Jualan / Pesanan Belian perlu sentiasa ditandakan sebagai pendahuluan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Lalai akaun Bank / Tunai akan secara automatik dikemaskini dalam Gaji Journal Kemasukan apabila mod ini dipilih.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Selang untuk Kod Gred {0} bertindih dengan selang gred bagi gred lain. Sila menyemak selang {0} dan {1} dan cuba lagi
 DocType: BOM,Raw Material Cost(Company Currency),Bahan mentah Kos (Syarikat Mata Wang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Kadar tidak boleh lebih besar daripada kadar yang digunakan dalam {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM laman Perkara
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian).
 DocType: Timesheet Detail,Bill,Rang Undang-Undang
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Selepas Tarikh Susutnilai dimasukkan sebagai tarikh lepas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Selepas Tarikh Susutnilai dimasukkan sebagai tarikh lepas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,White
 DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} dalam gudang {1} di mencatat masa catatan ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Perintah Jenis mestilah salah seorang daripada {0}
 DocType: Lead,Next Contact Date,Hubungi Seterusnya Tarikh
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Membuka Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
 DocType: Student Batch Name,Student Batch Name,Pelajar Batch Nama
 DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
 DocType: Repayment Schedule,Balance Loan Amount,Jumlah Baki Pinjaman
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Sila nyatakan {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
 DocType: Delivery Note,Delivery To,Penghantaran Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Jadual atribut adalah wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Perintah Jualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} tidak boleh negatif
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Diskaun
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Diskaun
 DocType: Asset,Total Number of Depreciations,Jumlah penurunan nilai
 DocType: Sales Invoice Item,Rate With Margin,Kadar Dengan Margin
 DocType: Sales Invoice Item,Rate With Margin,Kadar Dengan Margin
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,Nama Pertubuhan
 DocType: Tax Rule,Shipping State,Negeri Penghantaran
 ,Projected Quantity as Source,Kuantiti Unjuran sebagai Sumber
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Termasuk barangan tanpa saham yang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Perbelanjaan jualan
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
 DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poskod
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Poskod
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
 DocType: Opportunity,Contact Info,Maklumat perhubungan
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Membuat Kemasukan Stok
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Pengedar
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Membeli-belah Troli Penghantaran Peraturan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Pengeluaran Pesanan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
 ,Ordered Items To Be Billed,Item Diperintah dibilkan
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
 DocType: Global Defaults,Global Defaults,Lalai Global
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Sila masukkan Kod Item untuk mendapatkan Nombor kumpulan
 DocType: Stock Settings,Default Item Group,Default Perkara Kumpulan
 DocType: Employee Loan,Partially Disbursed,sebahagiannya Dikeluarkan
-DocType: Grading Structure,Grading System Name,Sistem Nama Grading
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Pangkalan data pembekal.
 DocType: Account,Balance Sheet,Kunci Kira-kira
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode bayaran tidak dikonfigurasikan. Sila semak, sama ada akaun ini tidak ditetapkan Mod Pembayaran atau POS Profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode bayaran tidak dikonfigurasikan. Sila semak, sama ada akaun ini tidak ditetapkan Mod Pembayaran atau POS Profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Orang jualan anda akan mendapat peringatan pada tarikh ini untuk menghubungi pelanggan
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,item yang sama tidak boleh dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akaun lanjut boleh dibuat di bawah Kumpulan, tetapi penyertaan boleh dibuat terhadap bukan Kumpulan"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Kerja Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Sila nyatakan sekurang-kurangnya satu atribut dalam jadual Atribut
 DocType: Announcement,All Students,semua Pelajar
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Perkara {0} perlu menjadi item tanpa saham yang
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Perkara {0} perlu menjadi item tanpa saham yang
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Lihat Lejar
 DocType: Grading Scale,Intervals,selang
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Pelajar Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Perkara {0} tidak boleh mempunyai Batch
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Invois Cemerlang
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu anda merancang dan mengambil tindakan susulan ke atas pembelian anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu anda merancang dan mengambil tindakan susulan ke atas pembelian anda
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Jumlah kuantiti Terbitan / Transfer {0} dalam Permintaan Bahan {1} \ tidak boleh lebih besar daripada kuantiti diminta {2} untuk item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kecil
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Produk atau Perkhidmatan anda
 DocType: Mode of Payment,Mode of Payment,Cara Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Kumpulan Nombor Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumlah semua berat tugas harus 1. Laraskan berat semua tugas Projek sewajarnya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Peralatan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Peraturan harga mula-mula dipilih berdasarkan &#39;Guna Mengenai&#39; bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} item dalam kemajuan
 DocType: Workstation,Workstation Name,Nama stesen kerja
-DocType: Grade Interval,Grade Code,Kod gred
+DocType: Grading Scale Interval,Grade Code,Kod gred
 DocType: POS Item Group,POS Item Group,POS Item Kumpulan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Perkakasan
 DocType: Sales Order,Recurring Upto,berulang Hamper
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Sila pilih sebuah Syarikat
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Sila pilih sebuah Syarikat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Pembekal Invois Tarikh
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Anda perlu untuk membolehkan Troli
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Penuaan 3
 DocType: Maintenance Schedule Item,No of Visits,Jumlah Lawatan
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Kehadiran
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Kehadiran
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Jadual Penyelenggaraan {0} wujud daripada {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,pelajar yang mendaftar
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata Wang Akaun Penutupan mestilah {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah mata untuk semua matlamat harus 100. Ia adalah {0}
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Carta Akaun
 DocType: Material Request,Terms and Conditions Content,Terma dan Syarat Kandungan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Perkara {0} bukan Item saham
 DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
 DocType: Employee,Owned,Milik
 DocType: Salary Detail,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
 DocType: Pricing Rule,"Higher the number, higher the priority","Lebih tinggi nombor tersebut, lebih tinggi keutamaan"
 ,Purchase Invoice Trends,Membeli Trend Invois
 DocType: Employee,Better Prospects,Prospek yang lebih baik
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: batch The {1} hanya {2} qty. Sila pilih satu lagi kumpulan yang mempunyai {3} qty ada atau berpecah baris ke dalam pelbagai baris, untuk menyampaikan / isu dari pelbagai kelompok"
 DocType: Vehicle,License Plate,Plate lesen
 DocType: Appraisal,Goals,Matlamat
 DocType: Warranty Claim,Warranty / AMC Status,Waranti / AMC Status
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika akaun dibekukan, entri dibenarkan pengguna terhad."
 DocType: Email Digest,Bank Balance,Baki Bank
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil kerja, kelayakan yang diperlukan dan lain-lain"
 DocType: Journal Entry Account,Account Balance,Baki Akaun
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tunjukkan P &amp; baki L tahun fiskal unclosed ini
 DocType: Shipping Rule,Shipping Account,Akaun Penghantaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Akaun {2} tidak aktif
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Buat Jualan Pesanan untuk membantu anda merancang kerja anda dan menyampaikan pada masa
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Buat Jualan Pesanan untuk membantu anda merancang kerja anda dan menyampaikan pada masa
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Jumlah Kos Tambahan
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,Untuk Nilai
 DocType: Asset Movement,Stock Manager,Pengurus saham
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk berturut-turut {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Slip pembungkusan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Slip pembungkusan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Pejabat Disewa
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import Gagal!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,Sumber
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ini {0} konflik dengan {1} untuk {2} {3}
 DocType: Student Attendance Tool,Students HTML,pelajar HTML
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,Tarikh Meninggalkan
 DocType: Pricing Rule,For Price List,Untuk Senarai Harga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cari Eksekutif
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Buat Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Buat Leads
 DocType: Maintenance Schedule,Schedules,Jadual
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM Tiada
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,pendaftaran program
 DocType: Sales Invoice Item,Brand Name,Nama jenama
 DocType: Purchase Receipt,Transporter Details,Butiran Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Pembekal mungkin
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Pertubuhan
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM lalai untuk {0} tidak dijumpai untuk Projek {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Tuntutan perbelanjaan syarikat.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Pelajar di tengah-tengah sistem, menambah semua pelajar anda"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Pelajar di tengah-tengah sistem, menambah semua pelajar anda"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Tarikh Clearance {1} tidak boleh sebelum Tarikh Cek {2}
 DocType: Company,Default Holiday List,Default Senarai Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Dari Masa dan Untuk Masa {1} adalah bertindih dengan {2}
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) di mana anda memohon cuti adalah cuti. Anda tidak perlu memohon cuti.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Hantar semula Pembayaran E-mel
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Tugasan baru
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Membuat Sebut Harga
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Membuat Sebut Harga
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Laporan lain
 DocType: Dependent Task,Dependent Task,Petugas bergantung
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
 DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Sila menetapkan Payroll Akaun Belum Bayar Lalai dalam Syarikat {0}
 DocType: SMS Center,Receiver List,Penerima Senarai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Cari Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Cari Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Jumlah dimakan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Perubahan Bersih dalam Tunai
 DocType: Assessment Plan,Grading Scale,Skala penggredan
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,sudah selesai
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Permintaan Bayaran sudah wujud {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,mengumpul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
 DocType: Customer,Default Price List,Senarai Harga Default
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak boleh memadam Tahun Anggaran {0}. Tahun Anggaran {0} ditetapkan sebagai piawai dalam Tetapan Global
 DocType: Journal Entry,Entry Type,Jenis Kemasukan
 ,Customer Credit Balance,Baki Pelanggan Kredit
@@ -1686,8 +1685,6 @@
 DocType: Student Sibling,Studying in Same Institute,Belajar di Institut Sama
 DocType: Territory,Territory Manager,Pengurus Wilayah
 DocType: Packed Item,To Warehouse (Optional),Untuk Gudang (pilihan)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod item&gt; Item Group&gt; Jenama
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod item&gt; Item Group&gt; Jenama
 DocType: Payment Entry,Paid Amount (Company Currency),Jumlah yang dibayar (Syarikat Mata Wang)
 DocType: Purchase Invoice,Additional Discount,Diskaun tambahan
 DocType: Selling Settings,Selling Settings,Menjual Tetapan
@@ -1697,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Lihat dalam Troli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Perbelanjaan pemasaran
 ,Item Shortage Report,Perkara Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat ini Entry Saham
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Selepas Tarikh Susutnilai adalah wajib bagi aset baru
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Selepas Tarikh Susutnilai adalah wajib bagi aset baru
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Berasingan Kumpulan berdasarkan kursus untuk setiap Batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Berasingan Kumpulan berdasarkan kursus untuk setiap Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unit tunggal Item satu.
@@ -1716,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,Wajaran
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Pusat Kos yang diperlukan untuk akaun &#39;Untung Rugi&#39; {2}. Sila menubuhkan Pusat Kos lalai untuk Syarikat.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Satu Kumpulan Pelanggan sudah wujud dengan nama yang sama, sila tukar nama Pelanggan atau menamakan semula Kumpulan Pelanggan"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Satu Kumpulan Pelanggan sudah wujud dengan nama yang sama, sila tukar nama Pelanggan atau menamakan semula Kumpulan Pelanggan"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Kenalan Baru
 DocType: Territory,Parent Territory,Wilayah Ibu Bapa
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
@@ -1745,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Penyesuaian JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak tiang. Mengeksport laporan dan mencetak penggunaan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Tidak dapat mencari Kadar pertukaran bagi {0} kepada {1} untuk tarikh kunci {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Bimbit
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Utama
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varian
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Utama
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
 DocType: Employee Attendance Tool,Employees HTML,pekerja HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
 DocType: Employee,Leave Encashed?,Cuti ditunaikan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Daripada bidang adalah wajib
 DocType: Email Digest,Annual Expenses,Perbelanjaan tahunan
 DocType: Item,Variants,Kelainan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Buat Pesanan Belian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Buat Pesanan Belian
 DocType: SMS Center,Send To,Hantar Kepada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang diperuntukkan
@@ -1779,7 +1773,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,penilaian
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Salinan No Serial masuk untuk Perkara {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Satu syarat untuk Peraturan Penghantaran
-DocType: Grading Structure,Grading Intervals,Selang Grading
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Sila masukkan
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Tidak dapat overbill untuk item {0} berturut-turut {1} lebih {2}. Untuk membolehkan lebih-bil, sila tetapkan dalam Membeli Tetapan"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Sila menetapkan penapis di Perkara atau Warehouse
@@ -1792,16 +1785,17 @@
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Telah adalah wajib terhadap Perkara ditolak {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pembayaran
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Menguruskan pesanan anda
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Menguruskan pesanan anda
 DocType: Production Order Operation,Actual Time and Cost,Masa sebenar dan Kos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimum {0} boleh dibuat untuk Perkara {1} terhadap Sales Order {2}
 DocType: Employee,Salutation,Salam
 DocType: Course,Course Abbreviation,Singkatan Course
 DocType: Student Leave Application,Student Leave Application,Pelajar Permohonan Cuti
 DocType: Item,Will also apply for variants,Juga akan memohon varian
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pekerja {0} pada hari Half pada {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak harus lebih besar daripada waktu kerja max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pada
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Barangan bundle pada masa jualan.
 DocType: Quotation Item,Actual Qty,Kuantiti Sebenar
 DocType: Sales Invoice Item,References,Rujukan
@@ -1811,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan perkara yang sama. Sila membetulkan dan cuba lagi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Madya
 DocType: Asset Movement,Asset Movement,Pergerakan aset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Troli baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Troli baru
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Perkara {0} bukan Item bersiri
 DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
 DocType: Vehicle,Wheels,Wheels
@@ -1843,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Melumpuhkan penciptaan balak masa terhadap Pesanan Pengeluaran. Operasi tidak boleh dikesan terhadap Perintah Pengeluaran
 DocType: Student,Student Mobile Number,Pelajar Nombor Telefon
 DocType: Item,Has Variants,Mempunyai Kelainan
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID adalah wajib
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID adalah wajib
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
 DocType: Sales Person,Parent Sales Person,Orang Ibu Bapa Jualan
 DocType: Purchase Invoice,Recurring Invoice,Invois berulang
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menguruskan Projek
@@ -1854,7 +1848,7 @@
 DocType: Budget,Fiscal Year,Tahun Anggaran
 DocType: Vehicle Log,Fuel Price,Harga bahan api
 DocType: Budget,Budget,Bajet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bajet tidak boleh diberikan terhadap {0}, kerana ia bukan satu akaun Pendapatan atau Perbelanjaan"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
 DocType: Student Admission,Application Form Route,Borang Permohonan Route
@@ -1885,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Jumlah {0} {1} ditolak daripada {2}
 DocType: Employee,Salary Information,Maklumat Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Pekerja
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
 DocType: Website Item Group,Website Item Group,Laman Web Perkara Kumpulan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Tugas dan Cukai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Sila masukkan tarikh Rujukan
@@ -1944,7 +1938,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulang Hasil Pelanggan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pasangan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
 DocType: Asset,Depreciation Schedule,Jadual susutnilai
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akaun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Tarikh Hari harus antara Dari Tarikh dan To Date
@@ -1961,13 +1955,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
 ,Quotation Trends,Trend Sebut Harga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Perkara Kumpulan tidak dinyatakan dalam perkara induk untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
 DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Sementara menunggu Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor penukaran
 DocType: Purchase Order,Delivered,Dihantar
 ,Vehicle Expenses,Perbelanjaan kenderaan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
+DocType: Serial No,Invoice Details,Butiran invois
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
 DocType: Purchase Receipt,Vehicle Number,Bilangan Kenderaan
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tarikh di mana invois berulang akan berhenti
 DocType: Employee Loan,Loan Amount,Jumlah pinjaman
@@ -1991,7 +1986,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskaun tambahan
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Kumpulan kepada Bukan Kumpulan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sukan
 DocType: Loan Type,Loan Name,Nama Loan
@@ -2003,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Gudang di mana anda mengekalkan stok barangan ditolak
 DocType: Production Order,Skip Material Transfer,Skip Transfer Bahan
 DocType: Production Order,Skip Material Transfer,Skip Transfer Bahan
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Tidak dapat mencari kadar pertukaran untuk {0} kepada {1} untuk tarikh kunci {2}. Sila buat rekod Penukaran Mata Wang secara manual
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Tahun kewangan anda berakhir pada
 DocType: POS Profile,Price List,Senarai Harga
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} kini Tahun Anggaran asalan. Sila muat semula browser anda untuk mengemaskini perubahan
@@ -2040,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Perkara {0} telah kembali
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Fiskal ** mewakili Tahun Kewangan. Semua kemasukan perakaunan dan transaksi utama yang lain dijejak terhadap Tahun Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
 DocType: Student Admission,Eligibility,kelayakan
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads membantu anda mendapatkan perniagaan, tambah semua kenalan anda dan lebih sebagai petunjuk anda"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads membantu anda mendapatkan perniagaan, tambah semua kenalan anda dan lebih sebagai petunjuk anda"
 DocType: Production Order Operation,Actual Operation Time,Masa Sebenar Operasi
 DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
 DocType: Purchase Taxes and Charges,Deduct,Memotong
@@ -2083,7 +2079,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Pilih Syarikat ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tinggalkan kosong jika dipertimbangkan untuk semua jabatan
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
 DocType: Process Payroll,Fortnightly,setiap dua minggu
 DocType: Currency Exchange,From Currency,Dari Mata Wang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
@@ -2099,7 +2095,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak boleh pilih jenis bayaran sebagai &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Pada Sebelumnya Row Jumlah&#39; untuk baris pertama
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Kanak-kanak Item tidak seharusnya menjadi Fail Produk. Sila keluarkan item `{0}` dan menyelamatkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,menambah Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,menambah Timesheets
 DocType: Vehicle Service,Service Item,perkhidmatan Item
 DocType: Bank Guarantee,Bank Guarantee,Jaminan bank
 DocType: Bank Guarantee,Bank Guarantee,Jaminan bank
@@ -2149,8 +2145,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan dipaparkan jika Senarai Harga tidak ditetapkan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Sila nyatakan negara untuk Peraturan Penghantaran ini atau daftar Penghantaran di seluruh dunia
 DocType: Stock Entry,Total Incoming Value,Jumlah Nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit Untuk diperlukan
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
 DocType: Offer Letter Term,Offer Term,Tawaran Jangka
 DocType: Quality Inspection,Quality Manager,Pengurus Kualiti
@@ -2184,14 +2180,14 @@
 DocType: Opportunity,Lost Reason,Hilang Akal
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Alamat Baru
 DocType: Quality Inspection,Sample Size,Saiz Sampel
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Sila masukkan Dokumen Resit
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Semua barang-barang telah diinvois
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Sila masukkan Dokumen Resit
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Semua barang-barang telah diinvois
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Sila nyatakan yang sah Dari Perkara No. &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat kos lanjut boleh dibuat di bawah Kumpulan tetapi penyertaan boleh dibuat terhadap bukan Kumpulan
 DocType: Project,External,Luar
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Kebenaran
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Pesanan Pengeluaran Ditubuhkan: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Pesanan Pengeluaran Ditubuhkan: {0}
 DocType: Branch,Branch,Cawangan
 DocType: Guardian,Mobile Number,Nombor telefon
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Penjenamaan
@@ -2200,7 +2196,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,No siri {0} tidak dijumpai
 DocType: Scheduling Tool,Student Batch,Batch pelajar
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Pelanggan anda
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Buat Pelajar
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Buat Pelajar
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Anda telah dijemput untuk bekerjasama dalam projek: {0}
 DocType: Leave Block List Date,Block Date,Sekat Tarikh
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Mohon sekarang
@@ -2224,8 +2220,9 @@
 DocType: SMS Log,Sent To,Dihantar Kepada
 DocType: Payment Request,Make Sales Invoice,Buat Jualan Invois
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Hubungi Selepas Tarikh tidak boleh pada masa lalu
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Hubungi Selepas Tarikh tidak boleh pada masa lalu
 DocType: Company,For Reference Only.,Untuk Rujukan Sahaja.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Pilih Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Tidak sah {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Jumlah
@@ -2239,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Perkara No. tidak boleh 0
 DocType: Item,Show a slideshow at the top of the page,Menunjukkan tayangan slaid di bahagian atas halaman
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Kedai
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Kedai
 DocType: Serial No,Delivery Time,Masa penghantaran
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Penuaan Berasaskan
 DocType: Item,End of Life,Akhir Hayat
@@ -2255,8 +2252,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Pemindahan Bahan
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nyatakan operasi, kos operasi dan memberikan Operasi unik tidak kepada operasi anda."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini melebihi had oleh {0} {1} untuk item {4}. Adakah anda membuat terhadap yang sama satu lagi {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Pilih perubahan kira jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Pilih perubahan kira jumlah
 DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
 DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
 DocType: Stock Settings,Allow Negative Stock,Benarkan Saham Negatif
@@ -2267,7 +2264,7 @@
 DocType: Budget Account,Budget Account,anggaran Akaun
 DocType: Quality Inspection,Verified By,Disahkan oleh
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak boleh menukar mata wang lalai syarikat itu, kerana terdapat urus niaga yang sedia ada. Transaksi mesti dibatalkan untuk menukar mata wang lalai."
-DocType: Grade Interval,Grade Description,gred Penerangan
+DocType: Grading Scale Interval,Grade Description,gred Penerangan
 DocType: Stock Entry,Purchase Receipt No,Resit Pembelian No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Wang Earnest
 DocType: Process Payroll,Create Salary Slip,Membuat Slip Gaji
@@ -2305,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,Kehadiran Untuk Tarikh
 DocType: Warranty Claim,Raised By,Dibangkitkan Oleh
 DocType: Payment Gateway Account,Payment Account,Akaun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Perubahan Bersih dalam Akaun Belum Terima
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Pampasan Off
 DocType: Offer Letter,Accepted,Diterima
@@ -2319,7 +2316,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Penghantaran Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Pantas Journal Kemasukan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
@@ -2333,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nama institut yang mana anda menyediakan sistem ini.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Catatan Perakaunan dibekukan sehingga tarikh ini, tiada siapa boleh melakukan / mengubah suai kemasukan kecuali yang berperanan seperti di bawah."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Sila simpan dokumen itu sebelum menjana jadual penyelenggaraan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Sila simpan dokumen itu sebelum menjana jadual penyelenggaraan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projek
 DocType: UOM,Check this to disallow fractions. (for Nos),Semak ini untuk tidak membenarkan pecahan. (Untuk Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Perintah Pengeluaran berikut telah dibuat:
@@ -2356,6 +2353,7 @@
 DocType: Email Digest,How frequently?,Berapa kerap?
 DocType: Purchase Receipt,Get Current Stock,Dapatkan Saham Semasa
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree Rang Undang-Undang Bahan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod item&gt; Item Group&gt; Jenama
 DocType: Student,Joining Date,menyertai Tarikh
 ,Employees working on a holiday,Kakitangan yang bekerja pada hari cuti
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Hadir
@@ -2437,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Clearance Tarikh tidak dinyatakan
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Pengeluaran
 DocType: Guardian,Occupation,Pekerjaan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumlah (Kuantiti)
 DocType: Sales Invoice,This Document,Dokumen ini
 DocType: Installation Note Item,Installed Qty,Dipasang Qty
@@ -2460,8 +2458,8 @@
 DocType: Notification Control,Sales Order Message,Pesanan Jualan Mesej
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nilai Default Tetapkan seperti Syarikat, mata wang, fiskal semasa Tahun, dan lain-lain"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
 DocType: Process Payroll,Select Employees,Pilih Pekerja
 DocType: Opportunity,Potential Sales Deal,Deal Potensi Jualan
 DocType: Payment Entry,Cheque/Reference Date,Cek Tarikh / Rujukan
@@ -2478,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Profil POS Global {0} telah dicipta untuk syarikat {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Ganti Perkara / BOM dalam semua BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,dokumen Resit hendaklah dikemukakan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,dokumen Resit hendaklah dikemukakan
 DocType: Purchase Invoice Item,Received Qty,Diterima Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Not Paid dan Tidak Dihantar
@@ -2491,7 +2489,7 @@
 ,To Produce,Hasilkan
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Bagi barisan {0} dalam {1}. Untuk memasukkan {2} dalam kadar Perkara, baris {3} hendaklah juga disediakan"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Buat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Buat Pengguna
 DocType: Packing Slip,Identification of the package for the delivery (for print),Pengenalan pakej untuk penghantaran (untuk cetak)
 DocType: Bin,Reserved Quantity,Cipta Terpelihara Kuantiti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Sila masukkan alamat emel yang sah
@@ -2505,11 +2503,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Templat kurang upaya tidak perlu menjadi templat lalai
 DocType: Account,Income Account,Akaun Pendapatan
 DocType: Payment Request,Amount in customer's currency,Amaun dalam mata wang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Penghantaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Penghantaran
 DocType: Stock Reconciliation Item,Current Qty,Kuantiti semasa
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lihat &quot;Kadar Bahan Based On&quot; dalam Seksyen Kos
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,terdahulu
 DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Kelompok pelajar membantu anda mengesan kehadiran, penilaian dan yuran untuk pelajar"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Kelompok pelajar membantu anda mengesan kehadiran, penilaian dan yuran untuk pelajar"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Diperuntukkan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Kemasukan Journal bagi gaji dari {0} kepada {1}
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads mengikut Jenis Industri.
 DocType: Item Supplier,Item Supplier,Perkara Pembekal
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat.
 DocType: Company,Stock Settings,Tetapan saham
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
@@ -2542,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Akan menghantar e-mel mengenai acara untuk pekerja dengan status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Bergantung kepada Tugas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Menguruskan Tree Kumpulan Pelanggan.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Lampiran boleh dipaparkan tanpa membolehkan troli membeli-belah
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Nama PTJ
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Panel Kawalan
@@ -2554,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,Debit Untuk
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Kuantiti Sebenar Selepas Transaksi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tiada slip gaji mendapati antara {0} dan {1}
 ,Pending SO Items For Purchase Request,Sementara menunggu SO Item Untuk Pembelian Permintaan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Kemasukan pelajar
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} dilumpuhkan
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} dilumpuhkan
 DocType: Supplier,Billing Currency,Bil Mata Wang
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Lebih Besar
@@ -2576,7 +2574,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage produk yang ditampilkan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Semua Kumpulan Penilaian
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nama Warehouse New
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Jumlah {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Jumlah {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Wilayah
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
 DocType: Stock Settings,Default Valuation Method,Kaedah Penilaian Default
@@ -2594,7 +2592,7 @@
 DocType: Price List,Price List Master,Senarai Harga Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Jualan boleh tagged terhadap pelbagai ** Jualan Orang ** supaya anda boleh menetapkan dan memantau sasaran.
 ,S.O. No.,PP No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Digunakan untuk Negara
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Hanya Tinggalkan Permohonan dengan status &#39;diluluskan&#39; dan &#39;Telah&#39; boleh dikemukakan
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Pelajar Kumpulan Nama adalah wajib berturut-turut {0}
@@ -2675,7 +2673,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
 DocType: Vehicle Service,Engine Oil,Minyak enjin
 DocType: Sales Invoice,Sales Team1,Team1 Jualan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Perkara {0} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Perkara {0} tidak wujud
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
 DocType: Employee Loan,Loan Details,Butiran pinjaman
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Bidang Qty mesti lebih besar daripada sifar.
@@ -2740,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
 DocType: Assessment Result Tool,Result HTML,keputusan HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Luput pada
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Tambahkan Pelajar
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Tambahkan Pelajar
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Sila pilih {0}
 DocType: C-Form,C-Form No,C-Borang No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2805,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,had Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Teroka
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Istilah akademik dengan ini &#39;Academic Year&#39; {0} dan &#39;Nama Term&#39; {1} telah wujud. Sila ubah suai entri ini dan cuba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Oleh kerana terdapat urus niaga yang sedia ada terhadap item {0}, anda tidak boleh menukar nilai {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Oleh kerana terdapat urus niaga yang sedia ada terhadap item {0}, anda tidak boleh menukar nilai {1}"
 DocType: UOM,Must be Whole Number,Mesti Nombor Seluruh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Diperuntukkan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,No siri {0} tidak wujud
@@ -2849,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Hari terakhir Bulan Depan
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue dekat selepas 7 hari
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti yang tidak boleh diperuntukkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Pemohon pelajar
 DocType: Asset Category Account,Accumulated Depreciation Account,Akaun Susut Nilai Terkumpul
 DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
@@ -2877,8 +2875,8 @@
 DocType: Asset,Item Code,Kod Item
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Pengeluaran
 DocType: Serial No,Warranty / AMC Details,Waranti / AMC Butiran
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
 DocType: Journal Entry,User Remark,Catatan pengguna
 DocType: Lead,Market Segment,Segmen pasaran
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Jumlah yang dibayar tidak boleh lebih besar daripada jumlah terkumpul negatif {0}
@@ -2897,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,Buat Permintaan Bahan
 DocType: Employee Education,School/University,Sekolah / Universiti
 DocType: Payment Request,Reference Details,Rujukan Butiran
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai dijangka After Life Berguna mesti kurang daripada Jumlah Kasar Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai dijangka After Life Berguna mesti kurang daripada Jumlah Kasar Pembelian
 DocType: Sales Invoice Item,Available Qty at Warehouse,Kuantiti didapati di Gudang
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jumlah dibilkan
 DocType: Asset,Double Declining Balance,Baki Penurunan Double
@@ -2918,19 +2916,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Amaun yang dikeluarkan tidak boleh lebih besar daripada Jumlah Pinjaman {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Order Production tidak dicipta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Order Production tidak dicipta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},tidak boleh menukar status sebagai pelajar {0} dikaitkan dengan permohonan pelajar {1}
 DocType: Asset,Fully Depreciated,disusutnilai sepenuhnya
 ,Stock Projected Qty,Saham Unjuran Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ketara HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Sebutharga cadangan, bida yang telah anda hantar kepada pelanggan anda"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Sebutharga cadangan, bida yang telah anda hantar kepada pelanggan anda"
 DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No dan Batch
 DocType: Warranty Claim,From Company,Daripada Syarikat
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Jumlah Markah Kriteria Penilaian perlu {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Sila menetapkan Bilangan penurunan nilai Ditempah
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Sila menetapkan Bilangan penurunan nilai Ditempah
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Nilai atau Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Saat
@@ -3061,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kumpulan pelajar
 DocType: Shopping Cart Settings,Quotation Series,Sebutharga Siri
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Item wujud dengan nama yang sama ({0}), sila tukar nama kumpulan item atau menamakan semula item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Sila pilih pelanggan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Sila pilih pelanggan
 DocType: C-Form,I,Saya
 DocType: Company,Asset Depreciation Cost Center,Aset Pusat Susutnilai Kos
 DocType: Sales Order Item,Sales Order Date,Pesanan Jualan Tarikh
@@ -3080,19 +3078,18 @@
 DocType: Vehicle,Insurance Details,Butiran Insurance
 DocType: Account,Payable,Kena dibayar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Sila masukkan Tempoh Bayaran Balik
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Penghutang ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Penghutang ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan Baru
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Keuntungan kasar%
 DocType: Appraisal Goal,Weightage (%),Wajaran (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Tarikh
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Jumlah Pembelian Kasar adalah wajib
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Jumlah Pembelian Kasar adalah wajib
 DocType: Lead,Address Desc,Alamat Deskripsi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Parti adalah wajib
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Nama
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast salah satu atau Jualan Membeli mesti dipilih
-DocType: Grading Structure,Grade Intervals,Selang gred
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pilih jenis perniagaan anda.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Tempat operasi pembuatan dijalankan.
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
@@ -3121,6 +3118,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
 DocType: Territory,Territory Targets,Sasaran Wilayah
 DocType: Delivery Note,Transporter Info,Maklumat Transporter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Sila menetapkan lalai {0} dalam Syarikat {1}
 DocType: Cheque Print Template,Starting position from top edge,kedudukan dari tepi atas Bermula
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,pembekal yang sama telah dibuat beberapa kali
@@ -3174,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Pesanan semula Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Lowongan Kerja Semasa
 DocType: Company,Stock Adjustment Account,Akaun Pelarasan saham
-DocType: Journal Entry,Write Off,Tulis Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Tulis Off
 DocType: Timesheet Detail,Operation ID,ID Operasi
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem Pengguna (log masuk) ID. Jika ditetapkan, ia akan menjadi lalai untuk semua bentuk HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
@@ -3185,8 +3183,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Pembekal menyampaikan kepada Pelanggan
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Borang / Item / {0}) kehabisan stok
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Tarikh akan datang mesti lebih besar daripada Pos Tarikh
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show cukai Perpecahan
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import dan Eksport
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","penyertaan saham wujud terhadap Warehouse {0}, oleh itu anda tidak boleh semula menetapkan-atau mengubahsuainya"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Tiada pelajar Terdapat
@@ -3198,14 +3196,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Daripada AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Sila pilih Sebutharga
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Sila pilih Sebutharga
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Sila pilih Sebutharga
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Sila pilih Sebutharga
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
 DocType: Company,Default Cash Account,Akaun Tunai Default
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ini adalah berdasarkan kepada kehadiran Pelajar ini
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,No Pelajar dalam
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Tambah lagi item atau bentuk penuh terbuka
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Sila masukkan &#39;Jangkaan Tarikh Penghantaran&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota Penghantaran {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
@@ -3252,9 +3251,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum perdamaian
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Cukai dan Caj Ditambah (Syarikat mata wang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
 DocType: Sales Order,Partly Billed,Sebahagiannya Membilkan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Perkara {0} perlu menjadi Asset Perkara Tetap
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Perkara {0} perlu menjadi Asset Perkara Tetap
 DocType: Item,Default BOM,BOM Default
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Cemerlang AMT
@@ -3277,7 +3276,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Senarai Harga Kadar Pertukaran
 DocType: Purchase Invoice Item,Rate,Kadar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Pelatih
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,alamat Nama
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,alamat Nama
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment Code,Assessment Code,Kod penilaian
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Asas
@@ -3302,7 +3301,7 @@
 DocType: Purchase Invoice,Print Language,Cetak Bahasa
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Stock Entry,Including items for sub assemblies,Termasuk perkara untuk sub perhimpunan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Masukkan nilai mesti positif
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Masukkan nilai mesti positif
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Item
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Pelajar sudah mendaftar.
@@ -3322,17 +3321,15 @@
 DocType: Issue,Opening Time,Masa Pembukaan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan kepada tarikh yang dikehendaki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Sekuriti &amp; Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
 DocType: Assessment Plan,Supervisor Name,Nama penyelia
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Program Pendaftaran
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Program Pendaftaran
-DocType: Grading Structure,Grading Structure,Struktur Grading
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Jumlah
 DocType: Tax Rule,Shipping City,Penghantaran Bandar
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Perkara ini adalah Varian {0} (Template). Sifat-sifat akan disalin lebih dari template kecuali &#39;Tiada Salinan&#39; ditetapkan
 DocType: Notification Control,Customize the Notification,Menyesuaikan Pemberitahuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Aliran Tunai daripada Operasi
 DocType: Sales Invoice,Shipping Rule,Peraturan Penghantaran
@@ -3355,6 +3352,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarikh pembukaan perlu sebelum Tarikh Tutup
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar
 DocType: Department,Days for which Holidays are blocked for this department.,Hari yang mana Holidays disekat untuk jabatan ini.
@@ -3383,7 +3381,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Jumlah (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Item No Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Cipta Rekod pekerja
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Cipta Rekod pekerja
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Jumlah Hadir
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Penyata perakaunan
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Jam
@@ -3398,8 +3396,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru selepas penggantian
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Tempat Jualan
 DocType: Payment Entry,Received Amount,Pendapatan daripada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Buat untuk kuantiti penuh, mengabaikan kuantiti sudah di perintah"
 DocType: Account,Tax,Cukai
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,tidak Ditandakan
@@ -3412,7 +3408,7 @@
 DocType: Batch,Source Document Name,Source Document Nama
 DocType: Batch,Source Document Name,Source Document Nama
 DocType: Job Opening,Job Title,Tajuk Kerja
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Buat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Buat Pengguna
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Lawati laporan untuk panggilan penyelenggaraan.
@@ -3424,8 +3420,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
 DocType: BOM,Website Description,Laman Web Penerangan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih dalam Ekuiti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,resit
 ,Sales Register,Jualan Daftar
@@ -3436,16 +3432,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ada apa-apa untuk mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
 DocType: Customer Group,Customer Group Name,Nama Kumpulan Pelanggan
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No Pelanggan lagi!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Penyata aliran tunai
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lesen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Sila pilih Carry Forward jika anda juga mahu termasuk baki tahun fiskal yang lalu daun untuk tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Jenis Baucar
 DocType: Item,Attributes,Sifat-sifat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Lepas Tarikh Perintah
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
 DocType: Student,Guardian Details,Guardian Butiran
 DocType: C-Form,C-Form,C-Borang
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran beberapa pekerja
@@ -3470,14 +3468,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akaun mestilah jenis &#39;Aset Tetap&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Keluar Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Kaedah-kaedah untuk mengira jumlah penghantaran untuk jualan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Siri adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Siri adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Perkhidmatan Kewangan
 DocType: Student Sibling,Student ID,ID pelajar
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Jenis aktiviti untuk Masa Balak
 DocType: Tax Rule,Sales,Jualan
 DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
 DocType: Training Event,Exam,peperiksaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
 DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Negeri Bil
@@ -3510,7 +3508,7 @@
 DocType: Payment Entry,Account Paid From,Akaun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan mentah Item Code
 DocType: Journal Entry,Write Off Based On,Tulis Off Based On
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,membuat Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,membuat Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Cetak dan Alat Tulis
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Hantar Email Pembekal
@@ -3526,6 +3524,7 @@
 DocType: Offer Letter,Awaiting Response,Menunggu Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Di atas
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Menyebut jika tidak standard akaun yang perlu dibayar
 DocType: Salary Slip,Earning & Deduction,Pendapatan &amp; Potongan
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Pilihan. Tetapan ini akan digunakan untuk menapis dalam pelbagai transaksi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
@@ -3562,7 +3561,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Pelajar Dari
 DocType: Hub Settings,Seller Country,Penjual Negara
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Terbitkan Item dalam Laman Web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Kumpulan pelajar anda dalam kelompok
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Kumpulan pelajar anda dalam kelompok
 DocType: Authorization Rule,Authorization Rule,Peraturan kebenaran
 DocType: Sales Invoice,Terms and Conditions Details,Terma dan Syarat Butiran
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Spesifikasi
@@ -3622,7 +3621,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Percubaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,New Akademik Tahun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Pulangan / Nota Kredit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Pulangan / Nota Kredit
 DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Jumlah Amaun Dibayar
 DocType: Production Order Item,Transferred Qty,Dipindahkan Qty
@@ -3663,6 +3662,7 @@
 ,Sales Funnel,Saluran Jualan
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Singkatan adalah wajib
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Dalam Troli
 ,Qty to Transfer,Qty untuk Pemindahan
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Petikan untuk Leads atau Pelanggan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peranan dibenarkan untuk mengedit saham beku
@@ -3696,7 +3696,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,memungut Yuran
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
 DocType: Lead,Add to calendar on this date,Tambah ke kalendar pada tarikh ini
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Peraturan untuk menambah kos penghantaran.
 DocType: Item,Opening Stock,Stok Awal
@@ -3714,7 +3714,7 @@
 DocType: Customer,From Lead,Dari Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Pelajar
 DocType: Hub Settings,Name Token,Nama Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Jualan Standard
@@ -3725,7 +3725,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nama Projek
-DocType: Supplier,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
+DocType: Customer,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
 DocType: Journal Entry Account,If Income or Expense,Jika Pendapatan atau Perbelanjaan
 DocType: Production Order,Required Items,Item yang diperlukan
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbezaan
@@ -3756,6 +3756,7 @@
 DocType: Item,Taxes,Cukai
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Dibayar dan Tidak Dihantar
 DocType: Project,Default Cost Center,Kos Pusat Default
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
 DocType: Bank Guarantee,End Date,Tarikh akhir
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Urusniaga saham
 DocType: Budget,Budget Accounts,Akaun belanjawan
@@ -3820,7 +3821,7 @@
 DocType: Customer,Sales Partner and Commission,Rakan Jualan dan Suruhanjaya
 DocType: Employee Loan,Rate of Interest (%) / Year,Kadar faedah (%) / Tahun
 ,Project Quantity,projek Kuantiti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua barangan adalah sifar, mungkin anda perlu menukar &#39;Mengedarkan Caj Berasaskan&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua barangan adalah sifar, mungkin anda perlu menukar &#39;Mengedarkan Caj Berasaskan&#39;"
 DocType: Opportunity,To Discuss,Bincang
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} diperlukan dalam {2} untuk melengkapkan urus niaga ini.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kadar faedah (%) tahunan
@@ -3843,7 +3844,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Tidak Hadir
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Matawang BOM # {1} hendaklah sama dengan mata wang yang dipilih {2}
 DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
 DocType: Homepage,Tag Line,Line tag
 DocType: Fee Component,Fee Component,Komponen Bayaran
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Pengurusan Fleet
@@ -3860,7 +3861,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Gudang {0} tidak wujud
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Daftar Untuk ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Peratusan Taburan Bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kadar penilaian tidak dijumpai untuk Perkara {0}, yang diperlukan untuk melakukan catatan perakaunan untuk {1} {2}. Jika yang menjalankan transaksi sebagai item sampel dalam {1}, sila sebut bahawa dalam {1} meja Item. Jika tidak, sila buat transaksi stok masuk untuk item atau sebutan kadar penilaian dalam rekod Item, dan kemudian cuba submiting / membatalkan entri ini"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% bahan-bahan yang dihantar untuk Nota Penghantaran ini
 DocType: Project,Customer Details,Butiran Pelanggan
@@ -3877,7 +3878,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,penghantaran pesanan tidak boleh dihapuskan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Baki akaun sudah dalam Debit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'Kredit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Pengurusan Kualiti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
 DocType: Employee Loan,Repay Fixed Amount per Period,Membayar balik Jumlah tetap setiap Tempoh
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Sila masukkan kuantiti untuk Perkara {0}
 DocType: Employee External Work History,Employee External Work History,Luar pekerja Sejarah Kerja
@@ -3904,7 +3905,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Pelajar Email ID
 DocType: Employee,Notice (days),Notis (hari)
 DocType: Tax Rule,Sales Tax Template,Template Cukai Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Pilih item untuk menyelamatkan invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Pilih item untuk menyelamatkan invois
 DocType: Employee,Encashment Date,Penunaian Tarikh
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Pelarasan saham
@@ -3938,6 +3939,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Nota Dikeluarkan
 DocType: Production Order,Warehouses,Gudang
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aset tidak boleh dipindahkan
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Perkara ini adalah Variant {0} (Template).
 DocType: Workstation,per hour,sejam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Membeli
 DocType: Announcement,Announcement,Pengumuman
@@ -3953,7 +3955,7 @@
 DocType: Account,Receivable,Belum Terima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak dibenarkan untuk menukar pembekal sebagai Perintah Pembelian sudah wujud
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peranan yang dibenarkan menghantar transaksi yang melebihi had kredit ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Pilih item untuk mengeluarkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Pilih item untuk mengeluarkan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
 DocType: Item,Material Issue,Isu Bahan
 DocType: Hub Settings,Seller Description,Penjual Penerangan
@@ -3966,7 +3968,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Mengarahkan
 DocType: Salary Detail,Component,komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria Penilaian Kumpulan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Membuka Susut Nilai Terkumpul mesti kurang dari sama dengan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Membuka Susut Nilai Terkumpul mesti kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Sila masukkan Meluluskan Peranan atau Meluluskan pengguna
@@ -4001,7 +4003,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk menetapkan Tahun Fiskal ini sebagai lalai, klik pada &#39;Tetapkan sebagai lalai&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Sertai
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Kekurangan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
 DocType: Employee Loan,Repay from Salary,Membayar balik dari Gaji
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Meminta pembayaran daripada {0} {1} untuk jumlah {2}
@@ -4019,7 +4021,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Penilaian Keputusan terperinci
 DocType: Employee Education,Employee Education,Pendidikan Pekerja
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,kumpulan item Duplicate dijumpai di dalam jadual kumpulan item
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
 DocType: Salary Slip,Net Pay,Gaji bersih
 DocType: Account,Account,Akaun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,No siri {0} telah diterima
@@ -4028,7 +4030,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} tidak dikaitkan dengan mana-mana akaun, sila membuat / menghubungkan akaun yang sama (Aset) untuk gudang."
 DocType: Purchase Invoice,Recurring Id,Id berulang
 DocType: Customer,Sales Team Details,Butiran Pasukan Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Padam selama-lamanya?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Padam selama-lamanya?
 DocType: Expense Claim,Total Claimed Amount,Jumlah Jumlah Tuntutan
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Peluang yang berpotensi untuk jualan.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Tidak sah {0}
@@ -4039,13 +4041,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Persediaan Sekolah anda di ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Tukar Jumlah Asas (Syarikat Mata Wang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Simpan dokumen pertama.
 DocType: Account,Chargeable,Boleh dikenakan cukai
 DocType: Company,Change Abbreviation,Perubahan Singkatan
 DocType: Expense Claim Detail,Expense Date,Perbelanjaan Tarikh
 DocType: Item,Max Discount (%),Max Diskaun (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Perintah lepas Jumlah
+DocType: Task,Is Milestone,adalah Milestone
 DocType: Daily Work Summary,Email Sent To,E-mel Dihantar Untuk
 DocType: Budget,Warn,Beri amaran
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sebarang kenyataan lain, usaha perlu diberi perhatian yang sepatutnya pergi dalam rekod."
@@ -4078,11 +4081,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
 DocType: Tax Rule,Purchase Tax Template,Membeli Template Cukai
 ,Project wise Stock Tracking,Projek Landasan Saham bijak
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Jadual Penyelenggaraan {0} wujud terhadap {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Kuantiti sebenar (pada sumber / sasaran)
 DocType: Item Customer Detail,Ref Code,Ref Kod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekod pekerja.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
 DocType: HR Settings,Payroll Settings,Tetapan Gaji
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Meletakkan pesanan
@@ -4105,7 +4107,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak betul dibersihkan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
 DocType: Purchase Invoice Item,Price List Rate,Senarai Harga Kadar
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Membuat sebut harga pelanggan
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Membuat sebut harga pelanggan
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Menunjukkan &quot;Pada Saham&quot; atau &quot;Tidak dalam Saham&quot; berdasarkan saham yang terdapat di gudang ini.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Rang Undang-Undang Bahan (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Purata masa yang diambil oleh pembekal untuk menyampaikan
@@ -4127,7 +4129,7 @@
 DocType: Asset,Disposal Date,Tarikh pelupusan
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mel akan dihantar kepada semua Pekerja Active syarikat itu pada jam yang diberikan, jika mereka tidak mempunyai percutian. Ringkasan jawapan akan dihantar pada tengah malam."
 DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Maklum balas latihan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
@@ -4135,7 +4137,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursus adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Tambah / Edit Harga
 DocType: Batch,Parent Batch,Batch ibubapa
 DocType: Batch,Parent Batch,Batch ibubapa
 DocType: Cheque Print Template,Cheque Print Template,Cek Cetak Template
@@ -4180,7 +4182,7 @@
 DocType: Item,Variant Based On,Based On Variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Pembekal anda
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
 DocType: Request for Quotation Item,Supplier Part No,Pembekal bahagian No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Tidak dapat menolak apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Jumlah&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Pemberian
@@ -4190,7 +4192,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Nilai Waktu mesti lebih besar daripada sifar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
 DocType: Issue,Content Type,Jenis kandungan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
@@ -4199,20 +4201,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan belum disatukan Penyertaan
 DocType: Payment Reconciliation,From Invoice Date,Dari Invois Tarikh
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,mata wang bil mesti sama dengan mata wang atau akaun pihak mata wang sama ada lalai comapany ini
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,mata wang bil mesti sama dengan mata wang atau akaun pihak mata wang sama ada lalai comapany ini
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,meninggalkan Penunaian
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Apa yang ia buat?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Semua Kemasukan Pelajar
 ,Average Commission Rate,Purata Kadar Suruhanjaya
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
 DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
 DocType: School House,House Name,Nama rumah
 DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Kemas kini kos tambahan untuk mengira kos mendarat barangan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Menambah seluruh organisasi anda sebagai pengguna anda. Anda juga boleh menambah menjemput Pelanggan untuk portal anda dengan menambah mereka dari Kenalan
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Menambah seluruh organisasi anda sebagai pengguna anda. Anda juga boleh menambah menjemput Pelanggan untuk portal anda dengan menambah mereka dari Kenalan
 DocType: Stock Entry,Total Value Difference (Out - In),Jumlah Perbezaan Nilai (Out - Dalam)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Kadar Pertukaran adalah wajib
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID pengguna tidak ditetapkan untuk Pekerja {0}
@@ -4221,7 +4223,7 @@
 DocType: Item,Customer Code,Kod Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Sejak hari Perintah lepas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 DocType: Buying Settings,Naming Series,Menamakan Siri
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Mula Tarikh harus kurang daripada tarikh Insurance End
@@ -4236,7 +4238,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji pekerja {0} telah dicipta untuk lembaran masa {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Perkara {0} dilumpuhkan
 DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Tempoh Dari dan Musim Ke tarikh wajib untuk berulang {0}
@@ -4249,7 +4251,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
 DocType: Sales Invoice Timesheet,Billing Hours,Waktu Billing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM lalai untuk {0} tidak dijumpai
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Ketik item untuk menambah mereka di sini
 DocType: Fees,Program Enrollment,program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Sila set {0}
@@ -4350,7 +4353,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Runcit &amp; Borong
 DocType: Issue,First Responded On,Pertama Dijawab Pada
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Penyenaraian rentas Item dalam pelbagai kumpulan
-DocType: Grade Interval,Grade Interval,gred Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tarikh Mula dan Tahun Anggaran Tarikh Tamat sudah ditetapkan dalam Tahun Anggaran {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Tarikh update
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4359,6 +4361,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
 DocType: Production Order,Planned End Date,Dirancang Tarikh Akhir
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Di mana item disimpan.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 DocType: Request for Quotation,Supplier Detail,Detail pembekal
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Ralat dalam formula atau keadaan: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Invois
@@ -4404,7 +4407,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Persediaan sebuah laman web yang mudah untuk organisasi saya
 DocType: Payment Reconciliation,Receivable / Payable Account,Belum Terima / Akaun Belum Bayar
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Gudang Default
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Sila masukkan induk pusat kos
@@ -4464,7 +4467,7 @@
 ,Items To Be Requested,Item Akan Diminta
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan lepas Kadar Pembelian
 DocType: Company,Company Info,Maklumat Syarikat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Pilih atau menambah pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Pilih atau menambah pelanggan baru
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,pusat kos diperlukan untuk menempah tuntutan perbelanjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Permohonan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ini adalah berdasarkan kepada kehadiran pekerja ini
@@ -4477,13 +4480,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna daripada membuat Permohonan Cuti pada hari-hari berikut.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Manfaat Pekerja
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Dikilangkan Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantiti Diterima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Sila menetapkan lalai Senarai Holiday untuk pekerja {0} atau Syarikat {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak wujud
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} tidak wujud
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Bil dinaikkan kepada Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
@@ -4492,15 +4495,17 @@
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Baucer Jenis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
 DocType: Employee Loan Application,Approved,Diluluskan
 DocType: Pricing Rule,Price,Harga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} dicipta untuk Pekerja {1} dalam julat tarikh yang diberikan
 DocType: Employee,Education,Pendidikan
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Menamakan Kempen Dengan
 DocType: Employee,Current Address Is,Alamat semasa
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,diubahsuai
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Pilihan. Set mata wang lalai syarikat, jika tidak dinyatakan."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Catatan jurnal perakaunan.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
@@ -4537,7 +4542,7 @@
 DocType: Hub Settings,Hub Settings,Tetapan Hub
 DocType: Project,Gross Margin %,Margin kasar%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
 DocType: Asset,Is Existing Asset,Adakah Aset Sedia Ada
 DocType: Salary Detail,Statistical Component,Komponen statistik
 DocType: Salary Detail,Statistical Component,Komponen statistik
@@ -4593,7 +4598,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Lampirkan Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Tahap saham
 DocType: Customer,Commission Rate,Kadar komisen
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Membuat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis bayaran mesti menjadi salah satu Menerima, Bayar dan Pindahan Dalaman"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4606,6 +4611,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Benarkan Pengeluaran pada Cuti
 DocType: Sales Order,Customer's Purchase Order Date,Pesanan Belian Tarikh Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Modal Saham
+DocType: Shopping Cart Settings,Show Public Attachments,Tunjuk Lampiran Awam
 DocType: Packing Slip,Package Weight Details,Pakej Berat Butiran
 DocType: Payment Gateway Account,Payment Gateway Account,Akaun Gateway Pembayaran
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
@@ -4630,7 +4636,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Tidak menunjukkan apa-apa simbol seperti $ dsb sebelah mata wang.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Separuh Hari)
 DocType: Supplier,Credit Days,Hari Kredit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Buat Batch Pelajar
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Buat Batch Pelajar
 DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Dapatkan Item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Membawa Hari Masa
@@ -4649,8 +4655,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah dibenarkan
 DocType: GL Entry,Is Opening,Adalah Membuka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Akaun {0} tidak wujud
 DocType: Account,Cash,Tunai
 DocType: Employee,Short biography for website and other publications.,Biografi ringkas untuk laman web dan penerbitan lain.
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index f0585f7..f8879bd 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,အသုတ်ပစ္စည်းသက်တမ်းကုန်ဆုံးအခြေအနေ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show ကို Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show ကို Variant
 DocType: Academic Term,Academic Term,ပညာရေးဆိုင်ရာ Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ပစ္စည်း
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,အရေအတွက်
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} လိုအပ်သည်
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Advertising ကြော်ငြာ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,တူညီသော Company ကိုတစ်ကြိမ်ထက်ပိုပြီးသို့ ဝင်. ဖြစ်ပါတယ်
 DocType: Employee,Married,အိမ်ထောင်သည်
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ဘို့ခွင့်မပြု
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} ဘို့ခွင့်မပြု
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,အထဲကပစ္စည်းတွေကို Get
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ကုန်ပစ္စည်း {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ဖော်ပြထားသောအရာများမရှိပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ကုန်စုံ
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 DocType: Process Payroll,Make Bank Entry,ဘဏ်မှ Entry &#39;ပါစေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** လစဉ်ဖြန့်ဖြူး ** သင်သည်သင်၏စီးပွားရေးလုပ်ငန်းမှာရာသီအလိုက်ရှိပါကသင်သည်လအတွင်းဖြတ်ပြီးဘတ်ဂျက် / Target ကဖြန့်ဝေကူညီပေးသည်။
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,မတွေ့ရှိပစ္စည်းများ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,မတွေ့ရှိပစ္စည်းများ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
 DocType: Sales Invoice Item,Sales Invoice Item,အရောင်းပြေစာ Item
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ဥပမာ &quot;မူလတန်းကျောင်း&quot; သို့မဟုတ် &quot;တက္ကသိုလ်က&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,စတော့အိတ်အစီရင်ခံစာများ
 DocType: Warehouse,Warehouse Detail,ဂိုဒေါင် Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,အဆိုပါ Term အဆုံးနေ့စွဲနောက်ပိုင်းတွင်သက်တမ်း (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာပြီးဆုံးရက်စွဲထက်မဖွစျနိုငျသညျ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ &quot;Fixed Asset ရှိ၏&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ &quot;Fixed Asset ရှိ၏&quot;"
 DocType: Vehicle Service,Brake Oil,ဘရိတ်ရေနံ
 DocType: Tax Rule,Tax Type,အခွန် Type အမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
 DocType: BOM,Item Image (if not slideshow),item ပုံရိပ် (Slideshow မလျှင်)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,တစ်ဦးဖုန်းဆက်သူအမည်တူနှင့်အတူတည်ရှိ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(အချိန်နာရီနှုန်း / 60) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM ကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOM ကို Select လုပ်ပါ
 DocType: SMS Log,SMS Log,SMS ကိုအထဲ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} အပေါ်အားလပ်ရက်နေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားမဖြစ်
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,grade
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးထုတ်လုပ်မှုအမိန့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,နှစ်ပတ်လည်လစာ
 DocType: Daily Work Summary,Daily Work Summary,Daily သတင်းစာလုပ်ငန်းခွင်အကျဉ်းချုပ်
 DocType: Period Closing Voucher,Closing Fiscal Year,နိဂုံးချုပ်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,ငွေစာရင်းဇယားအတွက်ဖြစ်တည်မှုကုမ္ပဏီကို select လုပ်ပါကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry &#39;
 DocType: Journal Entry Account,Credit in Company Currency,Company မှငွေကြေးစနစ်အတွက်အကြွေး
 DocType: Delivery Note,Installation Status,Installation လုပ်တဲ့နဲ့ Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",သငျသညျတက်ရောက်သူကို update ချင်ပါသလား? <br> ပစ္စုပ္ပန်: {0} \ <br> ပျက်ကွက်: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ဝယ်ယူခြင်းအဘို့အ supply ကုန်ကြမ်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ငွေပေးချေမှု၏အနည်းဆုံး mode ကို POS ငွေတောင်းခံလွှာဘို့လိုအပ်ပါသည်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ငွေပေးချေမှု၏အနည်းဆုံး mode ကို POS ငွေတောင်းခံလွှာဘို့လိုအပ်ပါသည်။
 DocType: Products Settings,Show Products as a List,တစ်ဦးစာရင်းအဖြစ် Show ကိုထုတ်ကုန်များ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Template ကို Download, သင့်လျော်သောအချက်အလက်ဖြည့်စွက်ခြင်းနှင့်ပြုပြင်ထားသောဖိုင်ပူးတွဲ။ ရွေးချယ်ထားတဲ့ကာလအတွက်အားလုံးသည်ရက်စွဲများနှင့်ဝန်ထမ်းပေါင်းစပ်လက်ရှိတက်ရောက်သူမှတ်တမ်းများနှင့်တကွ, template မှာရောက်လိမ့်မည်"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,တန်ဖိုး Entry &#39;Make
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,တောင်းဆိုမှုကအမျိုးအစား
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ထမ်း Make
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ထမ်း Make
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,အသံလွှင့်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,သတ်ခြင်း
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ပြုပြင်ထိန်းသိမ်းမှုလာလည်သူများသည် Plan စ။
 DocType: SMS Settings,Enter url parameter for message,မက်ဆေ့ခ်ျကိုသည် url parameter ကိုရိုက်ထည့်
 DocType: POS Profile,Customer Groups,ဖောက်သည်အဖွဲ့များ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ဘဏ္ဍာရေးရှင်းတမ်း
 DocType: Guardian,Students,ကျောင်းသားများ
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,စျေးနှုန်းနှင့်လျော့စျေးလျှောက်ထားသည်နည်းဥပဒေများ။
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,စျေးနှုန်း List ကိုဝယ်ယူသို့မဟုတ်ရောင်းချသည့်အဘို့အသက်ဆိုင်သောဖြစ်ရမည်
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Naming Series,Series List for this Transaction,ဒီ Transaction သည်စီးရီးများစာရင်း
 DocType: Company,Default Payroll Payable Account,default လစာပေးရန်အကောင့်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update ကိုအီးမေးလ်အုပ်စု
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update ကိုအီးမေးလ်အုပ်စု
 DocType: Sales Invoice,Is Opening Entry,Entry &#39;ဖွင့်လှစ်တာဖြစ်ပါတယ်
 DocType: Customer Group,Mention if non-standard receivable account applicable,Non-စံကိုရရန်အကောင့်ကိုသက်ဆိုင်လျှင်ဖော်ပြထားခြင်း
 DocType: Course Schedule,Instructor Name,သှအမည်
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,အရောင်းပြေစာ Item ဆန့်ကျင်
 ,Production Orders in Progress,တိုးတက်မှုအတွက်ထုတ်လုပ်မှုကိုအမိန့်
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ဘဏ္ဍာရေးကနေ Net ကငွေ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
 DocType: Lead,Address & Contact,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ဘဏ်မှ Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 DocType: Student Admission,Student Admission,ကျောင်းသားသမဂ္ဂင်ခွင့်
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,အော်တိုပစ္စည်းတောင်းဆိုမှု၏ဖန်တီးမှုအပေါ်အီးမေးလ်ကိုအကြောင်းကြား
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
 DocType: Payment Reconciliation Invoice,Invoice Type,ကုန်ပို့လွှာ Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Delivery မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Delivery မှတ်ချက်
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ရောင်းချပိုင်ဆိုင်မှု၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
-DocType: Grade Interval,Min Score,min ရမှတ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
 DocType: Student Applicant,Admitted,ဝန်ခံ
 DocType: Workstation,Rent Cost,ငှားရန်ကုန်ကျစရိတ်
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,အမိန့် Value ကို
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ပါတီဆန့်ကျင်သို့မဟုတ်ပြည်တွင်းရေးလွှဲပြောင်းဘို့ဘဏ် / ငွေကြေးအရောင်းအဝယ်ပြုလုပ်
 DocType: Shipping Rule,Valid for Countries,နိုင်ငံများအဘို့သက်တမ်းရှိ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,စုစုပေါင်းအမိန့်သတ်မှတ်
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,လယ်ပြင်၌တန်ဖိုးကို &#39;&#39; Day ကို Month ရဲ့အပေါ် Repeat &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ပြီးသားကာလထမ်း {1} များအတွက်ခွဲဝေ {2} {3} မှ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Item ကိုရွေးပါ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Non-Group ကမှ convert
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,တစ်ဦး Item ၏ batch (အများကြီး) ။
 DocType: C-Form Invoice Detail,Invoice Date,ကုန်ပို့လွှာနေ့စွဲ
 DocType: GL Entry,Debit Amount,debit ပမာဏ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ကျောင်းသားအဖွဲ့များ Create
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,စျေးနှုန်းအဘို့တောင်းဆိုခြင်း
 DocType: Salary Slip Timesheet,Working Hours,အလုပ်လုပ်နာရီ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ sequence number ကိုပြောင်းပါ။
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","မျိုးစုံစျေးနှုန်းများနည်းဥပဒေများနိုင်မှတည်လျှင်, အသုံးပြုသူများပဋိပက္ခဖြေရှင်းရန်ကို manually ဦးစားပေးသတ်မှတ်ဖို့တောင်းနေကြသည်။"
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,အရစ်ကျမိန့် Create
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,အရစ်ကျမိန့် Create
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,သက်ဆိုင်စွပ်စွဲချက်
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,အားလပ်ရက်မာစတာ။
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Package ကိုအမှတ်ကနေ
 DocType: Item Attribute,To Range,Range ကိုမှ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Securities and စာရင်း
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ဒါဟာ၏ကိုယ်ပိုင်အဘိုးပြတ်နည်းလမ်းမရှိပါဘူးရသောအချို့သောပစ္စည်းဆန့်ကျင်အရောင်းအရှိဖြစ်သကဲ့သို့, အဘိုးပြတ်နည်းလမ်းမပြောင်းနိုင်သလား"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ခွဲဝေ Total ကုမ္ပဏီအရွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Job Opening,Description of a Job Opening,တစ်ဦးယောဘဖွင့်ပွဲ၏ဖော်ပြချက်များ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ယနေ့ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
 DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,အလှကုန်
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ယ်ယူရန်
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Threshold 0% များအတွက်တန်းသတ်မှတ်ပေးပါ
 DocType: Sales Order,To Deliver,လှတျတျောမူရန်
 DocType: Purchase Invoice Item,Item,အချက်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 DocType: Production Plan Item,Pending Qty,ဆိုင်းငံ့ထား Qty
 DocType: Budget,Ignore,ဂရုမပြု
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} တက်ကြွမဟုတ်ပါဘူး
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} တက်ကြွမဟုတ်ပါဘူး
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},အောက်ပါနံပါတ်များကိုစလှေတျ SMS ကို: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ပုံနှိပ်ခြင်းအဘို့အ Setup ကိုစစ်ဆေးမှုများရှုထောင့်
 DocType: Salary Slip,Salary Slip Timesheet,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Timesheet
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,စုစုပေါင်းကော်မရှင်
 DocType: Pricing Rule,Sales Partner,အရောင်း Partner
 DocType: Buying Settings,Purchase Receipt Required,ဝယ်ယူခြင်း Receipt လိုအပ်သော
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ဖွင့်လှစ်စတော့အိတ်ဝသို့ဝင်လျှင်အဘိုးပြတ်နှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ဖွင့်လှစ်စတော့အိတ်ဝသို့ဝင်လျှင်အဘိုးပြတ်နှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,စုဆောင်းတန်ဖိုးများ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,ကိုယ်ရေးမှတ်တမ်းတွယ်တာ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,repeat Customer များ
 DocType: Leave Control Panel,Allocate,နေရာချထား
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,အရောင်းသို့ပြန်သွားသည်
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,မှတ်ချက်: စုစုပေါင်းခွဲဝေရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုရွက် {1} ထက်လျော့နည်းမဖြစ်သင့်ပါဘူး
 DocType: Announcement,Posted By,အားဖြင့် Posted
 DocType: Item,Delivered by Supplier (Drop Ship),ပေးသွင်း (Drop သင်္ဘော) ဖြင့်ကယ်လွှတ်
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,အရောင်းပြေစာ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ &amp; ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ဘဏ်မှ Entry စေရန်ငွေပေးချေမှုရမည့်အကောင့်ကို Select လုပ်ပါ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","အရွက်, စရိတ်တောင်းဆိုမှုများနှင့်လုပ်ခလစာကိုစီမံခန့်ခွဲဖို့ထမ်းမှတ်တမ်းများ Create"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","အရွက်, စရိတ်တောင်းဆိုမှုများနှင့်လုပ်ခလစာကိုစီမံခန့်ခွဲဖို့ထမ်းမှတ်တမ်းများ Create"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,အသိပညာတပ်စခန်းမှ Add
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,အဆိုပြုချက်ကို Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,ငွေပေးချေမှုရမည့် Entry ထုတ်ယူ
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 နှင့်အတူ relation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager က
 DocType: Payment Entry,Payment From / To,/ စေရန် မှစ. ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,နေ့စွဲ Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},နယူးအကြွေးကန့်သတ်ဖောက်သည်များအတွက်လက်ရှိထူးချွန်ငွေပမာဏထက်လျော့နည်းသည်။ အကြွေးကန့်သတ် atleast {0} ဖြစ်ဖို့ရှိပါတယ်
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},နယူးအကြွေးကန့်သတ်ဖောက်သည်များအတွက်လက်ရှိထူးချွန်ငွေပမာဏထက်လျော့နည်းသည်။ အကြွေးကန့်သတ် atleast {0} ဖြစ်ဖို့ရှိပါတယ်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
 DocType: SMS Settings,Receiver Parameter,receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;&#39; တွင် အခြေခံ. &#39;နဲ့&#39; Group မှဖြင့် &#39;&#39; အတူတူမဖွစျနိုငျ
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
 DocType: Student Batch Name,Batch Name,batch အမည်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,စာရင်းသွင်း
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ကျောင်းသားလစဉ်တက်ရောက်အစီရင်ခံစာအတွက်လက်ရှိအဖြစ်ကျောင်းသားကိုပြသပါလိမ့်မယ်
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,ကျောင်းသားများကျောင်း
 DocType: Sales Invoice Timesheet,Time Sheet,အချိန်ဇယား
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ကုန်ကြမ်းပစ္စည်းများအခြေပြုတွင်
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ဆောင်းပါးတပုဒ်ကအသေးစိတ်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ဆောင်းပါးတပုဒ်ကအသေးစိတ်ရိုက်ထည့်ပေးပါ
 DocType: Interest,Interest,စိတ်ဝင်စားမှု
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,အကြိုအရောင်း
 DocType: Purchase Receipt,Other Details,အခြားအသေးစိတ်
@@ -739,7 +742,7 @@
 ,Absent Student Report,ပျက်ကွက်ကျောင်းသားအစီရင်ခံစာ
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Offer Letter Term,Offer Letter Term,ပေးစာ Term ကိုပူဇော်
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,item {0} မတွေ့ရှိ
 DocType: Bin,Stock Value,စတော့အိတ် Value တစ်ခု
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ကုမ္ပဏီ {0} မတည်ရှိပါဘူး
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,အာမခံသက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 DocType: Material Request Item,Quantity and Warehouse,အရေအတွက်နှင့်ဂိုဒေါင်
 DocType: Sales Invoice,Commission Rate (%),ကော်မရှင် Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,အစီအစဉ်ကို select ပေးပါ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,အစီအစဉ်ကို select ပေးပါ
 DocType: Project,Estimated Cost,ခန့်မှန်းခြေကုန်ကျစရိတ်
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Mode of Payment Account,Default Account,default အကောင့်
 DocType: Payment Entry,Received Amount (Company Currency),ရရှိထားသည့်ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,အပတ်စဉ်ထုတ်ပယ်သောနေ့ရက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Production Order Operation,Planned End Time,စီစဉ်ထားသည့်အဆုံးအချိန်
 ,Sales Person Target Variance Item Group-Wise,အရောင်းပုဂ္ဂိုလ် Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Request for Quotation Supplier,Send Email,အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Supplier Quotation,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
 DocType: SMS Center,All Customer Contact,အားလုံးသည်ဖောက်သည်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV ကနေတဆင့်စတော့ရှယ်ယာချိန်ခွင်လျှာ upload ။
 DocType: Warehouse,Tree Details,သစ်ပင်ကိုအသေးစိတ်
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,နိမ့်ဆုံးပမာဏပြေစာ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ကုန်ကျစရိတ်စင်တာ {2} ကုမ္ပဏီ {3} ပိုင်ပါဘူး
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: အကောင့် {2} တဲ့ Group ကိုမဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,item Row {idx}: {DOCTYPE} {DOCNAME} အထက် &#39;&#39; {DOCTYPE} &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,item Row {idx}: {DOCTYPE} {DOCNAME} အထက် &#39;&#39; {DOCTYPE} &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,အဘယ်သူမျှမတာဝန်များကို
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","အော်တိုကုန်ပို့လွှာ 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 DocType: Asset,Opening Accumulated Depreciation,စုဆောင်းတန်ဖိုးဖွင့်လှစ်
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,Moving ပျမ်းမျှနှုန်း
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,သင်တန်းဇယား
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,သင်တန်းဇယား
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: HR Settings,Enter retirement age in years,နှစ်များတွင်အငြိမ်းစားအသက်အရွယ် Enter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target ကဂိုဒေါင်
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,All item အဖွဲ့များ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,လုပ်ပါရန်ပွင့်လင်း
 DocType: Notification Control,Delivery Note Message,Delivery Note ကို Message
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Block List ကိုနေ့စွဲ Leave
 DocType: Pricing Rule,Price or Discount,စျေးနှုန်းသို့မဟုတ်လျှော့
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,အရစ်ကျငွေလက်ခံပြေစာပစ္စည်းများ table ထဲမှာစုစုပေါင်းသက်ဆိုင်သောစွပ်စွဲချက်စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်အဖြစ်အတူတူပင်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,အရစ်ကျငွေလက်ခံပြေစာပစ္စည်းများ table ထဲမှာစုစုပေါင်းသက်ဆိုင်သောစွပ်စွဲချက်စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်အဖြစ်အတူတူပင်ဖြစ်ရပါမည်
 DocType: Sales Team,Incentives,မက်လုံးတွေပေးပြီး
 DocType: SMS Log,Requested Numbers,တောင်းဆိုထားသော Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,ကုန်ကြမ်းကိုသာရယူ
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ဓါတုဗေဒ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ဒီ mode ကိုရှေးခယျြထားသညျ့အခါ default ဘဏ် / ငွေအကောင့်ကိုအလိုအလျောက်လစာဂျာနယ် Entry အတွက် update လုပ်ပါလိမ့်မည်။
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",အဆင့် Code ကို {0} များအတွက်ကြားကာလအခြားအဆင့်များအတွက်တန်းကြားကာလနှင့်အတူထပ်နေသည်။ ကြားကာလ {0} နှင့် {1} စစ်ဆေးထပ်ကြိုးစားပါ
 DocType: BOM,Raw Material Cost(Company Currency),ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},အတန်း # {0}: နှုန်း {1} {2} များတွင်အသုံးပြုနှုန်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM ဝက်ဘ်ဆိုက် Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
 DocType: Timesheet Detail,Bill,ဘီလ်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,အဖြူ
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),အတန်း {0}: ({2} {3}) entry ကို၏အချိန်ပို့စ်တင်မှာ {1} ဂိုဒေါင်ထဲမှာ {4} များအတွက်အရည်အတွက်ရရှိနိုင်မ
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},အမိန့် Type {0} တယောက်ဖြစ်ရပါမည်
 DocType: Lead,Next Contact Date,Next ကိုဆက်သွယ်ရန်နေ့စွဲ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty ဖွင့်လှစ်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
 DocType: Student Batch Name,Student Batch Name,ကျောင်းသားအသုတ်လိုက်အမည်
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
 DocType: Repayment Schedule,Balance Loan Amount,balance ချေးငွေပမာဏ
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},တစ် {0} ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,လြှော့ခွငျး
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,လြှော့ခွငျး
 DocType: Asset,Total Number of Depreciations,တန်ဖိုးစုစုပေါင်းအရေအတွက်
 DocType: Sales Invoice Item,Rate With Margin,Margin အတူ rate
 DocType: Sales Invoice Item,Rate With Margin,Margin အတူ rate
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,အစည်းအရုံးအမည်
 DocType: Tax Rule,Shipping State,သဘောင်္တင်ခပြည်နယ်
 ,Projected Quantity as Source,အရင်းအမြစ်အဖြစ်စီမံကိန်းအရေအတွက်
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Non-စတော့ရှယ်ယာပစ္စည်းများပါဝင်စေ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,အရောင်းအသုံးစရိတ်များ
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,စာပို့သင်္ကေတ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,စာပို့သင်္ကေတ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,ဖြန့်ဖြူး
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,စျေးဝယ်တွန်းလှည်း Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
 ,Ordered Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ထုတ်ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 DocType: Global Defaults,Global Defaults,ဂလိုဘယ် Defaults ကို
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,အသုတ်လိုက်နံပါတ်ရဖို့ Item Code ကိုရိုက်ထည့်ပေးပါ
 DocType: Stock Settings,Default Item Group,default Item Group က
 DocType: Employee Loan,Partially Disbursed,တစ်စိတ်တစ်ပိုင်းထုတ်ချေး
-DocType: Grading Structure,Grading System Name,ဂမ် System ကိုအမည်
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ငွေပေးချေမှုရမည့် Mode ကို configured ကိုမရ။ အကောင့်ငွေပေးချေ၏ Mode ကိုအပေါ်သို့မဟုတ် POS Profile ကိုအပေါ်သတ်မှတ်ပြီးပါပြီဖြစ်စေ, စစ်ဆေးပါ။"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ငွေပေးချေမှုရမည့် Mode ကို configured ကိုမရ။ အကောင့်ငွေပေးချေ၏ Mode ကိုအပေါ်သို့မဟုတ် POS Profile ကိုအပေါ်သတ်မှတ်ပြီးပါပြီဖြစ်စေ, စစ်ဆေးပါ။"
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,သင့်ရဲ့ရောင်းအားလူတစ်ဦးကိုဖောက်သည်ကိုဆက်သွယ်ရန်ဤနေ့စွဲအပေါ်တစ်ဦးသတိပေးရလိမ့်မည်
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ရနိုင်မှာမဟုတ်ဘူး။
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,အလုပ် Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ထို Attribute တွေက table ထဲမှာအနည်းဆုံးတစ်ခု attribute ကို specify ကျေးဇူးပြု.
 DocType: Announcement,All Students,အားလုံးကျောင်းသားများ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,item {0} non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,item {0} non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,view လယ်ဂျာ
 DocType: Grading Scale,Intervals,အကြား
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ကျောင်းသားသမဂ္ဂမိုဘိုင်းအမှတ်
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,အရစ်ကျအမိန့်သင်သည်သင်၏ဝယ်ယူမှုအပေါ်စီစဉ်ထားခြင်းနှင့်ဖွင့်အတိုင်းလိုက်နာကူညီ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,အရစ်ကျအမိန့်သင်သည်သင်၏ဝယ်ယူမှုအပေါ်စီစဉ်ထားခြင်းနှင့်ဖွင့်အတိုင်းလိုက်နာကူညီ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,သေးငယ်သော
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync ကိုမာစတာ Data ကို
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
 DocType: Student Applicant,AP,အေပီ
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Group မှ Roll နံပါတ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,အားလုံး task ကိုအလေးစုစုပေါင်း 1. အညီအားလုံးစီမံကိန်းအလုပ်များကိုအလေးချိန်ညှိပေးပါရပါမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,မြို့တော်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,ဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,တိုးတက်မှုအတွက် {0} ပစ္စည်းများ
 DocType: Workstation,Workstation Name,Workstation နှင့်အမည်
-DocType: Grade Interval,Grade Code,grade Code ကို
+DocType: Grading Scale Interval,Grade Code,grade Code ကို
 DocType: POS Item Group,POS Item Group,POS ပစ္စည်းအုပ်စု
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,hardware
 DocType: Sales Order,Recurring Upto,နူန်းကျော်ကျော်ထပ်တလဲလဲ
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,အခွင့်ထူးထွက်ခွာ
 DocType: Purchase Invoice,Supplier Invoice Date,ပေးသွင်းပြေစာနေ့စွဲ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,သင်ကစျေးဝယ်ခြင်းတွန်းလှည်း enable ရန်လိုအပ်သည်
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,အစာ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,လည်ပတ်သူများမရှိပါ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,မာကုကိုတက်ရောက်ဖို့
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,မာကုကိုတက်ရောက်ဖို့
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},ကို Maintenance ဇယား {0} {1} ဆန့်ကျင်တည်ရှိ
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,စာရင်းသွင်းကျောင်းသား
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},အနီးကပ်အကောင့်ကို၏ငွေကြေး {0} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},အားလုံးပန်းတိုင်သည်ရမှတ် sum 100 ဖြစ်သင့်သည်က {0} သည်
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ငွေစာရင်း၏ဇယား
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Detail,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
 DocType: Pricing Rule,"Higher the number, higher the priority","ပိုမိုမြင့်မားသောအရေအတွက်, မြင့်ဦးစားပေး"
 ,Purchase Invoice Trends,ဝယ်ယူခြင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Employee,Better Prospects,သာ. ကောင်း၏အလားအလာ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","အတန်း # {0}: အဆိုပါအသုတ် {1} ရှိသော {2} အရည်အတွက်ရှိပါတယ်။ ရရှိနိုင်ပါ {3} အရည်အတွက်ဟာအခြားအသုတ်ကိုရွေးချယ်ပါသို့မဟုတ်မျိုးစုံနေသည်ဟုသူများထံမှ / ကိစ္စကိုကယ်လွှတ်ခြင်းငှါ, မျိုးစုံတန်းသို့အတန်းခွဲ ကျေးဇူးပြု."
 DocType: Vehicle,License Plate,လိုင်စင်ပြား
 DocType: Appraisal,Goals,ရည်မှန်းချက်များ
 DocType: Warranty Claim,Warranty / AMC Status,အာမခံ / AMC နဲ့ Status
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","အကောင့်အေးခဲသည်မှန်လျှင်, entries တွေကိုကန့်သတ်အသုံးပြုသူများမှခွင့်ပြုထားသည်။"
 DocType: Email Digest,Bank Balance,ဘဏ်ကို Balance ကို
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ယောဘသည် profile ကို, အရည်အချင်းများနှင့်ပြည့်စသည်တို့မလိုအပ်"
 DocType: Journal Entry Account,Account Balance,အကောင့်ကို Balance
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,မပိတ်ထားသည့်ဘဏ္ဍာနှစ်ရဲ့ P &amp; L ကိုချိန်ခွင်ပြရန်
 DocType: Shipping Rule,Shipping Account,သဘောင်္တင်ခအကောင့်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: အကောင့် {2} မလှုပ်မရှားဖြစ်ပါသည်
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,သင်သည်သင်၏အလုပ်စီစဉ်ကူညီအပေါ်အချိန်မကယ်မလွှတ်မှအရောင်းအမိန့် Make
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,သင်သည်သင်၏အလုပ်စီစဉ်ကူညီအပေါ်အချိန်မကယ်မလွှတ်မှအရောင်းအမိန့် Make
 DocType: Quality Inspection,Readings,ဖတ်
 DocType: Stock Entry,Total Additional Costs,စုစုပေါင်းအထပ်ဆောင်းကုန်ကျစရိတ်
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Asset Movement,Stock Manager,စတော့အိတ် Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office ကိုငှား
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show ကိုပိတ်ထား
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ပိုင်ဆိုင်မှုအမျိုးအစား Fixed Asset ကို item များအတွက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ပိုင်ဆိုင်မှုအမျိုးအစား Fixed Asset ကို item များအတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ဒီ {2} {3} ဘို့ {1} နှင့်အတူ {0} ပဋိပက္ခများကို
 DocType: Student Attendance Tool,Students HTML,ကျောင်းသားများက HTML
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,ထွက်ခွာ၏နေ့စွဲ
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ဦးဆောင်လမ်းပြ Create
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ဦးဆောင်လမ်းပြ Create
 DocType: Maintenance Schedule,Schedules,အချိန်ဇယားများ
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program ကိုကျောင်းအပ်
 DocType: Sales Invoice Item,Brand Name,ကုန်အမှတ်တံဆိပ်အမည်
 DocType: Purchase Receipt,Transporter Details,Transporter Details ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,သေတ္တာ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်း
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,အဖွဲ့
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} စီမံကိန်း {1} ဘို့မတွေ့ရှိများအတွက် default BOM
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ကျောင်းသားများသည်စနစ်၏နှလုံးမှာဖြစ်ကြောင်း, ရှိသမျှကိုသင်၏ကျောင်းသားများကို add"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ကျောင်းသားများသည်စနစ်၏နှလုံးမှာဖြစ်ကြောင်း, ရှိသမျှကိုသင်၏ကျောင်းသားများကို add"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},အတန်း # {0}: ရှင်းလင်းခြင်းနေ့စွဲ {1} {2} Cheque တစ်စောင်လျှင်နေ့စွဲမတိုင်မီမဖွစျနိုငျ
 DocType: Company,Default Holiday List,default အားလပ်ရက်များစာရင်း
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},အတန်း {0}: အချိန်နှင့်ရန်ကနေ {1} ၏အချိန် {2} နှင့်အတူထပ်ဖြစ်ပါတယ်
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ငွေပေးချေမှုရမည့်အီးမေးလ် Resend
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,တဲ့ New task
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,စျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,စျေးနှုန်းလုပ်ပါ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,အခြားအစီရင်ခံစာများ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ကြိုတင်မဲအတွက် X ကိုနေ့ရက်ကာလအဘို့စစ်ဆင်ရေးစီစဉ်ကြိုးစားပါ။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ကုမ္ပဏီ {0} အတွက်ပုံမှန်လစာပေးချေအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: SMS Center,Receiver List,receiver များစာရင်း
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ရှာရန် Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,ရှာရန် Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,စားသုံးသည့်ပမာဏ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Assessment Plan,Grading Scale,grade စကေး
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ယခုပင်လျှင်ပြီးစီး
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ငွေပေးချေမှုရမည့်တောင်းခံခြင်းပြီးသား {0} ရှိတယ်ဆိုတဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,စုဝေး
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,သငျသညျဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မဖျက်နိုင်ပါ။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} ကမ္တာ့ချိန်ညှိအတွက် default အနေနဲ့အဖြစ်သတ်မှတ်
 DocType: Journal Entry,Entry Type,entry Type အမျိုးအစား
 ,Customer Credit Balance,customer Credit Balance
@@ -1686,8 +1685,6 @@
 DocType: Student Sibling,Studying in Same Institute,တူ Institute ကိုလေ့လာနေ
 DocType: Territory,Territory Manager,နယ်မြေတွေကို Manager က
 DocType: Packed Item,To Warehouse (Optional),ဂိုဒေါင် (Optional) မှ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 DocType: Payment Entry,Paid Amount (Company Currency),Paid ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Purchase Invoice,Additional Discount,အပိုဆောင်းလျှော့
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
@@ -1697,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,လှည်းအတွက်ကြည့်ရန်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ဒီစတော့အိတ် Entry &#39;ပါစေရန်အသုံးပြုပစ္စည်းတောင်းဆိုခြင်း
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Next ကိုတန်ဖိုးနေ့စွဲအသစ်ပိုင်ဆိုင်မှုများအတွက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Next ကိုတန်ဖိုးနေ့စွဲအသစ်ပိုင်ဆိုင်မှုများအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,တိုင်းအသုတ်လိုက်အဘို့အုပ်စုအခြေစိုက်သီးခြားသင်တန်း
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,တိုင်းအသုတ်လိုက်အဘို့အုပ်စုအခြေစိုက်သီးခြားသင်တန်း
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
@@ -1716,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: ကုန်ကျစရိတ်စင်တာ &#39;&#39; အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု &#39;&#39; အကောင့် {2} ဘို့လိုအပ်ပါသည်။ ကုမ္ပဏီတစ်ခုက default ကုန်ကျစရိတ်စင်တာထူထောင်ပေးပါ။
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,နယူးဆက်သွယ်ရန်
 DocType: Territory,Parent Territory,မိဘနယ်မြေတွေကို
 DocType: Quality Inspection Reading,Reading 2,2 Reading
@@ -1745,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ပြန်လည်သင့်မြတ်ရေး JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,အများကြီးစစ်ကြောင်းများ။ အစီရင်ခံစာတင်ပို့ပြီး spreadsheet ပလီကေးရှင်းကိုအသုံးပြုခြင်းက print ထုတ်။
 DocType: Purchase Invoice Item,Batch No,batch မရှိပါ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},{1} ကီးကိုရက်စွဲအဘို့ {2} မှ {0} လဲလှယ်မှုနှုန်းကိုရှာဖွေနိုင်ခြင်း
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,တစ်ဖောက်သည်ရဲ့ဝယ်ယူမိန့်ဆန့်ကျင်မျိုးစုံအရောင်းအမိန့် Allow
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 မိုဘိုင်းဘယ်သူမျှမက
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,အဓိက
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,မူကွဲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,အဓိက
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,မူကွဲ
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
 DocType: Employee Attendance Tool,Employees HTML,ဝန်ထမ်းများ HTML ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
 DocType: Employee,Leave Encashed?,Encashed Leave?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,လယ်ပြင်၌ မှစ. အခွင့်အလမ်းမသင်မနေရ
 DocType: Email Digest,Annual Expenses,နှစ်ပတ်လည်ကုန်ကျစရိတ်
 DocType: Item,Variants,မျိုးကွဲ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
 DocType: Payment Reconciliation Payment,Allocated amount,ခွဲဝေပမာဏ
@@ -1779,7 +1773,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,တန်ဖိုးခြင်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Serial No Item {0} သည်သို့ဝင် Duplicate
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,တစ် Shipping Rule များအတွက်အခြေအနေ
-DocType: Grading Structure,Grading Intervals,ဂမ် Interval
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ကျေးဇူးပြု. ထည့်သွင်းပါ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","{2} ထက် {0} အတန်းအတွက် {1} ကပိုပစ္စည်းများအတွက် overbill လို့မရပါဘူး။ Over-ငွေတောင်းခံခွင့်ပြုပါရန်, Settings များဝယ်ယူထားကျေးဇူးပြုပြီး"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ပစ္စည်းသို့မဟုတ်ဂိုဒေါင်အပေါ်အခြေခံပြီး filter ကိုသတ်မှတ်ထားပေးပါ
@@ -1792,16 +1785,17 @@
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,သင့်ရဲ့အမိန့်ကိုစီမံခန့်ခွဲ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,သင့်ရဲ့အမိန့်ကိုစီမံခန့်ခွဲ
 DocType: Production Order Operation,Actual Time and Cost,အမှန်တကယ်အချိန်နှင့်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},အများဆုံး၏ပစ္စည်းတောင်းဆိုမှု {0} အရောင်းအမိန့် {2} ဆန့်ကျင်ပစ္စည်း {1} သည်ဖန်ဆင်းနိုင်
 DocType: Employee,Salutation,နှုတ်ဆက်
 DocType: Course,Course Abbreviation,သင်တန်းအတိုကောက်
 DocType: Student Leave Application,Student Leave Application,ကျောင်းသားသမဂ္ဂခွင့်လျှောက်လွှာ
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} အပေါ်တစ်ဝက်နေ့၌ဝန်ထမ်း {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},စုစုပေါင်းအလုပ်ချိန်နာရီ {0} အလုပ်လုပ် max ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်ပါဘူး
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,အပေါ်
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ရောင်းရငွေ၏အချိန်ပစ္စည်းများကို bundle ။
 DocType: Quotation Item,Actual Qty,အမှန်တကယ် Qty
 DocType: Sales Invoice Item,References,ကိုးကား
@@ -1811,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,သင်ကထပ်နေပစ္စည်းများကိုသို့ဝင်ပါပြီ။ ဆန်းစစ်နှင့်ထပ်ကြိုးစားပါ။
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,အပေါင်းအဖေါ်
 DocType: Asset Movement,Asset Movement,ပိုင်ဆိုင်မှုလပ်ြရြားမြ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,နယူးလှည်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,နယူးလှည်း
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,item {0} တဲ့နံပါတ်စဉ်အလိုက် Item မဟုတ်ပါဘူး
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
 DocType: Vehicle,Wheels,ရထားဘီး
@@ -1843,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်အချိန်သစ်လုံး၏ဖန်ဆင်းခြင်းလုပ်မလုပ်။ စစ်ဆင်ရေးထုတ်လုပ်မှုကိုအမိန့်ဆန့်ကျင်ခြေရာခံလိမ့်မည်မဟုတ်
 DocType: Student,Student Mobile Number,ကျောင်းသားသမဂ္ဂမိုဘိုင်းနံပါတ်
 DocType: Item,Has Variants,မူကွဲရှိပါတယ်
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
 DocType: Sales Person,Parent Sales Person,မိဘအရောင်းပုဂ္ဂိုလ်
 DocType: Purchase Invoice,Recurring Invoice,ထပ်တလဲလဲပြေစာ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,စီမံခန့်ခွဲမှုစီမံကိန်းများ
@@ -1854,7 +1848,7 @@
 DocType: Budget,Fiscal Year,ဘဏ္ဍာရေးနှစ်
 DocType: Vehicle Log,Fuel Price,လောင်စာစျေးနှုန်း
 DocType: Budget,Budget,ဘတ်ဂျက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ဒါကြောင့်တစ်ဦးဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုအကောင့်ကိုဖွင့်မရအဖြစ်ဘတ်ဂျက်, {0} ဆန့်ကျင်တာဝန်ပေးအပ်ရနိုင်မှာမဟုတ်ဘူး"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,အောင်မြင်
 DocType: Student Admission,Application Form Route,လျှောက်လွှာ Form ကိုလမ်းကြောင်း
@@ -1885,7 +1879,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ငွေပမာဏ {0} {1} {2} ဆန့်ကျင်နုတ်ယူ
 DocType: Employee,Salary Information,လစာပြန်ကြားရေး
 DocType: Sales Person,Name and Employee ID,အမည်နှင့်ထမ်း ID ကို
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
 DocType: Website Item Group,Website Item Group,website Item Group က
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,တာဝန်နှင့်အခွန်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
@@ -1944,7 +1938,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,repeat ဖောက်သည်အခွန်ဝန်ကြီးဌာန
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,လင်မယား
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
 DocType: Asset,Depreciation Schedule,တန်ဖိုးဇယား
 DocType: Bank Reconciliation Detail,Against Account,အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ဝက်နေ့နေ့စွဲနေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားဖြစ်သင့်တယ်
@@ -1961,13 +1955,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
 DocType: Purchase Order,Delivered,ကယ်နှုတ်တော်မူ၏
 ,Vehicle Expenses,ယာဉ်ကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
+DocType: Serial No,Invoice Details,ငွေတောင်းခံလွှာအသေးစိတ်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ထပ်တလဲလဲကုန်ပို့လွှာရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
 DocType: Employee Loan,Loan Amount,ချေးငွေပမာဏ
@@ -1991,7 +1986,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,က Non-Group ကိုမှ Group က
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,အားကစား
 DocType: Loan Type,Loan Name,ချေးငွေအမည်
@@ -2003,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,သင်ပယ်ချပစ္စည်းများစတော့ရှယ်ယာကိုထိန်းသိမ်းရာဂိုဒေါင်
 DocType: Production Order,Skip Material Transfer,ပစ္စည်းလွှဲပြောင်း Skip
 DocType: Production Order,Skip Material Transfer,ပစ္စည်းလွှဲပြောင်း Skip
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,သော့ချက်နေ့စွဲ {2} များအတွက် {1} မှ {0} လဲလှယ်မှုနှုန်းကိုရှာဖွေမပေးနိုင်ပါ။ ကိုယ်တိုင်တစ်ငွေကြေးလဲလှယ်ရေးစံချိန်ဖန်တီး ကျေးဇူးပြု.
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်အဆုံးသတ်
 DocType: POS Profile,Price List,စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ယခုက default ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဖြစ်ပါတယ်။ အကျိုးသက်ရောက်မှုယူမှအပြောင်းအလဲအတွက်သင့် browser refresh ပေးပါ။
@@ -2040,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ ** တစ်ဘဏ္ဍာရေးတစ်နှစ်တာကိုကိုယ်စားပြုပါတယ်။ အားလုံးသည်စာရင်းကိုင် posts များနှင့်အခြားသောအဓိကကျသည့်ကိစ္စများကို ** ** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဆန့်ကျင်ခြေရာခံထောက်လှမ်းနေကြပါတယ်။
 DocType: Opportunity,Customer / Lead Address,customer / ခဲလိပ်စာ
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 DocType: Student Admission,Eligibility,အရည်အချင်းများ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ဦးဆောင်လမ်းပြသင့်ရဲ့ဆောင်အဖြစ်အားလုံးသင့်ရဲ့အဆက်အသွယ်နဲ့ပိုပြီး add, သင်စီးပွားရေးလုပ်ငန်း get ကူညီ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ဦးဆောင်လမ်းပြသင့်ရဲ့ဆောင်အဖြစ်အားလုံးသင့်ရဲ့အဆက်အသွယ်နဲ့ပိုပြီး add, သင်စီးပွားရေးလုပ်ငန်း get ကူညီ"
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
@@ -2083,7 +2079,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Process Payroll,Fortnightly,နှစ်ပတ်တ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
@@ -2099,7 +2095,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ပထမဦးဆုံးအတန်းအတွက် &#39;ယခင် Row ပမာဏတွင်&#39; သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်းတွင် &#39;အဖြစ်တာဝန်ခံ type ကိုရွေးချယ်လို့မရပါဘူး
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ကလေး Item တစ်ကုန်ပစ္စည်း Bundle ကိုမဖြစ်သင့်ပါဘူး။ `{0} ကို item ကိုဖယ်ရှား` ကယ်တင်ပေးပါ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets Add
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets Add
 DocType: Vehicle Service,Service Item,Service ကို Item
 DocType: Bank Guarantee,Bank Guarantee,ဘဏ်အာမခံ
 DocType: Bank Guarantee,Bank Guarantee,ဘဏ်အာမခံ
@@ -2149,8 +2145,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,စျေးစာရင်းမသတ်မှတ်လျှင်စျေးနှုန်းများပြလိမ့်မည်မဟုတ်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ဒီအသဘောင်္တင်စိုးမိုးရေးများအတွက်တိုင်းပြည် specify သို့မဟုတ် Worldwide မှသဘောင်္တင်စစ်ဆေးပါ
 DocType: Stock Entry,Total Incoming Value,စုစုပေါင်း Incoming Value တစ်ခု
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,debit ရန်လိုအပ်သည်
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,debit ရန်လိုအပ်သည်
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
 DocType: Offer Letter Term,Offer Term,ကမ်းလှမ်းမှုကို Term
 DocType: Quality Inspection,Quality Manager,အရည်အသွေးအ Manager က
@@ -2184,14 +2180,14 @@
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,နယူးလိပ်စာ
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်းရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်းရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; တရားဝင်သတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Project,External,external
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,အသုံးပြုသူများနှင့်ခွင့်ပြုချက်
 DocType: Vehicle Log,VLOG.,ရုပ်ရှင်ဘလော့ဂ်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Created ထုတ်လုပ်မှုအမိန့်: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Created ထုတ်လုပ်မှုအမိန့်: {0}
 DocType: Branch,Branch,အညွန့
 DocType: Guardian,Mobile Number,လက်ကိုင်ဖုန်းနာပတ်
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ပုံနှိပ်နှင့် Branding
@@ -2200,7 +2196,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} မတွေ့ရှိ serial No
 DocType: Scheduling Tool,Student Batch,ကျောင်းသားအသုတ်လိုက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,သင့် Customer
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ကျောင်းသား Make
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ကျောင်းသား Make
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},သငျသညျစီမံကိန်းကိုအပေါ်ပူးပေါင်းဖို့ဖိတ်ခေါ်ခဲ့ကြ: {0}
 DocType: Leave Block List Date,Block Date,block နေ့စွဲ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,အခုဆိုရင် Apply
@@ -2224,8 +2220,9 @@
 DocType: SMS Log,Sent To,ရန်ကိုစလှေတျ
 DocType: Payment Request,Make Sales Invoice,အရောင်းပြေစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next ကိုဆက်သွယ်ပါနေ့စွဲအတိတ်ထဲမှာမဖွစျနိုငျ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next ကိုဆက်သွယ်ပါနေ့စွဲအတိတ်ထဲမှာမဖွစျနိုငျ
 DocType: Company,For Reference Only.,သာလျှင်ကိုးကားစရာသည်။
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,ကို Select လုပ်ပါအသုတ်လိုက်အဘယ်သူမျှမ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,ကြိုတင်ငွေပမာဏ
@@ -2239,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,အမှုနံပါတ် 0 မဖြစ်နိုင်
 DocType: Item,Show a slideshow at the top of the page,စာမျက်နှာ၏ထိပ်မှာတစ်ဆလိုက်ရှိုးပြရန်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,စတိုးဆိုင်များ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,စတိုးဆိုင်များ
 DocType: Serial No,Delivery Time,ပို့ဆောင်ချိန်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing အခြေပြုတွင်
 DocType: Item,End of Life,အသက်တာ၏အဆုံး
@@ -2255,8 +2252,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ဤစာရွက်စာတမ်းကို item {4} ဘို့ {0} {1} အားဖြင့်ကန့်သတ်ကျော်ပြီဖြစ်ပါသည်။ သငျသညျ {2} အတူတူဆန့်ကျင်သည်အခြား {3} လုပ်နေပါတယ်?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
@@ -2267,7 +2264,7 @@
 DocType: Budget Account,Budget Account,ဘတ်ဂျက်အကောင့်
 DocType: Quality Inspection,Verified By,By Verified
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","လက်ရှိအရောင်းအရှိပါသည်ကြောင့်, ကုမ္ပဏီ၏ default ငွေကြေးမပြောင်းနိုင်ပါတယ်။ အရောင်းအကို default ငွေကြေးပြောင်းလဲဖို့ဖျက်သိမ်းရပါမည်။"
-DocType: Grade Interval,Grade Description,grade ဖျေါပွခကျြ
+DocType: Grading Scale Interval,Grade Description,grade ဖျေါပွခကျြ
 DocType: Stock Entry,Purchase Receipt No,ဝယ်ယူခြင်းပြေစာမရှိ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,စားရန်ဖြစ်တော်မူ၏ငွေ
 DocType: Process Payroll,Create Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
@@ -2305,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,နေ့စွဲရန်တက်ရောက်
 DocType: Warranty Claim,Raised By,By ထမြောက်စေတော်
 DocType: Payment Gateway Account,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Accounts ကို receiver များတွင် Net က Change ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ပိတ် Compensatory
 DocType: Offer Letter,Accepted,လက်ခံထားတဲ့
@@ -2319,7 +2316,7 @@
 DocType: Shipping Rule,Shipping Rule Label,သဘောင်္တင်ခ Rule Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,အသုံးပြုသူဖိုရမ်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
@@ -2333,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,သငျသညျဤစနစ်တည်ထောင်ထားတဲ့များအတွက်အဖွဲ့အစည်း၏နာမတော်။
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ဒီ up to date ဖြစ်နေအေးခဲစာရင်းကိုင် entry ကိုဘယ်သူမှလုပ်နိုင် / အောက်တွင်သတ်မှတ်ထားသောအခန်းကဏ္ဍ မှလွဲ. entry ကို modify ။
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယားထုတ်လုပ်ဖို့ရှေ့တော်၌ထိုစာရွက်စာတမ်းကိုကယ်တင် ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယားထုတ်လုပ်ဖို့ရှေ့တော်၌ထိုစာရွက်စာတမ်းကိုကယ်တင် ကျေးဇူးပြု.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,စီမံချက်လက်ရှိအခြေအနေ
 DocType: UOM,Check this to disallow fractions. (for Nos),အပိုငျးအမြစ်တားရန်ဤစစ်ဆေးပါ။ (အမှတ်အတွက်)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,အောက်ပါထုတ်လုပ်မှုအမိန့်ကိုဖန်ဆင်းခဲ့သည်:
@@ -2356,6 +2353,7 @@
 DocType: Email Digest,How frequently?,ဘယ်လိုမကြာခဏ?
 DocType: Purchase Receipt,Get Current Stock,လက်ရှိစတော့အိတ် Get
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ပစ္စည်းများ၏ဘီလ်၏သစ်ပင်ကို
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 DocType: Student,Joining Date,နေ့စွဲလာရောက်ပူးပေါင်း
 ,Employees working on a holiday,တစ်အားလပ်ရက်တွင်လုပ်ကိုင်န်ထမ်းများ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,မာကုလက်ရှိ
@@ -2437,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ထုတ်လုပ်မှု
 DocType: Guardian,Occupation,အလုပ်အကိုင်
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),စုစုပေါင်း (Qty)
 DocType: Sales Invoice,This Document,ဒီစာရွက်စာတမ်း
 DocType: Installation Note Item,Installed Qty,Install လုပ်ရတဲ့ Qty
@@ -2460,8 +2458,8 @@
 DocType: Notification Control,Sales Order Message,အရောင်းအမှာစာ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ကုမ္ပဏီ, ငွေကြေးစနစ်, လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာစသည်တို့ကိုတူ Set Default တန်ဖိုးများ"
 DocType: Payment Entry,Payment Type,ငွေပေးချေမှုရမည့် Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
 DocType: Process Payroll,Select Employees,ဝန်ထမ်းများကိုရွေးပါ
 DocType: Opportunity,Potential Sales Deal,အလားအလာရှိသောအရောင်း Deal
 DocType: Payment Entry,Cheque/Reference Date,Cheque တစ်စောင်လျှင် / ကိုးကားစရာနေ့စွဲ
@@ -2478,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},{0} ပြီးသားကုမ္ပဏီ {1} ဖန်တီးသော Global POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Purchase Order,Ref SQ,Ref စတုရန်းမိုင်
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,အားလုံး BOMs အတွက် Item / BOM အစားထိုးဖို့
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ငွေလက်ခံပြေစာစာရွက်စာတမ်းတင်ပြရဦးမည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ငွေလက်ခံပြေစာစာရွက်စာတမ်းတင်ပြရဦးမည်
 DocType: Purchase Invoice Item,Received Qty,Qty ရရှိထားသည့်
 DocType: Stock Entry Detail,Serial No / Batch,serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Paid နှင့်မကယ်မနှုတ်မရ
@@ -2491,7 +2489,7 @@
 ,To Produce,ထုတ်လုပ်
 apps/erpnext/erpnext/config/hr.py +93,Payroll,အခစာရင်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,အသုံးပြုသူ Make
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,အသုံးပြုသူ Make
 DocType: Packing Slip,Identification of the package for the delivery (for print),(ပုံနှိပ်သည်) ကိုပေးပို့များအတွက်အထုပ်၏ identification
 DocType: Bin,Reserved Quantity,Reserved ပမာဏ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,မှန်ကန်သော email address ကိုရိုက်ထည့်ပေးပါ
@@ -2505,11 +2503,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,မသန်စွမ်း template ကို default အနေနဲ့ template ကိုမဖွစျရပါမညျ
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
 DocType: Payment Request,Amount in customer's currency,ဖောက်သည်ရဲ့ငွေကြေးပမာဏ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,delivery
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,delivery
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ပုဒ်မကုန်ကျမှာ &quot;ပစ္စည်းများအခြေတွင်အမျိုးမျိုးနှုန်း&quot; ကိုကြည့်ပါ
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ကျောင်းသား batch သင်ကျောင်းသားများအတွက်တက်ရောက်သူ, အကဲဖြတ်ခြင်းနှင့်အဖိုးအခကိုခြေရာခံကိုကူညီ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ကျောင်းသား batch သင်ကျောင်းသားများအတွက်တက်ရောက်သူ, အကဲဖြတ်ခြင်းနှင့်အဖိုးအခကိုခြေရာခံကိုကူညီ"
 DocType: Payment Entry,Total Allocated Amount,စုစုပေါင်းခွဲဝေပမာဏ
 DocType: Item Reorder,Material Request Type,material တောင်းဆိုမှုကအမျိုးအစား
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} {1} မှလစာများအတွက်တိကျမှန်ကန်ဂျာနယ် Entry &#39;
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
@@ -2542,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',&#39;&#39; ပွင့်လင်း &#39;&#39; အဆင့်အတန်းနှင့်အတူန်ထမ်းမှအဖြစ်အပျက်နှင့် ပတ်သက်. အီးမေးလ်တစ်စောင်ပေးပို့ပါလိမ့်မယ်
 DocType: Task,Depends on Tasks,လုပ်ငန်းများအပေါ်မူတည်
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ဖောက်သည်အုပ်စု Tree Manage ။
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ပူးတွဲဖိုင်စျေးဝယ်လှည်းအားဖွင့်ခြင်းမရှိဘဲပြသနိုင်ပါသည်
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
 DocType: Leave Control Panel,Leave Control Panel,Control Panel ကို Leave
@@ -2554,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,debit ရန်
 DocType: Delivery Note,Required only for sample item.,သာနမူနာကို item လိုအပ်သည်။
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Transaction ပြီးနောက်အမှန်တကယ် Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0} နှင့် {1} အကြားမျှမတွေ့လစာစလစ်
 ,Pending SO Items For Purchase Request,ဝယ်ယူခြင်းတောင်းဆိုခြင်းသည်ဆိုင်းငံ SO ပစ္စည်းများ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,အပိုအကြီးစား
@@ -2576,7 +2574,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,မူလစာမျက်နှာ Featured ကုန်ပစ္စည်း
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,အားလုံးအကဲဖြတ်အဖွဲ့များ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,နယူးဂိုဒေါင်အမည်
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),စုစုပေါင်း {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),စုစုပေါင်း {0} ({1})
 DocType: C-Form Invoice Detail,Territory,နယျမွေ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
@@ -2594,7 +2592,7 @@
 DocType: Price List,Price List Master,စျေးနှုန်း List ကိုမဟာ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,အားလုံးသည်အရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမျိုးစုံ ** အရောင်း Persons ဆန့်ကျင် tagged နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
 ,S.O. No.,SO အမှတ်
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
 DocType: Price List,Applicable for Countries,နိုင်ငံများအဘို့သက်ဆိုင်သော
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;&#39; Approved &#39;နဲ့&#39; ငြင်းပယ် &#39;&#39; တင်သွင်းနိုင်ပါသည် status ကိုအတူ Applications ကိုသာလျှင် Leave
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ကျောင်းသားအုပ်စုအမည်အတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
@@ -2675,7 +2673,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
 DocType: Vehicle Service,Engine Oil,အင်ဂျင်ပါဝါရေနံ
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
 DocType: Employee Loan,Loan Details,ချေးငွေအသေးစိတ်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,အတန်း {0}: Completed အရည်အတွက်သုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
@@ -2740,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူဂိုဒေါင်အုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 DocType: Assessment Result Tool,Result HTML,ရလဒ်က HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,တွင်သက်တမ်းကုန်ဆုံးမည်
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ကျောင်းသားများ Add
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ကျောင်းသားများ Add
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0} ကို select ကျေးဇူးပြု.
 DocType: C-Form,C-Form No,C-Form တွင်မရှိပါ
 DocType: BOM,Exploded_items,Exploded_items
@@ -2805,7 +2803,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ကန့်သတ်ဖြတ်ကူး
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,အကျိုးတူ Capital ကို
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ဒီ &#39;&#39; ပညာရေးတစ်နှစ်တာ &#39;&#39; {0} နှင့် {1} ပြီးသားတည်ရှိ &#39;&#39; Term အမည် &#39;&#39; နှင့်အတူတစ်ဦးပညာသင်နှစ်သက်တမ်း။ ဤအ entries တွေကိုပြုပြင်မွမ်းမံခြင်းနှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ကို item {0} ဆန့်ကျင်တည်ဆဲအရောင်းအရှိဖြစ်သကဲ့သို့, သင်က {1} ၏တန်ဖိုးမပြောင်းနိုင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ကို item {0} ဆန့်ကျင်တည်ဆဲအရောင်းအရှိဖြစ်သကဲ့သို့, သင်က {1} ၏တန်ဖိုးမပြောင်းနိုင်ပါ"
 DocType: UOM,Must be Whole Number,လုံးနံပါတ်ဖြစ်ရမည်
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(Days ခုနှစ်တွင်) ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,serial No {0} မတည်ရှိပါဘူး
@@ -2849,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,နောက်လ၏နောက်ဆုံးနေ့
 DocType: Support Settings,Auto close Issue after 7 days,7 ရက်အတွင်းအပြီးအော်တိုအနီးကပ်ပြဿနာ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကခွဲဝေမရနိုငျ"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ကျောင်းသားသမဂ္ဂလျှောက်ထားသူ
 DocType: Asset Category Account,Accumulated Depreciation Account,စုဆောင်းတန်ဖိုးအကောင့်
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
@@ -2877,8 +2875,8 @@
 DocType: Asset,Item Code,item Code ကို
 DocType: Production Planning Tool,Create Production Orders,ထုတ်လုပ်မှုအမိန့် Create
 DocType: Serial No,Warranty / AMC Details,အာမခံ / AMC အသေးစိတ်ကို
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
 DocType: Lead,Market Segment,Market မှာအပိုင်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -2897,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,ပစ္စည်းတောင်းဆို Create
 DocType: Employee Education,School/University,ကျောင်း / တက္ကသိုလ်က
 DocType: Payment Request,Reference Details,ကိုးကားစရာ Details ကို
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထားသည့် Value တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထားသည့် Value တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Sales Invoice Item,Available Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
 DocType: Asset,Double Declining Balance,နှစ်ချက်ကျဆင်းနေ Balance
@@ -2918,19 +2916,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ထုတ်ချေးငွေပမာဏချေးငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ထုတ်လုပ်မှုအမိန့်နေသူများကဖန်တီးမပေး
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,ထုတ်လုပ်မှုအမိန့်နေသူများကဖန်တီးမပေး
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; နေ့စွဲရန် &#39;&#39; နောက်မှာဖြစ်ရပါမည်
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်လွှာ {1} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
 DocType: Asset,Fully Depreciated,အပြည့်အဝတန်ဖိုးလျော့ကျ
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Employee Attendance Tool,Marked Attendance HTML,တခုတ်တရတက်ရောက် HTML ကို
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ကိုးကားအဆိုပြုချက်, သင်သည်သင်၏ဖောက်သည်များစေလွှတ်ပြီလေလံများမှာ"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ကိုးကားအဆိုပြုချက်, သင်သည်သင်၏ဖောက်သည်များစေလွှတ်ပြီလေလံများမှာ"
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,serial ဘယ်သူမျှမကနှင့်အသုတ်လိုက်
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,အကဲဖြတ်လိုအပ်ချက်များ၏ရမှတ်များပေါင်းလဒ် {0} ဖြစ်ရန်လိုအပ်ပါသည်။
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်သတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,မိနစ်
@@ -3061,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ကျောင်းသားအုပ်စု
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: C-Form,I,ငါ
 DocType: Company,Asset Depreciation Cost Center,ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမှာစာနေ့စွဲ
@@ -3080,19 +3078,18 @@
 DocType: Vehicle,Insurance Details,အာမခံအသေးစိတ်
 DocType: Account,Payable,ပေးအပ်သော
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ပြန်ဆပ်ကာလကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ကိုက် ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ကိုက် ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,နယူး Customer များ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,စုစုပေါင်းအမြတ်%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ရှင်းလင်းရေးနေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
 DocType: Lead,Address Desc,Desc လိပ်စာ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ပါတီမဖြစ်မနေဖြစ်ပါသည်
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ခေါင်းစဉ်အမည်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,ရောင်းစျေးသို့မဟုတ်ဝယ်ယူ၏ Atleast တယောက်ရွေးချယ်ထားရမည်ဖြစ်သည်
-DocType: Grading Structure,Grade Intervals,grade Interval
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,သင့်ရဲ့စီးပွားရေးလုပ်ငန်း၏သဘောသဘာဝကို Select လုပ်ပါ။
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,အဘယ်မှာရှိကုန်ထုတ်လုပ်မှုလုပ်ငန်းများကိုသယ်ဆောင်ကြသည်။
 DocType: Asset Movement,Source Warehouse,source ဂိုဒေါင်
@@ -3121,6 +3118,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},ကုမ္ပဏီ {1} အတွက် default အနေနဲ့ {0} သတ်မှတ်ထားပေးပါ
 DocType: Cheque Print Template,Starting position from top edge,ထိပ်ဆုံးအစွန်ကနေရာထူးစတင်ခြင်း
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,တူညီတဲ့ကုန်ပစ္စည်းပေးသွင်းအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
@@ -3174,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,လက်ရှိယောဘသည်င့်
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
-DocType: Journal Entry,Write Off,အကြွေးလျှော်ပစ်ခြင်း
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,အကြွေးလျှော်ပစ်ခြင်း
 DocType: Timesheet Detail,Operation ID,စစ်ဆင်ရေး ID ကို
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System ကိုအသုံးပြုသူ (login လုပ်လို့ရပါတယ်) ID ကို။ ထားလျှင်, အားလုံး HR ပုံစံများသည် default အဖြစ်လိမ့်မည်။"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} မှစ.
@@ -3185,8 +3183,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ပေးသွင်းဖောက်သည်မှကယ်တင်
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form ကို / ပစ္စည်း / {0}) စတော့ရှယ်ယာထဲကဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Next ကိုနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show ကိုအခွန်ချိုး-up က
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ဒေတာပို့ကုန်သွင်းကုန်
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","စတော့အိတ် entries တွေကိုသွားတော့သင် re-assign သို့မဟုတ်ပါကပြုပြင်မွမ်းမံလို့မရပါဘူး, ဂိုဒေါင် {0} ဆန့်ကျင်တည်ရှိ"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ကျောင်းသားများကို Found ဘယ်သူမျှမက
@@ -3198,14 +3196,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: Program Enrollment,School House,School တွင်အိမ်
 DocType: Serial No,Out of AMC,AMC ထဲက
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
 DocType: Company,Default Cash Account,default ငွေအကောင့်
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ဒီကျောင်းသားသမဂ္ဂများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,မကျောင်းသားများ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ပိုပြီးပစ္စည်းသို့မဟုတ်ဖွင့်အပြည့်အဝ form ကို Add
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
@@ -3252,9 +3251,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ပြန်လည်သင့်မြတ်ရေးမဖြစ်မီ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} မှ
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Added အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
 DocType: Sales Order,Partly Billed,တစ်စိတ်တစ်ပိုင်းကြေညာ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,item {0} တစ် Fixed Asset item ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,item {0} တစ် Fixed Asset item ဖြစ်ရပါမည်
 DocType: Item,Default BOM,default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
@@ -3277,7 +3276,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
 DocType: Purchase Invoice Item,Rate,rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,အလုပ်သင်ဆရာဝန်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,လိပ်စာအမည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,လိပ်စာအမည်
 DocType: Stock Entry,From BOM,BOM ကနေ
 DocType: Assessment Code,Assessment Code,အကဲဖြတ် Code ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,အခြေခံပညာ
@@ -3302,7 +3301,7 @@
 DocType: Purchase Invoice,Print Language,ပုံနှိပ်ပါဘာသာစကားများ
 DocType: Salary Slip,Total Working Hours,စုစုပေါင်းအလုပ်အဖွဲ့နာရီ
 DocType: Stock Entry,Including items for sub assemblies,ခွဲများအသင်းတော်တို့အဘို့ပစ္စည်းများအပါအဝင်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,အားလုံးသည် Territories
 DocType: Purchase Invoice,Items,items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ကျောင်းသားသမဂ္ဂပြီးသားစာရင်းသွင်းသည်။
@@ -3322,17 +3321,15 @@
 DocType: Issue,Opening Time,အချိန်ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ကနေနှင့်လိုအပ်သည့်ရက်စွဲများရန်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
 DocType: Assessment Plan,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
 DocType: Program Enrollment Course,Program Enrollment Course,Program ကိုကျောင်းအပ်သင်တန်းအမှတ်စဥ်
 DocType: Program Enrollment Course,Program Enrollment Course,Program ကိုကျောင်းအပ်သင်တန်းအမှတ်စဥ်
-DocType: Grading Structure,Grading Structure,grade ဖွဲ့စည်းပုံ
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
 DocType: Tax Rule,Shipping City,သဘောင်္တင်ခစီးတီး
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ဒါဟာ Item {0} (Template) ၏ Variant ဖြစ်ပါတယ်။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် Attribute တွေတင်းပလိတ်ဖိုင်ကနေကော်ပီကူးပါလိမ့်မည်
 DocType: Notification Control,Customize the Notification,ထိုအမိန့်ကြော်ငြာစာ Customize
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,စစ်ဆင်ရေးအနေဖြင့်ငွေသားဖြင့် Flow
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
@@ -3355,6 +3352,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 DocType: Leave Control Panel,Carry Forward,Forward သယ်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Department,Days for which Holidays are blocked for this department.,အားလပ်ရက်ဒီဌာနကိုပိတ်ဆို့ထားသောနေ့ရကျ။
@@ -3383,7 +3381,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),စုစုပေါင်း (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
 DocType: Quality Inspection,Item Serial No,item Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ထမ်းမှတ်တမ်း Create
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ထမ်းမှတ်တမ်း Create
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,စုစုပေါင်းလက်ရှိ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,စာရင်းကိုင်ဖော်ပြချက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,နာရီ
@@ -3398,8 +3396,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,အစားထိုးပြီးနောက်အသစ် BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ရောင်းမည်၏ပွိုင့်
 DocType: Payment Entry,Received Amount,ရရှိထားသည့်ငွေပမာဏ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","အမိန့်အပေါ်ပြီးသားအရေအတွက်လျစ်လျူရှု, အပြည့်အဝအရေအတွက်အဘို့အ Create"
 DocType: Account,Tax,အခွန်
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,မှတ်သားရန်မ
@@ -3412,7 +3408,7 @@
 DocType: Batch,Source Document Name,source စာရွက်စာတမ်းအမည်
 DocType: Batch,Source Document Name,source စာရွက်စာတမ်းအမည်
 DocType: Job Opening,Job Title,အလုပ်အကိုင်အမည်
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,အသုံးပြုသူများ Create
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,အသုံးပြုသူများ Create
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ဂရမ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ပြုပြင်ထိန်းသိမ်းမှုခေါ်ဆိုမှုအစီရင်ခံစာသွားရောက်ခဲ့ကြသည်။
@@ -3424,8 +3420,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: BOM,Website Description,website ဖော်ပြချက်များ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ပွေစာ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
@@ -3436,16 +3432,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,တည်းဖြတ်ရန်မရှိပါ။
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,မရှိသေးပါဖောက်သည်!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,လိုင်စင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,သင်တို့သည်လည်းယခင်ဘဏ္ဍာနှစ်ရဲ့ချိန်ခွင်လျှာဒီဘဏ္ဍာနှစ်မှပင်အရွက်ကိုထည့်သွင်းရန်လိုလျှင် Forward ပို့ကို select ကျေးဇူးပြု.
 DocType: GL Entry,Against Voucher Type,ဘောက်ချာ Type ဆန့်ကျင်
 DocType: Item,Attributes,Attribute တွေ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
 DocType: Student,Guardian Details,ဂါးဒီးယန်းအသေးစိတ်
 DocType: C-Form,C-Form,C-Form တွင်
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,မျိုးစုံန်ထမ်းများအတွက်မာကုတက်ရောက်
@@ -3470,14 +3468,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',အတန်း {0} # အကောင့်အမျိုးအစားဖြစ်ရပါမည် &#39;&#39; Fixed Asset &#39;&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty out
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ရောင်းချမှုသည်ရေကြောင်းပမာဏကိုတွက်ချက်ရန်စည်းမျဉ်းများ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,စီးရီးမသင်မနေရ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,စီးရီးမသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 DocType: Student Sibling,Student ID,ကျောင်းသား ID ကို
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,အချိန်မှတ်တမ်းများအဘို့အလှုပ်ရှားမှုများအမျိုးအစားများ
 DocType: Tax Rule,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
 DocType: Training Event,Exam,စာမေးပွဲ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
@@ -3510,7 +3508,7 @@
 DocType: Payment Entry,Account Paid From,ကနေ Paid အကောင့်
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ကုန်ကြမ်းပစ္စည်း Code ကို
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ခဲ Make
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ခဲ Make
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,ပုံနှိပ်နှင့်စာရေးကိရိယာ
 DocType: Stock Settings,Show Barcode Field,Show ကိုဘားကုဒ်ဖျော်ဖြေမှု
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
@@ -3526,6 +3524,7 @@
 DocType: Offer Letter,Awaiting Response,စောင့်ဆိုင်းတုန့်ပြန်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,အထက်
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Non-စံပေးဆောင်အကောင့်လျှင်ဖော်ပြထားခြင်း
 DocType: Salary Slip,Earning & Deduction,ဝင်ငွေ &amp; ထုတ်ယူ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
@@ -3562,7 +3561,7 @@
 DocType: Program Enrollment Tool,Get Students From,ကနေကျောင်းသားများ Get
 DocType: Hub Settings,Seller Country,ရောင်းချသူနိုင်ငံ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပစ္စည်းများ Publish
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,သုတ်ထဲမှာ Group မှသင့်ရဲ့ကျောင်းသားများအတွက်
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,သုတ်ထဲမှာ Group မှသင့်ရဲ့ကျောင်းသားများအတွက်
 DocType: Authorization Rule,Authorization Rule,authorization Rule
 DocType: Sales Invoice,Terms and Conditions Details,စည်းကမ်းသတ်မှတ်ချက်များအသေးစိတ်ကို
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,သတ်မှတ်ချက်များ
@@ -3622,7 +3621,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,အစမ်းထား
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,လစာ Components
 DocType: Program Enrollment Tool,New Academic Year,နယူးပညာရေးဆိုင်ရာတစ်နှစ်တာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ပြန်သွား / ခရက်ဒစ်မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,ပြန်သွား / ခရက်ဒစ်မှတ်ချက်
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
 DocType: Production Order Item,Transferred Qty,လွှဲပြောင်း Qty
@@ -3663,6 +3662,7 @@
 ,Sales Funnel,အရောင်းကတော့
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,အတိုကောက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Project,Task Progress,task ကိုတိုးတက်ရေးပါတီ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,လှည်း
 ,Qty to Transfer,သို့လွှဲပြောင်းရန် Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ခဲသို့မဟုတ် Customer များ quotes ။
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
@@ -3696,7 +3696,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,အခကြေးငွေများစုဆောင်း
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
 DocType: Lead,Add to calendar on this date,ဒီနေ့စွဲအပေါ်ပြက္ခဒိန်မှ Add
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
 DocType: Item,Opening Stock,စတော့အိတ်ဖွင့်လှစ်
@@ -3714,7 +3714,7 @@
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ထုတ်လုပ်မှုပြန်လွှတ်ပေးခဲ့အမိန့်။
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Program Enrollment Tool,Enroll Students,ကျောင်းသားများကျောင်းအပ်
 DocType: Hub Settings,Name Token,Token အမည်
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,စံရောင်းချသည့်
@@ -3725,7 +3725,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,စီမံကိန်းအမည်
-DocType: Supplier,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
+DocType: Customer,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
 DocType: Production Order,Required Items,လိုအပ်သောပစ္စည်းများ
 DocType: Stock Ledger Entry,Stock Value Difference,စတော့အိတ် Value တစ်ခု Difference
@@ -3756,6 +3756,7 @@
 DocType: Item,Taxes,အခွန်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Paid နှင့်မကယ်မနှုတ်
 DocType: Project,Default Cost Center,default ကုန်ကျစရိတ် Center က
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 DocType: Bank Guarantee,End Date,အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,စတော့အိတ်အရောင်းအဝယ်
 DocType: Budget,Budget Accounts,ဘတ်ဂျက်ငွေစာရင်း
@@ -3820,7 +3821,7 @@
 DocType: Customer,Sales Partner and Commission,အရောင်း partner နှင့်ကော်မရှင်မှ
 DocType: Employee Loan,Rate of Interest (%) / Year,အကျိုးစီးပွား၏နှုန်းမှာ (%) / တစ်နှစ်တာ
 ,Project Quantity,စီမံကိန်းအရေအတွက်
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","စုစုပေါင်း {0} ပစ္စည်းများအားလုံးအဘို့, သုညဖြစ်ပါသည်သင်က &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်ဖြစ်နိုင်သည်"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","စုစုပေါင်း {0} ပစ္စည်းများအားလုံးအဘို့, သုညဖြစ်ပါသည်သင်က &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်ဖြစ်နိုင်သည်"
 DocType: Opportunity,To Discuss,ဆွေးနွေးသည်မှ
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ဒီအရောင်းအဝယ်ပြီးမြောက်ရန် {2} လိုသေး {1} ၏ယူနစ်။
 DocType: Loan Type,Rate of Interest (%) Yearly,အကျိုးစီးပွား၏နှုန်းမှာ (%) နှစ်အလိုက်
@@ -3843,7 +3844,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,မာကုဒူးယောင်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},အတန်း {0}: အ BOM # ၏ငွေကြေး {1} ရွေးချယ်ထားတဲ့ငွေကြေး {2} တန်းတူဖြစ်သင့်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
 DocType: Homepage,Tag Line,tag ကိုလိုင်း
 DocType: Fee Component,Fee Component,အခကြေးငွေစိတျအပိုငျး
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
@@ -3860,7 +3861,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ဂိုဒေါင် {0} မတည်ရှိပါဘူး
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub သည် Register
 DocType: Monthly Distribution,Monthly Distribution Percentages,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","အဘိုးပြတ်မှုနှုန်း {1} {2} များအတွက်စာရင်းကိုင် entries တွေကိုလုပ်ဖို့လိုအပ်သောပစ္စည်း {0}, အဘို့ရှာမတွေ့ပါ။ ပစ္စည်းကတော့ {1} အတွက်နမူနာကို item အဖြစ်လုပ်ဆောင်လျှင်, {1} Item table ထဲမှာကြောင်းဖော်ပြထားခြင်းပါ။ ဒီလိုမှမဟုတ်ရင်ပစ္စည်းတစ်ခုဝင်လာသောစတော့ရှယ်ယာအရောင်းအဝယ်အတွက်ဖန်တီးသို့မဟုတ်ဖော်ပြထားခြင်းအဘိုးပြတ်နှုန်း Item စံချိန်အတွက်, ပြီးတော့ဒီ entry ပယ်ဖျက် / submiting ကြိုးစားကြည့်ပါ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ဒီ Delivery Note ကိုဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
 DocType: Project,Customer Details,customer အသေးစိတ်ကို
@@ -3877,7 +3878,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Submitted အမိန့်ပယ်ဖျက်မရပါ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,item {0} ကိုပိတ်ထားသည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,item {0} ကိုပိတ်ထားသည်
 DocType: Employee Loan,Repay Fixed Amount per Period,ကာလနှုန်း Fixed ငွေပမာဏပြန်ဆပ်
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
@@ -3904,7 +3905,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ကျောင်းသားသမဂ္ဂအီးမေးလ် ID ကို
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
 DocType: Tax Rule,Sales Tax Template,အရောင်းခွန် Template ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
 DocType: Employee,Encashment Date,Encashment နေ့စွဲ
 DocType: Training Event,Internet,အင်တာနက်ကို
 DocType: Account,Stock Adjustment,စတော့အိတ် Adjustments
@@ -3938,6 +3939,7 @@
 DocType: Purchase Invoice,Debit Note Issued,debit မှတ်ချက်ထုတ်ပေး
 DocType: Production Order,Warehouses,ကုနျလှောငျရုံ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ပိုင်ဆိုင်မှုလွှဲပြောင်းမရနိုငျ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ဤသည်အရာဝတ္ထု {0} (Template) ၏မူကွဲဖြစ်ပါတယ်။
 DocType: Workstation,per hour,တစ်နာရီကို
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ယ်ယူခြင်း
 DocType: Announcement,Announcement,အသိပေးကြေငြာခြင်း
@@ -3953,7 +3955,7 @@
 DocType: Account,Receivable,receiver
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {0}: ဝယ်ယူအမိန့်ရှိနှင့်ပြီးသားအဖြစ်ပေးသွင်းပြောင်းလဲပစ်ရန်ခွင့်ပြုခဲ့မဟုတ်
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ထားချေးငွေကန့်သတ်ထက်ကျော်လွန်ကြောင်းကိစ္စများကိုတင်ပြခွင့်ပြုခဲ့ကြောင်းအခန်းကဏ္ဍကို။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
 DocType: Item,Material Issue,material Issue
 DocType: Hub Settings,Seller Description,ရောင်းချသူဖော်ပြချက်များ
@@ -3966,7 +3968,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,အမိန့်ထုတ်
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,အကဲဖြတ်လိုအပ်ချက် Group မှ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},စုဆောင်းတန်ဖိုးဖွင့်လှစ် {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},စုဆောင်းတန်ဖိုးဖွင့်လှစ် {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Warehouse,Warehouse Name,ဂိုဒေါင်အမည်
 DocType: Naming Series,Select Transaction,Transaction ကိုရွေးပါ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,အခန်းက္ပအတည်ပြုပေးသောသို့မဟုတ်အသုံးပြုသူအတည်ပြုပေးသောရိုက်ထည့်ပေးပါ
@@ -4001,7 +4003,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, &#39;&#39; Default အဖြစ်သတ်မှတ်ပါ &#39;&#39; ကို click လုပ်ပါ"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ပူးပေါင်း
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Employee Loan,Repay from Salary,လစာထဲကနေပြန်ဆပ်
 DocType: Leave Application,LAP/,ရင်ခွင် /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ငွေပမာဏများအတွက် {0} {1} ဆန့်ကျင်ငွေပေးချေမှုတောင်းခံ {2}
@@ -4019,7 +4021,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,အကဲဖြတ်ရလဒ်အသေးစိတ်
 DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ပစ္စည်းအုပ်စု table ထဲမှာကိုတွေ့မိတ္တူပွားကို item အုပ်စု
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
 DocType: Salary Slip,Net Pay,Net က Pay ကို
 DocType: Account,Account,အကောင့်ဖွင့်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,serial No {0} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
@@ -4028,7 +4030,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",ဂိုဒေါင် {0} မည်သည့်အကောင့်နှင့်ဆက်စပ်သည်မဖန်တီး / ဂိုဒေါင်များအတွက်သက်ဆိုင်ရာ (ပိုင်ဆိုင်မှု) အကောင့်သို့လင့်ထားသည်ပါ။
 DocType: Purchase Invoice,Recurring Id,ထပ်တလဲလဲ Id
 DocType: Customer,Sales Team Details,အရောင်းရေးအဖွဲ့အသေးစိတ်ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,အမြဲတမ်းပယ်ဖျက်?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,အမြဲတမ်းပယ်ဖျက်?
 DocType: Expense Claim,Total Claimed Amount,စုစုပေါင်းအခိုင်အမာငွေပမာဏ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ရောင်းချခြင်းသည်အလားအလာရှိသောအခွင့်အလမ်း။
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},မမှန်ကန်ခြင်း {0}
@@ -4039,13 +4041,14 @@
 DocType: Warehouse,PIN,PIN ကို
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup ကို ERPNext ၌သင်တို့၏ကျောင်း
 DocType: Sales Invoice,Base Change Amount (Company Currency),base ပြောင်းလဲမှုပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
 DocType: Account,Chargeable,နှော
 DocType: Company,Change Abbreviation,ပြောင်းလဲမှုအတိုကောက်
 DocType: Expense Claim Detail,Expense Date,စရိတ်နေ့စွဲ
 DocType: Item,Max Discount (%),max လျှော့ (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,နောက်ဆုံးအမိန့်ငွေပမာဏ
+DocType: Task,Is Milestone,မှတ်တိုင်ဖြစ်ပါသည်
 DocType: Daily Work Summary,Email Sent To,ရန် Sent အီးမေးလ်
 DocType: Budget,Warn,အသိပေး
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","အခြားမည်သည့်သဘောထားမှတ်ချက်, မှတ်တမ်းများအတွက်သွားသင့်ကြောင်းမှတ်သားဖွယ်အားထုတ်မှု။"
@@ -4078,11 +4081,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze စတော့စျေးကွက် Older Than`%d ရက်ထက်နည်းသင့်သည်။
 DocType: Tax Rule,Purchase Tax Template,ဝယ်ယူခွန် Template ကို
 ,Project wise Stock Tracking,Project သည်ပညာရှိသောသူသည်စတော့အိတ်ခြေရာကောက်
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} {0} ဆန့်ကျင်ရှိတယျဆိုတာကို
 DocType: Stock Entry Detail,Actual Qty (at source/target),(အရင်းအမြစ် / ပစ်မှတ်မှာ) အမှန်တကယ် Qty
 DocType: Item Customer Detail,Ref Code,Ref Code ကို
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ဝန်ထမ်းမှတ်တမ်းများ။
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
 DocType: HR Settings,Payroll Settings,လုပ်ခလစာ Settings ကို
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Non-နှင့်ဆက်စပ်ငွေတောင်းခံလွှာနှင့်ပေးသွင်းခြင်းနှင့်ကိုက်ညီ။
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,အရပ်ဌာနအမိန့်
@@ -4105,7 +4107,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,မှားယွင်းစွာရှင်းလင်း Cheques နှင့်စာရင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
 DocType: Purchase Invoice Item,Price List Rate,စျေးနှုန်း List ကို Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ဖောက်သည်ကိုးကား Create
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ဖောက်သည်ကိုးကား Create
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",ဒီကိုဂိုဒေါင်ထဲမှာရရှိနိုင်စတော့ရှယ်ယာအပေါ်အခြေခံပြီး &quot;မစတော့အိတ်အတွက်&quot; &quot;စတော့အိတ်ခုနှစ်တွင်&quot; Show သို့မဟုတ်။
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ပစ္စည်းများ၏ဘီလ် (BOM)
 DocType: Item,Average time taken by the supplier to deliver,ပျမ်းမျှအားဖြင့်အချိန်မကယ်မလွှတ်မှပေးသွင်းခြင်းဖြင့်ယူ
@@ -4127,7 +4129,7 @@
 DocType: Asset,Disposal Date,စွန့်ပစ်နေ့စွဲ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","သူတို့အားလပ်ရက်ရှိသည်မဟုတ်ကြဘူးလျှင်အီးမေးလ်များ, ပေးထားသောနာရီမှာကုမ္ပဏီအပေါငျးတို့သ Active ကိုဝန်ထမ်းများထံသို့စေလွှတ်လိမ့်မည်။ တုံ့ပြန်မှု၏အကျဉ်းချုပ်သန်းခေါင်မှာကိုစလှေတျပါလိမ့်မည်။"
 DocType: Employee Leave Approver,Employee Leave Approver,ဝန်ထမ်းထွက်ခွာခွင့်ပြုချက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,လေ့ကျင့်ရေးတုံ့ပြန်ချက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
@@ -4135,7 +4137,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},သင်တန်းအတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
 DocType: Batch,Parent Batch,မိဘအသုတ်လိုက်
 DocType: Batch,Parent Batch,မိဘအသုတ်လိုက်
 DocType: Cheque Print Template,Cheque Print Template,Cheque တစ်စောင်လျှင်ပရင့်ထုတ်ရန် Template
@@ -4180,7 +4182,7 @@
 DocType: Item,Variant Based On,မူကွဲအခြေပြုတွင်
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,သင့်ရဲ့ပေးသွင်း
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
 DocType: Request for Quotation Item,Supplier Part No,ပေးသွင်းအပိုင်းဘယ်သူမျှမက
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;Vaulation နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,မှစ. ရရှိထားသည့်
@@ -4190,7 +4192,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,အတန်း {0}: နာရီတန်ဖိုးကိုသုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
@@ -4199,20 +4201,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
 DocType: Payment Reconciliation,From Invoice Date,ပြေစာနေ့စွဲထဲကနေ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Encashment Leave
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ဂိုဒေါင်မှ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,အားလုံးကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
 ,Average Commission Rate,ပျမ်းမျှအားဖြင့်ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: School House,House Name,အိမ်အမည်
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ပစ္စည်းများဆင်းသက်ကုန်ကျစရိတ်ကိုတွက်ချက်ဖို့အပိုဆောင်းကုန်ကျစရိတ်များကို Update
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,electrical
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,သင်၏အသုံးပြုသူများအဖြစ်သင်၏အဖွဲ့အစည်း၏ကျန်ထည့်ပါ။ သင်တို့သည်လည်း Contacts မှသူတို့ကိုထည့်သွင်းခြင်းအားဖြင့်သင့်ပေါ်တယ်မှ Customer များဖိတ်ခေါ် add နိုင်ပါတယ်
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,သင်၏အသုံးပြုသူများအဖြစ်သင်၏အဖွဲ့အစည်း၏ကျန်ထည့်ပါ။ သင်တို့သည်လည်း Contacts မှသူတို့ကိုထည့်သွင်းခြင်းအားဖြင့်သင့်ပေါ်တယ်မှ Customer များဖိတ်ခေါ် add နိုင်ပါတယ်
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},အသုံးပြုသူ ID န်ထမ်း {0} သည်စွဲလမ်းခြင်းမ
@@ -4221,7 +4223,7 @@
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,အာမခံ Start ကိုရက်စွဲအာမခံအဆုံးနေ့စွဲထက်လျော့နည်းဖြစ်သင့်
@@ -4236,7 +4238,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
@@ -4249,7 +4251,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Sales Invoice Timesheet,Billing Hours,ငွေတောင်းခံနာရီ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} မတွေ့ရှိများအတွက် default BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ဒီနေရာမှာသူတို့ကိုထည့်သွင်းဖို့ပစ္စည်းများကိုအသာပုတ်
 DocType: Fees,Program Enrollment,Program ကိုကျောင်းအပ်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} set ကျေးဇူးပြု.
@@ -4350,7 +4353,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &amp;
 DocType: Issue,First Responded On,ပထမဦးဆုံးတွင်တုန့်ပြန်
 DocType: Website Item Group,Cross Listing of Item in multiple groups,မျိုးစုံအုပ်စုများအတွက် Item ၏လက်ဝါးကပ်တိုင်အိမ်ခန်းနှင့်
-DocType: Grade Interval,Grade Interval,grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုပြီးသားဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} အတွက်သတ်မှတ်ကြသည်
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ရှင်းလင်းရေးနေ့စွဲ updated
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split ကိုအသုတ်လိုက်
@@ -4359,6 +4361,7 @@
 DocType: Request for Quotation Supplier,Download PDF,ဒေါင်းလုပ် PDF ဖိုင်ရယူရန်
 DocType: Production Order,Planned End Date,စီစဉ်ထားတဲ့အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Request for Quotation,Supplier Detail,ပေးသွင်း Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေအမှား: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Invoiced ငွေပမာဏ
@@ -4404,7 +4407,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup ကိုငါ့အအဖွဲ့အစည်းအတွက်ရိုးရှင်းတဲ့ဝက်ဘ်ဆိုက်
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,မိဘကုန်ကျစရိတ်အလယ်ဗဟိုကိုရိုက်ထည့်ပေးပါ
@@ -4464,7 +4467,7 @@
 ,Items To Be Requested,တောင်းဆိုထားသောခံရဖို့ items
 DocType: Purchase Order,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Company,Company Info,ကုမ္ပဏီ Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ကုန်ကျစရိတ်စင်တာတစ်ခုစရိတ်ပြောဆိုချက်ကိုစာအုပ်ဆိုင်လိုအပ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ဒီထမ်းများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
@@ -4477,13 +4480,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,အောက်ပါရက်ထွက်ခွာ Applications ကိုအောင်ကနေအသုံးပြုသူများကိုရပ်တန့်။
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,အရစ်ကျငွေပမာဏ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Production Order,Manufactured Qty,ထုတ်လုပ်သော Qty
 DocType: Purchase Receipt Item,Accepted Quantity,လက်ခံခဲ့သည်ပမာဏ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},{1} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
@@ -4492,15 +4495,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 Reading
 ,Hub,hub
 DocType: GL Entry,Voucher Type,ဘောက်ချာကအမျိုးအစား
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Employee Loan Application,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
 DocType: Guardian,Guardian,ဂေါကလူကြီး
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,စိစစ်ရေး {0} ပေးထားသောနေ့စွဲအကွာအဝေးအတွက်န်ထမ်း {1} ဖန်တီး
 DocType: Employee,Education,ပညာရေး
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,အားဖြင့်အမည်ကင်ပိန်း
 DocType: Employee,Current Address Is,လက်ရှိလိပ်စာ Is
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ပြုပြင်ထားသော
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
@@ -4537,7 +4542,7 @@
 DocType: Hub Settings,Hub Settings,hub Settings ကို
 DocType: Project,Gross Margin %,gross Margin%
 DocType: BOM,With Operations,စစ်ဆင်ရေးနှင့်အတူ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: Asset,Is Existing Asset,လက်ရှိပိုင်ဆိုင်မှုဖြစ်ပါသည်
 DocType: Salary Detail,Statistical Component,စာရင်းအင်းစိတျအပိုငျး
 DocType: Salary Detail,Statistical Component,စာရင်းအင်းစိတျအပိုငျး
@@ -4593,7 +4598,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo ကို Attach
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,စတော့အိတ် Levels
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Variant Make
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ငွေပေးချေမှုရမည့်အမျိုးအစား, လက်ခံတယောက်ဖြစ် Pay နှင့်ပြည်တွင်းလွှဲပြောင်းရမယ်"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
@@ -4606,6 +4611,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,အားလပ်ရက်အပေါ်ထုတ်လုပ်မှု Allow
 DocType: Sales Order,Customer's Purchase Order Date,customer ရဲ့ဝယ်ယူခြင်းအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,မြို့တော်စတော့အိတ်
+DocType: Shopping Cart Settings,Show Public Attachments,ပြည်သူ့ပူးတွဲပါပြရန်
 DocType: Packing Slip,Package Weight Details,package အလေးချိန်အသေးစိတ်ကို
 DocType: Payment Gateway Account,Payment Gateway Account,ငွေပေးချေမှုရမည့် Gateway ရဲ့အကောင့်ကို
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ငွေပေးချေမှုပြီးစီးပြီးနောက်ရွေးချယ်ထားသည့်စာမျက်နှာအသုံးပြုသူ redirect ။
@@ -4630,7 +4636,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ငွေကြေးကိုမှစသည်တို့ $ တူသောသင်္ကေတကိုလာမယ့်မပြပါနဲ့။
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ကျောင်းသားအသုတ်လိုက် Make
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ကျောင်းသားအသုတ်လိုက် Make
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ခဲအချိန် Days
@@ -4649,8 +4655,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
 DocType: Account,Cash,ငွေသား
 DocType: Employee,Short biography for website and other publications.,website နှင့်အခြားပုံနှိပ်ထုတ်ဝေအတိုကောက်အတ္ထုပ္ပတ္တိ။
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 542d2b6..5822fe0 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Item Vervaldatum Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankcheque
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Toon Varianten
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Toon Varianten
 DocType: Academic Term,Academic Term,academische Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Hoeveelheid
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gezondheidszorg
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vertraging in de betaling (Dagen)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,dienst Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Boekjaar {0} is vereist
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Adverteren
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Hetzelfde bedrijf is meer dan één keer ingevoerd
 DocType: Employee,Married,Getrouwd
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Niet toegestaan voor {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Niet toegestaan voor {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Krijgen items uit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer alsjeblieft het Systeem van de personeelsnaam in het menselijk hulpmiddel&gt; HR-instellingen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Geen artikelen vermeld
 DocType: Payment Reconciliation,Reconcile,Afletteren
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Kruidenierswinkel
 DocType: Quality Inspection Reading,Reading 1,Meting 1
 DocType: Process Payroll,Make Bank Entry,Maak Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensioenfondsen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Volgende afschrijvingen datum kan niet vóór Aankoopdatum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Volgende afschrijvingen datum kan niet vóór Aankoopdatum
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Maandelijkse Distributie ** helpt u om de begroting / Target verdelen over maanden als u de seizoensgebondenheid in uw bedrijf.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Niet artikelen gevonden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Niet artikelen gevonden
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Salarisstructuur Missing
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Invoice Item,Sales Invoice Item,Verkoopfactuur Artikel
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",bijvoorbeeld &quot;Primary School&quot; of &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Reports
 DocType: Warehouse,Warehouse Detail,Magazijn Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Einddatum kan niet later dan het jaar Einddatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Is vaste activa"" kan niet worden uitgeschakeld, als Asset record bestaat voor dit item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Is vaste activa"" kan niet worden uitgeschakeld, als Asset record bestaat voor dit item"
 DocType: Vehicle Service,Brake Oil,remolie
 DocType: Tax Rule,Tax Type,Belasting Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 DocType: BOM,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Een klant bestaat met dezelfde naam
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werkelijk Gepresteerde Tijd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Select BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kosten van geleverde zaken
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,De vakantie op {0} is niet tussen Van Datum en To Date
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Rang
 DocType: Sales Invoice Item,Delivered By Supplier,Geleverd door Leverancier
 DocType: SMS Center,All Contact,Alle Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Productieorder al gemaakt voor alle items met BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Productieorder al gemaakt voor alle items met BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Jaarsalaris
 DocType: Daily Work Summary,Daily Work Summary,Dagelijks Werk Samenvatting
 DocType: Period Closing Voucher,Closing Fiscal Year,Het sluiten van het fiscale jaar
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} is bevroren
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} is bevroren
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Kies een bestaand bedrijf voor het maken van Rekeningschema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Voorraadkosten
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecteer Target Warehouse
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company in Valuta
 DocType: Delivery Note,Installation Status,Installatie Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Wilt u aanwezig updaten? <br> Aanwezig: {0} \ <br> Afwezig: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Supply Grondstoffen voor Aankoop
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Ten minste één wijze van betaling is vereist voor POS factuur.
 DocType: Products Settings,Show Products as a List,Producten weergeven als een lijst
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download de Template, vul de juiste gegevens in en voeg het gewijzigde bestand bij. Alle data en toegewezen werknemer in de geselecteerde periode zullen in de sjabloon komen, met bestaande presentielijsten"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Maak Afschrijvingen Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Aanvraag type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,maak Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,maak Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Uitzenden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Uitvoering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details van de uitgevoerde handelingen.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan voor onderhoud bezoeken.
 DocType: SMS Settings,Enter url parameter for message,Voer URL-parameter voor bericht in
 DocType: POS Profile,Customer Groups,Doelgroepen
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Jaarrekening
 DocType: Guardian,Students,leerlingen
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regels voor de toepassing van prijzen en kortingen .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prijslijst moet van toepassing zijn op Inkoop of Verkoop
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
 DocType: Naming Series,Series List for this Transaction,Reeks voor deze transactie
 DocType: Company,Default Payroll Payable Account,Default Payroll Payable Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Pas E-Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Pas E-Group
 DocType: Sales Invoice,Is Opening Entry,Wordt Opening Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Vermeld als niet-standaard te ontvangen houdend met de toepasselijke
 DocType: Course Schedule,Instructor Name,instructeur Naam
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Tegen Sales Invoice Item
 ,Production Orders in Progress,Productieorders in behandeling
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,De netto kasstroom uit financieringsactiviteiten
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
 DocType: Lead,Address & Contact,Adres &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte bladeren van de vorige toewijzingen
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totaal bedrag Costing (via Urenregistratie)
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Gegevens
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Publiceren in Hub
 DocType: Student Admission,Student Admission,student Toelating
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Artikel {0} is geannuleerd
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
 DocType: Item,Purchase Details,Inkoop Details
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificeer per e-mail bij automatisch aanmaken van Materiaal Aanvraag
 DocType: Journal Entry,Multi Currency,Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Factuur Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Vrachtbrief
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Vrachtbrief
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kosten van Verkochte Asset
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Bericht is gewijzigd nadat u het getrokken. Neem dan trekt het weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
 DocType: Student Applicant,Admitted,toegelaten
 DocType: Workstation,Rent Cost,Huurkosten
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Bestellingswaarde
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash-transacties tegen de partij of voor interne overplaatsing
 DocType: Shipping Rule,Valid for Countries,Geldig voor Landen
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Dit artikel is een sjabloon en kunnen niet worden gebruikt bij transacties. Item attributen zal worden gekopieerd naar de varianten tenzij 'No Copy' is ingesteld
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Dit artikel is een sjabloon en kunnen niet worden gebruikt bij transacties. Item attributen zal worden gekopieerd naar de varianten tenzij 'No Copy' is ingesteld
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totaal Bestel Beschouwd
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Vul de 'Herhaal op dag van de maand' waarde in
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Belastingtarief
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegewezen voor Employee {1} voor periode {2} te {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selecteer Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converteren naar non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Partij van een artikel.
 DocType: C-Form Invoice Detail,Invoice Date,Factuurdatum
 DocType: GL Entry,Debit Amount,Debet Bedrag
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Maak Student Groepen
@@ -437,9 +440,9 @@
 DocType: Request for Quotation,Request for Quotation,Offerte
 DocType: Salary Slip Timesheet,Working Hours,Werkuren
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Maak een nieuwe klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Maak een nieuwe klant
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Als er meerdere prijzen Regels blijven die gelden, worden gebruikers gevraagd om Prioriteit handmatig instellen om conflicten op te lossen."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Maak Bestellingen
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Maak Bestellingen
 ,Purchase Register,Inkoop Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Toepasselijke kosten
@@ -483,7 +486,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakantie meester .
@@ -505,6 +508,7 @@
 DocType: Packing Slip,From Package No.,Van Pakket No
 DocType: Item Attribute,To Range,Om Bereik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Effecten en Deposito's
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan de waarderingsmethode niet wijzigen, aangezien er transacties zijn tegen sommige items die geen eigen waarderingsmethode hebben"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totaal bladeren toegewezen is verplicht
 DocType: Job Opening,Description of a Job Opening,Omschrijving van een Vacature
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Afwachting van activiteiten voor vandaag
@@ -532,7 +536,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
 DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
 DocType: Shipping Rule,Net Weight,Netto Gewicht
 DocType: Employee,Emergency Phone,Noodgeval Telefoonnummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kopen
@@ -542,7 +546,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Gelieve te definiëren cijfer voor drempel 0%
 DocType: Sales Order,To Deliver,Bezorgen
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
 DocType: Account,Profit and Loss,Winst en Verlies
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Managing Subcontracting
@@ -568,7 +572,7 @@
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 DocType: Production Plan Item,Pending Qty,In afwachting Aantal
 DocType: Budget,Ignore,Negeren
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} is niet actief
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} is niet actief
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS verzonden naar volgende nummers: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup check afmetingen voor afdrukken
 DocType: Salary Slip,Salary Slip Timesheet,Loonstrook Timesheet
@@ -577,13 +581,13 @@
 DocType: Sales Invoice,Total Commission,Totaal Commissie
 DocType: Pricing Rule,Sales Partner,Verkoop Partner
 DocType: Buying Settings,Purchase Receipt Required,Ontvangstbevestiging Verplicht
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Valuation Rate is verplicht als Opening Stock ingevoerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Valuation Rate is verplicht als Opening Stock ingevoerd
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Geen records gevonden in de factuur tabel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Selecteer Company en Party Type eerste
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Verzamelde waarden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Maak verkooporder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Maak verkooporder
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Algemeen totaal
@@ -600,7 +604,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten
 DocType: Leave Control Panel,Allocate,Toewijzen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Terugkerende verkoop
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Opmerking: Totaal toegewezen bladeren {0} mag niet kleiner zijn dan die reeds zijn goedgekeurd bladeren zijn {1} voor de periode
 DocType: Announcement,Posted By,Gepost door
 DocType: Item,Delivered by Supplier (Drop Ship),Geleverd door Leverancier (Drop Ship)
@@ -610,7 +614,7 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stel het bedrijf alstublieft in
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stel het bedrijf alstublieft in
@@ -622,7 +626,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selecteer Betaalrekening aan Bank Entry maken
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Maak Employee records bladeren, declaraties en salarisadministratie beheren"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Maak Employee records bladeren, declaraties en salarisadministratie beheren"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Voeg toe aan Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Voorstel Schrijven
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Aftrek
@@ -664,8 +668,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relatie met Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Betaling van / naar
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datumbereik
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},New kredietlimiet lager is dan de huidige uitstaande bedrag voor de klant. Kredietlimiet moet minstens zijn {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},New kredietlimiet lager is dan de huidige uitstaande bedrag voor de klant. Kredietlimiet moet minstens zijn {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Gebaseerd op' en 'Groepeer per' kunnen niet hetzelfde zijn
@@ -675,7 +678,7 @@
 DocType: Issue,Resolution Date,Oplossing Datum
 DocType: Student Batch Name,Batch Name,batch Naam
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Rooster gemaakt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Inschrijven
 DocType: Selling Settings,Customer Naming By,Klant Naming Door
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Zal de student zoals aanwezig in Student Maandelijkse Rapport Aanwezigheid tonen
@@ -718,7 +721,7 @@
 DocType: Student Attendance,Student Attendance,student Attendance
 DocType: Sales Invoice Timesheet,Time Sheet,Urenregistratie
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Grondstoffen afgeboekt op basis van
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Vul artikeldetails in
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Vul artikeldetails in
 DocType: Interest,Interest,Interesseren
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Voorverkoop
 DocType: Purchase Receipt,Other Details,Andere Details
@@ -736,7 +739,7 @@
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Offer Letter Term,Offer Letter Term,Aanbod Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item heeft varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} niet gevonden
 DocType: Bin,Stock Value,Voorraad Waarde
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Company {0} bestaat niet
@@ -745,8 +748,6 @@
 DocType: Serial No,Warranty Expiry Date,Garantie Vervaldatum
 DocType: Material Request Item,Quantity and Warehouse,Hoeveelheid en magazijn
 DocType: Sales Invoice,Commission Rate (%),Commissie Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel namenreeks voor {0} in via Setup&gt; Settings&gt; Naming Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel namenreeks voor {0} in via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecteer alsjeblieft Programma
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecteer alsjeblieft Programma
 DocType: Project,Estimated Cost,Geschatte kosten
@@ -765,7 +766,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} is geen voorraad artikel
 DocType: Mode of Payment Account,Default Account,Standaardrekening
 DocType: Payment Entry,Received Amount (Company Currency),Ontvangen bedrag (Company Munt)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Selecteer wekelijkse vrije dag
 DocType: Production Order Operation,Planned End Time,Geplande Eindtijd
 ,Sales Person Target Variance Item Group-Wise,Sales Person Doel Variance Post Group - Wise
@@ -848,7 +849,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Request for Quotation Supplier,Send Email,E-mail verzenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Geen toestemming
 DocType: Company,Default Bank Account,Standaard bankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
@@ -861,7 +862,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Geen werknemer gevonden
 DocType: Supplier Quotation,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgroep is al bijgewerkt.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgroep is al bijgewerkt.
 DocType: SMS Center,All Customer Contact,Alle Customer Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload voorraadsaldo via csv.
 DocType: Warehouse,Tree Details,Tree Details
@@ -872,8 +873,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Factuurbedrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: kostenplaats {2} behoort niet tot Company {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} kan geen Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DocName} bestaat niet in bovenstaande &#39;{} doctype&#39; table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DocName} bestaat niet in bovenstaande &#39;{} doctype&#39; table
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,geen taken
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische factuur zal bijvoorbeeld 05, 28 etc worden gegenereerd"
 DocType: Asset,Opening Accumulated Depreciation,Het openen van de cumulatieve afschrijvingen
@@ -889,7 +890,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Selecteer Artikelen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Course Schedule
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Course Schedule
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: HR Settings,Enter retirement age in years,Voer de pensioengerechtigde leeftijd in jaren
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Doel Magazijn
@@ -897,7 +898,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle Artikel Groepen
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle Artikel Groepen
 DocType: Process Payroll,Activity Log,Activiteitenlogboek
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto winst / verlies
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
@@ -908,7 +909,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Aanschaffen om de betaling
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Vrachtbrief Bericht
@@ -924,7 +925,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Aantal
 DocType: Leave Block List Date,Leave Block List Date,Laat Block List Datum
 DocType: Pricing Rule,Price or Discount,Prijs of korting
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totaal van toepassing zijnde kosten in Kwitantie Items tabel moet hetzelfde zijn als de totale belastingen en heffingen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totaal van toepassing zijnde kosten in Kwitantie Items tabel moet hetzelfde zijn als de totale belastingen en heffingen
 DocType: Sales Team,Incentives,Incentives
 DocType: SMS Log,Requested Numbers,Gevraagde Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Alleen verkrijgen Grondstoffen
@@ -982,8 +983,7 @@
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Fee Structure,Components,Components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
 DocType: Quality Inspection Reading,Reading 6,Meting 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
@@ -1035,8 +1035,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemisch
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Cash account wordt automatisch bijgewerkt in Salaris Journal Entry als deze modus wordt geselecteerd.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",De intervallen voor Grade Code {0} overlapt met het cijfer intervallen voor andere kwaliteiten. Controleer intervallen {0} en {1} en probeer het opnieuw
 DocType: BOM,Raw Material Cost(Company Currency),Grondstofkosten (Company Munt)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Rij # {0}: De tarief kan niet groter zijn dan de tarief die wordt gebruikt in {1} {2}
@@ -1049,7 +1047,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Volgende Afschrijvingen Date wordt ingevoerd als datum in het verleden
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Volgende Afschrijvingen Date wordt ingevoerd als datum in het verleden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Wit
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rij {0}: Aantal niet beschikbaar voor {4} in het magazijn van {1} op het plaatsen van tijd van de invoer ({2} {3})
@@ -1064,7 +1062,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type moet één van {0} zijn
 DocType: Lead,Next Contact Date,Volgende Contact Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vul Account for Change Bedrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vul Account for Change Bedrag
 DocType: Student Batch Name,Student Batch Name,Student batchnaam
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
 DocType: Repayment Schedule,Balance Loan Amount,Balance Leningen
@@ -1084,10 +1082,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Geef een {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Leveren Aan
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Planning Tool,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan niet negatief zijn
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Korting
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Korting
 DocType: Asset,Total Number of Depreciations,Totaal aantal Afschrijvingen
 DocType: Sales Invoice Item,Rate With Margin,Beoordeel met marges
 DocType: Workstation,Wages,Loon
@@ -1115,7 +1113,7 @@
 DocType: Lead,Organization Name,Naam van de Organisatie
 DocType: Tax Rule,Shipping State,Scheepvaart State
 ,Projected Quantity as Source,Geprojecteerd Hoeveelheid als Bron
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Omvatten niet-voorraadartikelen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Verkoopkosten
@@ -1123,7 +1121,7 @@
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postcode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Postcode
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} is {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Maken Stock Inzendingen
@@ -1166,7 +1164,7 @@
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Verzenden Regel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
 DocType: Global Defaults,Global Defaults,Global Standaardwaarden
@@ -1201,11 +1199,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vul de artikelcode voor Batch Number krijgen
 DocType: Stock Settings,Default Item Group,Standaard Artikelgroep
 DocType: Employee Loan,Partially Disbursed,gedeeltelijk uitbetaald
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverancierbestand
 DocType: Account,Balance Sheet,Balans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode is niet geconfigureerd. Controleer, of rekening is ingesteld op de wijze van betalingen of op POS Profile."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode is niet geconfigureerd. Controleer, of rekening is ingesteld op de wijze van betalingen of op POS Profile."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Uw verkoper krijgt een herinnering op deze datum om contact op te nemen met de klant
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Hetzelfde item kan niet meerdere keren worden ingevoerd.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere accounts kan worden gemaakt onder groepen, maar items kunnen worden gemaakt tegen niet-Groepen"
@@ -1244,11 +1241,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Afgerond Werk
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Gelieve ten minste één attribuut in de tabel attributen opgeven
 DocType: Announcement,All Students,Alle studenten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} moet een niet-voorraad artikel zijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} moet een niet-voorraad artikel zijn
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Bekijk Grootboek
 DocType: Grading Scale,Intervals,intervallen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Rest van de Wereld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
@@ -1289,8 +1286,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get openstaande facturen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Inkooporders helpen bij het plannen en opvolgen van uw aankopen
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Inkooporders helpen bij het plannen en opvolgen van uw aankopen
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",De totale Issue / Transfer hoeveelheid {0} in Materiaal Request {1} \ kan niet groter zijn dan de gevraagde hoeveelheid {2} voor post zijn {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Klein
@@ -1314,7 +1311,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Wijze van betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
@@ -1332,7 +1329,7 @@
 DocType: Student Group Student,Group Roll Number,Groepsrolnummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taak gewichten moeten 1. Pas gewichten van alle Project taken dienovereenkomstig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitaalgoederen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
@@ -1359,7 +1356,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journaalpost
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} items in progress
 DocType: Workstation,Workstation Name,Naam van werkstation
-DocType: Grade Interval,Grade Code,Grade Code
+DocType: Grading Scale Interval,Grade Code,Grade Code
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
@@ -1375,7 +1372,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,hardware
 DocType: Sales Order,Recurring Upto,terugkerende Tot
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Selecteer aub een andere vennootschap
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Selecteer aub een andere vennootschap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Bijzonder Verlof
 DocType: Purchase Invoice,Supplier Invoice Date,Factuurdatum Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,U moet Winkelwagen activeren.
@@ -1391,7 +1388,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Voeding
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vergrijzing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Aantal bezoeken
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark presentielijst
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark presentielijst
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Onderhoudsplan {0} bestaat tegen {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,student die zich inschrijft
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta van de Closing rekening moet worden {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Som van de punten voor alle doelen moeten zijn 100. Het is {0}
@@ -1440,13 +1438,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Rekeningschema
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Detail,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
 DocType: Pricing Rule,"Higher the number, higher the priority","Hoe hoger het getal, hoe hoger de prioriteit"
 ,Purchase Invoice Trends,Inkoopfactuur Trends
 DocType: Employee,Better Prospects,Betere vooruitzichten
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rij # {0}: De partij {1} heeft slechts {2} aantal. Selecteer alstublieft een andere partij die {3} beschikbaar heeft of verdeel de rij in meerdere rijen, om te leveren / uit te voeren vanuit meerdere batches"
 DocType: Vehicle,License Plate,Nummerplaat
 DocType: Appraisal,Goals,Doelen
 DocType: Warranty Claim,Warranty / AMC Status,Garantie / AMC Status
@@ -1465,7 +1464,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de rekening is bevroren, kunnen boekingen alleen door daartoe bevoegde gebruikers gedaan worden."
 DocType: Email Digest,Bank Balance,Banksaldo
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Post voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Post voor {0}: {1} kan alleen worden gedaan in valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Functieprofiel, benodigde kwalificaties enz."
 DocType: Journal Entry Account,Account Balance,Rekeningbalans
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Fiscale Regel voor transacties.
@@ -1476,7 +1475,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Toon ongesloten fiscale jaar P &amp; L saldi
 DocType: Shipping Rule,Shipping Account,Verzending Rekening
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} is niet actief
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Maak verkooporders om u te helpen uw werk en leveren op tijd
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Maak verkooporders om u te helpen uw werk en leveren op tijd
 DocType: Quality Inspection,Readings,Lezingen
 DocType: Stock Entry,Total Additional Costs,Totaal Bijkomende kosten
 DocType: Course Schedule,SH,SH
@@ -1487,7 +1486,7 @@
 DocType: Shipping Rule Condition,To Value,Tot Waarde
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakbon
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Pakbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Instellingen SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt!
@@ -1513,7 +1512,7 @@
 DocType: Sales Invoice,Source,Bron
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Toon gesloten
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Categorie is verplicht voor post der vaste activa
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Categorie is verplicht voor post der vaste activa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Geen records gevonden in de betaling tabel
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Deze {0} in strijd is met {1} voor {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenten HTML
@@ -1531,7 +1530,7 @@
 DocType: Student,Date of Leaving,Datum waarop het vaartuig
 DocType: Pricing Rule,For Price List,Voor Prijslijst
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Maak Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Maak Leads
 DocType: Maintenance Schedule,Schedules,Schema
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
@@ -1559,7 +1558,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,programma Inschrijvingen
 DocType: Sales Invoice Item,Brand Name,Merknaam
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Doos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mogelijke Leverancier
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,De Organisatie
@@ -1593,7 +1592,7 @@
 DocType: Quality Inspection Reading,Reading 4,Meting 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standaard BOM voor {0} niet gevonden voor Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Claims voor bedrijfsonkosten
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenten worden in het hart van het systeem, voegt al jouw leerlingen"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenten worden in het hart van het systeem, voegt al jouw leerlingen"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rij # {0}: Clearance date {1} kan niet vóór Cheque Date {2}
 DocType: Company,Default Holiday List,Standaard Vakantiedagen Lijst
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rij {0}: Van tijd en de tijd van de {1} overlapt met {2}
@@ -1605,20 +1604,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,De dag (en) waarop je solliciteert verlof zijn vakantie. U hoeft niet voor verlof.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,E-mail opnieuw te verzenden Betaling
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nieuwe taak
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Maak Offerte
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Maak Offerte
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andere rapporten
 DocType: Dependent Task,Dependent Task,Afhankelijke taak
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer plan operaties voor X dagen van tevoren.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Stel Default Payroll Payable account in Company {0}
 DocType: SMS Center,Receiver List,Ontvanger Lijst
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Zoekitem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Zoekitem
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruikte hoeveelheid
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto wijziging in cash
 DocType: Assessment Plan,Grading Scale,Grading Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Reeds voltooid
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betalingsverzoek bestaat al {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
@@ -1656,7 +1655,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Verzamelen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Je kunt niet verwijderen boekjaar {0}. Boekjaar {0} is ingesteld als standaard in Global Settings
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klant Kredietsaldo
@@ -1699,8 +1698,6 @@
 DocType: Student Sibling,Studying in Same Institute,Het bestuderen in hetzelfde instituut
 DocType: Territory,Territory Manager,Regio Manager
 DocType: Packed Item,To Warehouse (Optional),Om Warehouse (optioneel)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Itemgroep&gt; Merk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Itemgroep&gt; Merk
 DocType: Payment Entry,Paid Amount (Company Currency),Betaald bedrag (Bedrijfsvaluta)
 DocType: Purchase Invoice,Additional Discount,EXTRA KORTING
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
@@ -1710,9 +1707,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Bekijk in winkelwagen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiaal Aanvraag is gebruikt om deze Voorraad  Entry te maken
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Volgende Afschrijvingen Date is verplicht voor nieuwe aanwinst
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Volgende Afschrijvingen Date is verplicht voor nieuwe aanwinst
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Afzonderlijke cursusgroep voor elke partij
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Afzonderlijke cursusgroep voor elke partij
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enkel exemplaar van een artikel.
@@ -1729,9 +1726,7 @@
 DocType: Course Assessment Criteria,Weightage,Weging
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: kostenplaats is nodig voor &#39;Winst- en verliesrekening&#39; account {2}. Gelieve het opzetten van een standaard kostenplaats voor de onderneming.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Territorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nieuw contact
 DocType: Territory,Parent Territory,Bovenliggende Regio
 DocType: Quality Inspection Reading,Reading 2,Meting 2
@@ -1758,21 +1753,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Aflettering JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Teveel kolommen. Exporteer het rapport en druk het af via een Spreadsheet programma.
 DocType: Purchase Invoice Item,Batch No,Partij nr.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Kan geen wisselkoers te vinden {0} tot {1} voor de belangrijkste datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Kunnen meerdere verkooporders tegen een klant bestelling
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hoofd
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hoofd
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
 DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
 DocType: Employee,Leave Encashed?,Verlof verzilverd?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Opportuniteit Van"" veld is verplicht"
 DocType: Email Digest,Annual Expenses,jaarlijkse kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Toegewezen bedrag
@@ -1792,7 +1786,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,taxaties
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dubbel Serienummer ingevoerd voor Artikel {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Een voorwaarde voor een Verzendregel
-DocType: Grading Structure,Grading Intervals,Grading intervallen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom binnen alstublieft
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kan niet overbill voor post {0} in rij {1} meer dan {2}. Om over-facturering mogelijk te maken, stelt u in het kopen van Instellingen"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Stel filter op basis van artikel of Warehouse
@@ -1805,16 +1798,17 @@
 DocType: Authorization Control,Authorization Control,Autorisatie controle
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rij # {0}: Afgekeurd Warehouse is verplicht tegen verworpen Item {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betaling
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Beheer uw bestellingen
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Beheer uw bestellingen
 DocType: Production Order Operation,Actual Time and Cost,Werkelijke Tijd en kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiaal Aanvraag van maximaal {0} kan worden gemaakt voor Artikel {1} tegen Verkooporder {2}
 DocType: Employee,Salutation,Aanhef
 DocType: Course,Course Abbreviation,cursus Afkorting
 DocType: Student Leave Application,Student Leave Application,Student verlofaanvraag
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} op een halve dag op {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Totaal aantal werkuren mag niet groter zijn dan max werktijden {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Op
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundel artikelen op moment van verkoop.
 DocType: Quotation Item,Actual Qty,Werkelijk aantal
 DocType: Sales Invoice Item,References,Referenties
@@ -1824,7 +1818,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U hebt dubbele artikelen ingevoerd. Aub aanpassen en opnieuw proberen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,associëren
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nieuwe winkelwagen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,nieuwe winkelwagen
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} is geen seriegebonden artikel
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
 DocType: Vehicle,Wheels,Wheels
@@ -1856,10 +1850,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Schakelt creatie uit van tijdlogs tegen productieorders. Operaties worden niet bijgehouden tegen productieorder
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Heeft Varianten
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID is verplicht
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID is verplicht
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID is verplicht
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID is verplicht
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Terugkerende Factuur
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
@@ -1867,7 +1861,7 @@
 DocType: Budget,Fiscal Year,Boekjaar
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Begroting
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan niet worden toegewezen tegen {0}, want het is geen baten of lasten rekening"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Bereikt
 DocType: Student Admission,Application Form Route,Aanvraagformulier Route
@@ -1899,7 +1893,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Bedrag {0} {1} in mindering gebracht tegen {2}
 DocType: Employee,Salary Information,Salaris Informatie
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Invoerrechten en Belastingen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vul Peildatum in
@@ -1957,7 +1951,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Terugkerende klanten Opbrengsten
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
 DocType: Asset,Depreciation Schedule,afschrijving Schedule
 DocType: Bank Reconciliation Detail,Against Account,Tegen Rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halve dag datum moet zijn tussen Van Datum en To Date
@@ -1974,13 +1968,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
 DocType: Purchase Order,Delivered,Geleverd
 ,Vehicle Expenses,Vehicle Uitgaven
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
+DocType: Serial No,Invoice Details,Factuurgegevens
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
 DocType: Purchase Receipt,Vehicle Number,Voertuig Aantal
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,De datum waarop terugkerende factuur stopt
 DocType: Employee Loan,Loan Amount,Leenbedrag
@@ -2004,7 +1999,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Groep om Non-groep
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,lening Naam
@@ -2016,6 +2011,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazijn waar u voorraad bijhoudt van afgewezen artikelen
 DocType: Production Order,Skip Material Transfer,Materiaaloverdracht overslaan
 DocType: Production Order,Skip Material Transfer,Materiaaloverdracht overslaan
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan wisselkoers voor {0} tot {1} niet vinden voor de sleuteldatum {2}. Creëer alsjeblieft een valuta-wisselrecord
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Uw financiële jaar eindigt op
 DocType: POS Profile,Price List,Prijslijst
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} is nu het standaard Boekjaar. Ververs uw browser om de wijziging door te voeren .
@@ -2053,9 +2049,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Artikel {0} is al geretourneerd
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Boekjaar** staat voor een financieel jaar. Alle boekingen en andere belangrijke transacties worden bijgehouden in **boekjaar**.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 DocType: Student Admission,Eligibility,verkiesbaarheid
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads u helpen om zaken, voeg al uw contacten en nog veel meer als uw leads"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads u helpen om zaken, voeg al uw contacten en nog veel meer als uw leads"
 DocType: Production Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
@@ -2095,7 +2091,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selecteer Bedrijf ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laat leeg indien dit voor alle afdelingen is
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Process Payroll,Fortnightly,van twee weken
 DocType: Currency Exchange,From Currency,Van Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
@@ -2111,7 +2107,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan het type lading niet selecteren als 'On Vorige Row Bedrag ' of ' On Vorige Row Totaal ' voor de eerste rij
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Onderliggend item mag geen productbundel zijn. Gelieve item `{0}` te verwijderen en op te slaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankieren
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Voeg Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Voeg Timesheets
 DocType: Vehicle Service,Service Item,dienst Item
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
@@ -2161,8 +2157,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,De prijzen zullen niet worden weergegeven als prijslijst niet is ingesteld
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Geef aub een land dat voor deze verzending Rule of kijk Wereldwijde verzending
 DocType: Stock Entry,Total Incoming Value,Totaal Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debet Om vereist
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debet Om vereist
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Purchase Price List
 DocType: Offer Letter Term,Offer Term,Aanbod Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -2196,14 +2192,14 @@
 DocType: Opportunity,Lost Reason,Reden van verlies
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nieuw adres
 DocType: Quality Inspection,Sample Size,Monster grootte
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vul Ontvangst Document
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vul Ontvangst Document
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Alle items zijn reeds gefactureerde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Geef een geldig 'Van Zaaknummer'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Productieorders Gemaakt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Productieorders Gemaakt: {0}
 DocType: Branch,Branch,Tak
 DocType: Guardian,Mobile Number,Mobiel nummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printen en Branding
@@ -2212,7 +2208,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serienummer {0} niet gevonden
 DocType: Scheduling Tool,Student Batch,student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Uw Klanten
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,maak Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,maak Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},U bent uitgenodigd om mee te werken aan het project: {0}
 DocType: Leave Block List Date,Block Date,Blokeer Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Nu toepassen
@@ -2236,8 +2232,9 @@
 DocType: SMS Log,Sent To,Verzenden Naar
 DocType: Payment Request,Make Sales Invoice,Maak verkoopfactuur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Volgende Contact datum kan niet in het verleden
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Volgende Contact datum kan niet in het verleden
 DocType: Company,For Reference Only.,Alleen voor referentie.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Selecteer batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ongeldige {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-terugwerkende
 DocType: Sales Invoice Advance,Advance Amount,Voorschot Bedrag
@@ -2251,7 +2248,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Zaak nr. mag geen 0
 DocType: Item,Show a slideshow at the top of the page,Laat een diavoorstelling zien aan de bovenkant van de pagina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Winkels
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Winkels
 DocType: Serial No,Delivery Time,Levertijd
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vergrijzing Based On
 DocType: Item,End of Life,End of Life
@@ -2267,8 +2264,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Verplaats Materiaal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties, operationele kosten en geef een unieke operatienummer aan uw activiteiten ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dit document is dan limiet van {0} {1} voor punt {4}. Bent u het maken van een andere {3} tegen dezelfde {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Stel terugkerende na het opslaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Selecteer verandering bedrag rekening
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Stel terugkerende na het opslaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Selecteer verandering bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
 DocType: Stock Settings,Allow Negative Stock,Laat Negatieve voorraad
@@ -2279,7 +2276,7 @@
 DocType: Budget Account,Budget Account,budget account
 DocType: Quality Inspection,Verified By,Geverifieerd door
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",Kan standaard valuta van het bedrijf niet veranderen want er zijn bestaande transacties. Transacties moeten worden geannuleerd om de standaard valuta te wijzigen.
-DocType: Grade Interval,Grade Description,Grade Beschrijving
+DocType: Grading Scale Interval,Grade Description,Grade Beschrijving
 DocType: Stock Entry,Purchase Receipt No,Ontvangstbevestiging nummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Onderpand
 DocType: Process Payroll,Create Salary Slip,Maak loonstrook
@@ -2317,7 +2314,7 @@
 DocType: Upload Attendance,Attendance To Date,Aanwezigheid graag:
 DocType: Warranty Claim,Raised By,Opgevoed door
 DocType: Payment Gateway Account,Payment Account,Betaalrekening
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Netto wijziging in Debiteuren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,compenserende Off
 DocType: Offer Letter,Accepted,Geaccepteerd
@@ -2330,7 +2327,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Verzendregel Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
 DocType: Employee,Previous Work Experience,Vorige Werkervaring
@@ -2344,7 +2341,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,De naam van het instituut waarvoor u het opzetten van dit systeem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Boekingen bevroren tot deze datum, niemand kan / de boeking wijzigen behalve de hieronder gespecificeerde rol."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Sla het document op voordat u het onderhoudsschema genereert
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Sla het document op voordat u het onderhoudsschema genereert
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Aanvinken om delingen te verbieden.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,De volgende productieorders zijn gemaakt:
@@ -2367,6 +2364,7 @@
 DocType: Email Digest,How frequently?,Hoe vaak?
 DocType: Purchase Receipt,Get Current Stock,Get Huidige voorraad
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Boom van de Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Itemgroep&gt; Merk
 DocType: Student,Joining Date,Deelnemen Date
 ,Employees working on a holiday,Werknemers die op vakantie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
@@ -2468,7 +2466,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Ontruiming Datum niet vermeld
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,productie
 DocType: Guardian,Occupation,Bezetting
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
 DocType: Sales Invoice,This Document,Dit document
 DocType: Installation Note Item,Installed Qty,Aantal geïnstalleerd
@@ -2491,7 +2489,7 @@
 DocType: Notification Control,Sales Order Message,Verkooporder Bericht
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Instellen Standaardwaarden zoals Bedrijf , Valuta , huidige boekjaar , etc."
 DocType: Payment Entry,Payment Type,Betaling Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecteer een partij voor item {0}. Kan geen enkele batch vinden die aan deze eis voldoet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecteer een partij voor item {0}. Kan geen enkele batch vinden die aan deze eis voldoet
 DocType: Process Payroll,Select Employees,Selecteer Medewerkers
 DocType: Opportunity,Potential Sales Deal,Potentiële Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Reference Data
@@ -2508,7 +2506,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profiel {0} al gemaakt voor bedrijf {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Vervang Artikel / Stuklijst in alle stuklijsten
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Ontvangst document moet worden ingediend
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Ontvangst document moet worden ingediend
 DocType: Purchase Invoice Item,Received Qty,Ontvangen Aantal
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Niet betaald en niet geleverd
@@ -2521,7 +2519,7 @@
 ,To Produce,Produceren
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Loonlijst
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,maak Gebruiker
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,maak Gebruiker
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificatie van het pakket voor de levering (voor afdrukken)
 DocType: Bin,Reserved Quantity,Gereserveerde Hoeveelheid
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vul alstublieft een geldig e-mailadres in
@@ -2534,11 +2532,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Gehandicapte template mag niet standaard template
 DocType: Account,Income Account,Inkomstenrekening
 DocType: Payment Request,Amount in customer's currency,Bedrag in de valuta van de klant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Huidige Aantal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Zie &quot;Rate Of Materials Based On&quot; in Costing Sectie
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorige
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Batches helpen bijhouden opkomst, evaluaties en kosten voor studenten"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Batches helpen bijhouden opkomst, evaluaties en kosten voor studenten"
 DocType: Payment Entry,Total Allocated Amount,Totaal toegewezen bedrag
 DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry voor de salarissen van {0} tot {1}
@@ -2561,7 +2560,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
@@ -2571,6 +2570,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Zal een e-mail over het evenement aan de werknemers met de status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Hangt af van Taken
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Beheer Customer Group Boom .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Bijlagen kunnen worden getoond zonder de winkelwagentje in te schakelen
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nieuwe Kostenplaats Naam
 DocType: Leave Control Panel,Leave Control Panel,Verlof Configuratiescherm
@@ -2583,12 +2583,10 @@
 DocType: Sales Invoice,Debit To,Debitering van
 DocType: Delivery Note,Required only for sample item.,Alleen benodigd voor Artikelmonster.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Geen loonstrook gevonden tussen {0} en {1}
 ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentenadministratie
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} is uitgeschakeld
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} is uitgeschakeld
 DocType: Supplier,Billing Currency,Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-terugwerkende
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Groot
@@ -2605,7 +2603,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Assessment Groepen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nieuwe Warehouse Naam
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totaal {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totaal {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Regio
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
@@ -2623,7 +2621,7 @@
 DocType: Price List,Price List Master,Prijslijst Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkoop Transacties kunnen worden gelabeld tegen meerdere ** Sales Personen **, zodat u kunt instellen en controleren doelen."
 ,S.O. No.,VO nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Maak Klant van Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Maak Klant van Lead {0}
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Alleen verlofaanvragen met de status &#39;Goedgekeurd&#39; en &#39;Afgewezen&#39; kunnen worden ingediend
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student groepsnaam is verplicht in de rij {0}
@@ -2716,7 +2714,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Boekingen voor Voorraad
 DocType: Vehicle Service,Engine Oil,Motorolie
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
 DocType: Employee Loan,Loan Details,Loan Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rij {0}: Voltooid Aantal moet groter zijn dan nul.
@@ -2781,7 +2779,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Warehouses met bestaande transactie kan niet worden geconverteerd naar groep.
 DocType: Assessment Result Tool,Result HTML,resultaat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verloopt op
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Studenten toevoegen
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Studenten toevoegen
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Selecteer {0}
 DocType: C-Form,C-Form No,C-vorm nr.
 DocType: BOM,Exploded_items,Uitgeklapte Artikelen
@@ -2846,7 +2844,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Een wetenschappelijke term met deze &#39;Academisch Jaar&#39; {0} en &#39;Term Name&#39; {1} bestaat al. Wijzig deze ingangen en probeer het opnieuw.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Als er bestaande transacties tegen punt {0}, kunt u de waarde van het niet veranderen {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Als er bestaande transacties tegen punt {0}, kunt u de waarde van het niet veranderen {1}"
 DocType: UOM,Must be Whole Number,Moet heel getal zijn
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nieuwe Verloven Toegewezen (in dagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serienummer {0} bestaat niet
@@ -2890,7 +2888,7 @@
 DocType: Supplier,Last Day of the Next Month,Laatste dag van de volgende maand
 DocType: Support Settings,Auto close Issue after 7 days,Auto dicht Issue na 7 dagen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlof kan niet eerder worden toegewezen {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student Aanvrager
 DocType: Asset Category Account,Accumulated Depreciation Account,Cumulatieve afschrijvingen Account
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2918,8 +2916,8 @@
 DocType: Asset,Item Code,Artikelcode
 DocType: Production Planning Tool,Create Production Orders,Maak Productieorders
 DocType: Serial No,Warranty / AMC Details,Garantie / AMC Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Betaalde bedrag kan niet groter zijn dan de totale negatieve openstaande bedrag {0}
@@ -2937,7 +2935,7 @@
 DocType: Production Planning Tool,Create Material Requests,Maak Materiaal Aanvragen
 DocType: Employee Education,School/University,School / Universiteit
 DocType: Payment Request,Reference Details,Reference Details
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwachte waarde na Praktische Het leven moet minder dan Gross Aankoopbedrag zijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwachte waarde na Praktische Het leven moet minder dan Gross Aankoopbedrag zijn
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty bij Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Gefactureerd Bedrag
 DocType: Asset,Double Declining Balance,Double degressief
@@ -2958,19 +2956,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Uitbetaalde bedrag kan niet groter zijn dan Leningen zijn {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Productieorder niet gemaakt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Productieorder niet gemaakt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
 DocType: Asset,Fully Depreciated,volledig is afgeschreven
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Attendance HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Offertes zijn voorstellen, biedingen u uw klanten hebben gestuurd"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Offertes zijn voorstellen, biedingen u uw klanten hebben gestuurd"
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serienummer en Batch
 DocType: Warranty Claim,From Company,Van Bedrijf
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Som van de scores van de beoordelingscriteria moet {0} te zijn.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Stel Aantal geboekte afschrijvingen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Stel Aantal geboekte afschrijvingen
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Waarde of Aantal
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,minuut
@@ -3101,7 +3099,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Offerte Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Maak een keuze van de klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Maak een keuze van de klant
 DocType: C-Form,I,ik
 DocType: Company,Asset Depreciation Cost Center,Asset Afschrijvingen kostenplaats
 DocType: Sales Order Item,Sales Order Date,Verkooporder Datum
@@ -3120,19 +3118,18 @@
 DocType: Vehicle,Insurance Details,verzekering Details
 DocType: Account,Payable,betaalbaar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vul de aflossingsperiode
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debiteuren ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debiteuren ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nieuwe klanten
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Brutowinst%
 DocType: Appraisal Goal,Weightage (%),Weging (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Aankoopbedrag is verplicht
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Aankoopbedrag is verplicht
 DocType: Lead,Address Desc,Adres Omschr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party is verplicht
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,topic Naam
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Tenminste een van de verkopen of aankopen moeten worden gekozen
-DocType: Grading Structure,Grade Intervals,Grade intervallen
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selecteer de aard van uw bedrijf.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Waar de productie-activiteiten worden uitgevoerd.
 DocType: Asset Movement,Source Warehouse,Bron Magazijn
@@ -3161,6 +3158,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
 DocType: Territory,Territory Targets,Regio Doelen
 DocType: Delivery Note,Transporter Info,Vervoerder Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Territorium
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Stel default {0} in Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Uitgangspositie van bovenrand
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Dezelfde leverancier is meerdere keren ingevoerd
@@ -3214,7 +3212,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Bestelaantal
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Huidige vacatures
 DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening
-DocType: Journal Entry,Write Off,Afschrijven
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afschrijven
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systeemgebruiker (login) ID. Indien ingesteld, zal het de standaard worden voor alle HR-formulieren."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Van {1}
@@ -3225,8 +3223,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverancier levert aan de Klant
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Vorm / Item / {0}) is niet op voorraad
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Volgende Date moet groter zijn dan Posting Date
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Toon tax break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gegevens importeren en exporteren
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock inzendingen bestaan tegen Warehouse {0}, dus u kunt niet opnieuw toe te wijzen of aan te passen"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Geen studenten gevonden
@@ -3238,14 +3236,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Uit AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selecteer alsjeblieft Offerte
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selecteer alsjeblieft Offerte
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Maak Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selecteer alsjeblieft Offerte
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selecteer alsjeblieft Offerte
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maak Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
 DocType: Company,Default Cash Account,Standaard Kasrekening
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dit is gebaseerd op de aanwezigheid van de Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Geen studenten in
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Voeg meer items of geopend volledige vorm
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
@@ -3292,9 +3291,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Voordat verzoening
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Naar {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Belastingen en Toeslagen toegevoegd (Bedrijfsvaluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
 DocType: Sales Order,Partly Billed,Deels Gefactureerd
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} moet een post der vaste activa zijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} moet een post der vaste activa zijn
 DocType: Item,Default BOM,Standaard Stuklijst
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale uitstaande Amt
@@ -3317,7 +3316,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Prijslijst Wisselkoers
 DocType: Purchase Invoice Item,Rate,Tarief
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adres naam
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adres naam
 DocType: Stock Entry,From BOM,Van BOM
 DocType: Assessment Code,Assessment Code,assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Basis
@@ -3342,7 +3341,7 @@
 DocType: Purchase Invoice,Print Language,Print Taal
 DocType: Salary Slip,Total Working Hours,Totaal aantal Werkuren
 DocType: Stock Entry,Including items for sub assemblies,Inclusief items voor sub assemblies
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Voer waarde moet positief zijn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Voer waarde moet positief zijn
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle gebieden
 DocType: Purchase Invoice,Items,Artikelen
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student is reeds ingeschreven.
@@ -3362,17 +3361,15 @@
 DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Van en naar data vereist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
 DocType: Assessment Plan,Supervisor Name,supervisor Naam
 DocType: Program Enrollment Course,Program Enrollment Course,Programma Inschrijvingscursus
 DocType: Program Enrollment Course,Program Enrollment Course,Programma Inschrijvingscursus
-DocType: Grading Structure,Grading Structure,Grading Structuur
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
 DocType: Tax Rule,Shipping City,Verzending Stad
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dit artikel is een variant van {0} (Template). Attributen zullen worden gekopieerd uit de sjabloon, tenzij 'No Copy' is ingesteld"
 DocType: Notification Control,Customize the Notification,Aanpassen Kennisgeving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,De cashflow uit bedrijfsoperaties
 DocType: Sales Invoice,Shipping Rule,Verzendregel
@@ -3395,6 +3392,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Selecteer Boekingsdatum eerste
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Openingsdatum moeten vóór Sluitingsdatum
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve op te stellen nummeringsreeks voor Attendance via Setup&gt; Numbering Series
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenplaats met bestaande transacties kan niet worden omgezet naar grootboek
 DocType: Department,Days for which Holidays are blocked for this department.,Dagen waarvoor feestdagen zijn geblokkeerd voor deze afdeling.
@@ -3423,7 +3421,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 DocType: Quality Inspection,Item Serial No,Artikel Serienummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Maak Employee Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Maak Employee Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Totaal Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Boekhouding Jaarrekening
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,uur
@@ -3438,8 +3436,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,De nieuwe Stuklijst na vervanging
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,ontvangen Bedrag
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer alsjeblieft het Systeem van de personeelsnaam in het menselijk hulpmiddel&gt; HR-instellingen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer alsjeblieft het Systeem van de personeelsnaam in het menselijk hulpmiddel&gt; HR-instellingen
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Maak voor de volledige hoeveelheid, het negeren van de hoeveelheid reeds bestelde"
 DocType: Account,Tax,Belasting
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ongemerkt
@@ -3452,7 +3448,7 @@
 DocType: Batch,Source Document Name,Bron Document Naam
 DocType: Batch,Source Document Name,Bron Document Naam
 DocType: Job Opening,Job Title,Functietitel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Gebruikers maken
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Gebruikers maken
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bezoek rapport voor onderhoud gesprek.
@@ -3464,8 +3460,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: BOM,Website Description,Website Beschrijving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto wijziging in het eigen vermogen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Ontvangst
 ,Sales Register,Verkoopregister
@@ -3476,16 +3472,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
 DocType: Customer Group,Customer Group Name,Klant Groepsnaam
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nog geen klanten!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kasstroomoverzicht
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licentie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Selecteer Carry Forward als u ook wilt opnemen vorige boekjaar uit balans laat dit fiscale jaar
 DocType: GL Entry,Against Voucher Type,Tegen Voucher Type
 DocType: Item,Attributes,Attributen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Voer Afschrijvingenrekening in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Laatste Bestel Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} behoort niet tot bedrijf {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Attendance voor meerdere medewerkers
@@ -3510,14 +3508,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rij {0} # Account moet van het type zijn &#39;Vaste Activa&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Reeks is verplicht
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Reeks is verplicht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening
 DocType: Student Sibling,Student ID,student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Soorten activiteiten voor Time Logs
 DocType: Tax Rule,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
 DocType: Training Event,Exam,tentamen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte afwezigheden
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
@@ -3550,7 +3548,7 @@
 DocType: Payment Entry,Account Paid From,Account betaald uit
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstof Artikelcode
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,maak Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,maak Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print en stationaire
 DocType: Stock Settings,Show Barcode Field,Show streepjescodeveld
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Stuur Leverancier Emails
@@ -3566,6 +3564,7 @@
 DocType: Offer Letter,Awaiting Response,Wachten op antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Boven
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Noem als niet-standaard betaalbaar account
 DocType: Salary Slip,Earning & Deduction,Verdienen &amp; Aftrek
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
@@ -3602,7 +3601,7 @@
 DocType: Program Enrollment Tool,Get Students From,Krijgen studenten uit
 DocType: Hub Settings,Seller Country,Verkoper Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Artikelen publiceren op de website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Groep uw leerlingen in batches
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Groep uw leerlingen in batches
 DocType: Authorization Rule,Authorization Rule,Autorisatie Rule
 DocType: Sales Invoice,Terms and Conditions Details,Algemene Voorwaarden Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specificaties
@@ -3662,7 +3661,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,proeftijd
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,salaris Components
 DocType: Program Enrollment Tool,New Academic Year,New Academisch Jaar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Totale betaalde bedrag
 DocType: Production Order Item,Transferred Qty,Verplaatst Aantal
@@ -3703,6 +3702,7 @@
 ,Sales Funnel,Verkoop Trechter
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Afkorting is verplicht
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kar
 ,Qty to Transfer,Aantal te verplaatsen
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offertes naar leads of klanten.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan om bevroren voorraden bewerken
@@ -3736,7 +3736,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Verzamel Vergoedingen
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
 DocType: Lead,Add to calendar on this date,Toevoegen aan agenda op deze datum
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
 DocType: Item,Opening Stock,Opening Stock
@@ -3755,7 +3755,7 @@
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Orders vrijgegeven voor productie.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Program Enrollment Tool,Enroll Students,inschrijven Studenten
 DocType: Hub Settings,Name Token,Naam Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaard Verkoop
@@ -3766,7 +3766,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Naam van het project
-DocType: Supplier,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
+DocType: Customer,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
 DocType: Journal Entry Account,If Income or Expense,Indien Inkomsten (baten) of Uitgaven (lasten)
 DocType: Production Order,Required Items,Vereiste items
 DocType: Stock Ledger Entry,Stock Value Difference,Voorraad Waarde Verschil
@@ -3797,6 +3797,7 @@
 DocType: Item,Taxes,Belastingen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Betaald en niet geleverd
 DocType: Project,Default Cost Center,Standaard Kostenplaats
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel namenreeks voor {0} in via Setup&gt; Settings&gt; Naming Series
 DocType: Bank Guarantee,End Date,Einddatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transactions
 DocType: Budget,Budget Accounts,budget Accounts
@@ -3861,7 +3862,7 @@
 DocType: Customer,Sales Partner and Commission,Sales Partner en de Commissie
 DocType: Employee Loan,Rate of Interest (%) / Year,Rate of Interest (%) / Jaar
 ,Project Quantity,project Hoeveelheid
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kan je zou moeten veranderen &#39;Verdeel heffingen op basis van&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kan je zou moeten veranderen &#39;Verdeel heffingen op basis van&#39;"
 DocType: Opportunity,To Discuss,Te bespreken
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} eenheden van {1} die nodig zijn in {2} om deze transactie te voltooien.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rate of Interest (%) Jaarlijkse
@@ -3884,7 +3885,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Afwezig
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rij {0}: Munt van de BOM # {1} moet gelijk zijn aan de geselecteerde valuta zijn {2}
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Vloot beheer
@@ -3901,7 +3902,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazijn {0} bestaat niet
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inschrijven Voor ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Maandelijkse Verdeling Percentages
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waardering tarief niet gevonden voor het artikel {0}, die nodig is om boekingen te doen {1} {2}. Als het item wordt transacties als een monster punt in de {1}, gelieve dat in de {1} Item tafel. Zo niet, maak dan een inkomend aandelen transactie voor het item of de vermelding waardering tarief in de Item record, en dan proberen submiting / annuleren van dit item"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% van de geleverde materialen voor deze Vrachtbrief
 DocType: Project,Customer Details,Klant Details
@@ -3918,7 +3919,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Ingezonden bestellingen kunnen niet worden verwijderd
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Accountbalans reeds in Debet, 'Balans moet zijn' mag niet als 'Credit' worden ingesteld"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Quality Management
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} is uitgeschakeld
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} is uitgeschakeld
 DocType: Employee Loan,Repay Fixed Amount per Period,Terugbetalen vast bedrag per periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
 DocType: Employee External Work History,Employee External Work History,Werknemer Externe Werk Geschiedenis
@@ -3945,7 +3946,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selecteer items om de factuur te slaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Selecteer items om de factuur te slaan
 DocType: Employee,Encashment Date,Betalingsdatum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Voorraad aanpassing
@@ -3979,6 +3980,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debetnota
 DocType: Production Order,Warehouses,Magazijnen
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actief kan niet worden overgedragen
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Dit artikel is een variant van {0} (Sjabloon).
 DocType: Workstation,per hour,per uur
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,inkoop
 DocType: Announcement,Announcement,Mededeling
@@ -3994,7 +3996,7 @@
 DocType: Account,Receivable,Vordering
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan om van leverancier te veranderen als bestelling al bestaat
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan om transacties in te dienen die gestelde kredietlimieten overschrijden .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selecteer Items voor fabricage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Selecteer Items voor fabricage
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
 DocType: Item,Material Issue,Materiaal uitgifte
 DocType: Hub Settings,Seller Description,Verkoper Beschrijving
@@ -4007,7 +4009,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Besteld
 DocType: Salary Detail,Component,bestanddeel
 DocType: Assessment Criteria,Assessment Criteria Group,Beoordelingscriteria Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Het openen van de cumulatieve afschrijvingen moet kleiner zijn dan gelijk aan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Het openen van de cumulatieve afschrijvingen moet kleiner zijn dan gelijk aan {0}
 DocType: Warehouse,Warehouse Name,Magazijn Naam
 DocType: Naming Series,Select Transaction,Selecteer Transactie
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vul de Goedkeurders Rol of Goedkeurende Gebruiker in
@@ -4041,7 +4043,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit boekjaar in te stellen als standaard, klik op 'Als standaard instellen'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,toetreden
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
 DocType: Employee Loan,Repay from Salary,Terugbetalen van Loon
 DocType: Leave Application,LAP/,RONDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Betalingsverzoeken tegen {0} {1} van {2} bedrag
@@ -4059,7 +4061,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Assessment Resultaat Detail
 DocType: Employee Education,Employee Education,Werknemer Opleidingen
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate artikelgroep gevonden in de artikelgroep tafel
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
 DocType: Salary Slip,Net Pay,Nettoloon
 DocType: Account,Account,Rekening
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} is reeds ontvangen
@@ -4068,7 +4070,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} is niet gekoppeld aan een rekening, maak / verbinden de overeenkomstige (Asset) zijn goed voor het magazijn."
 DocType: Purchase Invoice,Recurring Id,Terugkerende Id
 DocType: Customer,Sales Team Details,Verkoop Team Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Permanent verwijderen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Permanent verwijderen?
 DocType: Expense Claim,Total Claimed Amount,Totaal gedeclareerd bedrag
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentiële mogelijkheden voor verkoop.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ongeldige {0}
@@ -4079,13 +4081,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Stel uw School in ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Bedrag (Company Munt)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Sla het document eerst.
 DocType: Account,Chargeable,Aan te rekenen
 DocType: Company,Change Abbreviation,Afkorting veranderen
 DocType: Expense Claim Detail,Expense Date,Kosten Datum
 DocType: Item,Max Discount (%),Max Korting (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Laatste Orderbedrag
+DocType: Task,Is Milestone,Is Milestone
 DocType: Daily Work Summary,Email Sent To,Email verzonden naar
 DocType: Budget,Warn,Waarschuwen
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, noemenswaardig voor in de boekhouding,"
@@ -4118,11 +4121,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Bevries Voorraden Ouder dan' moet minder dan %d dagen zijn.
 DocType: Tax Rule,Purchase Tax Template,Kopen Tax Template
 ,Project wise Stock Tracking,Projectgebaseerde Aandelenhandel
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Onderhoudsschema {0} bestaat tegen {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Werkelijke Aantal (bij de bron / doel)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Werknemer regel.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
 DocType: HR Settings,Payroll Settings,Loonadministratie Instellingen
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Plaats bestelling
@@ -4145,7 +4147,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques en Deposito verkeerd ontruimd
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
 DocType: Purchase Invoice Item,Price List Rate,Prijslijst Tarief
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Maak een offerte voor de klant
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Maak een offerte voor de klant
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Toon &quot;Op voorraad&quot; of &quot;Niet op voorraad&quot; op basis van de beschikbare voorraad in dit magazijn.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Stuklijsten
 DocType: Item,Average time taken by the supplier to deliver,De gemiddelde tijd die door de leverancier te leveren
@@ -4167,7 +4169,7 @@
 DocType: Asset,Disposal Date,verwijdering Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails worden meegedeeld aan alle actieve werknemers van het bedrijf worden verzonden op het opgegeven uur, als ze geen vakantie. Samenvatting van de reacties zal worden verzonden om middernacht."
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren instellen, omdat offerte is gemaakt."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,training Terugkoppeling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
@@ -4175,7 +4177,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Natuurlijk is verplicht in de rij {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Toevoegen / bewerken Prijzen
 DocType: Batch,Parent Batch,Ouderlijk Batch
 DocType: Batch,Parent Batch,Ouderlijk Batch
 DocType: Cheque Print Template,Cheque Print Template,Cheque Print Template
@@ -4220,7 +4222,7 @@
 DocType: Item,Variant Based On,Variant gebaseerd op
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Uw Leveranciers
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Kan niet als verloren instellen, omdat er al een verkooporder is gemaakt."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kan niet als verloren instellen, omdat er al een verkooporder is gemaakt."
 DocType: Request for Quotation Item,Supplier Part No,Leverancier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan niet aftrekken als categorie is voor &#39;Valuation&#39; of &#39;Vaulation en Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Gekregen van
@@ -4230,7 +4232,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Van {0} voor {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rij {0}: Aantal uren moet groter zijn dan nul.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
@@ -4239,20 +4241,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
 DocType: Payment Reconciliation,From Invoice Date,Na factuurdatum
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Billing munt moet gelijk zijn aan valuta of partij rekening valuta ofwel default comapany&#39;s zijn
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Billing munt moet gelijk zijn aan valuta of partij rekening valuta ofwel default comapany&#39;s zijn
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Laat Inning
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Wat doet het?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Tot Magazijn
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle studentenadministratie
 ,Average Commission Rate,Gemiddelde Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: School House,House Name,Huis naam
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Update de bijkomende kosten om de totaalkost te berekenen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,elektrisch
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Voeg de rest van uw organisatie als uw gebruikers. U kunt ook toevoegen uitnodigen klanten naar uw portal door ze toe te voegen vanuit Contacten
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Voeg de rest van uw organisatie als uw gebruikers. U kunt ook toevoegen uitnodigen klanten naar uw portal door ze toe te voegen vanuit Contacten
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Gebruikers-ID niet ingesteld voor Werknemer {0}
@@ -4261,7 +4263,7 @@
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagen sinds laatste Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum moet kleiner zijn dan de verzekering einddatum
@@ -4276,7 +4278,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Loonstrook van de werknemer {0} al gemaakt voor urenregistratie {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periode Van en periode te data verplicht voor terugkerende {0}
@@ -4289,7 +4291,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Af te schrijven bedrag (Bedrijfsvaluta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standaard BOM voor {0} niet gevonden
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tik op items om ze hier toe te voegen
 DocType: Fees,Program Enrollment,programma Inschrijving
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Stel {0} in
@@ -4389,7 +4392,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
 DocType: Issue,First Responded On,Eerst gereageerd op
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kruis Notering van Punt in meerdere groepen
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Boekjaar Startdatum en Boekjaar Einddatum zijn al ingesteld voor het fiscale jaar {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Ontruiming Geactualiseerd
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4398,6 +4400,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
 DocType: Production Order,Planned End Date,Geplande Einddatum
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Waar artikelen worden opgeslagen.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 DocType: Request for Quotation,Supplier Detail,Leverancier Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Fout in formule of aandoening: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Factuurbedrag
@@ -4443,7 +4446,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup een eenvoudige website voor mijn organisatie
 DocType: Payment Reconciliation,Receivable / Payable Account,Vorderingen / Crediteuren Account
 DocType: Delivery Note Item,Against Sales Order Item,Tegen Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vul bovenliggende kostenplaats in
@@ -4503,7 +4506,7 @@
 ,Items To Be Requested,Aan te vragen artikelen
 DocType: Purchase Order,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Company,Company Info,Bedrijfsinformatie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selecteer of voeg nieuwe klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Selecteer of voeg nieuwe klant
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostenplaats nodig is om een declaratie te boeken
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dit is gebaseerd op de aanwezigheid van deze werknemer
@@ -4516,13 +4519,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Weerhoud gebruikers van het maken van verlofaanvragen op de volgende dagen.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Aankoopbedrag
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Employee Benefits
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Production Order,Manufactured Qty,Geproduceerd Aantal
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Stel een standaard Holiday-lijst voor Employee {0} of Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} bestaat niet
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} bestaat niet
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factureren aan Klanten
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
@@ -4531,15 +4534,17 @@
 DocType: Quality Inspection Reading,Reading 3,Meting 3
 ,Hub,Naaf
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Employee Loan Application,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
 DocType: Guardian,Guardian,Voogd
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Beoordeling {0} gemaakt voor Employee {1} in de bepaalde periode
 DocType: Employee,Education,Onderwijs
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Campagnenaam gegeven door
 DocType: Employee,Current Address Is,Huidige adres is
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,gemodificeerde
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Optioneel. Stelt bedrijf prijslijst, indien niet opgegeven."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
@@ -4576,7 +4581,7 @@
 DocType: Hub Settings,Hub Settings,Hub Instellingen
 DocType: Project,Gross Margin %,Bruto marge %
 DocType: BOM,With Operations,Met Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn reeds geboekt in valuta {0} voor bedrijf {1}. Selecteer een vordering of te betalen rekening met valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn reeds geboekt in valuta {0} voor bedrijf {1}. Selecteer een vordering of te betalen rekening met valuta {0}.
 DocType: Asset,Is Existing Asset,Is Bestaande Asset
 DocType: Salary Detail,Statistical Component,Statistische Component
 DocType: Salary Detail,Statistical Component,Statistische Component
@@ -4632,7 +4637,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Bevestig Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Levels
 DocType: Customer,Commission Rate,Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Maak Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokkeer verlofaanvragen per afdeling.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type moet een van te ontvangen, betalen en Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
@@ -4645,6 +4650,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Laat Productie op vakantie
 DocType: Sales Order,Customer's Purchase Order Date,Inkooporder datum van Klant
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitaal Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Publieke bijlagen tonen
 DocType: Packing Slip,Package Weight Details,Pakket gewicht details
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Account
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Na betaling voltooiing omleiden gebruiker geselecteerde pagina.
@@ -4669,7 +4675,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Vertoon geen symbool zoals $, enz. naast valuta."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Maak Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Maak Student Batch
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Artikelen ophalen van Stuklijst
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Dagen
@@ -4688,8 +4694,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve op te stellen nummeringsreeks voor Attendance via Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve op te stellen nummeringsreeks voor Attendance via Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Rekening {0} bestaat niet
 DocType: Account,Cash,Contant
 DocType: Employee,Short biography for website and other publications.,Korte biografie voor website en andere publicaties.
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 985a9eb..74f95c4 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Element Utløps Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Vis Varianter
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Vis Varianter
 DocType: Academic Term,Academic Term,semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Antall
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Helsevesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dager)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Annonsering
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er angitt mer enn én gang
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tillatt for {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ikke tillatt for {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Ansattes navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen elementer oppført
 DocType: Payment Reconciliation,Reconcile,Forsone
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Dagligvare
 DocType: Quality Inspection Reading,Reading 1,Lesing 1
 DocType: Process Payroll,Make Bank Entry,Gjør Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensjonsfondene
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Neste Avskrivninger Datoen kan ikke være før Kjøpsdato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Neste Avskrivninger Datoen kan ikke være før Kjøpsdato
 DocType: SMS Center,All Sales Person,All Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Månedlig Distribusjon ** hjelper deg distribuere Budsjett / Target over måneder hvis du har sesongvariasjoner i din virksomhet.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ikke elementer funnet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Ikke elementer funnet
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Lønn Struktur Missing
 DocType: Lead,Person Name,Person Name
 DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Element
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",for eksempel &quot;Primary School&quot; eller &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lager rapporter
 DocType: Warehouse,Warehouse Detail,Warehouse Detalj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Sluttdato kan ikke være senere enn året sluttdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fixed Asset&quot; ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fixed Asset&quot; ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
 DocType: Vehicle Service,Brake Oil,bremse~~POS=TRUNC Oil
 DocType: Tax Rule,Tax Type,Skatt Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
 DocType: BOM,Item Image (if not slideshow),Sak Image (hvis ikke show)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Customer eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timepris / 60) * Faktisk Operation Tid
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Velg BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Velg BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad for leverte varer
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ferien på {0} er ikke mellom Fra dato og Til dato
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,grade
 DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: SMS Center,All Contact,All kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produksjonsordre allerede opprettet for alle varer med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Produksjonsordre allerede opprettet for alle varer med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Årslønn
 DocType: Daily Work Summary,Daily Work Summary,Daglig arbeid Oppsummering
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} er frosset
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Aksje Utgifter
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Velg Target Warehouse
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kreditt i selskapet Valuta
 DocType: Delivery Note,Installation Status,Installasjon Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ønsker du å oppdatere oppmøte? <br> Present: {0} \ <br> Fraværende: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Leverer råvare til Purchase
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,I det minste én modus av betaling er nødvendig for POS faktura.
 DocType: Products Settings,Show Products as a List,Vis produkter på en liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Gjør Avskrivninger Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Forespørsel Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Gjør Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Gjør Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Kringkasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Execution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljene for operasjonen utføres.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan for vedlikeholdsbesøk.
 DocType: SMS Settings,Enter url parameter for message,Skriv inn url parameter for melding
 DocType: POS Profile,Customer Groups,kunde~~POS=TRUNC grupper~~POS=HEADCOMP
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Årsregnskap
 DocType: Guardian,Students,studenter
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regler for bruk av prising og rabatt.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste må være aktuelt for å kjøpe eller selge
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
 DocType: Company,Default Payroll Payable Account,Standard Lønn betales konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Oppdater E-postgruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Oppdater E-postgruppe
 DocType: Sales Invoice,Is Opening Entry,Åpner Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nevn hvis ikke-standard fordring konto aktuelt
 DocType: Course Schedule,Instructor Name,instruktør Name
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot Salg Faktura Element
 ,Production Orders in Progress,Produksjonsordrer i Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Netto kontantstrøm fra finansierings
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Beløp (via Timeregistrering)
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Publisere i Hub
 DocType: Student Admission,Student Admission,student Entre
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Element {0} er kansellert
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 DocType: Item,Purchase Details,Kjøps Detaljer
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Levering Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Levering Note
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost of Selges Asset
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Entry har blitt endret etter at du trakk den. Kan trekke det igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
 DocType: Student Applicant,Admitted,innrømmet
 DocType: Workstation,Rent Cost,Rent Cost
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Bestillingsverdi
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / kontanter transaksjoner mot part eller for intern overføring
 DocType: Shipping Rule,Valid for Countries,Gyldig for Land
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre &#39;No Copy&#39; er satt"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre &#39;No Copy&#39; er satt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Bestill Regnes
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Skriv inn &#39;Gjenta på dag i måneden&#39; feltverdi
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Velg element
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (mye) av et element.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debet Beløp
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opprett studentgrupper
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Forespørsel om kostnadsoverslag
 DocType: Salary Slip Timesheet,Working Hours,Arbeidstid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Opprett en ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Opprett en ny kunde
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Pris Regler fortsette å råde, blir brukerne bedt om å sette Priority manuelt for å løse konflikten."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Opprette innkjøpsordrer
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Opprette innkjøpsordrer
 ,Purchase Register,Kjøp Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Gjeldende avgifter
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday mester.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Fra Package No.
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke endre verdsettelsesmetoden, da det er transaksjoner mot enkelte poster som ikke har egen verdsettelsesmetode"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse av en ledig jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for i dag
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kjøpe
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vennligst definer karakter for Terskel 0%
 DocType: Sales Order,To Deliver,Å Levere
 DocType: Purchase Invoice Item,Item,Sak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Administrerende Underleverandører
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 DocType: Production Plan Item,Pending Qty,Venter Stk
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} er ikke aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} er ikke aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS sendt til følgende nummer: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Oppsett sjekk dimensjoner for utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lønn Slip Timeregistrering
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Total Commission
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Kvitteringen Påkrevd
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Verdsettelse Rate er obligatorisk hvis Åpning Stock oppgitt
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Verdsettelse Rate er obligatorisk hvis Åpning Stock oppgitt
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,akkumulerte verdier
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Gjør Salgsordre
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Gjør Salgsordre
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,Fortsett Vedlegg
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
 DocType: Leave Control Panel,Allocate,Bevilge
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Merk: Totalt tildelte blader {0} bør ikke være mindre enn allerede innvilgede permisjoner {1} for perioden
 DocType: Announcement,Posted By,Postet av
 DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vennligst sett selskapet
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vennligst sett selskapet
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timeregistrering
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Velg betalingskonto å lage Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Lag personalregistre for å håndtere blader, refusjonskrav og lønn"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Lag personalregistre for å håndtere blader, refusjonskrav og lønn"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Legg til Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Forslaget Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relasjon med Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Betaling fra / til
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datointervall
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
 DocType: SMS Settings,Receiver Parameter,Mottaker Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Based On&quot; og &quot;Grupper etter&quot; ikke kan være det samme
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,Oppløsning Dato
 DocType: Student Batch Name,Batch Name,batch Name
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Registrere
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Vil vise studenten som Tilstede i Student Månedlig fremmøterapport
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,student Oppmøte
 DocType: Sales Invoice Timesheet,Time Sheet,Tids skjema
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Spylings Råvare basert på
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Skriv inn elementdetaljer
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Skriv inn elementdetaljer
 DocType: Interest,Interest,Renter
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Før salg
 DocType: Purchase Receipt,Other Details,Andre detaljer
@@ -739,7 +742,7 @@
 ,Absent Student Report,Fraværende Student Rapporter
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilby Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} ikke funnet
 DocType: Bin,Stock Value,Stock Verdi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Selskapet {0} finnes ikke
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,Garantiutløpsdato
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommisjonen Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vennligst velg Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vennligst velg Program
 DocType: Project,Estimated Cost,anslått pris
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ikke en lagervare
 DocType: Mode of Payment Account,Default Account,Standard konto
 DocType: Payment Entry,Received Amount (Company Currency),Mottatt beløp (Selskap Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vennligst velg ukentlig off dag
 DocType: Production Order Operation,Planned End Time,Planlagt Sluttid
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Avviks varegruppe-Wise
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Request for Quotation Supplier,Send Email,Send E-Post
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ingen tillatelse
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen ansatte funnet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen er allerede oppdatert.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen er allerede oppdatert.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen er allerede oppdatert.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen er allerede oppdatert.
 DocType: SMS Center,All Customer Contact,All Kundekontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Last opp lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Informasjon
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Fakturert beløp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostnadssted {2} ikke tilhører selskapet {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} kan ikke være en gruppe
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Sak Row {idx}: {doctype} {DOCNAME} finnes ikke i oven {doctype} tabellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Sak Row {idx}: {doctype} {DOCNAME} finnes ikke i oven {doctype} tabellen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ingen oppgaver
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagen i måneden som auto faktura vil bli generert for eksempel 05, 28 osv"
 DocType: Asset,Opening Accumulated Depreciation,Åpning akkumulerte avskrivninger
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,Moving Gjennomsnittlig pris
 DocType: Production Planning Tool,Select Items,Velg Items
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursplan
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursplan
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: HR Settings,Enter retirement age in years,Skriv inn pensjonsalder i år
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
 DocType: Stock Entry,STE-,an- drogene
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Aktivitetsloggen
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto gevinst / tap
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Bestilling til betaling
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Opening&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åpne for å gjøre
 DocType: Notification Control,Delivery Note Message,Levering Note Message
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Antall
 DocType: Leave Block List Date,Leave Block List Date,La Block List Dato
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt gjeldende avgifter i kvitteringen Elementer tabellen må være det samme som total skatter og avgifter
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt gjeldende avgifter i kvitteringen Elementer tabellen må være det samme som total skatter og avgifter
 DocType: Sales Team,Incentives,Motivasjon
 DocType: SMS Log,Requested Numbers,Etterspør Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Bare Skaffe råstoffer
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Fee Structure,Components,komponenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kjemisk
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Standard Bank / minibank konto vil bli automatisk oppdatert i Lønn bilagsregistrering når denne modusen er valgt.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallene for Grade Kode {0} overlapper med karakteren intervaller for andre karakterer. Vennligst sjekk intervaller {0} og {1} og prøv på nytt
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Selskap Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Prisen kan ikke være større enn frekvensen som brukes i {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Nettstedet Element
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
 DocType: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Hvit
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antall ikke tilgjengelig for {4} i lageret {1} ved å legge tidspunktet for innreise ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Ordretype må være en av {0}
 DocType: Lead,Next Contact Date,Neste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Antall åpne
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
 DocType: Student Batch Name,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
 DocType: Repayment Schedule,Balance Loan Amount,Balanse Lånebeløp
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Vennligst oppgi en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt antall Avskrivninger
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margin
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margin
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,Organization Name
 DocType: Tax Rule,Shipping State,Shipping State
 ,Projected Quantity as Source,Anslått Antall som kilde
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Elementet må legges til med &quot;Get Elementer fra innkjøps Receipts &#39;knappen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Elementet må legges til med &quot;Get Elementer fra innkjøps Receipts &#39;knappen
 DocType: Employee,A-,EN-
 DocType: Production Planning Tool,Include non-stock items,Inkluder ikke-lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Salgs Utgifter
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Post kode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Post kode
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock Entries
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Handlevogn Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 DocType: Global Defaults,Global Defaults,Global Defaults
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Fyll inn Element kode for å få Batch Number
 DocType: Stock Settings,Default Item Group,Standard varegruppe
 DocType: Employee Loan,Partially Disbursed,delvis Utbetalt
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balanse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din selger vil få en påminnelse på denne datoen for å kontakte kunden
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samme elementet kan ikke legges inn flere ganger.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Vennligst oppgi minst ett attributt i Attributter tabellen
 DocType: Announcement,All Students,alle studenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vis Ledger
 DocType: Grading Scale,Intervals,intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Innkjøpsordrer hjelpe deg å planlegge og følge opp kjøpene
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Innkjøpsordrer hjelpe deg å planlegge og følge opp kjøpene
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totale Issue / Transfer mengde {0} i Material Request {1} \ kan ikke være større enn ønsket antall {2} for Element {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Liten
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Gruppe-nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summen av alle oppgave vekter bør være 1. Juster vekter av alle prosjektoppgaver tilsvar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på &quot;Apply On-feltet, som kan være varen, varegruppe eller Brand."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elementer i fremgang
 DocType: Workstation,Workstation Name,Arbeidsstasjon Name
-DocType: Grade Interval,Grade Code,grade Kode
+DocType: Grading Scale Interval,Grade Code,grade Kode
 DocType: POS Item Group,POS Item Group,POS Varegruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Tilbakevendende Opp
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vennligst velg et selskap
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vennligst velg et selskap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege La
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Du må aktivere Handlevogn
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Aldring Range 3
 DocType: Maintenance Schedule Item,No of Visits,Ingen av besøk
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark frammøte
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark frammøte
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Vedlikeholdsplan {0} eksisterer mot {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,påmelding student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta ifølge kursen konto må være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summen av poeng for alle mål bør være 100. Det er {0}
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
 DocType: Salary Detail,Depends on Leave Without Pay,Avhenger La Uten Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Høyere tallet er, høyere prioritet"
 ,Purchase Invoice Trends,Fakturaen Trender
 DocType: Employee,Better Prospects,Bedre utsikter
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} har bare {2} antall. Vennligst velg en annen batch som har {3} antall tilgjengelig eller del opp raden i flere rader for å levere / utføre fra flere batcher
 DocType: Vehicle,License Plate,Bilskilt
 DocType: Appraisal,Goals,Mål
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
@@ -1452,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er fryst, er oppføringer lov til begrensede brukere."
 DocType: Email Digest,Bank Balance,Bank Balanse
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikasjoner som kreves etc."
 DocType: Journal Entry Account,Account Balance,Saldo
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Skatteregel for transaksjoner.
@@ -1463,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis unclosed regnskapsårets P &amp; L balanserer
 DocType: Shipping Rule,Shipping Account,Shipping konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Gjør salgsordrer for å hjelpe deg med å planlegge arbeidet ditt og levere i tide
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Gjør salgsordrer for å hjelpe deg med å planlegge arbeidet ditt og levere i tide
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Samlede merkostnader
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,I Value
 DocType: Asset Movement,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakkseddel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Pakkseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
@@ -1500,7 +1499,7 @@
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis stengt
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Denne {0} konflikter med {1} for {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenter HTML
@@ -1518,7 +1517,7 @@
 DocType: Student,Date of Leaving,Dato Leaving
 DocType: Pricing Rule,For Price List,For Prisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Lag Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Lag Leads
 DocType: Maintenance Schedule,Schedules,Rutetider
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
@@ -1546,7 +1545,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,program~~POS=TRUNC påmeldinger
 DocType: Sales Invoice Item,Brand Name,Merkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Eske
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mulig Leverandør
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisasjonen
@@ -1580,7 +1579,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standard BOM for {0} ikke funnet for Prosjekt {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Krav på bekostning av selskapet.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studentene er i hjertet av systemet, legge til alle elevene"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studentene er i hjertet av systemet, legge til alle elevene"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Clearance date {1} kan ikke være før Cheque Dato {2}
 DocType: Company,Default Holiday List,Standard Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Fra tid og klokkeslett {1} er overlappende med {2}
@@ -1592,20 +1591,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Sende Betaling Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Ny oppgave
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Gjør sitat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Gjør sitat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andre rapporter
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Vennligst sette Standard Lønn betales konto i selskapet {0}
 DocType: SMS Center,Receiver List,Mottaker List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Søk Element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Søk Element
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto endring i kontanter
 DocType: Assessment Plan,Grading Scale,Grading Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,allerede fullført
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
@@ -1643,7 +1642,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Samle inn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Customer Credit Balance
@@ -1684,7 +1683,6 @@
 DocType: Student Sibling,Studying in Same Institute,Å studere i samme institutt
 DocType: Territory,Territory Manager,Distriktssjef
 DocType: Packed Item,To Warehouse (Optional),Til Warehouse (valgfritt)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 DocType: Payment Entry,Paid Amount (Company Currency),Innbetalt beløp (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabatt
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
@@ -1694,9 +1692,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vis i handlekurven
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialet Request brukes til å gjøre dette lager Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Neste Avskrivninger dato er obligatorisk for ny aktiva
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Neste Avskrivninger dato er obligatorisk for ny aktiva
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbasert gruppe for hver batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbasert gruppe for hver batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enkelt enhet av et element.
@@ -1713,9 +1711,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Det kreves kostnadssted for &#39;resultat&#39; konto {2}. Sett opp en standardkostnadssted for selskapet.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Ny kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1742,20 +1738,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Avstemming JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 DocType: Purchase Invoice Item,Batch No,Batch No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},å finne valutakursen for klarer {0} til {1} for viktig dato {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hoved
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hoved
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
 DocType: Employee,Leave Encashed?,Permisjon encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige utgifter
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Bevilget beløp
@@ -1773,7 +1768,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,medarbeidersamtaler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En forutsetning for en Shipping Rule
-DocType: Grading Structure,Grading Intervals,Grading intervaller
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Vennligst skriv inn
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kan ikke bill for Element {0} i rad {1} mer enn {2}. For å tillate overfakturering, kan du sette i å kjøpe Innstillinger"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Vennligst sette filter basert på varen eller Warehouse
@@ -1786,16 +1780,17 @@
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betaling
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Administrere dine bestillinger
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Administrere dine bestillinger
 DocType: Production Order Operation,Actual Time and Cost,Faktisk leveringstid og pris
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialet Request av maksimal {0} kan gjøres for Element {1} mot Salgsordre {2}
 DocType: Employee,Salutation,Hilsen
 DocType: Course,Course Abbreviation,Kurs forkortelse
 DocType: Student Leave Application,Student Leave Application,Student La Application
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} på halv dag {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Quotation Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
@@ -1805,7 +1800,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har skrevet inn like elementer. Vennligst utbedre og prøv igjen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Forbinder
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,New Handlekurv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,New Handlekurv
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
 DocType: SMS Center,Create Receiver List,Lag Receiver List
 DocType: Vehicle,Wheels,hjul
@@ -1837,10 +1832,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiverer etableringen av tids logger mot produksjonsordrer. Driften skal ikke spores mot produksjonsordre
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID er obligatorisk
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID er obligatorisk
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID er obligatorisk
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID er obligatorisk
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Tilbakevendende Faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
@@ -1848,7 +1843,7 @@
 DocType: Budget,Fiscal Year,Regnskapsår
 DocType: Vehicle Log,Fuel Price,Fuel Pris
 DocType: Budget,Budget,Budsjett
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budsjettet kan ikke overdras mot {0}, som det er ikke en inntekt eller kostnad konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Oppnås
 DocType: Student Admission,Application Form Route,Søknadsskjema Rute
@@ -1879,7 +1874,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
 DocType: Employee,Salary Information,Lønn Informasjon
 DocType: Sales Person,Name and Employee ID,Navn og Employee ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Skatter og avgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Skriv inn Reference dato
@@ -1938,7 +1933,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gjenta kunden Revenue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
 DocType: Asset,Depreciation Schedule,avskrivninger Schedule
 DocType: Bank Reconciliation Detail,Against Account,Mot konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date bør være mellom Fra dato og Til dato
@@ -1955,13 +1950,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
 DocType: Purchase Order,Delivered,Levert
 ,Vehicle Expenses,Vehicle Utgifter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
+DocType: Serial No,Invoice Details,Fakturadetaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datoen som tilbakevendende faktura vil bli stoppe
 DocType: Employee Loan,Loan Amount,Lånebeløp
@@ -1985,7 +1981,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppe til Non-gruppe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,lån Name
@@ -1997,6 +1993,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse hvor du opprettholder lager avviste elementer
 DocType: Production Order,Skip Material Transfer,Hopp over materialoverføring
 DocType: Production Order,Skip Material Transfer,Hopp over materialoverføring
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan ikke finne valutakurs for {0} til {1} for nøkkeldato {2}. Vennligst opprett en valutautvekslingsrekord manuelt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Din regnskapsår avsluttes på
 DocType: POS Profile,Price List,Pris Liste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nå standard regnskapsåret. Vennligst oppdater nettleser for at endringen skal tre i kraft.
@@ -2034,9 +2031,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Element {0} er allerede returnert
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskapsår ** representerer et regnskapsår. Alle regnskapspostene og andre store transaksjoner spores mot ** regnskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 DocType: Student Admission,Eligibility,kvalifikasjon
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads hjelpe deg å få virksomheten, legge til alle dine kontakter og mer som dine potensielle kunder"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads hjelpe deg å få virksomheten, legge til alle dine kontakter og mer som dine potensielle kunder"
 DocType: Production Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
@@ -2077,7 +2074,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Velg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,La stå tom hvis vurderes for alle avdelinger
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Process Payroll,Fortnightly,hver fjortende dag
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
@@ -2093,7 +2090,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som &#39;On Forrige Row beløp &quot;eller&quot; On Forrige Row Totals for første rad
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Varen bør ikke være et produkt Bundle. Vennligst fjern element `{0}` og lagre
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Legg Timelister
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Legg Timelister
 DocType: Vehicle Service,Service Item,tjenesten Element
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
@@ -2143,8 +2140,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prisene vil ikke bli vist hvis prislisten er ikke satt
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vennligst oppgi et land for denne Shipping Regel eller sjekk Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debet Å kreves
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debet Å kreves
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
 DocType: Offer Letter Term,Offer Term,Tilbudet Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -2178,14 +2175,14 @@
 DocType: Opportunity,Lost Reason,Mistet Reason
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Fyll inn Kvittering Document
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Fyll inn Kvittering Document
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Alle elementene er allerede blitt fakturert
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig &quot;Fra sak nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 DocType: Project,External,Ekstern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brukere og tillatelser
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produksjonsordrer Laget: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Produksjonsordrer Laget: {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Mobilnummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykking og merkevarebygging
@@ -2194,7 +2191,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ikke funnet
 DocType: Scheduling Tool,Student Batch,student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dine kunder
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Gjør Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Gjør Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
 DocType: Leave Block List Date,Block Date,Block Dato
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Søk nå
@@ -2218,8 +2215,9 @@
 DocType: SMS Log,Sent To,Sendt til
 DocType: Payment Request,Make Sales Invoice,Gjør Sales Faktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programvare
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Neste Kontakt Datoen kan ikke være i fortiden
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Neste Kontakt Datoen kan ikke være i fortiden
 DocType: Company,For Reference Only.,For referanse.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Velg batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Forskuddsbeløp
@@ -2233,7 +2231,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Sak nr kan ikke være 0
 DocType: Item,Show a slideshow at the top of the page,Vis en lysbildeserie på toppen av siden
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Butikker
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Butikker
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Based On
 DocType: Item,End of Life,Slutten av livet
@@ -2249,8 +2247,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Velg endring mengde konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
 DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
@@ -2261,7 +2259,7 @@
 DocType: Budget Account,Budget Account,budsjett konto
 DocType: Quality Inspection,Verified By,Verified by
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
-DocType: Grade Interval,Grade Description,grade Beskrivelse
+DocType: Grading Scale Interval,Grade Description,grade Beskrivelse
 DocType: Stock Entry,Purchase Receipt No,Kvitteringen Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Penger
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
@@ -2299,7 +2297,7 @@
 DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Netto endring i kundefordringer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenserende Off
 DocType: Offer Letter,Accepted,Akseptert
@@ -2312,7 +2310,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,bruker~~POS=TRUNC
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
 DocType: Employee,Previous Work Experience,Tidligere arbeidserfaring
@@ -2326,7 +2324,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Navnet på institutt for som du setter opp dette systemet.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Regnskap oppføring frosset opp til denne datoen, kan ingen gjøre / endre oppføring unntatt rolle angitt nedenfor."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Prosjekt Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Sjekk dette for å forby fraksjoner. (For Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
@@ -2349,6 +2347,7 @@
 DocType: Email Digest,How frequently?,Hvor ofte?
 DocType: Purchase Receipt,Get Current Stock,Få Current Stock
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 DocType: Student,Joining Date,Bli med dato
 ,Employees working on a holiday,Arbeidstakere som arbeider på ferie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
@@ -2430,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Klaring Dato ikke nevnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produksjon
 DocType: Guardian,Occupation,Okkupasjon
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Stk)
 DocType: Sales Invoice,This Document,dette dokumentet
 DocType: Installation Note Item,Installed Qty,Installert antall
@@ -2453,8 +2452,8 @@
 DocType: Notification Control,Sales Order Message,Salgsordre Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Sett standardverdier som Company, Valuta, værende regnskapsår, etc."
 DocType: Payment Entry,Payment Type,Betalings Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
 DocType: Process Payroll,Select Employees,Velg Medarbeidere
 DocType: Opportunity,Potential Sales Deal,Potensielle Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Sjekk / Reference Date
@@ -2471,7 +2470,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalt POS profil {0} allerede opprettet for selskap {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Erstatte varen / BOM i alle stykklister
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvittering dokumentet må sendes
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvittering dokumentet må sendes
 DocType: Purchase Invoice Item,Received Qty,Mottatt Antall
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ikke betalt og ikke levert
@@ -2484,7 +2483,7 @@
 ,To Produce,Å Produsere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,lønn
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Gjør Bruker
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Gjør Bruker
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasjon av pakken for levering (for print)
 DocType: Bin,Reserved Quantity,Reservert Antall
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vennligst skriv inn gyldig e-postadresse
@@ -2498,11 +2497,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Funksjonshemmede malen må ikke være standardmal
 DocType: Account,Income Account,Inntekt konto
 DocType: Payment Request,Amount in customer's currency,Beløp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of materialer basert på&quot; i Costing Seksjon
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student batcher hjelpe deg med å spore oppmøte, vurderinger og avgifter for studenter"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student batcher hjelpe deg med å spore oppmøte, vurderinger og avgifter for studenter"
 DocType: Payment Entry,Total Allocated Amount,Totalt tildelte beløp
 DocType: Item Reorder,Material Request Type,Materialet Request Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural dagboken til lønninger fra {0} i {1}
@@ -2525,7 +2525,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spor Leads etter bransje Type.
 DocType: Item Supplier,Item Supplier,Sak Leverandør
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
@@ -2535,6 +2535,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Vil sende en e-post om hendelsen til ansatte med status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Avhenger Oppgaver
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrere kunde Gruppe treet.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Vedlegg kan vises uten å tillate handlekurven
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
@@ -2547,12 +2548,10 @@
 DocType: Sales Invoice,Debit To,Debet Å
 DocType: Delivery Note,Required only for sample item.,Kreves bare for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Selve Antall Etter Transaksjons
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lønn slip funnet mellom {0} og {1}
 ,Pending SO Items For Purchase Request,Avventer SO varer for kjøp Request
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,student Opptak
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} er deaktivert
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra large
@@ -2569,7 +2568,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Aktuelle produkter
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Assessment grupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Warehouse navn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totalt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
@@ -2587,7 +2586,7 @@
 DocType: Price List,Price List Master,Prisliste Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle salgstransaksjoner kan være merket mot flere ** Salgs Personer ** slik at du kan stille inn og overvåke mål.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 DocType: Price List,Applicable for Countries,Gjelder for Land
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Bare La Applikasjoner med status &#39;Godkjent&#39; og &#39;Avvist&#39; kan sendes inn
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Gruppenavn er obligatorisk i rad {0}
@@ -2668,7 +2667,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Regnskap Entry for Stock
 DocType: Vehicle Service,Engine Oil,Motorolje
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Employee Loan,Loan Details,lån Detaljer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rad {0}: Fullført Antall må være større enn null.
@@ -2733,7 +2732,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut på dato den
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Legg Studenter
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Legg Studenter
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
@@ -2798,7 +2797,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Krysset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Et semester med denne &#39;Academic Year&#39; {0} og &quot;Term Name {1} finnes allerede. Vennligst endre disse oppføringene og prøv igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Ettersom det er eksisterende transaksjoner mot item {0}, kan du ikke endre verdien av {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Ettersom det er eksisterende transaksjoner mot item {0}, kan du ikke endre verdien av {1}"
 DocType: UOM,Must be Whole Number,Må være hele tall
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye Løv Tildelte (i dager)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} finnes ikke
@@ -2842,7 +2841,7 @@
 DocType: Supplier,Last Day of the Next Month,Siste dag av neste måned
 DocType: Support Settings,Auto close Issue after 7 days,Auto nær Issue etter 7 dager
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Permisjon kan ikke tildeles før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student Søker
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumulerte avskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2870,7 +2869,7 @@
 DocType: Asset,Item Code,Sak Kode
 DocType: Production Planning Tool,Create Production Orders,Opprett produksjonsordrer
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
@@ -2889,7 +2888,7 @@
 DocType: Production Planning Tool,Create Material Requests,Opprett Material Forespørsler
 DocType: Employee Education,School/University,Skole / universitet
 DocType: Payment Request,Reference Details,Referanse Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgjengelig Antall på Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturert beløp
 DocType: Asset,Double Declining Balance,Dobbel degressiv
@@ -2910,19 +2909,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Utbetalt Mengde kan ikke være større enn låne beløpet {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produksjonsordre ikke opprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Produksjonsordre ikke opprettet
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Fra dato&quot; må være etter &#39;To Date&#39;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
 DocType: Asset,Fully Depreciated,fullt avskrevet
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merket Oppmøte HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Sitater er forslag, bud du har sendt til dine kunder"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Sitater er forslag, bud du har sendt til dine kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No og Batch
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summen av Resultater av vurderingskriterier må være {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Verdi eller Stk
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutt
@@ -3052,7 +3051,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Gruppe
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Velg kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Velg kunde
 DocType: C-Form,I,Jeg
 DocType: Company,Asset Depreciation Cost Center,Asset Avskrivninger kostnadssted
 DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
@@ -3071,19 +3070,18 @@
 DocType: Vehicle,Insurance Details,forsikring Detaljer
 DocType: Account,Payable,Betales
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Fyll inn nedbetalingstid
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Skyldnere ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Skyldnere ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruttofortjeneste%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Klaring Dato
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party er obligatorisk
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,emne Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Minst én av de selge eller kjøpe må velges
-DocType: Grading Structure,Grade Intervals,Vurder intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Velg formålet med virksomheten.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvor fabrikasjonsvirksomhet gjennomføres.
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
@@ -3112,6 +3110,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Vennligst sett standard {0} i selskapet {1}
 DocType: Cheque Print Template,Starting position from top edge,Startposisjon fra øverste kant
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Samme leverandør er angitt flere ganger
@@ -3165,7 +3164,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Omgjøre Antall
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Nåværende jobb Åpninger
 DocType: Company,Stock Adjustment Account,Stock Adjustment konto
-DocType: Journal Entry,Write Off,Skriv Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Skriv Off
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systemet bruker (innlogging) ID. Hvis satt, vil det bli standard for alle HR-skjemaer."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
@@ -3176,8 +3175,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / post / {0}) er utsolgt
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Neste dato må være større enn konteringsdato
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Vis skatt break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Aksjeoppføringer finnes mot Warehouse {0}, dermed kan du ikke re-tildele eller endre den"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ingen studenter Funnet
@@ -3189,13 +3188,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Ut av AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vennligst velg tilbud
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Gjør Vedlikehold Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vennligst velg tilbud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gjør Vedlikehold Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
 DocType: Company,Default Cash Account,Standard Cash konto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er basert på tilstedeværelse av denne Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Ingen studenter i
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Legg til flere elementer eller åpne full form
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
@@ -3242,9 +3242,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og avgifter legges (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
 DocType: Sales Order,Partly Billed,Delvis Fakturert
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Element {0} må være et driftsmiddel element
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} må være et driftsmiddel element
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Outstanding Amt
@@ -3267,7 +3267,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adressenavn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adressenavn
 DocType: Stock Entry,From BOM,Fra BOM
 DocType: Assessment Code,Assessment Code,Assessment Kode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grunnleggende
@@ -3292,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,Print Språk
 DocType: Salary Slip,Total Working Hours,Samlet arbeidstid
 DocType: Stock Entry,Including items for sub assemblies,Inkludert elementer for sub samlinger
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Oppgi verdien skal være positiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Oppgi verdien skal være positiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle Territories
 DocType: Purchase Invoice,Items,Elementer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student er allerede registrert.
@@ -3312,17 +3312,15 @@
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kreves
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
 DocType: Assessment Plan,Supervisor Name,Supervisor Name
 DocType: Program Enrollment Course,Program Enrollment Course,Programopptakskurs
 DocType: Program Enrollment Course,Program Enrollment Course,Programopptakskurs
-DocType: Grading Structure,Grading Structure,Grading Struktur
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
 DocType: Tax Rule,Shipping City,Shipping by
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denne varen er en variant av {0} (Mal). Attributtene vil bli kopiert over fra malen med mindre &#39;No Copy&#39; er satt
 DocType: Notification Control,Customize the Notification,Tilpass varslings
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Kontantstrøm fra driften
 DocType: Sales Invoice,Shipping Rule,Shipping Rule
@@ -3345,6 +3343,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vennligst velg Publiseringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 DocType: Leave Control Panel,Carry Forward,Fremføring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til Ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Dager som Holidays er blokkert for denne avdelingen.
@@ -3373,7 +3372,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Sak Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Lag Medarbeider Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Lag Medarbeider Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,regnskaps~~POS=TRUNC Uttalelser
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Time
@@ -3388,8 +3387,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM etter utskiftning
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Utsalgssted
 DocType: Payment Entry,Received Amount,mottatt beløp
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Ansattes navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Ansattes navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Lag full mengde, ignorerer mengde allerede er i ordre"
 DocType: Account,Tax,Skatte
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ikke Merket
@@ -3402,7 +3399,7 @@
 DocType: Batch,Source Document Name,Kilde dokumentnavn
 DocType: Batch,Source Document Name,Kilde dokumentnavn
 DocType: Job Opening,Job Title,Jobbtittel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Lag brukere
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Lag brukere
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøk rapport for vedlikehold samtale.
@@ -3414,8 +3411,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: BOM,Website Description,Website Beskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto endring i egenkapital
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Kvittering
 ,Sales Register,Salg Register
@@ -3426,16 +3423,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ingen kunder ennå!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantstrømoppstilling
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Tillatelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
 DocType: GL Entry,Against Voucher Type,Mot Voucher Type
 DocType: Item,Attributes,Egenskaper
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Siste Order Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Oppmøte for flere ansatte
@@ -3460,14 +3459,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen &quot;Fixed Asset &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antall
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler for å beregne frakt beløp for et salg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typer aktiviteter for Tid Logger
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
 DocType: Training Event,Exam,Eksamen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
@@ -3500,7 +3499,7 @@
 DocType: Payment Entry,Account Paid From,Konto betalt fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Elementkode
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Gjør Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Gjør Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Skriv ut og Saker
 DocType: Stock Settings,Show Barcode Field,Vis strekkodefelt
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Send Leverandør e-post
@@ -3516,6 +3515,7 @@
 DocType: Offer Letter,Awaiting Response,Venter på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Fremfor
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Nevn hvis ikke-standard betalingskonto
 DocType: Salary Slip,Earning & Deduction,Tjene &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
@@ -3552,7 +3552,7 @@
 DocType: Program Enrollment Tool,Get Students From,Få studenter fra
 DocType: Hub Settings,Seller Country,Selger Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publiser Elementer på nettstedet
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppe elevene i grupper
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Gruppe elevene i grupper
 DocType: Authorization Rule,Authorization Rule,Autorisasjon Rule
 DocType: Sales Invoice,Terms and Conditions Details,Vilkår og betingelser Detaljer
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Spesifikasjoner
@@ -3612,7 +3612,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Prøvetid
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lønn Components
 DocType: Program Enrollment Tool,New Academic Year,Nytt studieår
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retur / kreditnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Retur / kreditnota
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Totalt innbetalt beløp
 DocType: Production Order Item,Transferred Qty,Overført Antall
@@ -3653,6 +3653,7 @@
 ,Sales Funnel,Sales trakt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kurven
 ,Qty to Transfer,Antall overføre
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
@@ -3686,7 +3687,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,samle gebyrer
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
 DocType: Lead,Add to calendar on this date,Legg til i kalender på denne datoen
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regler for å legge til fraktkostnader.
 DocType: Item,Opening Stock,åpning Stock
@@ -3704,7 +3705,7 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestillinger frigitt for produksjon.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Meld Studenter
 DocType: Hub Settings,Name Token,Navn Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3715,7 +3716,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Prosjektnavn
-DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
+DocType: Customer,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
 DocType: Journal Entry Account,If Income or Expense,Dersom inntekt eller kostnad
 DocType: Production Order,Required Items,nødvendige elementer
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Verdi Difference
@@ -3745,6 +3746,7 @@
 DocType: Item,Taxes,Skatter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Betalt og ikke levert
 DocType: Project,Default Cost Center,Standard kostnadssted
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Bank Guarantee,End Date,Sluttdato
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,aksje~~POS=TRUNC
 DocType: Budget,Budget Accounts,Budsjett Regnskap
@@ -3809,7 +3811,7 @@
 DocType: Customer,Sales Partner and Commission,Sales Partner og Kommisjonen
 DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / År
 ,Project Quantity,prosjekt Antall
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totalt {0} for alle elementer er null, kan være du bør endre &#39;Fordel Avgifter basert på&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totalt {0} for alle elementer er null, kan være du bør endre &#39;Fordel Avgifter basert på&#39;"
 DocType: Opportunity,To Discuss,Å Diskutere
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} trengs i {2} for å fullføre denne transaksjonen.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rente (%) Årlig
@@ -3832,7 +3834,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: valuta BOM # {1} bør være lik den valgte valutaen {2}
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flåtestyring
@@ -3849,7 +3851,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} finnes ikke
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrer For ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlig Distribusjonsprosent
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verdsettelse hastighet ikke funnet med Element {0}, som er nødvendig for å gjøre regnskap oppføringer for {1} {2}. Hvis elementet er transacting som en prøve element i {1}, kan nevnes at i {1} Element tabell. Ellers må du opprette en innkommende lager transaksjon for varen eller omtale verdivurdering hastighet i element posten, og deretter prøve submiting / avbryter denne oppføringen"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av materialer leveres mot denne følgeseddel
 DocType: Project,Customer Details,Kunde Detaljer
@@ -3866,7 +3868,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Innsendte bestillinger kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kvalitetsstyring
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Element {0} har blitt deaktivert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} har blitt deaktivert
 DocType: Employee Loan,Repay Fixed Amount per Period,Smelle fast beløp per periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Skriv inn antall for Element {0}
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
@@ -3892,7 +3894,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Velg elementer for å lagre fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Velg elementer for å lagre fakturaen
 DocType: Employee,Encashment Date,Encashment Dato
 DocType: Training Event,Internet,Internett
 DocType: Account,Stock Adjustment,Stock Adjustment
@@ -3925,6 +3927,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debitnota Utstedt
 DocType: Production Order,Warehouses,Næringslokaler
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eiendelen kan ikke overføres
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Denne varen er en variant av {0} (mal).
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,innkjøp
 DocType: Announcement,Announcement,Kunngjøring
@@ -3940,7 +3943,7 @@
 DocType: Account,Receivable,Fordring
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Velg delbetaling Produksjon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Velg delbetaling Produksjon
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Selger Beskrivelse
@@ -3953,7 +3956,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Gruppe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Velg Transaksjons
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Skriv inn Godkjenne Rolle eller Godkjenne User
@@ -3987,7 +3990,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For å sette dette regnskapsåret som standard, klikk på &quot;Angi som standard &#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Bli med
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Employee Loan,Repay from Salary,Smelle fra Lønn
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Ber om betaling mot {0} {1} for mengden {2}
@@ -4005,7 +4008,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Assessment Resultat Detalj
 DocType: Employee Education,Employee Education,Ansatt Utdanning
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate varegruppe funnet i varegruppen bordet
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
 DocType: Salary Slip,Net Pay,Netto Lønn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} er allerede mottatt
@@ -4014,7 +4017,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} er ikke knyttet til noen konto, kan du opprette / knytte tilsvarende (Asset) står for lageret."
 DocType: Purchase Invoice,Recurring Id,Gjentakende Id
 DocType: Customer,Sales Team Details,Salgsteam Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Slett permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Slett permanent?
 DocType: Expense Claim,Total Claimed Amount,Total Hevdet Beløp
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensielle muligheter for å selge.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ugyldig {0}
@@ -4025,13 +4028,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Oppsettet ditt School i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Endre Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Lagre dokumentet først.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Endre Forkortelse
 DocType: Expense Claim Detail,Expense Date,Expense Dato
 DocType: Item,Max Discount (%),Max Rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Siste ordrebeløp
+DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,E-post sendt Å
 DocType: Budget,Warn,Advare
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene."
@@ -4064,11 +4068,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Aksjer Eldre Than` bør være mindre enn% d dager.
 DocType: Tax Rule,Purchase Tax Template,Kjøpe Tax Mal
 ,Project wise Stock Tracking,Prosjektet klok Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedlikeholdsplan {0} finnes mot {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske antall (ved kilden / target)
 DocType: Item Customer Detail,Ref Code,Ref Kode
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbeider poster.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
 DocType: HR Settings,Payroll Settings,Lønn Innstillinger
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Legg inn bestilling
@@ -4091,7 +4094,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Sjekker og Innskudd feil ryddet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
 DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Opprett kunde sitater
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Opprett kunde sitater
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;på lager&quot; eller &quot;Not in Stock&quot; basert på lager tilgjengelig i dette lageret.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Gjennomsnittlig tid tatt av leverandøren til å levere
@@ -4113,7 +4116,7 @@
 DocType: Asset,Disposal Date,Deponering Dato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post vil bli sendt til alle aktive ansatte i selskapet ved den gitte timen, hvis de ikke har ferie. Oppsummering av svarene vil bli sendt ved midnatt."
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Tilbakemelding
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
@@ -4121,7 +4124,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurset er obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags dato kan ikke være før fra dato
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Legg til / Rediger priser
 DocType: Batch,Parent Batch,Parent Batch
 DocType: Cheque Print Template,Cheque Print Template,Sjekk ut Mal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plan Kostnadssteder
@@ -4165,7 +4168,7 @@
 DocType: Item,Variant Based On,Variant basert på
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting &#39;eller&#39; Vaulation og Total &#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Mottatt fra
@@ -4175,7 +4178,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rad {0}: Timer verdien må være større enn null.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
 DocType: Issue,Content Type,Innholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
@@ -4184,20 +4187,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
 DocType: Payment Reconciliation,From Invoice Date,Fra Fakturadato
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta må være lik enten standard comapany valuta eller fremmed regning av valuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta må være lik enten standard comapany valuta eller fremmed regning av valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,La Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Hva gjør det?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Student Opptak
 ,Average Commission Rate,Gjennomsnittlig kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
 DocType: School House,House Name,Husnavn
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Oppdater ekstra kostnader for å beregne inntakskost annonser
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrisk
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsett resten av organisasjonen som brukerne. Du kan også legge invitere kunder til portalen ved å legge dem fra Kontakter
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsett resten av organisasjonen som brukerne. Du kan også legge invitere kunder til portalen ved å legge dem fra Kontakter
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruker-ID ikke satt for Employee {0}
@@ -4206,7 +4209,7 @@
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Bursdag Påminnelse for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dager siden siste Bestill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
@@ -4221,7 +4224,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM inneholder ikke lagervare
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periode Fra og perioden Til dato obligatoriske for gjentakende {0}
@@ -4234,7 +4237,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings~~POS=TRUNC Timer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Trykk på elementer for å legge dem til her
 DocType: Fees,Program Enrollment,program Påmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vennligst sett {0}
@@ -4334,7 +4338,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,Først Svarte På
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering av varen i flere grupper
-DocType: Grade Interval,Grade Interval,grade Intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskapsår Startdato og regnskapsår sluttdato er allerede satt i regnskapsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Lagersalg oppdatert
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4343,6 +4346,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Last ned PDF
 DocType: Production Order,Planned End Date,Planlagt sluttdato
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvor varene er lagret.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Request for Quotation,Supplier Detail,Leverandør Detalj
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Feil i formel eller betingelse: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Fakturert beløp
@@ -4388,7 +4392,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Oppsett en enkel nettside for min organisasjon
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordringer / gjeld konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot kundeordreposisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Skriv inn forelder kostnadssted
@@ -4448,7 +4452,7 @@
 ,Items To Be Requested,Elementer å bli forespurt
 DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Company,Company Info,Selskap Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Velg eller legg til ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Velg eller legg til ny kunde
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostnadssted er nødvendig å bestille en utgift krav
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er basert på tilstedeværelse av denne Employee
@@ -4461,13 +4465,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppe brukere fra å gjøre La Applications på følgende dager.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,kjøpesummen
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Slutt År kan ikke være før start År
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Slutt År kan ikke være før start År
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Ytelser til ansatte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Produsert Antall
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ikke eksisterer
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger hevet til kundene.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
@@ -4476,15 +4480,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Kupong Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Employee Loan Application,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} skapt for Employee {1} i den gitte datointervall
 DocType: Employee,Education,Utdanning
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanje Naming Av
 DocType: Employee,Current Address Is,Gjeldende adresse Er
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifisert
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
@@ -4521,7 +4527,7 @@
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Er Eksisterende Asset
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 DocType: Salary Detail,Statistical Component,Statistisk komponent
@@ -4577,7 +4583,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Fest Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lagernivåer
 DocType: Customer,Commission Rate,Kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Gjør Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstype må være en av Motta, Lønn og Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4590,6 +4596,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillat Produksjonen på helligdager
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Purchase Order Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitalbeholdningen
+DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedlegg
 DocType: Packing Slip,Package Weight Details,Pakken vektdetaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Etter betaling ferdigstillelse omdirigere brukeren til valgt side.
@@ -4614,7 +4621,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Gjør Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Gjør Student Batch
 DocType: Leave Type,Is Carry Forward,Er fremføring
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Få Elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledetid Days
@@ -4633,8 +4640,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: GL Entry,Is Opening,Er Åpnings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} finnes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmeside og andre publikasjoner.
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 32c8711..86fc6c4 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Przedmiot status ważności
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Przekaz bankowy
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Pokaż Warianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Pokaż Warianty
 DocType: Academic Term,Academic Term,semestr
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiał
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Ilość
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Opieka zdrowotna
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Opóźnienie w płatności (dni)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Koszty usługi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Rok fiskalny {0} jest wymagane
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamowanie
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ta sama Spółka wpisana jest więcej niż jeden raz
 DocType: Employee,Married,Żonaty / Zamężna
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie dopuszczony do {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nie dopuszczony do {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Pobierz zawartość z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę skonfigurować system nazwisk pracowników w zasobach ludzkich&gt; ustawienia HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Brak elementów na liście
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Artykuły spożywcze
 DocType: Quality Inspection Reading,Reading 1,Odczyt 1
 DocType: Process Payroll,Make Bank Entry,Dodaj Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundusze Emerytalne
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Następny Amortyzacja Data nie może być wcześniejsza Data zakupu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Następny Amortyzacja Data nie może być wcześniejsza Data zakupu
 DocType: SMS Center,All Sales Person,Wszyscy Sprzedawcy
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Miesięczny Dystrybucja ** pomaga rozprowadzić Budget / target całej miesięcy, jeśli masz sezonowości w firmie."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nie znaleziono przedmiotów
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nie znaleziono przedmiotów
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktura Wynagrodzenie Brakujący
 DocType: Lead,Person Name,Imię i nazwisko osoby
 DocType: Sales Invoice Item,Sales Invoice Item,Przedmiot Faktury Sprzedaży
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",np &quot;Szkoła Podstawowa&quot; lub &quot;Uniwersytet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Raporty seryjne
 DocType: Warehouse,Warehouse Detail,Szczegóły magazynu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data zakończenia nie może być późniejsza niż data zakończenia roku na rok akademicki, którego termin jest związany (Academic Year {}). Popraw daty i spróbuj ponownie."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Jest Środkiem Trwałym"" nie może być odznaczone, jeśli istnieją pozycje z takim ustawieniem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Jest Środkiem Trwałym"" nie może być odznaczone, jeśli istnieją pozycje z takim ustawieniem"
 DocType: Vehicle Service,Brake Oil,Olej hamulcowy
 DocType: Tax Rule,Tax Type,Rodzaj podatku
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
 DocType: BOM,Item Image (if not slideshow),Element Obrazek (jeśli nie slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Istnieje Klient o tej samej nazwie
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Godzina Kursy / 60) * Rzeczywista Czas pracy
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Wybierz BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Wybierz BOM
 DocType: SMS Log,SMS Log,Dziennik zdarzeń SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Koszt dostarczonych przedmiotów
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Święto w dniu {0} nie jest pomiędzy Od Data i do tej pory
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Stopień
 DocType: Sales Invoice Item,Delivered By Supplier,Dostarczane przez Dostawcę
 DocType: SMS Center,All Contact,Wszystkie dane Kontaktu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produkcja Zamów już stworzony dla wszystkich elementów z BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Produkcja Zamów już stworzony dla wszystkich elementów z BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Roczne Wynagrodzenie
 DocType: Daily Work Summary,Daily Work Summary,Dziennie Podsumowanie zawodowe
 DocType: Period Closing Voucher,Closing Fiscal Year,Zamknięcie roku fiskalnego
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} jest zamrożone
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} jest zamrożone
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Wybierz istniejącą spółkę do tworzenia planu kont
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Wydatki magazynowe
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Wybierz Magazyn docelowy
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry (Zapis przeciwstawny)
 DocType: Journal Entry Account,Credit in Company Currency,Kredyt w walucie Spółki
 DocType: Delivery Note,Installation Status,Status instalacji
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Czy chcesz zaktualizować frekwencję? <br> Obecni: {0} \ <br> Nieobecne {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dostawa surowce Skupu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Co najmniej jeden tryb płatności POS jest wymagane dla faktury.
 DocType: Products Settings,Show Products as a List,Wyświetl produkty w układzie listy
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Pobierz szablon, wypełnić odpowiednie dane i dołączyć zmodyfikowanego pliku.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Bądź Amortyzacja Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ zapytania
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Bądź pracownika
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Bądź pracownika
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmitowanie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Wykonanie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Szczegóły dotyczące przeprowadzonych operacji.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan wizyt serwisowych.
 DocType: SMS Settings,Enter url parameter for message,Wpisz URL dla wiadomości
 DocType: POS Profile,Customer Groups,Grupy klientów
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Sprawozdania finansowe
 DocType: Guardian,Students,studenci
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Zasady określania cen i zniżek
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cennik musi być przyporządkowany do kupna albo sprzedaży
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista serii dla tej transakcji
 DocType: Company,Default Payroll Payable Account,Domyślny Płace Płatne konta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aktualizacja Grupa E
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aktualizacja Grupa E
 DocType: Sales Invoice,Is Opening Entry,
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Wspomnieć, jeśli nie standardowe konto należności dotyczy"
 DocType: Course Schedule,Instructor Name,Instruktor Nazwa
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Na podstawie pozycji faktury sprzedaży
 ,Production Orders in Progress,Zamówienia Produkcji w toku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Przepływy pieniężne netto z finansowania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
 DocType: Lead,Address & Contact,Adres i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj niewykorzystane urlopy z poprzednich alokacji
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Całkowita kwota Costing (przez czas arkuszu)
 DocType: Item Website Specification,Item Website Specification,Element Specyfikacja Strony
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Operacje bankowe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,Publikowanie w Hub
 DocType: Student Admission,Student Admission,Wstęp Student
 ,Terretory,Obszar
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Element {0} jest anulowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Element {0} jest anulowany
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
 DocType: Item,Purchase Details,Szczegóły zakupu
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
 DocType: Journal Entry,Multi Currency,Wielowalutowy
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Dowód dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Dowód dostawy
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Koszt sprzedanych aktywów
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Wpis płatności został zmodyfikowany po ściągnięciu. Proszę ściągnąć ponownie.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
-DocType: Grade Interval,Min Score,min-line
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
 DocType: Student Applicant,Admitted,Przyznał
 DocType: Workstation,Rent Cost,Koszt Wynajmu
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Wartość zamówienia
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transakcje Bank / Gotówka przeciwko osobie lub do przenoszenia wewnętrznego
 DocType: Shipping Rule,Valid for Countries,Ważny dla krajów
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Zamówienie razem Uważany
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Proszę wpisz wartości w pola ""Powtórz w dni miesiąca"""
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,Stawka podatku
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} już przydzielone Pracodawcy {1} dla okresu {2} do {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Wybierz produkt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Przekształć w nie-Grupę
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Partia (pakiet) produktu.
 DocType: C-Form Invoice Detail,Invoice Date,Data faktury
 DocType: GL Entry,Debit Amount,Kwota Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tworzenie grup studenckich
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,Zapytanie ofertowe
 DocType: Salary Slip Timesheet,Working Hours,Godziny pracy
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Tworzenie nowego klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Tworzenie nowego klienta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jeśli wiele Zasady ustalania cen nadal dominować, użytkownicy proszeni są o ustawienie Priorytet ręcznie rozwiązać konflikt."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Stwórz zamówienie zakupu
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Stwórz zamówienie zakupu
 ,Purchase Register,Rejestracja Zakupu
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Obowiązujące opłaty
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
 DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do
 DocType: SMS Log,Sent On,Wysłano w
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Nr Przesyłki
 DocType: Item Attribute,To Range,Do osiągnięcia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Papiery wartościowe i depozyty
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nie można zmienić metody wyceny, ponieważ istnieją transakcje dotyczące niektórych pozycji, które nie mają własnej metody wyceny"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Job Opening,Description of a Job Opening,Opis Ogłoszenia o Pracę
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Działania oczekujące na dziś
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,
 DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetyki
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupować
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Proszę określić stopień dla progu 0%
 DocType: Sales Order,To Deliver,Dostarczyć
 DocType: Purchase Invoice Item,Item,Asortyment
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
 DocType: Account,Profit and Loss,Zyski i Straty
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Zarządzanie Podwykonawstwo
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,
 DocType: Production Plan Item,Pending Qty,Oczekuje szt
 DocType: Budget,Ignore,Ignoruj
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} jest nieaktywny
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} jest nieaktywny
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS wysłany do następujących numerów: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Wymiary Sprawdź konfigurację do druku
 DocType: Salary Slip,Salary Slip Timesheet,Slip Wynagrodzenie grafiku
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Całkowita kwota prowizji
 DocType: Pricing Rule,Sales Partner,Partner Sprzedaży
 DocType: Buying Settings,Purchase Receipt Required,Wymagane Potwierdzenie Zakupu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Wycena Cena jest obowiązkowe, jeżeli wprowadzone Otwarcie Zdjęcie"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Wycena Cena jest obowiązkowe, jeżeli wprowadzone Otwarcie Zdjęcie"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,skumulowane wartości
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Niestety, numery seryjne nie mogą zostać połączone"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Stwórz Zamówienie Sprzedaży
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Stwórz Zamówienie Sprzedaży
 DocType: Project Task,Project Task,Zadanie projektu
 ,Lead Id,ID Tropu
 DocType: C-Form Invoice Detail,Grand Total,Suma Całkowita
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,W skrócie Załącznik
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Powtarzający się klient
 DocType: Leave Control Panel,Allocate,Przydziel
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Zwrot sprzedaży
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Uwaga: Wszystkie przydzielone liście {0} nie powinna być mniejsza niż już zatwierdzonych liści {1} dla okresu
 DocType: Announcement,Posted By,Wysłane przez
 DocType: Item,Delivered by Supplier (Drop Ship),Dostarczane przez Dostawcę (Drop Ship)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Proszę ustawić firmę
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Proszę ustawić firmę
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Faktura sprzedaży grafiku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Wybierz Konto Płatność aby bankowego Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Tworzenie rekordów pracownika do zarządzania liście, roszczenia o wydatkach i płac"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Tworzenie rekordów pracownika do zarządzania liście, roszczenia o wydatkach i płac"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj do Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pisanie Wniosku
 DocType: Payment Entry Deduction,Payment Entry Deduction,Płatność Wejście Odliczenie
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relacja z Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menager
 DocType: Payment Entry,Payment From / To,Płatność Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Zakres dat
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nowy limit kredytowy wynosi poniżej aktualnej kwoty należności dla klienta. Limit kredytowy musi być conajmniej {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nowy limit kredytowy wynosi poniżej aktualnej kwoty należności dla klienta. Limit kredytowy musi być conajmniej {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Ta sama pozycja została wprowadzona wielokrotnie.
 DocType: SMS Settings,Receiver Parameter,Parametr Odbiorcy
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Pola ""Bazuje na"" i ""Grupuj wg."" nie mogą być takie same"
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,Data Rozstrzygnięcia
 DocType: Student Batch Name,Batch Name,Batch Nazwa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Grafiku stworzył:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Zapisać
 DocType: Selling Settings,Customer Naming By,
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Pokaże studenta jako obecny w Student Monthly Uczestnictwo Raporcie
@@ -722,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,Obecność Studenta
 DocType: Sales Invoice Timesheet,Time Sheet,Czas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Płukanie surowce na podstawie
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
 DocType: Interest,Interest,Zainteresowanie
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Przedsprzedaż
 DocType: Purchase Receipt,Other Details,Pozostałe szczegóły
@@ -740,7 +743,7 @@
 ,Absent Student Report,Nieobecny Raport Student
 DocType: Email Digest,Next email will be sent on:,Kolejny e-mali zostanie wysłany w dniu:
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} nie został znaleziony
 DocType: Bin,Stock Value,Wartość zapasów
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} nie istnieje
@@ -749,8 +752,6 @@
 DocType: Serial No,Warranty Expiry Date,Data upływu gwarancji
 DocType: Material Request Item,Quantity and Warehouse,Ilość i magazyn
 DocType: Sales Invoice,Commission Rate (%),Wartość prowizji (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Serie nazw dla {0} przez Konfiguracja&gt; Ustawienia&gt; Serie nazw
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Serie nazw dla {0} przez Konfiguracja&gt; Ustawienia&gt; Serie nazw
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Proszę wybrać Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Proszę wybrać Program
 DocType: Project,Estimated Cost,Szacowany koszt
@@ -769,7 +770,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nie jest przechowywany na magazynie
 DocType: Mode of Payment Account,Default Account,Domyślne konto
 DocType: Payment Entry,Received Amount (Company Currency),Otrzymaną kwotą (Spółka waluty)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Wybierz tygodniowe dni wolne
 DocType: Production Order Operation,Planned End Time,Planowany czas zakończenia
 ,Sales Person Target Variance Item Group-Wise,
@@ -852,7 +853,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Request for Quotation Supplier,Send Email,Wyślij E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Brak uprawnień
 DocType: Company,Default Bank Account,Domyślne konto bankowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
@@ -865,8 +866,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nie znaleziono pracowników
 DocType: Supplier Quotation,Stopped,Zatrzymany
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupa studentów jest już aktualizowana.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupa studentów jest już aktualizowana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupa studentów jest już aktualizowana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupa studentów jest już aktualizowana.
 DocType: SMS Center,All Customer Contact,Wszystkie dane kontaktowe klienta
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Wyślij bilans asortymentu używając csv.
 DocType: Warehouse,Tree Details,drzewo Szczegóły
@@ -877,8 +878,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna kwota faktury
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: MPK {2} nie należy do Spółki {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} {2} Konto nie może być grupą
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Przedmiot Row {idx} {} {doctype DOCNAME} nie istnieje w wyżej &#39;{doctype}&#39; Stół
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Przedmiot Row {idx} {} {doctype DOCNAME} nie istnieje w wyżej &#39;{doctype}&#39; Stół
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Brak zadań
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym auto faktury będą generowane na przykład 05, 28 itd"
 DocType: Asset,Opening Accumulated Depreciation,Otwarcie Skumulowana amortyzacja
@@ -894,7 +895,7 @@
 DocType: Bin,Moving Average Rate,Cena Średnia Ruchoma
 DocType: Production Planning Tool,Select Items,Wybierz Elementy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Plan zajęć
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Plan zajęć
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: HR Settings,Enter retirement age in years,Podaj wiek emerytalny w latach
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Magazyn docelowy
@@ -902,7 +903,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
 DocType: Stock Entry,STE-,STEMI
 DocType: Upload Attendance,Import Attendance,Importuj Frekwencję
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Wszystkie grupy produktów
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Wszystkie grupy produktów
 DocType: Process Payroll,Activity Log,Dziennik aktywności
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Zysk / strata netto
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatyczna wiadomość o założeniu transakcji
@@ -913,7 +914,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Zamówienie zakupu do płatności
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Otwarcie&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otwarty na uwagi
 DocType: Notification Control,Delivery Note Message,Wiadomość z Dowodu Dostawy
@@ -929,7 +930,7 @@
 DocType: Item Reorder,Re-Order Qty,Ilość w ponowieniu zamówienia
 DocType: Leave Block List Date,Leave Block List Date,Opuść Zablokowaną Listę Dat
 DocType: Pricing Rule,Price or Discount,Cena albo Zniżka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Wszystkich obowiązujących opłat w ZAKUPU Elementy tabeli muszą być takie same jak Wszystkich podatkach i opłatach
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Wszystkich obowiązujących opłat w ZAKUPU Elementy tabeli muszą być takie same jak Wszystkich podatkach i opłatach
 DocType: Sales Team,Incentives,
 DocType: SMS Log,Requested Numbers,Wymagane numery
 DocType: Production Planning Tool,Only Obtain Raw Materials,Uzyskanie wyłącznie materiały
@@ -987,8 +988,7 @@
 DocType: Supplier,Default Payable Accounts,Domyślne konta Rozrachunki z dostawcami
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Fee Structure,Components,składniki
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Wyślij Fakturę Zaliczkową / Proformę
@@ -1040,8 +1040,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemiczny
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Domyślne konto bank / bankomat zostanie automatycznie zaktualizowana wynagrodzenia Journal Entry po wybraniu tego trybu.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Przedziały Grade Kodeksu {0} pokrywa się z okresami klasy dla innych klas. Proszę sprawdzać harmonogram {0} i {1} i spróbuj ponownie
 DocType: BOM,Raw Material Cost(Company Currency),Koszt surowca (Spółka waluty)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Wiersz {0}: stawka nie może być większa niż stawka stosowana w {1} {2}
@@ -1054,7 +1052,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Element
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
 DocType: Timesheet Detail,Bill,Rachunek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Następny Amortyzacja Data jest wpisana w minionym dniem
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Następny Amortyzacja Data jest wpisana w minionym dniem
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Biały
 DocType: SMS Center,All Lead (Open),Wszystkie Leady (Otwarte)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Wiersz {0}: Ilość nie jest dostępny dla {4} w magazynie {1} w delegowania chwili wejścia ({2} {3})
@@ -1069,7 +1067,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
 DocType: Lead,Next Contact Date,Data Następnego Kontaktu
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Ilość Otwarcia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
 DocType: Student Batch Name,Student Batch Name,Student Batch Nazwa
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
 DocType: Repayment Schedule,Balance Loan Amount,Kwota salda kredytu
@@ -1089,10 +1087,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Proszę podać {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
 DocType: Delivery Note,Delivery To,Dostawa do
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nie może być ujemna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Zniżka (rabat)
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Zniżka (rabat)
 DocType: Asset,Total Number of Depreciations,Całkowita liczba amortyzacją
 DocType: Sales Invoice Item,Rate With Margin,Rate With Margin
 DocType: Sales Invoice Item,Rate With Margin,Rate With Margin
@@ -1121,7 +1119,7 @@
 DocType: Lead,Organization Name,Nazwa organizacji
 DocType: Tax Rule,Shipping State,Stan zakupu
 ,Projected Quantity as Source,Prognozowana ilość jako źródło
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
 DocType: Employee,A-,ZA-
 DocType: Production Planning Tool,Include non-stock items,Zawierać elementy non-stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Koszty Sprzedaży
@@ -1129,7 +1127,7 @@
 DocType: GL Entry,Against,Wyklucza
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,Partner Wdrożeniowy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kod pocztowy
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Kod pocztowy
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
 DocType: Opportunity,Contact Info,Dane kontaktowe
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Dokonywanie stockowe Wpisy
@@ -1172,7 +1170,7 @@
 DocType: Sales Partner,Distributor,Dystrybutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Zamówienie Produkcji {0} musi być odwołane przed odwołaniem Zamówienia Sprzedaży
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 DocType: Global Defaults,Global Defaults,Globalne wartości domyślne
@@ -1207,11 +1205,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Proszę wpisać kod produkt, aby uzyskać numer partii"
 DocType: Stock Settings,Default Item Group,Domyślna Grupa Przedmiotów
 DocType: Employee Loan,Partially Disbursed,częściowo wypłacona
-DocType: Grading Structure,Grading System Name,Nazwa standaryzacji systemu
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza dostawców
 DocType: Account,Balance Sheet,Arkusz Bilansu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Tryb płatność nie jest skonfigurowana. Proszę sprawdzić, czy konto zostało ustawione na tryb płatności lub na POS Profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Tryb płatność nie jest skonfigurowana. Proszę sprawdzić, czy konto zostało ustawione na tryb płatności lub na POS Profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Sprzedawca otrzyma w tym dniu przypomnienie, aby skontaktować się z klientem"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama pozycja nie może być wprowadzone wiele razy.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalsze relacje mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
@@ -1250,11 +1247,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Proszę zaznaczyć co najmniej jeden atrybut w tabeli atrybutów
 DocType: Announcement,All Students,Wszyscy uczniowie
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Element {0} musi być elementem non-stock
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} musi być elementem non-stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Podgląd księgi
 DocType: Grading Scale,Intervals,przedziały
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Nie Student Komórka
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Reszta świata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
@@ -1295,8 +1292,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
 DocType: Journal Entry,Get Outstanding Invoices,Uzyskaj zaległą fakturę
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Zamówienia pomoże Ci zaplanować i śledzić na zakupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Zamówienia pomoże Ci zaplanować i śledzić na zakupy
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Całkowita ilość Issue / Przelew {0} w dziale Zamówienie {1} \ nie może być większa od ilości wnioskowanej dla {2} {3} Przedmiot
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mały
@@ -1320,7 +1317,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Twoje Produkty lub Usługi
 DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jest grupa przedmiotów root i nie mogą być edytowane.
@@ -1338,7 +1335,7 @@
 DocType: Student Group Student,Group Roll Number,Numer grupy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko Kredytowane konta mogą być połączone z innym zapisem po stronie debetowej"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Suma wszystkich wagach zadanie powinno być 1. Proszę ustawić wagi wszystkich zadań projektowych odpowiednio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
@@ -1365,7 +1362,7 @@
 DocType: Depreciation Schedule,Journal Entry,Zapis księgowy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} pozycji w przygotowaniu
 DocType: Workstation,Workstation Name,Nazwa stacji roboczej
-DocType: Grade Interval,Grade Code,Kod klasy
+DocType: Grading Scale Interval,Grade Code,Kod klasy
 DocType: POS Item Group,POS Item Group,POS Pozycja Grupy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
@@ -1382,7 +1379,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Sprzęt komputerowy
 DocType: Sales Order,Recurring Upto,Cyklicznie upto
 DocType: Attendance,HR Manager,
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Wybierz firmę
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Wybierz firmę
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,
 DocType: Purchase Invoice,Supplier Invoice Date,Data faktury dostawcy
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Musisz włączyć Koszyk
@@ -1398,7 +1395,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Żywność
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starzenie Zakres 3
 DocType: Maintenance Schedule Item,No of Visits,Numer wizyt
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Harmonogram konserwacji {0} istnieje przeciwko {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Zapis uczeń
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Waluta Rachunku Zamknięcie musi być {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma punktów dla wszystkich celów powinno być 100. {0}
@@ -1447,13 +1445,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plan Kont
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Element {0} nie jest w magazynie
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Element {0} nie jest w magazynie
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Detail,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
 DocType: Pricing Rule,"Higher the number, higher the priority","Im wyższa liczba, wyższy priorytet"
 ,Purchase Invoice Trends,Trendy Faktur Zakupów
 DocType: Employee,Better Prospects,Lepsze Alternatywy
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Wiersz # {0}: partia {1} ma tylko {2} qty. Wybierz inną partię, która ma {3} qty dostępną lub podzielisz wiersz na wiele wierszy, aby dostarczyć / wydać z wielu partii"
 DocType: Vehicle,License Plate,Tablica rejestracyjna
 DocType: Appraisal,Goals,Cele
 DocType: Warranty Claim,Warranty / AMC Status,Gwarancja / AMC Status
@@ -1472,7 +1471,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
 DocType: Email Digest,Bank Balance,Saldo bankowe
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil stanowiska pracy, wymagane kwalifikacje itp."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
@@ -1483,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaż niezamkniętych rok obrotowy za P &amp; L sald
 DocType: Shipping Rule,Shipping Account,Konto dostawy
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} {2} konto jest nieaktywne
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Dokonać zamówienia sprzedaży, które pomogą Ci zaplanować swoją pracę i dostarczyć na czas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Dokonać zamówienia sprzedaży, które pomogą Ci zaplanować swoją pracę i dostarczyć na czas"
 DocType: Quality Inspection,Readings,Odczyty
 DocType: Stock Entry,Total Additional Costs,Wszystkich Dodatkowe koszty
 DocType: Course Schedule,SH,SH
@@ -1494,7 +1493,7 @@
 DocType: Shipping Rule Condition,To Value,Określ wartość
 DocType: Asset Movement,Stock Manager,Kierownik magazynu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magazyn źródłowy jest obowiązkowy dla wiersza {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,List przewozowy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,List przewozowy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Wydatki na wynajem
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import nie powiódł się!
@@ -1520,7 +1519,7 @@
 DocType: Sales Invoice,Source,Źródło
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Pokaż closed
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Kategoria atutem jest obowiązkowe dla Fixed pozycja aktywów
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Kategoria atutem jest obowiązkowe dla Fixed pozycja aktywów
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ten {0} konflikty z {1} do {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenci HTML
@@ -1538,7 +1537,7 @@
 DocType: Student,Date of Leaving,Data Pozostawiając
 DocType: Pricing Rule,For Price List,Dla Listy Cen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Szukanie wykonawcze
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Tworzenie Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Tworzenie Leads
 DocType: Maintenance Schedule,Schedules,Harmonogramy
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Numer
@@ -1566,7 +1565,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Zgłoszenia
 DocType: Sales Invoice Item,Brand Name,Nazwa marki
 DocType: Purchase Receipt,Transporter Details,Szczegóły transportu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Pudło
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Dostawca możliwe
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacja
@@ -1600,7 +1599,7 @@
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Domyślny BOM dla {0} Nie znaleziono Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Zwrot wydatków
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenci są w samym sercu systemu, dodanie wszystkich swoich uczniów"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenci są w samym sercu systemu, dodanie wszystkich swoich uczniów"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Wiersz # {0}: Data Rozliczenie {1} nie może być wcześniejsza niż data Czek {2}
 DocType: Company,Default Holiday List,Domyślnie lista urlopowa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Wiersz {0}: od czasu do czasu i od {1} pokrywa się z {2}
@@ -1612,20 +1611,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dzień (s), w którym starasz się o urlop jest święta. Nie musisz ubiegać się o urlop."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Wyślij ponownie płatności E-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nowe zadanie
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Dodać Oferta
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Dodać Oferta
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Inne raporty
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,Zatrzymaj przypomnienia o urodzinach
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Proszę ustawić domyślny Payroll konto płatne w Spółce {0}
 DocType: SMS Center,Receiver List,Lista odbiorców
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Szukaj przedmiotu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Szukaj przedmiotu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Skonsumowana wartość
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Zmiana netto stanu środków pieniężnych
 DocType: Assessment Plan,Grading Scale,Skala ocen
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Zakończone
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Płatność Zapytanie już istnieje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
@@ -1663,7 +1662,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zebrać
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślna List Cen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nie można usunąć Fiscal Year {0}. Rok fiskalny {0} jest ustawiona jako domyślna w Ustawienia globalne
 DocType: Journal Entry,Entry Type,Rodzaj wpisu
 ,Customer Credit Balance,Saldo kredytowe klienta
@@ -1704,8 +1703,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studia w sam instytut
 DocType: Territory,Territory Manager,Kierownik Regionalny
 DocType: Packed Item,To Warehouse (Optional),Aby Warehouse (opcjonalnie)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa towarów&gt; Marka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa towarów&gt; Marka
 DocType: Payment Entry,Paid Amount (Company Currency),Zapłacona kwota (waluta firmy)
 DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
@@ -1715,9 +1712,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobacz Koszyk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,Element Zgłoś Niedobór
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Następny Amortyzacja Data jest obowiązkowe dla nowych aktywów
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Następny Amortyzacja Data jest obowiązkowe dla nowych aktywów
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Oddzielna grupa kursów dla każdej partii
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Oddzielna grupa kursów dla każdej partii
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Jednostka produktu.
@@ -1734,9 +1731,7 @@
 DocType: Course Assessment Criteria,Weightage,Waga/wiek
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: MPK jest wymagane dla &quot;zysków i strat&quot; konta {2}. Proszę ustawić domyślny centrum kosztów dla firmy.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klienta&gt; Terytorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klienta&gt; Terytorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nowy kontakt
 DocType: Territory,Parent Territory,Nadrzędne terytorium
 DocType: Quality Inspection Reading,Reading 2,Odczyt 2
@@ -1763,21 +1758,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Wyrównywanie JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego.
 DocType: Purchase Invoice Item,Batch No,Nr Partii
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nie można znaleźć kurs wymiany {0} {1} dla terminu kluczowego {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zezwalaj na wiele zleceń sprzedaży wobec Klienta Zamówienia
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Komórka Nie
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Główny
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Wariant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Główny
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Wariant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ustaw prefiks dla numeracji serii na swoich transakcji
 DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
 DocType: Employee,Leave Encashed?,"Jesteś pewien, że chcesz wyjść z Wykupinych?"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Email Digest,Annual Expenses,roczne koszty
 DocType: Item,Variants,Warianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Wprowadź Zamówienie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Wprowadź Zamówienie
 DocType: SMS Center,Send To,Wyślij do
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},
 DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota
@@ -1797,7 +1791,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,wyceny
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Warunki wysyłki
-DocType: Grading Structure,Grading Intervals,Odstępy skarpy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Podaj
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nie można overbill do pozycji {0} w wierszu {1} więcej niż {2}. Aby umożliwić nad-billing, należy ustawić w Ustawienia zakupów"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Proszę ustawić filtr na podstawie pkt lub magazynie
@@ -1810,16 +1803,17 @@
 DocType: Authorization Control,Authorization Control,Kontrola Autoryzacji
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Wiersz # {0}: Odrzucone Magazyn jest obowiązkowe przed odrzucony poz {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Płatność
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Zarządzanie zamówień
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Zarządzanie zamówień
 DocType: Production Order Operation,Actual Time and Cost,Rzeczywisty Czas i Koszt
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Zamówienie produktu o maksymalnej ilości {0} może być zrealizowane dla przedmiotu {1} w zamówieniu {2}
 DocType: Employee,Salutation,Forma grzecznościowa
 DocType: Course,Course Abbreviation,Skrót golfowe
 DocType: Student Leave Application,Student Leave Application,Student Application Leave
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pracownik {0} na pół dnia na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Całkowita liczba godzin pracy nie powinna być większa niż max godzinach pracy {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,włączony
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Pakiet przedmiotów w momencie sprzedaży
 DocType: Quotation Item,Actual Qty,Rzeczywista Ilość
 DocType: Sales Invoice Item,References,Referencje
@@ -1829,7 +1823,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Wprowadziłeś duplikat istniejących rzeczy. Sprawdź i spróbuj ponownie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Współpracownik
 DocType: Asset Movement,Asset Movement,Zaleta Ruch
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nowy Koszyk
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Nowy Koszyk
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
 DocType: Vehicle,Wheels,Koła
@@ -1861,10 +1855,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Wyłącza tworzenie dzienników razem przeciwko zleceń produkcyjnych. Operacje nie będą śledzone przed produkcja na zamówienie
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ma Warianty
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
 DocType: Purchase Invoice,Recurring Invoice,Powtarzająca się faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Zarządzanie projektami
@@ -1872,7 +1866,7 @@
 DocType: Budget,Fiscal Year,Rok Podatkowy
 DocType: Vehicle Log,Fuel Price,Cena paliwa
 DocType: Budget,Budget,Budżet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budżet nie może być przypisany przed {0}, ponieważ nie jest to konto przychodów lub kosztów"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Osiągnięte
 DocType: Student Admission,Application Form Route,Formularz zgłoszeniowy Route
@@ -1904,7 +1898,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Kwota {0} {1} odliczone przed {2}
 DocType: Employee,Salary Information,Informacja na temat wynagrodzenia
 DocType: Sales Person,Name and Employee ID,Imię i Identyfikator Pracownika
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
 DocType: Website Item Group,Website Item Group,Grupa przedmiotów strony WWW
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Podatki i cła
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,
@@ -1963,7 +1957,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Powtórz Przychody klienta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Para
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
 DocType: Asset,Depreciation Schedule,amortyzacja Harmonogram
 DocType: Bank Reconciliation Detail,Against Account,Konto korespondujące
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pół Dzień Data powinna być pomiędzy Od Data i do tej pory
@@ -1980,13 +1974,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
 DocType: Shipping Rule Condition,Shipping Amount,Ilość dostawy
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
 DocType: Purchase Order,Delivered,Dostarczono
 ,Vehicle Expenses,Wydatki Samochodowe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
+DocType: Serial No,Invoice Details,Dane do faktury
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
 DocType: Purchase Receipt,Vehicle Number,Numer pojazdu
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,
 DocType: Employee Loan,Loan Amount,Kwota kredytu
@@ -2009,7 +2004,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
 DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupa do Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporty
 DocType: Loan Type,Loan Name,pożyczka Nazwa
@@ -2020,6 +2015,7 @@
 ,Customer Acquisition and Loyalty,
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazyn w którym zarządzasz odrzuconymi przedmiotami
 DocType: Production Order,Skip Material Transfer,Pomiń Przesył materiału
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nie można znaleźć kursu wymiany dla {0} do {1} dla daty klucza {2}. Proszę utworzyć ręcznie rekord wymiany walut
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Zakończenie roku podatkowego
 DocType: POS Profile,Price List,Cennik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} jest teraz domyślnym rokiem finansowym. Odśwież swoją przeglądarkę aby zmiana weszła w życie
@@ -2057,9 +2053,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Element {0} został zwrócony
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
 DocType: Student Admission,Eligibility,Wybieralność
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Przewody pomóc biznesu, dodać wszystkie kontakty i więcej jak swoich klientów"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Przewody pomóc biznesu, dodać wszystkie kontakty i więcej jak swoich klientów"
 DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
@@ -2100,7 +2096,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Wybierz firmą ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Zostaw puste jeśli jest to rozważane dla wszystkich departamentów
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Rodzaje zatrudnienia (umowa o pracę, zlecenie, praktyka zawodowa itd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Process Payroll,Fortnightly,Dwutygodniowy
 DocType: Currency Exchange,From Currency,Od Waluty
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
@@ -2116,7 +2112,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nie można wybrać typu opłaty jako ""Sumy Poprzedniej Komórki"" lub ""Całkowitej kwoty poprzedniej Komórki"" w pierwszym rzędzie"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dziecko pozycja nie powinna być Bundle produktu. Proszę usunąć pozycję `` {0} i zapisać
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankowość
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj ewidencja czasu pracy
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj ewidencja czasu pracy
 DocType: Vehicle Service,Service Item,service Element
 DocType: Bank Guarantee,Bank Guarantee,Gwarancja bankowa
 DocType: Bank Guarantee,Bank Guarantee,Gwarancja bankowa
@@ -2166,8 +2162,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nie będą wyświetlane, jeśli Cennik nie jest ustawiony"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Proszę podać kraj, w tym wysyłka Reguły lub sprawdź wysyłka na cały świat"
 DocType: Stock Entry,Total Incoming Value,Całkowita wartość przychodów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debetowane Konto jest wymagane
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debetowane Konto jest wymagane
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy
 DocType: Offer Letter Term,Offer Term,Oferta Term
 DocType: Quality Inspection,Quality Manager,Manager Jakości
@@ -2201,14 +2197,14 @@
 DocType: Opportunity,Lost Reason,Powód straty
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nowy adres
 DocType: Quality Inspection,Sample Size,Wielkość próby
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Proszę podać Otrzymanie dokumentu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Proszę podać Otrzymanie dokumentu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Project,External,Zewnętrzny
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Użytkownicy i uprawnienia
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Zlecenia produkcyjne Utworzono: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Zlecenia produkcyjne Utworzono: {0}
 DocType: Branch,Branch,Odddział
 DocType: Guardian,Mobile Number,Numer telefonu komórkowego
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukowanie i firmowanie
@@ -2217,7 +2213,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Nr seryjny {0} nie znaleziono
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Twoi Klienci
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Dokonaj Studenta
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Dokonaj Studenta
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Zostałeś zaproszony do współpracy przy projekcie: {0}
 DocType: Leave Block List Date,Block Date,Zablokowana Data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplikuj teraz
@@ -2241,8 +2237,9 @@
 DocType: SMS Log,Sent To,Wysłane Do
 DocType: Payment Request,Make Sales Invoice,Nowa faktura sprzedaży
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Oprogramowania
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Następnie Kontakt Data nie może być w przeszłości
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Następnie Kontakt Data nie może być w przeszłości
 DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Wybierz numer partii
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nieprawidłowy {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET
 DocType: Sales Invoice Advance,Advance Amount,Kwota Zaliczki
@@ -2256,7 +2253,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Numer sprawy nie może wynosić 0
 DocType: Item,Show a slideshow at the top of the page,Pokazuj slideshow na górze strony
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,LM
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Sklepy
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Sklepy
 DocType: Serial No,Delivery Time,Czas dostawy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,
 DocType: Item,End of Life,Zakończenie okresu eksploatacji
@@ -2272,8 +2269,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer materiału
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Niniejszy dokument ma na granicy przez {0} {1} dla pozycji {4}. Robisz kolejny {3} przeciwko samo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Wybierz opcję Zmień konto kwotę
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Wybierz opcję Zmień konto kwotę
 DocType: Purchase Invoice,Price List Currency,Waluta cennika
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
 DocType: Stock Settings,Allow Negative Stock,Dozwolony ujemny stan
@@ -2284,7 +2281,7 @@
 DocType: Budget Account,Budget Account,budżet konta
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nie można zmienić domyślnej waluty firmy, ponieważ istnieją przypisane do niej transakcje. Anuluj transakcje, aby zmienić domyślną walutę"
-DocType: Grade Interval,Grade Description,Stopień Opis
+DocType: Grading Scale Interval,Grade Description,Stopień Opis
 DocType: Stock Entry,Purchase Receipt No,Nr Potwierdzenia Zakupu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Pieniądze zaliczkowe
 DocType: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
@@ -2322,7 +2319,7 @@
 DocType: Upload Attendance,Attendance To Date,Obecność do Daty
 DocType: Warranty Claim,Raised By,Wywołany przez
 DocType: Payment Gateway Account,Payment Account,Konto Płatność
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Zmiana netto stanu należności
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,
 DocType: Offer Letter,Accepted,Przyjęte
@@ -2336,7 +2333,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Etykieta z zasadami wysyłki i transportu
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum użytkowników
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy
 DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe
@@ -2350,7 +2347,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Warunki1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Nazwa instytutu, dla którego jest utworzenie tego systemu."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Zapisywanie kont zostało zamrożone do tej daty, nikt  nie może tworzyć / modyfikować zapisów poza uprawnionymi użytkownikami wymienionymi poniżej."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Poniższe Zlecenia produkcyjne powstały:
@@ -2373,6 +2370,7 @@
 DocType: Email Digest,How frequently?,Jak często?
 DocType: Purchase Receipt,Get Current Stock,Pobierz aktualny stan magazynowy
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drzewo Zestawienia materiałów
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa towarów&gt; Marka
 DocType: Student,Joining Date,Data Dołączenia
 ,Employees working on a holiday,Pracownicy zatrudnieni na wakacje
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
@@ -2474,7 +2472,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produkcja
 DocType: Guardian,Occupation,Zawód
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Wiersz {0}: Data Początku musi być przed Datą Końca
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Wiersz {0}: Data Początku musi być przed Datą Końca
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Razem (szt)
 DocType: Sales Invoice,This Document,Ten dokument
 DocType: Installation Note Item,Installed Qty,Liczba instalacji
@@ -2497,8 +2495,8 @@
 DocType: Notification Control,Sales Order Message,Informacje Zlecenia Sprzedaży
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ustaw wartości domyślne jak firma, waluta, bieżący rok rozliczeniowy, itd."
 DocType: Payment Entry,Payment Type,Typ płatności
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
 DocType: Process Payroll,Select Employees,Wybierz Pracownicy
 DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży
 DocType: Payment Entry,Cheque/Reference Date,Czek / Reference Data
@@ -2515,7 +2513,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalny POS Profil {0} już stworzony dla firmy {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zastąp rzecz ? BOM we wszystkich BOM
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Otrzymanie dokumentu należy składać
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Otrzymanie dokumentu należy składać
 DocType: Purchase Invoice Item,Received Qty,Otrzymana ilość
 DocType: Stock Entry Detail,Serial No / Batch,Nr seryjny / partia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nie Płatny i nie Dostarczany
@@ -2528,7 +2526,7 @@
 ,To Produce,Do produkcji
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lista płac
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Do rzędu {0} w {1}. Aby dołączyć {2} w cenę towaru, wiersze {3} musi być włączone"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Dokonaj użytkownika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Dokonaj użytkownika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Nr identyfikujący paczkę do dostawy (do druku)
 DocType: Bin,Reserved Quantity,Zarezerwowana ilość
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Proszę wprowadzić poprawny adres email
@@ -2542,11 +2540,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Szablon niepełnosprawnych nie może być domyślny szablon
 DocType: Account,Income Account,Konto przychodów
 DocType: Payment Request,Amount in customer's currency,Kwota w walucie klienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dostarczanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Dostarczanie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Patrz ""Oceń Materiały w oparciu o"" w sekcji Kalkulacji kosztów"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Poprzedni
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Partie studenckich pomóc śledzenie obecności, oceny i opłat dla studentów"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Partie studenckich pomóc śledzenie obecności, oceny i opłat dla studentów"
 DocType: Payment Entry,Total Allocated Amount,Łączna kwota przyznanego wsparcia
 DocType: Item Reorder,Material Request Type,Typ zamówienia produktu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry na wynagrodzenia z {0} {1}
@@ -2569,7 +2568,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Śledź leady przez typy przedsiębiorstw
 DocType: Item Supplier,Item Supplier,Dostawca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
@@ -2579,6 +2578,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Wyśle wiadomość e-mail o zdarzeniu pracowników ze statusem &quot;Otwórz&quot;
 DocType: Task,Depends on Tasks,Zależy Zadania
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Zarządzaj drzewem grupy klientów
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Załączniki mogą być wyświetlane bez włączania koszyka
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nazwa nowego Centrum Kosztów
 DocType: Leave Control Panel,Leave Control Panel,Panel do obsługi Urlopów
@@ -2591,12 +2591,10 @@
 DocType: Sales Invoice,Debit To,Debetowane Konto (Winien)
 DocType: Delivery Note,Required only for sample item.,
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nie znaleziono wynagrodzenie poślizg między {0} i {1}
 ,Pending SO Items For Purchase Request,Oczekiwane elementy Zamówień Sprzedaży na Prośbę Zakupu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Rekrutacja dla studentów
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} jest wyłączony
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} jest wyłączony
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
 DocType: Sales Invoice,SINV-RET-,SINV-RET
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Bardzo Duży
@@ -2613,7 +2611,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Ciekawa Strona produktu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Wszystkie grupy oceny
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nowy magazyn Nazwa
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Razem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Razem {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Region
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,
 DocType: Stock Settings,Default Valuation Method,Domyślna metoda wyceny
@@ -2631,7 +2629,7 @@
 DocType: Price List,Price List Master,Ustawienia Cennika
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele."
 ,S.O. No.,
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Proszę utworzyć Klienta z {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Proszę utworzyć Klienta z {0}
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Pozostawić tylko Aplikacje ze statusem „Approved” i „Odrzucone” mogą być składane
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Nazwa grupy jest obowiązkowe w wierszu {0}
@@ -2724,7 +2722,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Zapis księgowy dla zapasów
 DocType: Vehicle Service,Engine Oil,Olej silnikowy
 DocType: Sales Invoice,Sales Team1,Team Sprzedażowy1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} nie istnieje
 DocType: Sales Invoice,Customer Address,Adres klienta
 DocType: Employee Loan,Loan Details,pożyczka Szczegóły
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Wiersz {0}: Zakończony Ilość musi być większa od zera.
@@ -2789,7 +2787,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Magazyny z istniejącymi transakcji nie mogą być zamieniane na grupy.
 DocType: Assessment Result Tool,Result HTML,wynik HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Upływa w dniu
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj uczniów
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj uczniów
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Proszę wybrać {0}
 DocType: C-Form,C-Form No,
 DocType: BOM,Exploded_items,Exploded_items
@@ -2854,7 +2852,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Semestr z tym &quot;Roku Akademickiego&quot; {0} i &#39;Nazwa Termin&#39; {1} już istnieje. Proszę zmodyfikować te dane i spróbuj jeszcze raz.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Ponieważ istnieje istniejące transakcje przeciwko elementu {0}, nie można zmienić wartość {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Ponieważ istnieje istniejące transakcje przeciwko elementu {0}, nie można zmienić wartość {1}"
 DocType: UOM,Must be Whole Number,Musi być liczbą całkowitą
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nowe Zwolnienie Przypisano (W Dniach)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Nr seryjny {0} nie istnieje
@@ -2898,7 +2896,7 @@
 DocType: Supplier,Last Day of the Next Month,Ostatni dzień następnego miesiąca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blisko Issue po 7 dniach
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Urlopu nie może być przyznane przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Wnioskodawca
 DocType: Asset Category Account,Accumulated Depreciation Account,Skumulowana konta Amortyzacja
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
@@ -2926,8 +2924,8 @@
 DocType: Asset,Item Code,Kod identyfikacyjny
 DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji
 DocType: Serial No,Warranty / AMC Details,Gwarancja / AMC Szczegóły
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
 DocType: Journal Entry,User Remark,Nota Użytkownika
 DocType: Lead,Market Segment,Segment rynku
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Wpłaconej kwoty nie może być większa od całkowitej ujemnej kwoty należności {0}
@@ -2946,7 +2944,7 @@
 DocType: Production Planning Tool,Create Material Requests,
 DocType: Employee Education,School/University,Szkoła/Uniwersytet
 DocType: Payment Request,Reference Details,Szczegóły odniesienia
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Oczekiwana wartość Po okres użytkowania może być mniejsza niż brutto Kwota do zapłaty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Oczekiwana wartość Po okres użytkowania może być mniejsza niż brutto Kwota do zapłaty
 DocType: Sales Invoice Item,Available Qty at Warehouse,Ilość dostępna w magazynie
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Ilość Rozliczenia
 DocType: Asset,Double Declining Balance,Podwójne Bilans Spadek
@@ -2967,19 +2965,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Wypłacona kwota nie może być wyższa niż Kwota kredytu {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produkcja Zamówienie nie stworzył
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Produkcja Zamówienie nie stworzył
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
 DocType: Asset,Fully Depreciated,pełni zamortyzowanych
 ,Stock Projected Qty,Przewidywana ilość zapasów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Zaznaczona Obecność HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Notowania są propozycje, oferty Wysłane do klientów"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Notowania są propozycje, oferty Wysłane do klientów"
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Numer seryjny oraz Batch
 DocType: Warranty Claim,From Company,Od Firmy
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma punktów kryteriów oceny musi być {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Proszę ustawić ilość amortyzacji zarezerwowano
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Proszę ustawić ilość amortyzacji zarezerwowano
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Wartość albo Ilość
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
@@ -3109,7 +3107,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupa Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Wyeceny
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Wybierz klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Wybierz klienta
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Zaleta Centrum Amortyzacja kosztów
 DocType: Sales Order Item,Sales Order Date,Data Zlecenia
@@ -3128,19 +3126,18 @@
 DocType: Vehicle,Insurance Details,Szczegóły ubezpieczenia
 DocType: Account,Payable,Płatność
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Proszę wprowadzić okresy spłaty
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dłużnicy ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dłużnicy ({0})
 DocType: Pricing Rule,Margin,
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nowi klienci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Zysk brutto%
 DocType: Appraisal Goal,Weightage (%),Waga/wiek (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Czystki
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Zakup Kwota brutto jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Zakup Kwota brutto jest obowiązkowe
 DocType: Lead,Address Desc,Opis adresu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partia jest obowiązkowe
 DocType: Journal Entry,JV-,V-
 DocType: Topic,Topic Name,Nazwa tematu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Conajmniej jeden sprzedaż lub zakup musi być wybrany
-DocType: Grading Structure,Grade Intervals,Stopień Odstępy
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Wybierz charakteru swojej działalności.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"W przypadku, gdy czynności wytwórcze są prowadzone."
 DocType: Asset Movement,Source Warehouse,Magazyn źródłowy
@@ -3169,6 +3166,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
 DocType: Territory,Territory Targets,Cele Regionalne
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klienta&gt; Terytorium
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Proszę ustawić domyślny {0} w towarzystwie {1}
 DocType: Cheque Print Template,Starting position from top edge,stanowisko od górnej krawędzi Zaczynając
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,"Tego samego dostawcy, który został wpisany wielokrotnie"
@@ -3222,7 +3220,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Ilość do ponownego zamówienia
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktualne ofert pracy
 DocType: Company,Stock Adjustment Account,Konto korekty
-DocType: Journal Entry,Write Off,Odpis
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpis
 DocType: Timesheet Detail,Operation ID,Operacja ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Użytkownik systemu (login) ID. Jeśli ustawiono, stanie się on domyślnym dla wszystkich formularzy HR"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} od
@@ -3233,8 +3231,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dostawca dostarcza Klientowi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Postać / poz / {0}) jest niedostępne
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Następna data musi być większe niż Data publikacji
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Pokaż Podatek rozpad
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import i eksport danych
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Zbiory wpisy istnieją wobec hurtowni {0}, a więc nie można ponownie przydzielić lub modyfikować"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nie znaleziono studentów
@@ -3246,14 +3244,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Proszę wybrać cytaty
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Proszę wybrać cytaty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Stwórz Wizytę Konserwacji
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Proszę wybrać cytaty
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Proszę wybrać cytaty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Stwórz Wizytę Konserwacji
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
 DocType: Company,Default Cash Account,Domyślne Konto Gotówkowe
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Informacje o własnej firmie.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Jest to oparte na obecności tego Studenta
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Brak uczniów w Poznaniu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodać więcej rzeczy lub otworzyć pełną formę
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Proszę wprowadź 'Spodziewaną Datę Dstawy'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
@@ -3300,9 +3299,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Dodano podatki i opłaty (Firmowe)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
 DocType: Sales Order,Partly Billed,Częściowo Zapłacono
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Element {0} musi być trwałego przedmiotu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} musi być trwałego przedmiotu
 DocType: Item,Default BOM,Domyślne Zestawienie Materiałów
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Razem Najlepszy Amt
@@ -3325,7 +3324,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Cennik Kursowy
 DocType: Purchase Invoice Item,Rate,Stawka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stażysta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adres
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adres
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Kod Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Podstawowy
@@ -3350,7 +3349,7 @@
 DocType: Purchase Invoice,Print Language,Język drukowania
 DocType: Salary Slip,Total Working Hours,Całkowita liczba godzin pracy
 DocType: Stock Entry,Including items for sub assemblies,W tym elementów dla zespołów sub
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Wprowadź wartość musi być dodatnia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Wprowadź wartość musi być dodatnia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Wszystkie obszary
 DocType: Purchase Invoice,Items,Produkty
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student jest już zarejestrowany.
@@ -3370,17 +3369,15 @@
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Daty Od i Do są wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Papiery i Notowania Giełdowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Z magazynu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
 DocType: Assessment Plan,Supervisor Name,Nazwa Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Kurs rejestracyjny programu
 DocType: Program Enrollment Course,Program Enrollment Course,Kurs rekrutacji
-DocType: Grading Structure,Grading Structure,Klasyfikację Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
 DocType: Tax Rule,Shipping City,Wysyłka Miasto
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Pozycja ta jest Wariant {0} (szablonu). Atrybuty zostaną skopiowane z szablonu, chyba że ""Nie Kopiuj"" jest ustawiony"
 DocType: Notification Control,Customize the Notification,Dostosuj powiadomienie
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Przepływy środków pieniężnych z działalności
 DocType: Sales Invoice,Shipping Rule,Zasada dostawy
@@ -3403,6 +3400,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data otwarcia powinien być przed Dniem Zamknięcia
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę skonfigurować serie numeracyjne dla uczestnictwa w programie Setup&gt; Numbering Series
 DocType: Leave Control Panel,Carry Forward,Przeniesienie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w rejestr
 DocType: Department,Days for which Holidays are blocked for this department.,Dni kiedy urlop jest zablokowany dla tego departamentu
@@ -3431,7 +3429,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 DocType: Quality Inspection,Item Serial No,Nr seryjny
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Tworzenie pracownicze Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Tworzenie pracownicze Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Razem Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Raporty księgowe
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Godzina
@@ -3446,8 +3444,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Nowy BOM po wymianie
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punkt Sprzedaży (POS)
 DocType: Payment Entry,Received Amount,Kwota otrzymana
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę skonfigurować system nazwisk pracowników w zasobach ludzkich&gt; ustawienia HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę skonfigurować system nazwisk pracowników w zasobach ludzkich&gt; ustawienia HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Tworzenie pełnej ilości, ignorując ilości już zamówionych"
 DocType: Account,Tax,Podatek
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nieoznaczone
@@ -3460,7 +3456,7 @@
 DocType: Batch,Source Document Name,Nazwa dokumentu źródłowego
 DocType: Batch,Source Document Name,Nazwa dokumentu źródłowego
 DocType: Job Opening,Job Title,Nazwa stanowiska pracy
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Tworzenie użytkowników
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Tworzenie użytkowników
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Raport wizyty dla wezwania konserwacji.
@@ -3472,8 +3468,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
 DocType: BOM,Website Description,Opis strony WWW
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Zmiana netto w kapitale własnym
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Ważności
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Paragon
 ,Sales Register,Rejestracja Sprzedaży
@@ -3484,16 +3480,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nie ma nic do edycji
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Brak klientów!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Raport kasowy
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Proszę wybrać Przeniesienie jeżeli chcesz uwzględnić balans poprzedniego roku rozliczeniowego do tego roku rozliczeniowego
 DocType: GL Entry,Against Voucher Type,Rodzaj dowodu
 DocType: Item,Attributes,Atrybuty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Proszę zdefiniować konto odpisów
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data Ostatniego Zamówienia
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
 DocType: Student,Guardian Details,Szczegóły Stróża
 DocType: C-Form,C-Form,
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Zaznacz Obecność dla wielu pracowników
@@ -3518,14 +3516,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Wiersz {0} # Konto musi być typu &quot;trwałego&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Brak Ilości
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serie jest obowiązkowa
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serie jest obowiązkowa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe
 DocType: Student Sibling,Student ID,legitymacja studencka
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Rodzaje działalności za czas Logi
 DocType: Tax Rule,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
 DocType: Training Event,Exam,Egzamin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
 DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Kr
 DocType: Tax Rule,Billing State,Stan Billing
@@ -3558,7 +3556,7 @@
 DocType: Payment Entry,Account Paid From,Konto Płatny Z
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kod surowca
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Dokonaj Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Dokonaj Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Druk i papiernicze
 DocType: Stock Settings,Show Barcode Field,Pokaż pole kodu kreskowego
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Wyślij e-maile Dostawca
@@ -3574,6 +3572,7 @@
 DocType: Offer Letter,Awaiting Response,Oczekuje na Odpowiedź
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Powyżej
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Wspomnij, jeśli nietypowe konto płatne"
 DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Błąd Szacowania Wartość nie jest dozwolona
@@ -3610,7 +3609,7 @@
 DocType: Program Enrollment Tool,Get Students From,Uzyskaj studentów z
 DocType: Hub Settings,Seller Country,Sprzedawca Kraj
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikowanie przedmioty na stronie internetowej
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa uczniowie w partiach
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa uczniowie w partiach
 DocType: Authorization Rule,Authorization Rule,Reguła autoryzacji
 DocType: Sales Invoice,Terms and Conditions Details,Szczegóły regulaminu
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specyfikacje
@@ -3670,7 +3669,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Wyrok lub staż
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,składników wynagrodzenia
 DocType: Program Enrollment Tool,New Academic Year,Nowy rok akademicki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Powrót / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Powrót / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Automatycznie wstaw wartość z cennika jeśli jej brakuje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Kwota całkowita Płatny
 DocType: Production Order Item,Transferred Qty,Przeniesione ilości
@@ -3711,6 +3710,7 @@
 ,Sales Funnel,Lejek Sprzedaży
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skrót jest obowiązkowy
 DocType: Project,Task Progress,Postęp wykonywania zadania
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Koszyk
 ,Qty to Transfer,Ilość do transferu
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Wycena dla Tropów albo Klientów
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rola Zezwala na edycję zamrożonych zasobów
@@ -3744,7 +3744,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,pobierania opłat
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
 DocType: Lead,Add to calendar on this date,Dodaj do kalendarza pod tą datą
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Zasady naliczania kosztów transportu.
 DocType: Item,Opening Stock,Otwarcie Zdjęcie
@@ -3763,7 +3763,7 @@
 DocType: Customer,From Lead,Od śladu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Zamówienia puszczone do produkcji.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Program Enrollment Tool,Enroll Students,zapisać studentów
 DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard sprzedaży
@@ -3774,7 +3774,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nazwa projektu
-DocType: Supplier,Mention if non-standard receivable account,"Wskazać, jeśli niestandardowe konto należności"
+DocType: Customer,Mention if non-standard receivable account,"Wskazać, jeśli niestandardowe konto należności"
 DocType: Journal Entry Account,If Income or Expense,Jeśli przychód lub koszt
 DocType: Production Order,Required Items,wymagane przedmioty
 DocType: Stock Ledger Entry,Stock Value Difference,Różnica wartości zapasów
@@ -3805,6 +3805,7 @@
 DocType: Item,Taxes,Podatki
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Płatny i niedostarczone
 DocType: Project,Default Cost Center,Domyślne Centrum Kosztów
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Serie nazw dla {0} przez Konfiguracja&gt; Ustawienia&gt; Serie nazw
 DocType: Bank Guarantee,End Date,Data zakończenia
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Operacje magazynowe
 DocType: Budget,Budget Accounts,Rachunki ekonomiczne
@@ -3869,7 +3870,7 @@
 DocType: Customer,Sales Partner and Commission,Partner sprzedaży i Prowizja
 DocType: Employee Loan,Rate of Interest (%) / Year,Stopa procentowa (% / rok)
 ,Project Quantity,Ilość projektów
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów wynosi zero, może trzeba zmienić „Dystrybucja opłat na podstawie”"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów wynosi zero, może trzeba zmienić „Dystrybucja opłat na podstawie”"
 DocType: Opportunity,To Discuss,Do omówienia
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} jednostki {1} potrzebne w {2}, aby zakończyć tę transakcję."
 DocType: Loan Type,Rate of Interest (%) Yearly,Stopa procentowa (%) Roczne
@@ -3892,7 +3893,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Oznacz Nieobecna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Wiersz {0}: Waluta BOM # {1} powinna być równa wybranej walucie {2}
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
 DocType: Homepage,Tag Line,tag Linia
 DocType: Fee Component,Fee Component,opłata Komponent
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
@@ -3909,7 +3910,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazyn {0} nie istnieje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Zarejestruj Dla Hubu ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Miesięczne Procenty Dystrybucja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Wybrany element nie może mieć Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Wybrany element nie może mieć Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa wycena nie znaleziono Item {0}, który jest zobowiązany do zapisów księgowych dla {1} {2}. Jeśli pozycja jest transakcje jako elementu próbki w {1}, należy wspomnieć, że w {1} tabeli poz. W przeciwnym razie, należy utworzyć połączenie przychodzące transakcję akcji na artykuł lub wzmianka kursu wyceny w rekordzie element, a następnie spróbuj wysłaniem / anulowanie tego wpisu"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiałów dostarczonych w stosunku do dowodu dostawy
 DocType: Project,Customer Details,Dane Klienta
@@ -3926,7 +3927,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Złożone zlecenia nie mogą zostać usunięte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jest na minusie, nie możesz ustawić wymagań jako kredyt."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Zarządzanie jakością
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Element {0} została wyłączona
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} została wyłączona
 DocType: Employee Loan,Repay Fixed Amount per Period,Spłacić ustaloną kwotę za okres
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Wprowadź ilość dla przedmiotu {0}
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
@@ -3953,7 +3954,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student ID email
 DocType: Employee,Notice (days),Wymówienie (dni)
 DocType: Tax Rule,Sales Tax Template,Szablon Podatek od sprzedaży
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
 DocType: Employee,Encashment Date,Data Inkaso
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Korekta
@@ -3987,6 +3988,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nocie debetowej
 DocType: Production Order,Warehouses,Magazyny
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} zasób nie może zostać przetransferowany
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ta pozycja jest wariantem {0} (szablon).
 DocType: Workstation,per hour,na godzinę
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabywczy
 DocType: Announcement,Announcement,Ogłoszenie
@@ -4002,7 +4004,7 @@
 DocType: Account,Receivable,Należności
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rola pozwala na zatwierdzenie transakcji, których kwoty przekraczają ustalone limity kredytowe."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Wybierz produkty do Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Wybierz produkty do Manufacture
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Mistrz synchronizacja danych, może to zająć trochę czasu"
 DocType: Item,Material Issue,Wydanie materiałów
 DocType: Hub Settings,Seller Description,Sprzedawca Opis
@@ -4015,7 +4017,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Zamówione
 DocType: Salary Detail,Component,Składnik
 DocType: Assessment Criteria,Assessment Criteria Group,Kryteria oceny grupowej
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otwarcie Skumulowana amortyzacja powinna być mniejsza niż równa {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otwarcie Skumulowana amortyzacja powinna być mniejsza niż równa {0}
 DocType: Warehouse,Warehouse Name,Nazwa magazynu
 DocType: Naming Series,Select Transaction,Wybierz Transakcję
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Proszę wprowadzić Rolę osoby zatwierdzającej dla użytkownika zatwierdzającego
@@ -4050,7 +4052,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Aby ustawić ten rok finansowy jako domyślny, kliknij przycisk ""Ustaw jako domyślne"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,łączyć
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Employee Loan,Repay from Salary,Spłaty z pensji
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Żądanie zapłatę przed {0} {1} w ilości {2}
@@ -4068,7 +4070,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Wynik oceny Szczegóły
 DocType: Employee Education,Employee Education,Wykształcenie pracownika
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplikat grupę pozycji w tabeli grupy produktów
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
 DocType: Salary Slip,Net Pay,Stawka Netto
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nr seryjny {0} otrzymano
@@ -4077,7 +4079,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magazyn {0} nie jest powiązany z żadnym kontem, tworzyć / odwołuje się odpowiedni (aktywo) konto na magazynie."
 DocType: Purchase Invoice,Recurring Id,Powtarzające się ID
 DocType: Customer,Sales Team Details,Szczegóły dotyczące Teamu Sprzedażowego
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Usuń na stałe?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Usuń na stałe?
 DocType: Expense Claim,Total Claimed Amount,Całkowita kwota roszczeń
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencjalne szanse na sprzedaż.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Nieprawidłowy {0}
@@ -4088,13 +4090,14 @@
 DocType: Warehouse,PIN,KOŁEK
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Konfiguracja swoją szkołę w ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Kwota bazowa Change (Spółka waluty)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Zapisz dokument jako pierwszy.
 DocType: Account,Chargeable,Odpowedni do pobierania opłaty.
 DocType: Company,Change Abbreviation,Zmień Skrót
 DocType: Expense Claim Detail,Expense Date,Data wydatku
 DocType: Item,Max Discount (%),Maksymalny rabat (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Kwota ostatniego zamówienia
+DocType: Task,Is Milestone,Jest Milestone
 DocType: Daily Work Summary,Email Sent To,Email wysłany do
 DocType: Budget,Warn,Ostrzeż
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Wszelkie inne uwagi, zauważyć, że powinien iść nakładu w ewidencji."
@@ -4127,11 +4130,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Zapasy starsze niż' powinny być starczyć na %d dni
 DocType: Tax Rule,Purchase Tax Template,Szablon podatkowy zakupów
 ,Project wise Stock Tracking,
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plan Konserwacji {0} występuje przeciw {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Rzeczywista Ilość (u źródła/celu)
 DocType: Item Customer Detail,Ref Code,Ref kod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekordy pracownika.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
 DocType: HR Settings,Payroll Settings,Ustawienia Listy Płac
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Łączenie faktur z płatnościami
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Złóż zamówienie
@@ -4154,7 +4156,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Czeki i Depozyty nieprawidłowo rozliczone
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
 DocType: Purchase Invoice Item,Price List Rate,Wartość w cenniku
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Tworzenie cytaty z klientami
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Tworzenie cytaty z klientami
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokazuj ""W magazynie"" lub ""Brak w magazynie"" bazując na ilości dostępnej w tym magazynie."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Zestawienie materiałowe (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Średni czas podjęte przez dostawcę do dostarczenia
@@ -4176,7 +4178,7 @@
 DocType: Asset,Disposal Date,Utylizacja Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emaile zostaną wysłane do wszystkich aktywnych pracowników Spółki w danej godzinie, jeśli nie mają wakacji. Streszczenie odpowiedzi będą wysyłane na północy."
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Szkolenie Zgłoszenie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Zamówienie Produkcji {0} musi być zgłoszone
@@ -4184,7 +4186,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurs jest obowiązkowy w wierszu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"""Do daty"" nie może być terminem przed ""od daty"""
 DocType: Supplier Quotation Item,Prevdoc DocType,Typ dokumentu dla poprzedniego dokumentu
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Edytuj ceny
 DocType: Batch,Parent Batch,Nadrzędna partia
 DocType: Batch,Parent Batch,Nadrzędna partia
 DocType: Cheque Print Template,Cheque Print Template,Czek Szablon Drukuj
@@ -4229,7 +4231,7 @@
 DocType: Item,Variant Based On,Wariant na podstawie
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Całkowita przypisana waga powinna wynosić 100%. Jest {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Twoi Dostawcy
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
 DocType: Request for Quotation Item,Supplier Part No,Dostawca Część nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nie można odliczyć, gdy kategoria jest dla &#39;Wycena&#39; lub &#39;Vaulation i Total&#39;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Otrzymane od
@@ -4239,7 +4241,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Wiersz {0}: Godziny wartość musi być większa od zera.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
 DocType: Issue,Content Type,Typ zawartości
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Pokaż ten produkt w wielu grupach na stronie internetowej.
@@ -4248,20 +4250,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
 DocType: Payment Reconciliation,From Invoice Date,Od daty faktury
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Walutą Rozliczenia musi być równa lub rachunku walutowego waluty dowolnej ze stron domyślnego comapany za
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Walutą Rozliczenia musi być równa lub rachunku walutowego waluty dowolnej ze stron domyślnego comapany za
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Zostawić Inkaso
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Czym się zajmuje?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do magazynu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Wszystkie Przyjęć studenckie
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Obecność nie może być oznaczana na przyszłość
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: School House,House Name,Nazwa domu
 DocType: Purchase Taxes and Charges,Account Head,Konto główne
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Zaktualizuj dodatkowe koszty do obliczenia całkowitego kosztu operacji
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektryczne
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodać resztę organizacji jako użytkowników. Można również dodać zaprosić klientów do portalu dodając je z Kontaktów
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodać resztę organizacji jako użytkowników. Można również dodać zaprosić klientów do portalu dodając je z Kontaktów
 DocType: Stock Entry,Total Value Difference (Out - In),Całkowita Wartość Różnica (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID Użytkownika nie ustawiony dla Pracownika {0}
@@ -4270,7 +4272,7 @@
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od ostatniego zamówienia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
 DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Data rozpoczęcia ubezpieczenia powinna być mniejsza niż data zakończenia ubezpieczenia
@@ -4285,7 +4287,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip Wynagrodzenie pracownika {0} już stworzony dla arkusza czasu {1}
 DocType: Vehicle Log,Odometer,Drogomierz
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,Zamroź zapasy do
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Okres Okres Od i Do dat obowiązkowych dla powtarzających {0}
@@ -4298,7 +4300,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kwota Odpisu (Waluta Firmy)
 DocType: Sales Invoice Timesheet,Billing Hours,Godziny billingowe
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Domyślnie BOM dla {0} Nie znaleziono
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Dotknij elementów, aby je dodać tutaj"
 DocType: Fees,Program Enrollment,Rejestracja w programie
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ustaw {0}
@@ -4400,7 +4403,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Hurt i Detal
 DocType: Issue,First Responded On,Data pierwszej odpowiedzi
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach
-DocType: Grade Interval,Grade Interval,Stopień Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego są już ustawione w roku podatkowym {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Rozliczenie Data aktualizacji
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Podział partii
@@ -4409,6 +4411,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Pobierz PDF
 DocType: Production Order,Planned End Date,Planowana data zakończenia
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Gdzie produkty są przechowywane.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
 DocType: Request for Quotation,Supplier Detail,Dostawca Szczegóły
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Błąd wzoru lub stanu {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Kwota zafakturowana
@@ -4454,7 +4457,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Konfiguracja prosta strona mojej organizacji
 DocType: Payment Reconciliation,Receivable / Payable Account,Konto Należności / Zobowiązań
 DocType: Delivery Note Item,Against Sales Order Item,Na podstawie pozycji zamówienia sprzedaży
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Proszę podać nadrzędne centrum kosztów
@@ -4514,7 +4517,7 @@
 ,Items To Be Requested,
 DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Company,Company Info,Informacje o firmie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Wybierz lub dodaj nowego klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Wybierz lub dodaj nowego klienta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,centrum kosztów jest zobowiązany do zwrotu kosztów rezerwacji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Jest to oparte na obecności pracownika
@@ -4527,13 +4530,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Zatrzymaj możliwość składania zwolnienia chorobowego użytkownikom w następujące dni.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Kwota zakupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Koniec roku nie może być przed rozpoczęciem Roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Koniec roku nie może być przed rozpoczęciem Roku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Świadczenia pracownicze
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Production Order,Manufactured Qty,Ilość wyprodukowanych
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Proszę ustawić domyślnej listy wypoczynkowe dla pracowników {0} lub {1} firmy
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nie istnieje
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nie istnieje
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rachunki dla klientów.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
@@ -4542,15 +4545,17 @@
 DocType: Quality Inspection Reading,Reading 3,Odczyt 3
 ,Hub,Piasta
 DocType: GL Entry,Voucher Type,Typ Podstawy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Employee Loan Application,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
 DocType: Guardian,Guardian,Opiekun
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Ocena {0} utworzona dla Pracownika {1} w datach od-do
 DocType: Employee,Education,Edukacja
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Nazwa Kampanii Przez
 DocType: Employee,Current Address Is,Obecny adres to
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Zmodyfikowano
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcjonalny. Ustawia domyślną walutę firmy, jeśli nie podano."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Dziennik zapisów księgowych.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
@@ -4587,7 +4592,7 @@
 DocType: Hub Settings,Hub Settings,Ustawienia Hub
 DocType: Project,Gross Margin %,Marża brutto %
 DocType: BOM,With Operations,Wraz z działaniami
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
 DocType: Asset,Is Existing Asset,Czy istniejącego środka trwałego
 DocType: Salary Detail,Statistical Component,Składnik statystyczny
 DocType: Salary Detail,Statistical Component,Składnik statystyczny
@@ -4643,7 +4648,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Załącz Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Poziom zapasów
 DocType: Customer,Commission Rate,Wartość prowizji
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Bądź Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zablokuj wnioski urlopowe według departamentów
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ płatności musi być jednym z Odbierz Pay and przelew wewnętrzny
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analityka
@@ -4656,6 +4661,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Pozwól Produkcja na święta
 DocType: Sales Order,Customer's Purchase Order Date,Data Zamówienia Zakupu Klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitał zakładowy
+DocType: Shopping Cart Settings,Show Public Attachments,Pokaż załączniki publiczne
 DocType: Packing Slip,Package Weight Details,Informacje o wadze paczki
 DocType: Payment Gateway Account,Payment Gateway Account,Płatność konto Brama
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokonaniu płatności przekierować użytkownika do wybranej strony.
@@ -4680,7 +4686,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nie pokazuj żadnych symboli przy walutach, takich jak $"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Bądź Batch Studenta
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Bądź Batch Studenta
 DocType: Leave Type,Is Carry Forward,
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Weź produkty z zestawienia materiałowego
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Czas realizacji (dni)
@@ -4699,8 +4705,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Zatwierdzona Kwota
 DocType: GL Entry,Is Opening,Otwiera się
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę skonfigurować serie numeracyjne dla uczestnictwa w programie Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę skonfigurować serie numeracyjne dla uczestnictwa w programie Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} nie istnieje
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,Krótka notka na stronę i do innych publikacji
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 1a679ae..3368ce2 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,دسته شمیره د پای حالت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,بانک مسوده
 DocType: Mode of Payment Account,Mode of Payment Account,د تادیاتو حساب اکر
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,انکړپټه ښودل تانبه
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,انکړپټه ښودل تانبه
 DocType: Academic Term,Academic Term,علمي مهاله
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,د مادي
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,کمیت
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,روغتیایی پاملرنه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),د ځنډ په پیسو (ورځې)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,خدمتونو د اخراجاتو
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,صورتحساب
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالي کال د {0} ته اړتیا لیدل کیږي
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,د اعلاناتو
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همدې شرکت څخه یو ځل بیا ننوتل
 DocType: Employee,Married,واده
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لپاره نه اجازه {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},لپاره نه اجازه {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,له توکي ترلاسه کړئ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو کارکوونکی کې د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},د محصول د {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,هیڅ توکي لست
 DocType: Payment Reconciliation,Reconcile,پخلا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,دغذا
 DocType: Quality Inspection Reading,Reading 1,لوستلو 1
 DocType: Process Payroll,Make Bank Entry,بانک د انفاذ د کمکیانو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,د تقاعد د بسپنو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
 DocType: SMS Center,All Sales Person,ټول خرڅلاو شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** میاشتنی ویش ** تاسو سره مرسته کوي که تاسو د خپل کاروبار د موسمي لري د بودجې د / د هدف په ټول مياشتو وویشي.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,نه توکي موندل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,نه توکي موندل
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,معاش جوړښت ورک
 DocType: Lead,Person Name,کس نوم
 DocType: Sales Invoice Item,Sales Invoice Item,خرڅلاو صورتحساب د قالب
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",د بيلګې په توګه: &quot;لومړنی ښوونځی&quot; یا &quot;پوهنتون&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,دحمل راپورونه
 DocType: Warehouse,Warehouse Detail,ګدام تفصیلي
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پای نیټه نه وروسته د کال د پای د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا ثابته شتمني&quot; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا ثابته شتمني&quot; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
 DocType: Vehicle Service,Brake Oil,لنت ترمز د تیلو
 DocType: Tax Rule,Tax Type,د مالياتو ډول
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تاسو اختيار نه لري چې مخکې ثبت کرښې زیاتولی او یا تازه {0}
 DocType: BOM,Item Image (if not slideshow),د قالب د انځور (که سلاید نه)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,د پيرودونکو سره په همدې نوم شتون لري
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(قيامت Rate / 60) * د عملیاتو د وخت
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,انتخاب هیښ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,انتخاب هیښ
 DocType: SMS Log,SMS Log,SMS ننوتنه
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,د تحویلوونکی سامان لګښت
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,د {0} د رخصتۍ له تاريخ او د تاريخ تر منځ نه ده
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,ټولګي
 DocType: Sales Invoice Item,Delivered By Supplier,تحویلوونکی By عرضه
 DocType: SMS Center,All Contact,ټول سره اړيکي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,کلنی معاش
 DocType: Daily Work Summary,Daily Work Summary,هره ورځ د کار لنډیز
 DocType: Period Closing Voucher,Closing Fiscal Year,مالي کال تړل
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} د {1} ده کنګل
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} د {1} ده کنګل
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,دحمل داخراجاتو
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,وټاکئ هدف ګدام
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra انفاذ
 DocType: Journal Entry Account,Credit in Company Currency,په شرکت د پیسو د اعتبار
 DocType: Delivery Note,Installation Status,نصب او وضعیت
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",تاسو غواړئ چې د حاضرۍ د اوسمهالولو؟ <br> اوسنی: {0} \ <br> حاضر: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},منل + رد Qty باید د قالب برابر رارسيدلي مقدار وي {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,رسولو لپاره خام توکي د رانيول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
 DocType: Products Settings,Show Products as a List,انکړپټه ښودل محصوالت په توګه بشپړفهرست
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود د کينډۍ، د مناسبو معلوماتو د ډکولو او د دوتنه کې ضمیمه کړي. د ټاکل شوې مودې په ټولو نیټې او کارمند ترکیب به په کېنډۍ کې راغلي، د موجوده حاضري سوابق
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,د استهالک د داخلولو د کمکیانو لپاره
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,غوښتنه ډول
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,د کارګر د کمکیانو لپاره
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,د کارګر د کمکیانو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,د اجرا
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,د عملیاتو په بشپړه توګه کتل ترسره.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,د ساتنې کتنو پلان.
 DocType: SMS Settings,Enter url parameter for message,د پیغام url عوامل وليکئ
 DocType: POS Profile,Customer Groups,پيرودونکو ډلې
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,مالي بیانونه
 DocType: Guardian,Students,زده کوونکي
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,لپاره درخواست قیمتونو او د تخفیف اصول.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,د بیې په لېست باید د شځينه يا خرڅول د تطبيق وړ وي
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
 DocType: Naming Series,Series List for this Transaction,د دې پیسو د انتقال د لړۍ بشپړفهرست
 DocType: Company,Default Payroll Payable Account,Default د معاشاتو د راتلوونکې حساب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,تازه بريښناليک ګروپ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,تازه بريښناليک ګروپ
 DocType: Sales Invoice,Is Opening Entry,ده انفاذ پرانيستل
 DocType: Customer Group,Mention if non-standard receivable account applicable,یادونه که غیر معیاري ترلاسه حساب د تطبيق وړ
 DocType: Course Schedule,Instructor Name,د لارښوونکي نوم
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,په وړاندې د خرڅلاو صورتحساب د قالب
 ,Production Orders in Progress,په پرمختګ تولید امر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,له مالي خالص د نغدو
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
 DocType: Lead,Address & Contact,پته تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,د تیرو تخصیص ناکارول پاڼي ورزیات کړئ
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},بل د راګرځېدل {0} به جوړ شي {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total لګښت مقدار (د وخت پاڼه له لارې)
 DocType: Item Website Specification,Item Website Specification,د قالب د ځانګړتیاوو وېب پاڼه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,د وتو بنديز لګېدلی
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,بانک توکي
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,کلنی
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,دحمل پخلاينې د قالب
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,په مرکز د خپرېدو
 DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} د قالب دی لغوه
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} د قالب دی لغوه
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
 DocType: Item,Purchase Details,رانيول نورولوله
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,د اتومات د موادو غوښتنه رامنځته کېدو له امله دبرېښنا ليک خبر
 DocType: Journal Entry,Multi Currency,څو د اسعارو
 DocType: Payment Reconciliation Invoice,Invoice Type,صورتحساب ډول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,د سپارنې پرمهال یادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,د سپارنې پرمهال یادونه
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,مالیات ترتیبول
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,د شتمنيو د دلال لګښت
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,د پیسو د داخلولو بدل شوی دی وروسته کش تاسو دا. دا بیا لطفا وباسي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
-DocType: Grade Interval,Min Score,Min نمره
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,لنډيز دې اوونۍ او په تمه د فعالیتونو لپاره
 DocType: Student Applicant,Admitted,اعتراف وکړ
 DocType: Workstation,Rent Cost,د کرايې لګښت
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,نظم ارزښت
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,بانک / د نقدو پیسو د ګوند پر وړاندې او یا د داخلي د لیږد لپاره د معاملو
 DocType: Shipping Rule,Valid for Countries,لپاره د اعتبار وړ هیوادونه
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,دا د قالب يو کينډۍ ده او په معاملو کې نه شي کارېدلی. د قالب صفاتو به د بېرغونو کې کاپي شي، مګر نه کاپي &#39;ټاکل شوې ده
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,دا د قالب يو کينډۍ ده او په معاملو کې نه شي کارېدلی. د قالب صفاتو به د بېرغونو کې کاپي شي، مګر نه کاپي &#39;ټاکل شوې ده
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total نظم نیول کیږی
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,لطفا ډګر ارزښت &#39;د مياشتې په ورځ تکرار&#39;
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,د مالياتو د Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} لپاره د کارګر لا ځانګړې {1} لپاره موده {2} د {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,انتخاب د قالب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},د کتارونو تر # {0}: دسته نه باید ورته وي {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,د غیر ګروپ ته واړوئ
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,دسته (ډېر) د یو قالب.
 DocType: C-Form Invoice Detail,Invoice Date,صورتحساب نېټه
 DocType: GL Entry,Debit Amount,ډیبیټ مقدار
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,مهرباني مل وګورئ
 DocType: Purchase Order,% Received,٪ د ترلاسه
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,د زده کونکو د ډلو جوړول
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,لپاره د داوطلبۍ غوښتنه
 DocType: Salary Slip Timesheet,Working Hours,کار ساعتونه
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,یو نوی پيرودونکو جوړول
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,یو نوی پيرودونکو جوړول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",که څو د بیو د اصولو دوام پراخیدل، د کاروونکو څخه پوښتنه کيږي چي د لومړیتوب ټاکل لاسي د شخړې حل کړي.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,رانيول امر جوړول
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,رانيول امر جوړول
 ,Purchase Register,رانيول د نوم ثبتول
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,د تطبيق په تور
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,د ټولو د توليد د پروسې Global امستنې.
 DocType: Accounts Settings,Accounts Frozen Upto,جوړوي ګنګل ترمړوندونو پورې
 DocType: SMS Log,Sent On,ته وليږدول د
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
 DocType: HR Settings,Employee record is created using selected field. ,د کارګر ریکارډ انتخاب ډګر په کارولو سره جوړ.
 DocType: Sales Order,Not Applicable,کاروړی نه دی
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,د رخصتۍ د بادار.
@@ -506,6 +509,7 @@
 DocType: Packing Slip,From Package No.,له مجموعې شمیره
 DocType: Item Attribute,To Range,ته Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,امنيت او د سپما
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",د ارزښت د میتود بدل نه شي، لکه د ځينو توکو په وړاندې د معاملو چې دا نه لري شته د خپل ارزښت د میتود
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total پاڼي تخصيص الزامی دی
 DocType: Job Opening,Description of a Job Opening,د دنده تفصيل پرانیستل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,د نن په تمه فعالیتونو
@@ -533,7 +537,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
 DocType: Production Order,Additional Operating Cost,اضافي عملياتي لګښت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,د سينګار
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
 DocType: Shipping Rule,Net Weight,خالص وزن
 DocType: Employee,Emergency Phone,بيړنۍ تيليفون
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,کشاورزی
@@ -543,7 +547,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا لپاره قدمه 0٪ ټولګي تعریف
 DocType: Sales Order,To Deliver,ته تحویل
 DocType: Purchase Invoice Item,Item,د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
 DocType: Journal Entry,Difference (Dr - Cr),توپير (ډاکټر - CR)
 DocType: Account,Profit and Loss,ګټه او زیان
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,د اداره کولو په ټیکه
@@ -569,7 +573,7 @@
 DocType: Installation Note Item,Installation Note Item,نصب او يادونه د قالب
 DocType: Production Plan Item,Pending Qty,تصویبه Qty
 DocType: Budget,Ignore,له پامه
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} د {1} فعاله نه وي
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} د {1} فعاله نه وي
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},پیغامونه د دې لاندې شمېرې ته استول: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,د چاپ Setup چک ابعادو
 DocType: Salary Slip,Salary Slip Timesheet,معاش ټوټه Timesheet
@@ -578,13 +582,13 @@
 DocType: Sales Invoice,Total Commission,Total کمیسیون
 DocType: Pricing Rule,Sales Partner,خرڅلاو همکار
 DocType: Buying Settings,Purchase Receipt Required,رانيول رسيد اړین
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیڅ ډول ثبتونې په صورتحساب جدول کې وموندل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,د مالي / جوړوي کال.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,جمع ارزښتونه
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",بښنه غواړو، سریال وځيري نه مدغم شي
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
 DocType: Project Task,Project Task,د پروژې د کاري
 ,Lead Id,سرب د Id
 DocType: C-Form Invoice Detail,Grand Total,ستره مجموعه
@@ -601,7 +605,7 @@
 DocType: Job Applicant,Resume Attachment,سوانح ضميمه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تکرار پېرودونکي
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,خرڅلاو Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,خرڅلاو Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوټ: ټولې اختصاص پاڼي {0} بايد نه مخکې تصویب پاڼو څخه کم وي {1} د مودې لپاره
 DocType: Announcement,Posted By,خپرندوی
 DocType: Item,Delivered by Supplier (Drop Ship),تحویلوونکی له خوا عرضه (لاسرسئ کښتۍ)
@@ -611,7 +615,7 @@
 DocType: Quotation,Quotation To,د داوطلبۍ
 DocType: Lead,Middle Income,د منځني عايداتو
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),د پرانستلو په (آر)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,مهرباني وکړئ د شرکت جوړ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,مهرباني وکړئ د شرکت جوړ
@@ -623,7 +627,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,خرڅلاو صورتحساب Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب د پیسو حساب ته د بانک د داخلولو لپاره
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",د پاڼو، لګښت د ادعاوو او د معاشونو د اداره کارکوونکی د اسنادو جوړول
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",د پاڼو، لګښت د ادعاوو او د معاشونو د اداره کارکوونکی د اسنادو جوړول
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,د علم ورزیات کړئ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,سره د اړیکو Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدير
 DocType: Payment Entry,Payment From / To,د پیسو له / د
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,نېټه Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ورته توکی دی څو ځلې داخل شوي دي.
 DocType: SMS Settings,Receiver Parameter,د اخيستونکي د پاراميټر
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;پر بنسټ&#39; او &#39;ډله په&#39; کولای شي په څېر نه وي
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,لیک نیټه
 DocType: Student Batch Name,Batch Name,دسته نوم
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,کې شامل کړي
 DocType: Selling Settings,Customer Naming By,پيرودونکو نوم By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,به د زده کوونکو په توګه د زده کوونکو د حاضرۍ میاشتنی رپوټ وړاندې ښيي
@@ -720,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,د زده کوونکو د حاضرۍ
 DocType: Sales Invoice Timesheet,Time Sheet,د وخت پاڼه
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مواد پر بنسټ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,لطفا توکی جزئيات داخل
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,لطفا توکی جزئيات داخل
 DocType: Interest,Interest,په زړه پوري
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,مخکې خرڅلاو
 DocType: Purchase Receipt,Other Details,نور جزئيات
@@ -738,7 +741,7 @@
 ,Absent Student Report,غیر حاضر زده کوونکو راپور
 DocType: Email Digest,Next email will be sent on:,بل برېښليک به واستول شي په:
 DocType: Offer Letter Term,Offer Letter Term,وړاندې لیک مهاله
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,د قالب د بېرغونو لري.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,د قالب د بېرغونو لري.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,د قالب {0} ونه موندل شو
 DocType: Bin,Stock Value,دحمل ارزښت
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,شرکت {0} نه شته
@@ -747,8 +750,6 @@
 DocType: Serial No,Warranty Expiry Date,ګرنټی د پای نېټه
 DocType: Material Request Item,Quantity and Warehouse,کمیت او ګدام
 DocType: Sales Invoice,Commission Rate (%),کمیسیون کچه)٪ (
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا جوړ د {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا جوړ د {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
 DocType: Project,Estimated Cost,اټکل شوی لګښت
@@ -767,7 +768,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} يو سټاک د قالب نه دی
 DocType: Mode of Payment Account,Default Account,default اکانټ
 DocType: Payment Entry,Received Amount (Company Currency),د مبلغ (شرکت د اسعارو)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا اونیز پړاو ورځ وټاکئ
 DocType: Production Order Operation,Planned End Time,پلان د پاي وخت
 ,Sales Person Target Variance Item Group-Wise,خرڅلاو شخص د هدف وړ توپیر د قالب ګروپ تدبيراومصلحت
@@ -831,7 +832,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,بیې په لېست کې نه ټاکل
 DocType: Employee,Family Background,د کورنۍ مخينه
 DocType: Request for Quotation Supplier,Send Email,برېښنا لیک ولېږه
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,نه د اجازې د
 DocType: Company,Default Bank Account,Default بانک حساب
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پر بنسټ د ګوند چاڼ، غوره ګوند د لومړي ډول
@@ -844,8 +845,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,هیڅ یو کارمند وموندل شول
 DocType: Supplier Quotation,Stopped,ودرول
 DocType: Item,If subcontracted to a vendor,که قرارداد ته د يو خرڅوونکي په
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
 DocType: SMS Center,All Customer Contact,ټول پيرودونکو سره اړيکي
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,پورته سټاک csv له لارې د توازن.
 DocType: Warehouse,Tree Details,د ونو په بشپړه توګه کتل
@@ -856,8 +857,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,لږ تر لږه صورتحساب مقدار
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} د {1}: لګښت مرکز {2} کوي چې د دې شرکت سره تړاو نه لري {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} د {1}: Account {2} نه شي کولای د يو ګروپ وي
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته &#39;{doctype}&#39; جدول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته &#39;{doctype}&#39; جدول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,نه دندو
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",د مياشتې په ورځ چې د موټرو د صورتحساب به د مثال په 05، 28 او نور تولید شي
 DocType: Asset,Opening Accumulated Depreciation,د استهلاک د پرانيستلو
@@ -873,7 +874,7 @@
 DocType: Bin,Moving Average Rate,حرکت اوسط نرخ
 DocType: Production Planning Tool,Select Items,انتخاب سامان
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} بیل په وړاندې د {1} مورخ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,کورس د مهال ويش
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,کورس د مهال ويش
 DocType: Maintenance Visit,Completion Status,تکميل حالت
 DocType: HR Settings,Enter retirement age in years,په کلونو کې د تقاعد د عمر وليکئ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,هدف ګدام
@@ -881,7 +882,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,د وړاندې کولو یا رسید ترمړوندونو پورې دې په سلو کې اجازه باندې
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,د وارداتو د حاضرۍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ټول د قالب ډلې
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ټول د قالب ډلې
 DocType: Process Payroll,Activity Log,فعالیت ننوتنه
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,خالصه ګټه / له لاسه ورکول
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,په اتوماتيک ډول د معاملو د سپارلو پېغام کمپوز.
@@ -892,7 +893,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,نظم ته د پیسو پیري
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,وړاندوینی Qty
 DocType: Sales Invoice,Payment Due Date,د پیسو له امله نېټه
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;پرانیستل&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,د پرانستې ته ایا
 DocType: Notification Control,Delivery Note Message,د سپارنې پرمهال يادونه پيغام
@@ -908,7 +909,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-نظم Qty
 DocType: Leave Block List Date,Leave Block List Date,پريږدئ بالک بشپړفهرست نېټه
 DocType: Pricing Rule,Price or Discount,د بیې او يا کمښت
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,په رانيول رسيد توکي جدول ټولې د تطبیق په تور باید په توګه ټول ماليات او په تور ورته وي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,په رانيول رسيد توکي جدول ټولې د تطبیق په تور باید په توګه ټول ماليات او په تور ورته وي
 DocType: Sales Team,Incentives,هڅوونکي
 DocType: SMS Log,Requested Numbers,غوښتنه شميرې
 DocType: Production Planning Tool,Only Obtain Raw Materials,یوازې خام مواد په لاس راوړئ
@@ -966,8 +967,7 @@
 DocType: Supplier,Default Payable Accounts,Default د راتلوونکې حسابونه
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
 DocType: Fee Structure,Components,د اجزاو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,د قالب تانبه {0} تازه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,پیري صورتحساب پرمختللی
@@ -1019,8 +1019,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,د کتارونو تر {0}: خرڅلاو / د اخستلو د امر په وړاندې د پیسو باید د تل لپاره له مخکې په نښه شي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کيمياوي
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default بانک / د نقدو پیسو حساب به په معاش ژورنال انفاذ په اتوماتيک ډول پرلیکه شي کله چې دا اکر انتخاب.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",د ټولګي کوډ انټروال {0} تداخل د نورو ټولګي د رتبې انټروال. انټروال مهرباني وکړئ وګورئ {0} او {1} او بیا کوښښ وکړه
 DocType: BOM,Raw Material Cost(Company Currency),لومړنیو توکو لګښت (شرکت د اسعارو)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ټول توکي لا له وړاندې د دې تولید نظم ته انتقال شوي دي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},د کتارونو تر # {0}: اندازه کېدای شي نه په ميزان کې کارول په پرتله زیات وي {1} {2}
@@ -1033,7 +1031,7 @@
 DocType: BOM Website Item,BOM Website Item,هیښ وېب پاڼه شمیره
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
 DocType: Timesheet Detail,Bill,بیل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,سپین
 DocType: SMS Center,All Lead (Open),ټول کوونکۍ (خلاص)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({2} {3})
@@ -1048,7 +1046,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},نظم ډول باید د یو وي {0}
 DocType: Lead,Next Contact Date,بل د تماس نېټه
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,پرانيستل Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
 DocType: Student Batch Name,Student Batch Name,د زده کونکو د دسته نوم
 DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
 DocType: Repayment Schedule,Balance Loan Amount,د توازن د پور مقدار
@@ -1068,10 +1066,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},مهرباني وکړئ مشخص یو {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
 DocType: Delivery Note,Delivery To,ته د وړاندې کولو
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ځانتیا جدول الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ځانتیا جدول الزامی دی
 DocType: Production Planning Tool,Get Sales Orders,خرڅلاو امر ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} کېدای شي منفي نه وي
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,تخفیف
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,Total د Depreciations شمېر
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
@@ -1100,7 +1098,7 @@
 DocType: Lead,Organization Name,د ادارې نوم
 DocType: Tax Rule,Shipping State,انتقال د بهرنیو چارو
 ,Projected Quantity as Source,وړاندوینی مقدار په توګه سرچینه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,د قالب بايد د کارولو تڼی څخه رانيول معاملو لپاره توکي ترلاسه کړئ &#39;زياته شي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,د قالب بايد د کارولو تڼی څخه رانيول معاملو لپاره توکي ترلاسه کړئ &#39;زياته شي
 DocType: Employee,A-,خبرتیاوي
 DocType: Production Planning Tool,Include non-stock items,غیر سټاک توکي شامل دي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,خرڅلاو داخراجاتو
@@ -1108,7 +1106,7 @@
 DocType: GL Entry,Against,په وړاندې
 DocType: Item,Default Selling Cost Center,Default پلورل لګښت مرکز
 DocType: Sales Partner,Implementation Partner,د تطبیق همکار
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,زیپ کوډ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,زیپ کوډ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
 DocType: Opportunity,Contact Info,تماس پيژندنه
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,جوړول دحمل توکي
@@ -1152,7 +1150,7 @@
 DocType: Sales Partner,Distributor,ویشونکی-
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خرید په ګاډۍ نقل حاکمیت
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,تولید نظم {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
 ,Ordered Items To Be Billed,امر توکي چې د محاسبې ته شي
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,له Range لري چې کم وي په پرتله د Range
 DocType: Global Defaults,Global Defaults,Global افتراضیو
@@ -1187,11 +1185,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,لطفا شمیره کود داخل ته د بستې شمېره تر لاسه
 DocType: Stock Settings,Default Item Group,Default د قالب ګروپ
 DocType: Employee Loan,Partially Disbursed,په نسبی ډول مصرف
-DocType: Grading Structure,Grading System Name,د رتبو د سیستم نوم
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,عرضه ډیټابیس.
 DocType: Account,Balance Sheet,توازن پاڼه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ستاسې د پلورنې کس به د پند په دې نېټې ته د مشتريانو د تماس ترلاسه
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ورته توکی نه شي کولای شي د څو ځله ننوتل.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",لا حسابونو شي ډلو لاندې کړې، خو د زياتونې شي غیر ډلو په وړاندې د
@@ -1229,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,کار وشو
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,مهرباني وکړی په صفات جدول کې لږ تر لږه يو د خاصه مشخص
 DocType: Announcement,All Students,ټول زده کوونکي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,محتویات پنډو
 DocType: Grading Scale,Intervals,انټروال
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ژر
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,د زده کوونکو د موبايل په شمیره
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,د نړۍ پاتې
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,د قالب {0} نه شي کولای دسته لري
@@ -1274,8 +1271,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},نه اجازه کنګل حساب د سمولو {0}
 DocType: Journal Entry,Get Outstanding Invoices,يو وتلي صورتحساب ترلاسه کړئ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,رانيول امر تاسو سره مرسته پلان او ستاسو د اخیستلو تعقيب
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,رانيول امر تاسو سره مرسته پلان او ستاسو د اخیستلو تعقيب
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,د کوچنیو
@@ -1299,7 +1296,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,پرانیځئ ماسټر معلوماتو
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
 DocType: Mode of Payment,Mode of Payment,د تادیاتو اکر
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,هیښ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,دا یو د ريښي توکی ډلې او نه تصحيح شي.
@@ -1317,7 +1314,7 @@
 DocType: Student Group Student,Group Roll Number,ګروپ رول شمیره
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,پلازمیینه تجهیزاتو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",د بیې د حاکمیت لومړی پر بنسټ ټاکل &#39;Apply د&#39; ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
@@ -1344,7 +1341,7 @@
 DocType: Depreciation Schedule,Journal Entry,په ورځپانه کی ثبت شوی مطلب
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} په پرمختګ توکي
 DocType: Workstation,Workstation Name,Workstation نوم
-DocType: Grade Interval,Grade Code,ټولګي کوډ
+DocType: Grading Scale Interval,Grade Code,ټولګي کوډ
 DocType: POS Item Group,POS Item Group,POS د قالب ګروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ولېږئ Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
@@ -1361,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,هډوتري
 DocType: Sales Order,Recurring Upto,راګرځېدل ترمړوندونو پورې
 DocType: Attendance,HR Manager,د بشري حقونو څانګې د مدير
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,لطفا یو شرکت غوره
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,لطفا یو شرکت غوره
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,امتیاز څخه ځي
 DocType: Purchase Invoice,Supplier Invoice Date,عرضه صورتحساب نېټه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,تاسو باید د خرید په ګاډۍ وتوانوي
@@ -1377,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,د خوړو د
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,نه د ليدنې
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,مارک Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,مارک Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},د ساتنې او ویش {0} په وړاندې د شته {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,شمولیت محصل
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},د تړل د حساب اسعارو باید د {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},د ټولو موخو ټکي مبلغ بايد 100. وي دا د {0}
@@ -1426,13 +1424,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,د حسابونو چارټ
 DocType: Material Request,Terms and Conditions Content,د قرارداد شرايط منځپانګه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
 DocType: Employee,Owned,د دولتي
 DocType: Salary Detail,Depends on Leave Without Pay,په پرته د معاشونو اذن سره تړلی دی
 DocType: Pricing Rule,"Higher the number, higher the priority",د شمېر د لوړو، لوړو لومړیتوب
 ,Purchase Invoice Trends,پیري صورتحساب رجحانات
 DocType: Employee,Better Prospects,ته ښه زمينه
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",د کتارونو تر # {0}: د د ستې {1} لري یوازې {2} qty. لطفا بل batch چې {3} qty موجود ټاکلو او یا د څو کتارونو د قطار ویشل، د موضوع له څو دستو ورسوي /
 DocType: Vehicle,License Plate,منښتليک ذريعه
 DocType: Appraisal,Goals,موخې
 DocType: Warranty Claim,Warranty / AMC Status,ګرنټی / AMC حالت
@@ -1450,7 +1449,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",که په پام کې ده کنګل، زياتونې پورې محدود کاروونکو اجازه لري.
 DocType: Email Digest,Bank Balance,بانک دبیلانس
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",دنده پېژنڅېر، وړتوبونه اړتیا او داسې نور
 DocType: Journal Entry Account,Account Balance,موجوده حساب
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,د معاملو د ماليې حاکمیت.
@@ -1461,7 +1460,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,وښایاست ناتړل مالي کال د P &amp; L توازن
 DocType: Shipping Rule,Shipping Account,انتقال حساب
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} د {1}: Account {2} ده ناچارنده
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,د کمکیانو لپاره د خرڅلاو امر تاسو ته د خپل کاري پلان کې مرسته وکړي او پر وخت ورسوي
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,د کمکیانو لپاره د خرڅلاو امر تاسو ته د خپل کاري پلان کې مرسته وکړي او پر وخت ورسوي
 DocType: Quality Inspection,Readings,نانود
 DocType: Stock Entry,Total Additional Costs,Total اضافي لګښتونو
 DocType: Course Schedule,SH,SH
@@ -1472,7 +1471,7 @@
 DocType: Shipping Rule Condition,To Value,ته ارزښت
 DocType: Asset Movement,Stock Manager,دحمل مدير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},سرچینه ګودام لپاره چي په کتارونو الزامی دی {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,بسته بنديو ټوټه
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,بسته بنديو ټوټه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,دفتر کرایې
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS ورننوتلو امستنې
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,د وارداتو کې ناکام شو!
@@ -1498,7 +1497,7 @@
 DocType: Sales Invoice,Source,سرچینه
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,انکړپټه ښودل تړل
 DocType: Leave Type,Is Leave Without Pay,ده پرته د معاشونو د وتو
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,هیڅ ډول ثبتونې په قطعا د جدول کې وموندل
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},دا {0} د شخړو د {1} د {2} {3}
 DocType: Student Attendance Tool,Students HTML,زده کوونکو د HTML
@@ -1516,7 +1515,7 @@
 DocType: Student,Date of Leaving,د پریښودل نېټه
 DocType: Pricing Rule,For Price List,د بیې په لېست کې
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرايي پلټنه
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,لامل جوړول
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,لامل جوړول
 DocType: Maintenance Schedule,Schedules,مهال ويش
 DocType: Purchase Invoice Item,Net Amount,خالص مقدار
 DocType: Purchase Order Item Supplied,BOM Detail No,هیښ تفصیلي نه
@@ -1544,7 +1543,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,د پروګرام د شموليت
 DocType: Sales Invoice Item,Brand Name,دتوليد نوم
 DocType: Purchase Receipt,Transporter Details,ته لېږدول، په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,بکس
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ممکنه عرضه
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,د سازمان
@@ -1578,7 +1577,7 @@
 DocType: Quality Inspection Reading,Reading 4,لوستلو 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},د {0} نه د پروژو په موندل Default هیښ {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,د شرکت د لګښت د ادعا.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",زده کوونکي دي د نظام په زړه کې، ستاسو د ټولو زده کوونکو اضافه
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",زده کوونکي دي د نظام په زړه کې، ستاسو د ټولو زده کوونکو اضافه
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},د کتارونو تر # {0}: چاڼېزو نېټې {1} نه مخکې آرډر نېټه وي {2}
 DocType: Company,Default Holiday List,افتراضي رخصتي بشپړفهرست
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},د کتارونو تر {0}: د وخت او د وخت د {1} له ده سره د تداخل {2}
@@ -1590,20 +1589,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,بیا ولېږې قطعا د ليک
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,نوې دنده
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,د داوطلبۍ د کمکیانو لپاره د
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,د داوطلبۍ د کمکیانو لپاره د
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,نور راپورونه
 DocType: Dependent Task,Dependent Task,اتکا کاري
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,له مخکې پلان لپاره د X ورځو عملیاتو کوښښ وکړئ.
 DocType: HR Settings,Stop Birthday Reminders,Stop کالیزې په دوراني ډول
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
 DocType: SMS Center,Receiver List,د اخيستونکي بشپړفهرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,د لټون د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,د لټون د قالب
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,په مصرف مقدار
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,په نغدو خالص د بدلون
 DocType: Assessment Plan,Grading Scale,د رتبو او مقياس
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,د {0} اندازه واحد په د تغیر فکتور جدول څخه يو ځل داخل شوي دي
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,د {0} اندازه واحد په د تغیر فکتور جدول څخه يو ځل داخل شوي دي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,لا د بشپړ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},د پیسو غوښتنه د مخکې نه شتون {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,د خپریدلو سامان لګښت
@@ -1641,7 +1640,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,راټول
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
 DocType: Journal Entry,Entry Type,د ننوتلو ډول
 ,Customer Credit Balance,پيرودونکو پور بیلانس
@@ -1684,8 +1683,6 @@
 DocType: Student Sibling,Studying in Same Institute,په ورته انستیتیوت زده کړه
 DocType: Territory,Territory Manager,خاوره د مدير
 DocType: Packed Item,To Warehouse (Optional),ته ګدام (اختیاري)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,شمیره code&gt; توکی ګروپ&gt; نښې
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,شمیره code&gt; توکی ګروپ&gt; نښې
 DocType: Payment Entry,Paid Amount (Company Currency),ورکړل مقدار (شرکت د اسعارو)
 DocType: Purchase Invoice,Additional Discount,اضافي کمښت
 DocType: Selling Settings,Selling Settings,خرڅول امستنې
@@ -1695,9 +1692,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,محتویات یی په ګاډۍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,بازار موندنه داخراجاتو
 ,Item Shortage Report,د قالب په کمښت کې راپور
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,د موادو غوښتنه د دې دحمل د داخلولو لپاره په کار وړل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,بل د استهالک نېټه د نوي شتمنیو الزامی دی
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بل د استهالک نېټه د نوي شتمنیو الزامی دی
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جلا کورس د هر دسته بنسټ ګروپ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جلا کورس د هر دسته بنسټ ګروپ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,د يو قالب واحد واحد.
@@ -1714,9 +1711,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} د {1}: لګښت مرکز د &#39;ګټه او زیان&#39; ګڼون اړتیا {2}. لطفا يو default لپاره د دې شرکت د لګښت مرکز جوړ.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,نوي سره اړيکي
 DocType: Territory,Parent Territory,Parent خاوره
 DocType: Quality Inspection Reading,Reading 2,لوستلو 2
@@ -1743,20 +1738,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,پخلاینې JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ډېر زيات ستنې. په راپور کې د صادرولو او د چاپولو لپاره دا وېړې پاڼې د درخواست په کارولو.
 DocType: Purchase Invoice Item,Batch No,دسته نه
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},لپاره د تبادلې نرخ د موندلو توان نلري {0} د {1} مهمو نېټې د {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,د مراجعينو د اخستلو امر په وړاندې د څو خرڅلاو فرمانونو په اجازه
 DocType: Student Group Instructor,Student Group Instructor,د زده کوونکو د ډلې د لارښوونکي
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 د موبايل په هيڅ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,اصلي
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,اصلي
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,چې د خپلې راکړې ورکړې شمیر لړ جوړ مختاړی
 DocType: Employee Attendance Tool,Employees HTML,د کارکوونکو د HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
 DocType: Employee,Leave Encashed?,ووځي Encashed؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت له ډګر الزامی دی
 DocType: Email Digest,Annual Expenses,د کلني لګښتونو
 DocType: Item,Variants,تانبه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
 DocType: SMS Center,Send To,لېږل
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ځانګړې اندازه
@@ -1776,7 +1770,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ارزونه
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},دوه شعبه لپاره د قالب ته ننوتل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,لپاره يو نقل د حاکمیت شرط
-DocType: Grading Structure,Grading Intervals,د رتبو انټروال
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ولیکۍ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",په قطار د {0} شمیره overbill نه شي کولای {1} څخه زيات {2}. ته-د بیلونو په اجازه، لطفا په اخیستلو ته امستنې جوړ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
@@ -1789,16 +1782,17 @@
 DocType: Authorization Control,Authorization Control,د واک ورکولو د کنټرول
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},د کتارونو تر # {0}: رد ګدام رد د قالب په وړاندې د الزامی دی {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,د پیسو
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ستاسو د امر اداره
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ستاسو د امر اداره
 DocType: Production Order Operation,Actual Time and Cost,واقعي وخت او لګښت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},د اعظمي {0} د موادو غوښتنه کولای {1} په وړاندې د خرڅلاو نظم شي لپاره د قالب جوړ {2}
 DocType: Employee,Salutation,سلام
 DocType: Course,Course Abbreviation,کورس Abbreviation
 DocType: Student Leave Application,Student Leave Application,د زده کوونکو ته لاړل کاریال
 DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارکوونکی د {0} په نيمه ورځ په {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,د
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,د خرڅلاو وخت بنډل په پېژندتورو.
 DocType: Quotation Item,Actual Qty,واقعي Qty
 DocType: Sales Invoice Item,References,ماخذونه
@@ -1808,7 +1802,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,تا د دوه ګونو توکو ته ننوتل. لطفا د سمولو او بیا کوښښ وکړه.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ملګري
 DocType: Asset Movement,Asset Movement,د شتمنیو غورځنګ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,د نوي په ګاډۍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,د نوي په ګاډۍ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} د قالب يو serialized توکی نه دی
 DocType: SMS Center,Create Receiver List,جوړول د اخيستونکي بشپړفهرست
 DocType: Vehicle,Wheels,په عرابو
@@ -1840,10 +1834,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,معلولينو د تولید امر په وړاندې د وخت يادښتونه رامنځته. عملیاتو بايد د تولید نظم په وړاندې له پښو نه شي
 DocType: Student,Student Mobile Number,د زده کوونکو د موبايل په شمېر
 DocType: Item,Has Variants,لري تانبه
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,د میاشتنی ویش نوم
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,دسته تذکرو الزامی دی
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,دسته تذکرو الزامی دی
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته تذکرو الزامی دی
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته تذکرو الزامی دی
 DocType: Sales Person,Parent Sales Person,Parent خرڅلاو شخص
 DocType: Purchase Invoice,Recurring Invoice,راګرځېدل صورتحساب
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,د پروژو د اداره کولو
@@ -1851,7 +1845,7 @@
 DocType: Budget,Fiscal Year,پولي کال، مالي کال
 DocType: Vehicle Log,Fuel Price,د ګازو د بیو
 DocType: Budget,Budget,د بودجې د
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",د بودجې د {0} په وړاندې د ګمارل نه شي، ځکه چې نه يو عايد يا اخراجاتو حساب
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,السته
 DocType: Student Admission,Application Form Route,د غوښتنليک فورمه لار
@@ -1882,7 +1876,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
 DocType: Employee,Salary Information,معاش معلومات
 DocType: Sales Person,Name and Employee ID,نوم او د کارګر ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
 DocType: Website Item Group,Website Item Group,وېب پاڼه د قالب ګروپ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,دندې او مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
@@ -1941,7 +1935,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار پيرودونکو د عوایدو
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید رول &#39;اخراجاتو Approver&#39; لري
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,جوړه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
 DocType: Asset,Depreciation Schedule,د استهالک ويش
 DocType: Bank Reconciliation Detail,Against Account,په وړاندې حساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,نيمه ورځ نېټه بايد د تاريخ او تر اوسه پورې تر منځ وي
@@ -1958,13 +1952,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
 ,Quotation Trends,د داوطلبۍ رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
 DocType: Shipping Rule Condition,Shipping Amount,انتقال مقدار
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,د تغیر فکتور
 DocType: Purchase Order,Delivered,تحویلوونکی
 ,Vehicle Expenses,موټر داخراجاتو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
+DocType: Serial No,Invoice Details,صورتحساب نورولوله
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
 DocType: Purchase Receipt,Vehicle Number,موټر شمېر
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,د نېټې په اړه چې د تکراري صورتحساب به بند شي
 DocType: Employee Loan,Loan Amount,د پور مقدار
@@ -1988,7 +1983,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,اضافي کمښت مقدار
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
 DocType: Leave Block List Allow,Leave Block List Allow,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,د غیر ګروپ ګروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,لوبې
 DocType: Loan Type,Loan Name,د پور نوم
@@ -2000,6 +1995,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ګدام ځای کې چې تاسو د رد په پېژندتورو سټاک ساتلو
 DocType: Production Order,Skip Material Transfer,ته وګرځه توکو لېږدونه د
 DocType: Production Order,Skip Material Transfer,ته وګرځه توکو لېږدونه د
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,لپاره د تبادلې نرخ د موندلو توان نلري {0} د {1} د مهمو نېټه {2}. مهرباني وکړئ د پیسو د بدلولو ریکارډ په لاسي جوړ کړي
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ستاسو د مالي کال د پای رسیدو په
 DocType: POS Profile,Price List,د بیې په لېست
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} اوس د مالي کال تلواله. لطفا خپل د کتنمل تازه لپاره د بدلون د اغېز لپاره.
@@ -2037,9 +2033,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,{0} د قالب لا ته راوړل شوي دي
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** مالي کال ** د مالي کال استازيتوب کوي. ټول د محاسبې زياتونې او نورو لويو معاملو ** مالي کال په وړاندې تعقیبیږي **.
 DocType: Opportunity,Customer / Lead Address,پيرودونکو / سوق پته
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
 DocType: Student Admission,Eligibility,وړتيا
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",لامل تاسو سره مرسته ترلاسه سوداګرۍ، ټولې خپلې اړيکې او نور ستاسو د لامل اضافه
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",لامل تاسو سره مرسته ترلاسه سوداګرۍ، ټولې خپلې اړيکې او نور ستاسو د لامل اضافه
 DocType: Production Order Operation,Actual Operation Time,واقعي عملياتو د وخت
 DocType: Authorization Rule,Applicable To (User),د تطبیق وړ د (کارن)
 DocType: Purchase Taxes and Charges,Deduct,وضع
@@ -2080,7 +2076,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,وټاکئ شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالي پريږدئ که د ټولو څانګو په پام کې
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
 DocType: Process Payroll,Fortnightly,جلالت
 DocType: Currency Exchange,From Currency,څخه د پیسو د
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا په تيروخت کي يو قطار تخصيص مقدار، صورتحساب ډول او صورتحساب شمېر غوره
@@ -2096,7 +2092,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,آیا تور د ډول په توګه په تیره د کتارونو تر مقدار &#39;انتخاب نه یا د&#39; په تیره د کتارونو تر Total لپاره په اول قطار
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,د ماشومانو د قالب باید د محصول د بنډل نه وي. لطفا توکی لرې `{0}` او وژغوري
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداري
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Add ویشونو
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Add ویشونو
 DocType: Vehicle Service,Service Item,د خدمتونو د قالب
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
@@ -2146,8 +2142,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,بيې به که بیې په لېست کې نه دی جوړ نه ښودل شي
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,لطفا د دې نقل حاکمیت يو هېواد مشخص او يا د نړۍ په نقل وګورئ
 DocType: Stock Entry,Total Incoming Value,Total راتلونکي ارزښت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ډیبیټ ته اړتيا ده
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ډیبیټ ته اړتيا ده
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,رانيول بیې لېست
 DocType: Offer Letter Term,Offer Term,وړاندیز مهاله
 DocType: Quality Inspection,Quality Manager,د کیفیت د مدير
@@ -2181,14 +2177,14 @@
 DocType: Opportunity,Lost Reason,له لاسه دلیل
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,نوې پته
 DocType: Quality Inspection,Sample Size,نمونه اندازه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,لطفا د رسيد سند ته ننوځي
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ټول توکي لا له وړاندې د رسیدونو شوي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,لطفا د رسيد سند ته ننوځي
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ټول توکي لا له وړاندې د رسیدونو شوي
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا &#39;له Case شمیره&#39; مشخص معتبر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,لا لګښت مرکزونه کولای شي ډلو لاندې کړې خو زياتونې شي غیر ډلو په وړاندې د
 DocType: Project,External,د بهرنيو
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کارنان او حلال
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},تولید امر ايجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},تولید امر ايجاد شده: {0}
 DocType: Branch,Branch,څانګه
 DocType: Guardian,Mobile Number,ګرځنده شمیره
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,د چاپونې او د عالمه
@@ -2197,7 +2193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,شعبه {0} ونه موندل شو
 DocType: Scheduling Tool,Student Batch,د زده کونکو د دسته
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ستاسو پېرودونکي
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,د زده کوونکو د کمکیانو لپاره د
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,د زده کوونکو د کمکیانو لپاره د
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
 DocType: Leave Block List Date,Block Date,د بنديز نېټه
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,اوس غوښتنه وکړه
@@ -2221,8 +2217,9 @@
 DocType: SMS Log,Sent To,لیږل شوی ورته
 DocType: Payment Request,Make Sales Invoice,د کمکیانو لپاره د خرڅلاو صورتحساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,دکمپیوتر
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
 DocType: Company,For Reference Only.,د ماخذ یوازې.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,انتخاب دسته نه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},باطلې {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,پرمختللی مقدار
@@ -2236,7 +2233,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case شمیره نه شي کولای 0 وي
 DocType: Item,Show a slideshow at the top of the page,د پاڼې په سر کې یو سلاید وښایاست
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,دوکانونه
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,دوکانونه
 DocType: Serial No,Delivery Time,د لېږدون وخت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing پر بنسټ
 DocType: Item,End of Life,د ژوند تر پايه
@@ -2252,8 +2249,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,د انتقال د موادو
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",د عملیاتو، د عملیاتي مصارفو ليکئ او نه ستاسو په عملیاتو یو بې ساری عملياتو ورکړي.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,دغه سند له خوا حد دی {0} د {1} لپاره توکی {4}. آیا تاسو د ورته په وړاندې د بل {3} {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,انتخاب بدلون اندازه حساب
 DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
 DocType: Naming Series,User must always select,کارن بايد تل انتخاب
 DocType: Stock Settings,Allow Negative Stock,د منفی دحمل اجازه
@@ -2264,7 +2261,7 @@
 DocType: Budget Account,Budget Account,د بودجې د حساب
 DocType: Quality Inspection,Verified By,تایید شوي By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",شرکت د تلواله اسعارو بدل نشي کولای، ځکه هلته موجوده معاملو دي. انتقال باید لغوه شي چې د تلواله د اسعارو بدلون.
-DocType: Grade Interval,Grade Description,ټولګي Description
+DocType: Grading Scale Interval,Grade Description,ټولګي Description
 DocType: Stock Entry,Purchase Receipt No,رانيول رسيد نه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ارنست د پیسو
 DocType: Process Payroll,Create Salary Slip,معاش ټوټه جوړول
@@ -2302,7 +2299,7 @@
 DocType: Upload Attendance,Attendance To Date,د نېټه حاضرۍ
 DocType: Warranty Claim,Raised By,راپورته By
 DocType: Payment Gateway Account,Payment Account,د پیسو حساب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,په حسابونه ترلاسه خالص د بدلون
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,د معاوضې پړاو
 DocType: Offer Letter,Accepted,منل
@@ -2316,7 +2313,7 @@
 DocType: Shipping Rule,Shipping Rule Label,انتقال حاکمیت نښه د
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,کارن فورم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,د چټک ژورنال انفاذ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
 DocType: Employee,Previous Work Experience,مخکینی کاری تجربه
@@ -2330,7 +2327,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,اصطلاحات او Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",د محاسبې د ننوتلو د دې نېټې کنګل کړي، څوک کولای شي / رول د لاندې ټاکل شوي پرته د ننوتلو لپاره تعديلوي.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,لطفا د توليد ساتنې مهال ویش مخکې د سند د ژغورلو
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,لطفا د توليد ساتنې مهال ویش مخکې د سند د ژغورلو
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,د پروژې د حالت
 DocType: UOM,Check this to disallow fractions. (for Nos),وګورئ دا ښیی disallow. (د وځيري)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,دغه لانديني تولید امر جوړ شو:
@@ -2353,6 +2350,7 @@
 DocType: Email Digest,How frequently?,څنګه په وار وار؟
 DocType: Purchase Receipt,Get Current Stock,روانه دحمل ترلاسه کړئ
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,د توکو د بیل ونو
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,شمیره code&gt; توکی ګروپ&gt; نښې
 DocType: Student,Joining Date,په یوځای کېدو نېټه
 ,Employees working on a holiday,د کارکوونکو په رخصتۍ کار کوي
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,مارک حاضر
@@ -2434,7 +2432,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,بېلوګډو چاڼېزو نېټه نه ذکر
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,تولید
 DocType: Guardian,Occupation,وظيفه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,د کتارونو تر {0}: بیا نېټه دمخه بايد د پای نیټه وي
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,د کتارونو تر {0}: بیا نېټه دمخه بايد د پای نیټه وي
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,دا لاسوند
 DocType: Installation Note Item,Installed Qty,نصب Qty
@@ -2457,8 +2455,8 @@
 DocType: Notification Control,Sales Order Message,خرڅلاو نظم پيغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",د ټاکلو په تلواله ارزښتونو شرکت، د اسعارو، روان مالي کال، او داسې نور په شان
 DocType: Payment Entry,Payment Type,د پیسو ډول
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
 DocType: Process Payroll,Select Employees,انتخاب مامورین
 DocType: Opportunity,Potential Sales Deal,احتمالي خرڅلاو تړون
 DocType: Payment Entry,Cheque/Reference Date,آرډر / ماخذ نېټه
@@ -2475,7 +2473,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS پيژند {0} لا د شرکت جوړ {1}
 DocType: Purchase Order,Ref SQ,دسرچینی یادونه مربع
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,په ټولو BOMs د قالب / هیښ ځاېناستول
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,د رسيد سند بايد وسپارل شي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,د رسيد سند بايد وسپارل شي
 DocType: Purchase Invoice Item,Received Qty,ترلاسه Qty
 DocType: Stock Entry Detail,Serial No / Batch,شعبه / دسته
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,نه ورکړل او نه تحویلوونکی
@@ -2488,7 +2486,7 @@
 ,To Produce,توليدول
 apps/erpnext/erpnext/config/hr.py +93,Payroll,د معاشاتو
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لپاره چي په کتارونو {0} د {1}. په قالب کچه {2} شامل دي، د قطارونو په {3} هم باید شامل شي
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,د کارن د کمکیانو لپاره د
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,د کارن د کمکیانو لپاره د
 DocType: Packing Slip,Identification of the package for the delivery (for print),لپاره د وړاندې کولو د ټولګې د پيژندنې (د چاپي)
 DocType: Bin,Reserved Quantity,خوندي دي مقدار
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا د اعتبار وړ ایمیل ادرس ولیکۍ
@@ -2502,11 +2500,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,معلولینو کېنډۍ باید default کېنډۍ نه وي
 DocType: Account,Income Account,پر عايداتو باندې حساب
 DocType: Payment Request,Amount in customer's currency,په مشتري د پيسو اندازه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,د سپارنې پرمهال
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,د سپارنې پرمهال
 DocType: Stock Reconciliation Item,Current Qty,اوسني Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",وګورئ: په لګښت برخه کې د &quot;د موادو پر بنسټ Rate&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,مهم مسوولیت په سیمه
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
 DocType: Payment Entry,Total Allocated Amount,ټولې پیسې د
 DocType: Item Reorder,Material Request Type,د موادو غوښتنه ډول
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},څخه د {0} ته د معاشونو Accural ژورنال دکانکورازموينه {1}
@@ -2529,7 +2528,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track له خوا د صنعت ډول ځای شوی.
 DocType: Item Supplier,Item Supplier,د قالب عرضه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ټول Addresses.
 DocType: Company,Stock Settings,دحمل امستنې
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",آژانسونو هغه مهال ممکنه ده که لاندې شتمنۍ په دواړو اسنادو يو شان دي. دی ګروپ، د ریښی ډول، د شرکت
@@ -2539,6 +2538,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',به د غونډې په اړه يو بريښناليک چي حالت کارمندانو ته واستوي &#39;پرانيستلی&#39;
 DocType: Task,Depends on Tasks,په دندې پورې تړاو لري
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage پيرودونکو ګروپ د ونو.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ضميمې کولای شي پرته د سودا کراچۍ مساعد ښودل شي
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,نوي لګښت مرکز نوم
 DocType: Leave Control Panel,Leave Control Panel,پريږدئ Control Panel
@@ -2551,12 +2551,10 @@
 DocType: Sales Invoice,Debit To,د ډیبیټ
 DocType: Delivery Note,Required only for sample item.,يوازې د نمونه توکی ته اړتيا لري.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,واقعي Qty د راکړې ورکړې وروسته
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},نه معاش ټوټه تر منځ موندل {0} او {1}
 ,Pending SO Items For Purchase Request,SO سامان د اخستلو غوښتنه په تمه
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,د زده کوونکو د شمولیت
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} د {1} معلول دی
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} د {1} معلول دی
 DocType: Supplier,Billing Currency,د بیلونو د اسعارو
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ډېر لوی
@@ -2573,7 +2571,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,کورپاڼه د ځانګړي محصول
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ټول د ارزونې ډلې
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,نوي ګدام نوم
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,خاوره
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,لورينه وکړئ د اړتيا کتنو نه یادونه
 DocType: Stock Settings,Default Valuation Method,تلواله ارزښت Method
@@ -2591,7 +2589,7 @@
 DocType: Price List,Price List Master,د بیې په لېست ماسټر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ټول خرڅلاو معاملې کولی شی څو ** خرڅلاو اشخاص ** په وړاندې د سکس شي تر څو چې تاسو کولای شي او د اهدافو څخه څارنه وکړي.
 ,S.O. No.,SO شمیره
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
 DocType: Price List,Applicable for Countries,لپاره هیوادونه د تطبيق وړ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يوازې سره حالت غوښتنلیکونه پرېږدئ &#39;تصویب&#39; او &#39;رد&#39; کولای وسپارل شي
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},د زده کونکو د ډلې نوم په قطار الزامی دی {0}
@@ -2672,7 +2670,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
 DocType: Vehicle Service,Engine Oil,د انجن د تیلو
 DocType: Sales Invoice,Sales Team1,خرڅلاو Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,د قالب {0} نه شته
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,د قالب {0} نه شته
 DocType: Sales Invoice,Customer Address,پيرودونکو پته
 DocType: Employee Loan,Loan Details,د پور نورولوله
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,د کتارونو تر {0}: بشپړ Qty باید له صفر څخه زیات وي.
@@ -2737,7 +2735,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
 DocType: Assessment Result Tool,Result HTML,د پایلو د HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,په ختمېږي
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,زده کوونکي ورزیات کړئ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,زده کوونکي ورزیات کړئ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},مهرباني غوره {0}
 DocType: C-Form,C-Form No,C-فورمه نشته
 DocType: BOM,Exploded_items,Exploded_items
@@ -2802,7 +2800,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,حد اوښتي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,تصدي پلازمیینه
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,سره د دې د تعليمي کال د &#39;يوه علمي اصطلاح {0} او مهاله نوم&#39; {1} مخکې نه شتون لري. لطفا د دې زياتونې کې بدلون او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",لکه {0} توکی په وړاندې د موجودو معاملو شته دي، تاسو نه شي کولای د ارزښت د بدلون {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",لکه {0} توکی په وړاندې د موجودو معاملو شته دي، تاسو نه شي کولای د ارزښت د بدلون {1}
 DocType: UOM,Must be Whole Number,باید ټول شمېر وي
 DocType: Leave Control Panel,New Leaves Allocated (In Days),نوې پاڼې د تخصيص (په ورځې)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,شعبه {0} نه شته
@@ -2846,7 +2844,7 @@
 DocType: Supplier,Last Day of the Next Month,د د راتلونکې میاشتې په وروستۍ ورځ
 DocType: Support Settings,Auto close Issue after 7 days,د موټرونو 7 ورځې وروسته له نږدې Issue
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",تر وتلو وړاندې نه شي کولای ځانګړي شي {0} په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,د زده کوونکو د غوښتنليک
 DocType: Asset Category Account,Accumulated Depreciation Account,د استهلاک د حساب
 DocType: Stock Settings,Freeze Stock Entries,د يخبندان دحمل توکي
@@ -2874,8 +2872,8 @@
 DocType: Asset,Item Code,د قالب کوډ
 DocType: Production Planning Tool,Create Production Orders,تولید امر جوړول
 DocType: Serial No,Warranty / AMC Details,ګرنټی / AMC نورولوله
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
 DocType: Journal Entry,User Remark,کارن تبصره
 DocType: Lead,Market Segment,بازار برخه
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
@@ -2894,7 +2892,7 @@
 DocType: Production Planning Tool,Create Material Requests,د موادو غوښتنه جوړول
 DocType: Employee Education,School/University,ښوونځی / پوهنتون
 DocType: Payment Request,Reference Details,ماخذ په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
 DocType: Sales Invoice Item,Available Qty at Warehouse,موجود Qty په ګدام
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,د بلونو د مقدار
 DocType: Asset,Double Declining Balance,Double کموالی بیلانس
@@ -2915,19 +2913,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ورکړل شوي مقدار نه شي کولای د پور مقدار زیات وي {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,تولید نظم نه جوړ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,تولید نظم نه جوړ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;له نېټه باید وروسته&#39; ته د نېټه وي
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
 DocType: Asset,Fully Depreciated,په بشپړه توګه راکم شو
 ,Stock Projected Qty,دحمل وړاندوینی Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,د پام وړ د حاضرۍ د HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",د داوطلبۍ دي وړانديزونه، د داوطلبۍ د خپل مشتريان تاسو ته ليږلي دي
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",د داوطلبۍ دي وړانديزونه، د داوطلبۍ د خپل مشتريان تاسو ته ليږلي دي
 DocType: Sales Order,Customer's Purchase Order,پيرودونکو د اخستلو امر
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,شعبه او دسته
 DocType: Warranty Claim,From Company,له شرکت
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,د ارزونې معیارونه په لسګونو Sum ته اړتيا لري د {0} وي.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ارزښت او يا د Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,دقیقه
@@ -3058,7 +3056,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,د زده کونکو د ګروپ
 DocType: Shopping Cart Settings,Quotation Series,د داوطلبۍ لړۍ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",توکی سره د ورته نوم شتون لري ({0})، لطفا د توکي ډلې نوم بدل کړي او يا د جنس نوم بدلولی شی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,لطفا د مشتريانو د ټاکلو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,لطفا د مشتريانو د ټاکلو
 DocType: C-Form,I,زه
 DocType: Company,Asset Depreciation Cost Center,د شتمنيو د استهالک لګښت مرکز
 DocType: Sales Order Item,Sales Order Date,خرڅلاو نظم نېټه
@@ -3077,19 +3075,18 @@
 DocType: Vehicle,Insurance Details,د بیمې په بشپړه توګه کتل
 DocType: Account,Payable,د تادیې وړ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,لطفا د پور بيرته پړاوونه داخل
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),پوروړو ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),پوروړو ({0})
 DocType: Pricing Rule,Margin,څنډی
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نوي پېرېدونکي
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,ټولټال ګټه ٪
 DocType: Appraisal Goal,Weightage (%),Weightage)٪ (
 DocType: Bank Reconciliation Detail,Clearance Date,بېلوګډو چاڼېزو نېټه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
 DocType: Lead,Address Desc,د حل نزولی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ګوند الزامی دی
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,موضوع نوم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,تيروخت د خرڅالو او يا د خريداري يو باید وټاکل شي
-DocType: Grading Structure,Grade Intervals,ټولګي انټروال
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,د خپلې سوداګرۍ د ماهیت وټاکئ.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,هلته عملیاتو په جوړولو سره کيږي.
 DocType: Asset Movement,Source Warehouse,سرچینه ګدام
@@ -3118,6 +3115,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,میاشتنی ویش سلنه
 DocType: Territory,Territory Targets,خاوره موخې
 DocType: Delivery Note,Transporter Info,لېږدول پيژندنه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},لطفا په شرکت default {0} جوړ {1}
 DocType: Cheque Print Template,Starting position from top edge,د پیل څخه د پورتنی څنډې مقام
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ورته عرضه کړې څو ځلې داخل شوي دي
@@ -3171,7 +3169,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ترمیمي Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,اوسنۍ دنده په پرانیستولو
 DocType: Company,Stock Adjustment Account,دحمل اصلاحاتو اکانټ
-DocType: Journal Entry,Write Off,ولیکئ پړاو
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ولیکئ پړاو
 DocType: Timesheet Detail,Operation ID,تذکرو د عملياتو
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",سيستم کارن (د ننوتو) پېژند. که ټاکل شوی، دا به د ټولو د بشري حقونو څانګې د فورمو default شي.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: له {1}
@@ -3182,8 +3180,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,عرضه کوونکي ته پيرودونکو برابروی
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# فورمه / د قالب / {0}) د ونډې څخه ده
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,بل نېټه بايد پست کوي نېټه څخه ډيره وي
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,خپرونه د ماليې راپرځيدو
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,خپرونه د ماليې راپرځيدو
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,په معلوماتو کې د وارداتو او صادراتو د
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",دحمل زياتونې ګدام {0} په وړاندې شتون لري، نو تاسو نشی کولای د بيا ورکړی او یا د بدلون لپاره دا
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,نه زده کوونکي موندل
@@ -3195,14 +3193,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 DocType: Program Enrollment,School House,د ښوونځي ماڼۍ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,لطفا د داوطلبۍ انتخاب
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,لطفا د داوطلبۍ انتخاب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,لطفا د داوطلبۍ انتخاب
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,لطفا د داوطلبۍ انتخاب
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
 DocType: Company,Default Cash Account,Default د نقدو پیسو حساب
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,شرکت (نه پيرودونکو يا عرضه) بادار.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,دا د دې د زده کوونکو د ګډون پر بنسټ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,په هيڅ ډول زده کوونکي
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,نور توکي یا علني بشپړه فورمه ورزیات کړئ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',لطفا &#39;د تمی د سپارلو نېټه&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,د سپارنې پرمهال یاداښتونه {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
@@ -3249,9 +3248,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,مخکې له پخلاینې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},د {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیه او په تور د ورزیاتولو (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
 DocType: Sales Order,Partly Billed,خفيف د محاسبې
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,د قالب {0} بايد يوه ثابته شتمني د قالب وي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,د قالب {0} بايد يوه ثابته شتمني د قالب وي
 DocType: Item,Default BOM,default هیښ
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,مهرباني وکړئ د بيا ډول شرکت نوم د تایید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total وتلي نننیو
@@ -3274,7 +3273,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,د بیې په لېست د بدلولو نرخ
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,پته نوم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,پته نوم
 DocType: Stock Entry,From BOM,له هیښ
 DocType: Assessment Code,Assessment Code,ارزونه کوډ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,د اساسي
@@ -3299,7 +3298,7 @@
 DocType: Purchase Invoice,Print Language,چاپ ژبه
 DocType: Salary Slip,Total Working Hours,Total کاري ساعتونه
 DocType: Stock Entry,Including items for sub assemblies,په شمول د فرعي شوراګانو لپاره شیان
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ټول سیمې
 DocType: Purchase Invoice,Items,توکي
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,د زده کوونکو د مخکې شامل.
@@ -3319,17 +3318,15 @@
 DocType: Issue,Opening Time,د پرانستلو په وخت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,څخه او د خرما اړتیا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,امنيت &amp; Commodity exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه په اساس
 DocType: Delivery Note Item,From Warehouse,له ګدام
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
 DocType: Assessment Plan,Supervisor Name,څارونکي نوم
 DocType: Program Enrollment Course,Program Enrollment Course,پروګرام شمولیت کورس
 DocType: Program Enrollment Course,Program Enrollment Course,پروګرام شمولیت کورس
-DocType: Grading Structure,Grading Structure,د رتبو جوړښت
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزښت او Total
 DocType: Tax Rule,Shipping City,انتقال ښار
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,دا قالب د {0} (کينډۍ) يو variant ده. صفات به د کېنډۍ څخه مګر نه کاپي &#39;ټاکل شوې ده باندې د ټولګړو شي
 DocType: Notification Control,Customize the Notification,د خبرتیا دتنظيمولو
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,له عملیاتو په نقدو پیسو د جریان
 DocType: Sales Invoice,Shipping Rule,انتقال حاکمیت
@@ -3352,6 +3349,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,پرانيستل نېټه بايد تړل د نیټې څخه مخکې وي
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا د تشکیلاتو Setup له لارې د حاضرۍ لړۍ شمېر&gt; شمیرې لړۍ
 DocType: Leave Control Panel,Carry Forward,مخ په وړاندې ترسره کړي
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,د موجوده معاملو لګښت مرکز بدل نه شي چې د پنډو
 DocType: Department,Days for which Holidays are blocked for this department.,ورځو لپاره چې د رخصتۍ لپاره د دې ادارې تړل شوي دي.
@@ -3380,7 +3378,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (نننیو)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ساعتېري &amp; تفريح
 DocType: Quality Inspection,Item Serial No,د قالب شعبه
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,کارکوونکی سوابق جوړول
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,کارکوونکی سوابق جوړول
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total حاضر
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,د محاسبې څرګندونې
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ساعت
@@ -3395,8 +3393,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,د ځای ناستی وروسته د نوي هیښ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,د دخرسون ټکی
 DocType: Payment Entry,Received Amount,د مبلغ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو کارکوونکی کې د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو کارکوونکی کې د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",د بشپړ مقدار جوړول، لا له وړاندي په موخه سترګې پټې کمیت
 DocType: Account,Tax,د مالياتو
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,نه ولمانځل شوه
@@ -3409,7 +3405,7 @@
 DocType: Batch,Source Document Name,سرچینه د سند نوم
 DocType: Batch,Source Document Name,سرچینه د سند نوم
 DocType: Job Opening,Job Title,د دندې سرلیک
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,کارنان جوړول
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,کارنان جوړول
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ګرام
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,د ساتنې غوښتنې ته راپور ته سفر وکړي.
@@ -3421,8 +3417,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
 DocType: BOM,Website Description,وېب پاڼه Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,په مساوات خالص د بدلون
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,رسيد
 ,Sales Register,خرڅلاو د نوم ثبتول
@@ -3433,16 +3429,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,هيڅ د سمولو لپاره شتون لري.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
 DocType: Customer Group,Customer Group Name,پيرودونکو ډلې نوم
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,نه پېرېدونکي تر اوسه!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,منښتليک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,مهرباني غوره مخ په وړاندې ترسره کړي که تاسو هم غواړي چې عبارت دي د تېر مالي کال د توازن د دې مالي کال ته روان شو
 DocType: GL Entry,Against Voucher Type,په وړاندې د ګټمنو ډول
 DocType: Item,Attributes,صفات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,لطفا حساب ولیکئ پړاو
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تېره نظم نېټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
 DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
 DocType: C-Form,C-Form,C-فورمه
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,د څو کارکوونکي مارک حاضريدل
@@ -3467,14 +3465,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',د کتارونو تر {0} # حساب بايد د ډول وي شتمن &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,له جملې څخه Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,اصول د يو خرڅلاو لپاره انتقال د مقدار دمحاسبې
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,لړۍ الزامی دی
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,لړۍ الزامی دی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,مالي خدمتونه
 DocType: Student Sibling,Student ID,زده کوونکي د پیژندنې
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,لپاره د وخت کندي د فعالیتونو ډولونه
 DocType: Tax Rule,Sales,خرڅلاو
 DocType: Stock Entry Detail,Basic Amount,اساسي مقدار
 DocType: Training Event,Exam,ازموينه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
 DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
 DocType: Tax Rule,Billing State,د بیلونو د بهرنیو چارو
@@ -3507,7 +3505,7 @@
 DocType: Payment Entry,Account Paid From,حساب ورکړل له
 DocType: Purchase Order Item Supplied,Raw Material Item Code,لومړنیو توکو د قالب کوډ
 DocType: Journal Entry,Write Off Based On,ولیکئ پړاو پر بنسټ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,د کمکیانو لپاره د مشرتابه
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,د کمکیانو لپاره د مشرتابه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,چاپ او قرطاسيه
 DocType: Stock Settings,Show Barcode Field,انکړپټه ښودل Barcode ساحوي
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,عرضه برېښناليک وليږئ
@@ -3523,6 +3521,7 @@
 DocType: Offer Letter,Awaiting Response,په تمه غبرګون
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,پورته
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
+DocType: Supplier,Mention if non-standard payable account,یادونه که غیر معیاري د تادیې وړ حساب
 DocType: Salary Slip,Earning & Deduction,وټې &amp; Deduction
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاري. دا امستنې به په بېلا بېلو معاملو چاڼ وکارول شي.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفي ارزښت Rate اجازه نه وي
@@ -3559,7 +3558,7 @@
 DocType: Program Enrollment Tool,Get Students From,زده کونکي له ترلاسه کړئ
 DocType: Hub Settings,Seller Country,پلورونکی هېواد
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,په وېب پاڼه د خپرېدو لپاره توکي
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ګروپ په دستو ستاسو د زده کوونکو
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ګروپ په دستو ستاسو د زده کوونکو
 DocType: Authorization Rule,Authorization Rule,د واک ورکولو د حاکمیت
 DocType: Sales Invoice,Terms and Conditions Details,د قرارداد شرايط په بشپړه توګه کتل
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,مشخصاتو
@@ -3619,7 +3618,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,تعليقي
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,معاش د اجزاو
 DocType: Program Enrollment Tool,New Academic Year,د نوي تعليمي کال د
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,بیرته / اعتبار يادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,بیرته / اعتبار يادونه
 DocType: Stock Settings,Auto insert Price List rate if missing,کړکېو کې درج د بیې په لېست کچه که ورک
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ټولې ورکړل شوې پیسې د
 DocType: Production Order Item,Transferred Qty,انتقال Qty
@@ -3660,6 +3659,7 @@
 ,Sales Funnel,خرڅلاو کیږدئ
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abbreviation الزامی دی
 DocType: Project,Task Progress,کاري پرمختګ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,کراچۍ
 ,Qty to Transfer,Qty ته سپاري
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ته د ياه یا پېرېدونکي له قوله.
 DocType: Stock Settings,Role Allowed to edit frozen stock,رول اجازه کنګل سټاک د سمولو
@@ -3693,7 +3693,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,فیس راټول
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
 DocType: Lead,Add to calendar on this date,په دې نېټې جنتري ورزیات کړئ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,د زياته کړه لېږد لګښتونه اصول.
 DocType: Item,Opening Stock,پرانيستل دحمل
@@ -3711,7 +3711,7 @@
 DocType: Customer,From Lead,له کوونکۍ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,امر د تولید لپاره د خوشې شول.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,مالي کال لپاره وټاکه ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
 DocType: Program Enrollment Tool,Enroll Students,زده کوونکي شامل کړي
 DocType: Hub Settings,Name Token,نوم د نښې
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,معياري پلورل
@@ -3722,7 +3722,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} خرڅلاو صورتحساب په وړاندې د {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,د پروژې نوم
-DocType: Supplier,Mention if non-standard receivable account,یادونه که غیر معیاري ترلاسه حساب
+DocType: Customer,Mention if non-standard receivable account,یادونه که غیر معیاري ترلاسه حساب
 DocType: Journal Entry Account,If Income or Expense,که پر عايداتو او يا اخراجاتو
 DocType: Production Order,Required Items,د اړتیا توکي
 DocType: Stock Ledger Entry,Stock Value Difference,دحمل ارزښت بدلون
@@ -3753,6 +3753,7 @@
 DocType: Item,Taxes,مالیات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,ورکړل او نه تحویلوونکی
 DocType: Project,Default Cost Center,Default لګښت مرکز
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا جوړ د {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
 DocType: Bank Guarantee,End Date,د پای نیټه
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,دحمل معاملې
 DocType: Budget,Budget Accounts,د بودجې د حسابونه
@@ -3817,7 +3818,7 @@
 DocType: Customer,Sales Partner and Commission,خرڅلاو همکار او کميسيون
 DocType: Employee Loan,Rate of Interest (%) / Year,د په زړه پوری (٪) / کال کچه
 ,Project Quantity,د پروژې د مقدار
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Total {0} لپاره ټول توکي صفر دی، کېدی شي چې تاسو باید بدلون &#39;په تور ویشي پر بنسټ&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Total {0} لپاره ټول توکي صفر دی، کېدی شي چې تاسو باید بدلون &#39;په تور ویشي پر بنسټ&#39;
 DocType: Opportunity,To Discuss,د خبرو اترو
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} د واحدونو {1} د {2} د دې معاملې د بشپړولو لپاره اړتيا لري.
 DocType: Loan Type,Rate of Interest (%) Yearly,د ګټې کچه)٪ (کلنی
@@ -3840,7 +3841,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک حاضر
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},د کتارونو تر {0}: د هیښ # د اسعارو د {1} بايد مساوي د ټاکل اسعارو وي {2}
 DocType: Journal Entry Account,Exchange Rate,د بدلولو نرخ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
 DocType: Homepage,Tag Line,Tag کرښې
 DocType: Fee Component,Fee Component,فیس برخه
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,د بیړیو د مدیریت
@@ -3857,7 +3858,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ګدام {0} نه شته
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,راجستر سيستم د ERPNext مرکز
 DocType: Monthly Distribution,Monthly Distribution Percentages,میاشتنی ویش فيصدۍ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",سنجي کچه د {0} د توکي، چې اړتيا ده چې د محاسبې د زياتونې نه موندل {1} {2}. که توکی په توګه په یوه نمونه توکی transacting د {1}، لطفا یادونه چې په {1} شمیره جدول. که نه نو، لطفا لپاره په سامان ریکارډ د توکی یا ذکر د ارزښت په کچه راتلونکي سټاک معامله جوړ کړي، او بیا هڅه submiting / دا ننوت فسخه
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ د توکو د دې سپارنې يادونه وړاندې کولو
 DocType: Project,Customer Details,پيرودونکو په بشپړه توګه کتل
@@ -3874,7 +3875,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ګڼون بیلانس د مخه په ګزارې، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه اعتبار &#39;اجازه نه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,د کیفیت د مدیریت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} د قالب نافعال شوی دی
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} د قالب نافعال شوی دی
 DocType: Employee Loan,Repay Fixed Amount per Period,هر دوره ثابته مقدار ورکول
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},لورينه وکړئ د قالب اندازه داخل {0}
 DocType: Employee External Work History,Employee External Work History,د کارګر د بهرنيو کار تاریخ
@@ -3901,7 +3902,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,د زده کونکو د ليک ID
 DocType: Employee,Notice (days),خبرتیا (ورځې)
 DocType: Tax Rule,Sales Tax Template,خرڅلاو د مالياتو د کينډۍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
 DocType: Employee,Encashment Date,د ورکړې نېټه
 DocType: Training Event,Internet,د انټرنېټ
 DocType: Account,Stock Adjustment,دحمل اصلاحاتو
@@ -3935,6 +3936,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ډیبیټ يادونه خپور شوی
 DocType: Production Order,Warehouses,Warehouses
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} د شتمنیو نه انتقال شي
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,د دې توکي د {0} (کينډۍ) يو variant ده.
 DocType: Workstation,per hour,په يوه ګړۍ کې
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,د خريدارۍ د
 DocType: Announcement,Announcement,اعلانونه
@@ -3950,7 +3952,7 @@
 DocType: Account,Receivable,ترلاسه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,د کتارونو تر # {0}: نه، اجازه لري چې عرضه بدلون په توګه د اخستلو د امر د مخکې نه شتون
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,رول چې اجازه راکړه ورکړه چې د پور د حدودو ټاکل تجاوز ته وړاندې کړي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
 DocType: Item,Material Issue,مادي Issue
 DocType: Hub Settings,Seller Description,پلورونکی Description
@@ -3963,7 +3965,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,امر وکړ
 DocType: Salary Detail,Component,برخه
 DocType: Assessment Criteria,Assessment Criteria Group,د ارزونې معیارونه ګروپ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
 DocType: Warehouse,Warehouse Name,ګدام نوم
 DocType: Naming Series,Select Transaction,انتخاب معامالتو
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,لطفا رول تصويب يا تصويب کارن
@@ -3998,7 +4000,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",د دې مالي کال په توګه (Default) جوړ، په &#39;د ټاکلو په توګه Default&#39; کیکاږۍ
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,سره یو ځای شول
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,په کمښت کې Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
 DocType: Employee Loan,Repay from Salary,له معاش ورکول
 DocType: Leave Application,LAP/,دورو /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},د غوښتنې په وړاندې د پیسو {0} د {1} لپاره د اندازه {2}
@@ -4016,7 +4018,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,د ارزونې د پایلو د تفصیلي
 DocType: Employee Education,Employee Education,د کارګر ښوونه
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,دوه ګونو توکی ډلې په توکی ډلې جدول کې وموندل
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
 DocType: Salary Slip,Net Pay,خالص د معاشونو
 DocType: Account,Account,ګڼون
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,شعبه {0} لا ترلاسه شوي دي
@@ -4025,7 +4027,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",ګدام {0} دی چې د هر حساب سره اړيکي نه لري، نو مهرباني رامنځته / د ګدام د استازیتوب د (د شتمنیو د) حساب سره تړنې لري.
 DocType: Purchase Invoice,Recurring Id,راګرځېدل Id
 DocType: Customer,Sales Team Details,خرڅلاو ټيم په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,د تل لپاره ړنګ کړئ؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,د تل لپاره ړنګ کړئ؟
 DocType: Expense Claim,Total Claimed Amount,Total ادعا مقدار
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,د پلورلو د بالقوه فرصتونو.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},باطلې {0}
@@ -4036,13 +4038,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup په ERPNext ستاسو په ښوونځي
 DocType: Sales Invoice,Base Change Amount (Company Currency),اډه د بدلون مقدار (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,لومړی سند وژغورۍ.
 DocType: Account,Chargeable,Chargeable
 DocType: Company,Change Abbreviation,د بدلون Abbreviation
 DocType: Expense Claim Detail,Expense Date,اخراجاتو نېټه
 DocType: Item,Max Discount (%),Max کمښت)٪ (
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,تېره نظم مقدار
+DocType: Task,Is Milestone,آیا د معیار
 DocType: Daily Work Summary,Email Sent To,د برېښناليک لېږلو
 DocType: Budget,Warn,خبرداری
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کوم بل څرګندونې، د یادولو وړ هڅې چې بايد په اسنادو ته ولاړ شي.
@@ -4075,11 +4078,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
 DocType: Tax Rule,Purchase Tax Template,پیري د مالياتو د کينډۍ
 ,Project wise Stock Tracking,د پروژې هوښيار دحمل څارلو
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},د ساتنې او ویش {0} په وړاندې موجود دی {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),واقعي Qty (په سرچينه / هدف)
 DocType: Item Customer Detail,Ref Code,دسرچینی یادونه کوډ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,د کارګر اسناد.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
 DocType: HR Settings,Payroll Settings,د معاشاتو په امستنې
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غیر تړاو بلونه او د تادياتو لوبه.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ځای نظم
@@ -4102,7 +4104,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques او سپما په ناسم ډول پاکه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ګڼون {0}: تاسو نه شي کولاي ځان د مور او پلار په پام کې وګماری
 DocType: Purchase Invoice Item,Price List Rate,د بیې په لېست Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,د پېرېدونکو يادي جوړول
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,د پېرېدونکو يادي جوړول
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",وښیه &quot;په سټاک&quot; يا &quot;نه په سټاک&quot; پر بنسټ د ونډې په دې ګودام لپاره چمتو کېږي.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),د توکو Bill (هیښ)
 DocType: Item,Average time taken by the supplier to deliver,د وخت اوسط د عرضه کوونکي له خوا اخيستل ته ورسوي
@@ -4124,7 +4126,7 @@
 DocType: Asset,Disposal Date,برطرف نېټه
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",برېښناليک به د ورکړل ساعت چې د شرکت د ټولو فعاله کارمندان واستول شي، که رخصتي نه لرو. د ځوابونو لنډیز به په نيمه شپه ته واستول شي.
 DocType: Employee Leave Approver,Employee Leave Approver,د کارګر اجازه Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",په توګه له لاسه نه اعلان کولای، ځکه د داوطلبۍ شوی دی.
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,د زده کړې Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,تولید نظم {0} بايد وسپارل شي
@@ -4132,7 +4134,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},د کورس په قطار الزامی دی {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تر اوسه پورې ونه شي کولای له نېټې څخه مخکې وي
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Add / سمول نرخونه
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Add / سمول نرخونه
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Cheque Print Template,Cheque Print Template,آرډر چاپ کينډۍ
@@ -4177,7 +4179,7 @@
 DocType: Item,Variant Based On,variant پر بنسټ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage ګمارل باید 100٪ شي. دا د {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ستاسو د عرضه کوونکي
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
 DocType: Request for Quotation Item,Supplier Part No,عرضه برخه نه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ترلاسه له
@@ -4187,7 +4189,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: د {0} د {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},د کتارونو تر # {0}: د جنس د ټاکلو په عرضه {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,د کتارونو تر {0}: ساعتونه ارزښت باید له صفر څخه زیات وي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
 DocType: Issue,Content Type,منځپانګه ډول
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کمپيوټر
 DocType: Item,List this Item in multiple groups on the website.,په د ويب پاڼې د څو ډلو د دې توکي لست کړئ.
@@ -4196,20 +4198,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,تاسو د ګنګل ارزښت جوړ واک نه دي
 DocType: Payment Reconciliation,Get Unreconciled Entries,تطبیق توکي ترلاسه کړئ
 DocType: Payment Reconciliation,From Invoice Date,له صورتحساب نېټه
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,په نقطو څخه ووځي
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,دا څه کوي؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ته ګدام
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ټول د زده کوونکو د شمولیت
 ,Average Commission Rate,په اوسط ډول د کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
 DocType: Pricing Rule,Pricing Rule Help,د بیې د حاکمیت مرسته
 DocType: School House,House Name,ماڼۍ نوم
 DocType: Purchase Taxes and Charges,Account Head,ګڼون مشر
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,اضافي لګښتونه د اوسمهالولو لپاره د توکو لګیدلي لګښت محاسبه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,برق
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ستاسو د کاروونکو د خپل سازمان د پاتې کړئ. تاسو هم کولای شی چې ستاسو تانبه پېرېدونکي ته بلنه اضافه له خوا څخه د اړيکې شمېره زياته يې
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ستاسو د کاروونکو د خپل سازمان د پاتې کړئ. تاسو هم کولای شی چې ستاسو تانبه پېرېدونکي ته بلنه اضافه له خوا څخه د اړيکې شمېره زياته يې
 DocType: Stock Entry,Total Value Difference (Out - In),Total ارزښت بدلون (له جملې څخه - په)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,د کتارونو تر {0}: د بدلولو نرخ الزامی دی
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},کارن تذکرو لپاره د کارکونکو نه {0}
@@ -4218,7 +4220,7 @@
 DocType: Item,Customer Code,پيرودونکو کوډ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ورځو راهیسې تېر نظم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
 DocType: Buying Settings,Naming Series,نوم لړۍ
 DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,د بيمې د پیل نیټه بايد د بيمې د پای نیټه په پرتله کمه وي
@@ -4233,7 +4235,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,امر Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,د قالب {0} معلول دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,د قالب {0} معلول دی
 DocType: Stock Settings,Stock Frozen Upto,دحمل ګنګل ترمړوندونو پورې
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},دوره او د د دورې ته د خرما د تکراري اجباري {0}
@@ -4246,7 +4248,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),مقدار ولیکئ پړاو (د شرکت د اسعارو)
 DocType: Sales Invoice Timesheet,Billing Hours,بلونو ساعتونه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,دلته يې اضافه توکي tap
 DocType: Fees,Program Enrollment,پروګرام شمولیت
 DocType: Landed Cost Voucher,Landed Cost Voucher,تيرماښام لګښت ګټمنو
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا جوړ {0}
@@ -4346,7 +4349,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,د پرچون او عمده
 DocType: Issue,First Responded On,لومړی ځواب د
 DocType: Website Item Group,Cross Listing of Item in multiple groups,په څو ډلو د قالب صلیب داعلاناتو
-DocType: Grade Interval,Grade Interval,ټولګي وقفه
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالي کال د پیل نیټه او د مالي کال د پای نیټه لا پخوا د مالي کال کې جوړ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تازه چاڼېزو نېټه
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ویش په دسته
@@ -4355,6 +4357,7 @@
 DocType: Request for Quotation Supplier,Download PDF,دانلود PDF
 DocType: Production Order,Planned End Date,پلان د پای نیټه
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,هلته توکو زیرمه شوي دي.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
 DocType: Request for Quotation,Supplier Detail,عرضه تفصیلي
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},په فورمول يا حالت تېروتنه: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,رسیدونو د مقدار
@@ -4400,7 +4403,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup زما د سازمان لپاره یو ساده ویب پاڼه
 DocType: Payment Reconciliation,Receivable / Payable Account,ترلاسه / د راتلوونکې اکانټ
 DocType: Delivery Note Item,Against Sales Order Item,په وړاندې د خرڅلاو نظم قالب
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
 DocType: Item,Default Warehouse,default ګدام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},د بودجې د ګروپ د حساب په وړاندې نه شي کولای {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,لطفا مورنی لګښت مرکز ته ننوځي
@@ -4460,7 +4463,7 @@
 ,Items To Be Requested,د ليکنو ته غوښتنه وشي
 DocType: Purchase Order,Get Last Purchase Rate,ترلاسه تېره رانيول Rate
 DocType: Company,Company Info,پيژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),د بسپنو (شتمني) کاریال
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,دا د دې د کارکونکو د راتګ پر بنسټ
@@ -4473,13 +4476,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,څخه په لاندې ورځو کولو اجازه غوښتنلیکونه کاروونکو ودروي.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,رانيول مقدار
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,د کارګر ګټې
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},ډک اندازه بايد په قطار د {0} د قالب اندازه برابر {1}
 DocType: Production Order,Manufactured Qty,جوړيږي Qty
 DocType: Purchase Receipt Item,Accepted Quantity,منل مقدار
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} نه شتون
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} نه شتون
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,بلونه د پېرېدونکي راپورته کړې.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,د پروژې Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
@@ -4488,15 +4491,17 @@
 DocType: Quality Inspection Reading,Reading 3,لوستلو 3
 ,Hub,مرکز
 DocType: GL Entry,Voucher Type,ګټمنو ډول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
 DocType: Employee Loan Application,Approved,تصویب شوې
 DocType: Pricing Rule,Price,د بیې
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
 DocType: Guardian,Guardian,ګارډین
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزونې {0} په ټاکلې نیټه لړ {1} لپاره د کارګر جوړ
 DocType: Employee,Education,ښوونه
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,دل
 DocType: Selling Settings,Campaign Naming By,د کمپاین نوم By
 DocType: Employee,Current Address Is,اوسني پته ده
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,بدلون موندلی
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاري. ټاکي شرکت د تلواله اسعارو، که مشخصه نه ده.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,د محاسبې ژورنال زياتونې.
 DocType: Delivery Note Item,Available Qty at From Warehouse,موجود Qty په له ګدام
@@ -4533,7 +4538,7 @@
 DocType: Hub Settings,Hub Settings,مرکزي امستنې
 DocType: Project,Gross Margin %,د ناخالصه عايد٪
 DocType: BOM,With Operations,سره د عملیاتو په
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,په اسعارو د محاسبې زياتونې لا شوي دي {0} د شرکت {1}. لطفا د کرنسۍ ته د ترلاسه يا د ورکړې وړ حساب غوره {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,په اسعارو د محاسبې زياتونې لا شوي دي {0} د شرکت {1}. لطفا د کرنسۍ ته د ترلاسه يا د ورکړې وړ حساب غوره {0}.
 DocType: Asset,Is Existing Asset,آیا موجوده د شتمنیو
 DocType: Salary Detail,Statistical Component,د احصایې برخه
 DocType: Salary Detail,Statistical Component,د احصایې برخه
@@ -4589,7 +4594,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo ضمیمه
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,سټاک کچه
 DocType: Customer,Commission Rate,کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,د کمکیانو لپاره د variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,د کمکیانو لپاره د variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,له خوا د رياست د بنديز رخصت غوښتنلیکونه.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",د پیسو ډول بايد د تر لاسه شي، د تنخاوو او کورني انتقال
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4602,6 +4607,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,په رخصتۍ تولید اجازه
 DocType: Sales Order,Customer's Purchase Order Date,پيرودونکو د اخستلو امر نېټه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,پلازمیینه دحمل
+DocType: Shopping Cart Settings,Show Public Attachments,د عامې ضم وښایاست
 DocType: Packing Slip,Package Weight Details,بستې وزن نورولوله
 DocType: Payment Gateway Account,Payment Gateway Account,د پیسو ليدونکی اکانټ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,د پیسو له بشپړېدو وروسته ټاکل مخ ته د کارونکي عکس د تاوولو.
@@ -4626,7 +4632,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,مه $ نور په څېر د هر سمبول تر څنګ اسعارو نه ښيي.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نیمه ورځ)
 DocType: Supplier,Credit Days,اعتبار ورځې
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
 DocType: Leave Type,Is Carry Forward,مخ په وړاندې د دې لپاره ترسره کړي
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,له هیښ توکي ترلاسه کړئ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,د وخت ورځې سوق
@@ -4645,8 +4651,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,تحریم مقدار
 DocType: GL Entry,Is Opening,ده پرانيستل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},د کتارونو تر {0}: ډیبیټ د ننوتلو سره د نه تړاو شي کولای {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا د تشکیلاتو Setup له لارې د حاضرۍ لړۍ شمېر&gt; شمیرې لړۍ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا د تشکیلاتو Setup له لارې د حاضرۍ لړۍ شمېر&gt; شمیرې لړۍ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,ګڼون {0} نه شته
 DocType: Account,Cash,د نغدو پيسو
 DocType: Employee,Short biography for website and other publications.,د ويب سايټ او نورو خپرونو لنډ ژوندلیک.
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index d352454..fd1606c 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -43,6 +43,7 @@
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Tabela de Contas não pode estar vazia.
 DocType: Employee Education,Year of Passing,Ano de passagem
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Em Estoque
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Incidentes Abertos
 DocType: Production Plan Item,Production Plan Item,Item do Planejamento de Produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao Colaborador {1}
@@ -56,6 +57,7 @@
 DocType: Delivery Note,Vehicle No,Placa do Veículo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Por favor, selecione Lista de Preço"
 apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Contador
+DocType: Cost Center,Stock User,Usuário de Estoque
 apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissão dos Parceiros de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
@@ -72,22 +74,22 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Selecione Armazém...
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Mesma empresa está inscrita mais de uma vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Não permitido para {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
 DocType: Process Payroll,Make Bank Entry,Fazer Lançamento Bancário
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Estrutura salarial ausente
 DocType: Sales Invoice Item,Sales Invoice Item,Item da Nota Fiscal de Venda
 DocType: POS Profile,Write Off Cost Center,Centro de custo do abatimento
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Estoque
 DocType: Warehouse,Warehouse Detail,Detalhes do Armazén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
 DocType: Vehicle Service,Brake Oil,Óleo de Freio
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo de operação real
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Selecionar LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Selecionar LDM
 DocType: SMS Log,SMS Log,Log de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
 DocType: Student Log,Student Log,Log do Aluno
@@ -120,7 +122,7 @@
 DocType: SMS Center,All Contact,Todo o Contato
 DocType: Daily Work Summary,Daily Work Summary,Resumo de Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do Exercício Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} está congelado
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Despesas com Estoque
 DocType: Journal Entry,Contra Entry,Contrapartida de Entrada
@@ -138,7 +140,7 @@
 DocType: Sales Invoice,Change Amount,Troco
 DocType: Depreciation Schedule,Make Depreciation Entry,Fazer Lançamento de Depreciação
 DocType: Appraisal Template Goal,KRA,APR
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Criar Colaborador
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Criar Colaborador
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radio-difusão
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,execução
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Os detalhes das operações realizadas.
@@ -169,7 +171,7 @@
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},O valor do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Atualizar Grupo de Email
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Atualizar Grupo de Email
 DocType: Sales Invoice,Is Opening Entry,É Lançamento de Abertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se a conta a receber aplicável não for a conta padrão
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Armazén de destino necessário antes de enviar
@@ -196,7 +198,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Custo Total (via Registro de Tempo)
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Lançamentos do Banco
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item da Conciliação de Estoque
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
@@ -210,7 +212,7 @@
 DocType: POS Profile,Allow user to edit Rate,Permitir que o usuário altere o preço
 DocType: Item,Publish in Hub,Publicar no Hub
 DocType: Student Admission,Student Admission,Admissão do Aluno
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Item {0} é cancelada
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Requisição de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes de Compra
@@ -249,13 +251,12 @@
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Nota Fiscal
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
-DocType: Grade Interval,Min Score,Nota Mínima
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 DocType: Workstation,Rent Cost,Custo do Aluguel
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Próximos Eventos do Calendário
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Selecione mês e ano
 DocType: GL Entry,Debit Amount in Account Currency,Débito em moeda da conta
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total considerado em pedidos
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Designação do colaborador (por exemplo, CEO, Diretor, etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Por favor, digite 'Repeat no Dia do Mês ' valor do campo"
@@ -265,13 +266,13 @@
 DocType: Item Tax,Tax Rate,Alíquota do Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já está alocado para o Colaborador {1} para o período de {2} até {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selecionar item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: Nº do Lote deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converter para Não-Grupo
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lote de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data do Faturamento
 DocType: GL Entry,Debit Amount,Total do Débito
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 DocType: Purchase Order,% Received,Recebido %
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Alunos
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Instalação já está concluída!
@@ -291,9 +292,9 @@
 DocType: Request for Quotation,Request for Quotation,Solicitação de Orçamento
 DocType: Salary Slip Timesheet,Working Hours,Horas de trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Alterar o número sequencial de início/atual de uma série existente.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Criar novo Cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Criar novo Cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias regras de preços continuam a prevalecer, os usuários são convidados a definir a prioridade manualmente para resolver o conflito."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Criar Pedidos de Compra
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Criar Pedidos de Compra
 ,Purchase Register,Registro de Compras
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,Custo dos Consumíveis
@@ -306,7 +307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Por favor, indique Centro de Custo"
 DocType: Journal Entry Account,Sales Order,Pedido de Venda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Valor Médio de Venda
-DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
 DocType: Delivery Note,% Installed,Instalado %
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o manual de ERPNext
 DocType: Email Digest,Pending Purchase Orders,Pedidos de Compra Pendentes
@@ -320,7 +320,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registro do colaborador é criado usando o campo selecionado.
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Cadastro de feriados.
 DocType: Request for Quotation Item,Required Date,Para o Dia
@@ -353,7 +353,7 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 ,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
 DocType: Sales Invoice,Offline POS Name,Nome do POS Offline
 DocType: Sales Order,To Deliver,Para Entregar
@@ -376,7 +376,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Fechamento (Cr)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 DocType: Production Plan Item,Pending Qty,Pendente Qtde
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} não está ativo
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} não está ativo
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurar dimensões do cheque para impressão
 DocType: Salary Slip,Salary Slip Timesheet,Controle de Tempo do Demonstrativo de Pagamento
 apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
@@ -395,14 +395,14 @@
 DocType: Job Applicant,Resume Attachment,Anexo currículo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes Repetidos
 DocType: Leave Control Panel,Allocate,Alocar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Devolução de Vendas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Devolução de Vendas
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue pelo Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Banco de Dados de Clientes
 DocType: Quotation,Quotation To,Orçamento para
 DocType: Lead,Middle Income,Média Renda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Total alocado não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Training Result Employee,Training Result Employee,Resultado do Treinamento do Colaborador
@@ -437,15 +437,14 @@
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Gestão de Emprestimos à Colaboradores
 DocType: Employee,Passport Number,Número do Passaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gerente
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervalo entre datas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novo limite de crédito é inferior ao saldo devedor atual do cliente. O limite de crédito deve ser de pelo menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novo limite de crédito é inferior ao saldo devedor atual do cliente. O limite de crédito deve ser de pelo menos {0}
 DocType: SMS Settings,Receiver Parameter,Parâmetro do recebedor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupar por' não podem ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas do Vendedor
 DocType: Production Order Operation,In minutes,Em Minutos
 DocType: Issue,Resolution Date,Data da Solução
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Registro de Tempo criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Nomeação de Cliente por
 DocType: Depreciation Schedule,Depreciation Amount,Valor de Depreciação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converter em Grupo
@@ -474,7 +473,7 @@
 DocType: Student Attendance,Student Attendance,Frequência do Aluno
 DocType: Sales Invoice Timesheet,Time Sheet,Registro de Tempo
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmação de matérias-primas baseada em
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Por favor insira os detalhes do item
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Por favor insira os detalhes do item
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pré Venda
 DocType: Purchase Receipt,Other Details,Outros detalhes
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Fornecedor
@@ -487,7 +486,7 @@
 ,Absent Student Report,Relatório de Frequência do Aluno
 DocType: Email Digest,Next email will be sent on:,Próximo email será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Termos da Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor do Estoque
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tipo de árvore
@@ -505,7 +504,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} não é um item de estoque
 DocType: Payment Entry,Received Amount (Company Currency),Total recebido (moeda da empresa)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,O Cliente em Potencial deve ser informado se a Oportunidade foi feita para um Cliente em Potencial.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,O Cliente em Potencial deve ser informado se a Oportunidade foi feita para um Cliente em Potencial.
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor selecione dia de folga semanal
 DocType: Production Order Operation,Planned End Time,Horário Planejado de Término
 ,Sales Person Target Variance Item Group-Wise,Variação de Público do Vendedor por Grupo de Item
@@ -593,7 +592,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +344,"If you have any questions, please get back to us.","Se você tem alguma pergunta, por favor nos contate."
 DocType: Item,Website Warehouse,Armazém do Site
 DocType: Payment Reconciliation,Minimum Invoice Amount,Valor Mínimo da Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontuação deve ser inferior ou igual a 5
 apps/erpnext/erpnext/config/accounts.py +299,C-Form records,Registros C -Form
@@ -603,13 +602,13 @@
 DocType: Bin,Moving Average Rate,Taxa da Média Móvel
 DocType: Production Planning Tool,Select Items,Selecione Itens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Agenda do Curso
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Agenda do Curso
 DocType: Maintenance Visit,Completion Status,Status de Conclusão
 DocType: HR Settings,Enter retirement age in years,Insira a idade da aposentadoria em anos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Armazén de Destino
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir entrega ou recebimento adicional até este percentual
 DocType: Upload Attendance,Import Attendance,Importação de Atendimento
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Todos os grupos de itens
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Log de Atividade
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
 DocType: Production Order,Item To Manufacture,Item para Fabricação
@@ -618,7 +617,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Pedido de Compra para Pagamento
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Abrindo'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atribuições em aberto
 DocType: Notification Control,Delivery Note Message,Mensagem da Guia de Remessa
@@ -667,7 +666,6 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
 DocType: Purchase Receipt,Range,Alcance
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Colaborador {0} não está ativo ou não existe
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Adiantamento da Nota Fiscal de Compra
 DocType: Hub Settings,Sync Now,Sincronizar agora
@@ -705,8 +703,6 @@
 						Please enter a valid Invoice","Row {0}: Fatura {1} é inválido, poderia ser cancelado / não existe. \ Por favor, indique uma factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Linha {0}: O pagamento relacionado a Pedidos de Compra/Venda deve ser sempre marcado como adiantamento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Os intervalos para o Código de Nota de Avaliação {0} se sobrepõe com os intervalos de outras notas de avaliação. Por favor verifique intervalos {0} e {1} e tente novamente
 DocType: BOM,Raw Material Cost(Company Currency),Custo da matéria-prima (moeda da empresa)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Workstation,Electricity Cost,Custo de Energia Elétrica
@@ -738,7 +734,7 @@
 DocType: Packing Slip Item,Packing Slip Item,Item da Guia de Remessa
 DocType: Purchase Invoice,Cash/Bank Account,Conta do Caixa/Banco
 DocType: Delivery Note,Delivery To,Entregar Para
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,A tabela de atributos é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,A tabela de atributos é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Pedidos de Venda
 DocType: Asset,Total Number of Depreciations,Número Total de Depreciações
 DocType: Workstation,Wages,Salário
@@ -755,12 +751,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Armazén de Trabalho em Andamento
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Nº de Série {0} está sob contrato de manutenção até {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de Custo Padrão de Vendas
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,CEP
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,CEP
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Pedido de Venda {0} é {1}
 DocType: Opportunity,Contact Info,Informações para Contato
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Fazendo Lançamentos no Estoque
@@ -788,7 +784,7 @@
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números de registro da empresa para sua referência. Exemplo: CNPJ, IE, etc"
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regra de Envio do Carrinho de Compras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar este Pedido de Venda
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
 ,Ordered Items To Be Billed,"Itens Vendidos, mas não Faturados"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 DocType: Global Defaults,Global Defaults,Padrões Globais
@@ -815,9 +811,8 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},Perfil do PDV {0} já criado para o usuário: {1} e empresa {2}
 DocType: Sales Invoice Item,UOM Conversion Factor,Fator de Conversão da Unidade de Medida
 DocType: Stock Settings,Default Item Group,Grupo de Itens padrão
-DocType: Grading Structure,Grading System Name,Nome do Sistema de Nota de Avaliação
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados do fornecedor.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Seu vendedor receberá um lembrete nesta data para contatar o cliente
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em Grupos, mas as entradas podem ser feitas contra os Não-Grupos"
 DocType: Lead,Lead,Cliente em Potencial
@@ -840,10 +835,10 @@
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +157,Please select prefix first,Por favor selecione o prefixo primeiro
 DocType: Maintenance Visit Purpose,Work Done,Trabalho Feito
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Especifique pelo menos um atributo na tabela de atributos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ver Livro Razão
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Celular do Aluno
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Celular do Aluno
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto do Mundo
@@ -871,7 +866,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter notas pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Pedido de Venda {0} não é válido
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total Saída / Transferir {0} na Requisição de Material {1} \ não pode ser maior do que a quantidade solicitada {2} para o Item {3}
 DocType: Employee,Employee Number,Número do Colaborador
@@ -889,7 +884,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronizar com o Servidor
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Seus Produtos ou Serviços
 DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
 DocType: Journal Entry Account,Purchase Order,Pedido de Compra
 DocType: Vehicle,Fuel UOM,UDM do Combustível
@@ -921,7 +916,7 @@
 DocType: Depreciation Schedule,Journal Entry,Lançamento no Livro Diário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} itens em andamento
 DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
-DocType: Grade Interval,Grade Code,Código de Nota de Avaliação
+DocType: Grading Scale Interval,Grade Code,Código de Nota de Avaliação
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Resumo por Email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição de metas
@@ -932,7 +927,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Ferramentas
 DocType: Sales Order,Recurring Upto,recorrente Upto
 DocType: Attendance,HR Manager,Gerente de RH
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Por favor, selecione uma empresa"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Por favor, selecione uma empresa"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Data de emissão da nota fiscal
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta do Modelo de Avaliação
@@ -977,7 +972,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Buying Amount,Valor de Compra
 DocType: Sales Invoice,Shipping Address Name,Endereço de Entrega
 DocType: Material Request,Terms and Conditions Content,Conteúdo dos Termos e Condições
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem Agendamento
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licença sem vencimento
 ,Purchase Invoice Trends,Tendência de Notas Fiscais de Compra
@@ -994,7 +989,7 @@
 Used for Taxes and Charges",Detalhe da tabela de imposto obtido a partir do cadastro do item como texto e armazenado neste campo. Usado para Tributos e Encargos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Colaborador não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta for congelada, os lançamentos só serão permitidos aos usuários restritos."
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil da vaga, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da conta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regra de imposto para transações.
@@ -1008,7 +1003,7 @@
 DocType: Shipping Rule Condition,To Value,Para o Valor
 DocType: Asset Movement,Stock Manager,Gerente de Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},O armazén de origem é obrigatório para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Guia de Remessa
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Guia de Remessa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Aluguel do Escritório
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurações de gateway SMS Setup
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha na Importação!
@@ -1084,14 +1079,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar email de pagamento
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova Tarefa
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Relatórios Adicionais
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planejar operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Interromper lembretes de aniversários
 DocType: SMS Center,Receiver List,Lista de recebedores
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade Consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variação Líquida em Dinheiro
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Já concluído
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Pedido de Pagamento já existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Produtos Enviados
@@ -1116,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Linha {0}: Adiantamento relacionado com o fornecedor deve ser um débito
 DocType: Expense Claim,Total Amount Reimbursed,Quantia total reembolsada
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Relacionado à nota fiscal do fornecedor nº {0} emitida em {1}
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
 DocType: Journal Entry,Entry Type,Tipo de Lançamento
 ,Customer Credit Balance,Saldo de Crédito do Cliente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
@@ -1152,7 +1147,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +17,Fulfillment,Realização
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despesas com Marketing
 ,Item Shortage Report,Relatório de Escassez de Itens
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Também mencione ""Unidade de Medida de Peso"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Também mencione ""Unidade de Medida de Peso"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Requisição de Material usada para fazer esta Entrada de Material
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unidade única de um item.
 DocType: Fee Category,Fee Category,Categoria de Taxas
@@ -1164,7 +1159,7 @@
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,Configuração do ERPNext Concluída!
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Centro de Custo é necessário para a conta de ""Lucros e Perdas"" {2}. Por favor, crie um Centro de Custo padrão para a Empresa."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novo Contato
 DocType: Territory,Parent Territory,Território pai
 DocType: Stock Entry,Material Receipt,Entrada de Material
@@ -1186,11 +1181,11 @@
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir vários Pedidos de Venda relacionados ao Pedido de Compra do Cliente
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
 DocType: Employee Attendance Tool,Employees HTML,Colaboradores HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Licenças Cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"O campo ""Oportunidade de"" é obrigatório"
 DocType: Email Digest,Annual Expenses,Despesas Anuais
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Criar Pedido de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Criar Pedido de Compra
 DocType: Payment Reconciliation Payment,Allocated amount,Quantidade atribuída
 DocType: Stock Reconciliation,Stock Reconciliation,Conciliação de Estoque
 DocType: Territory,Territory Name,Nome do Território
@@ -1200,7 +1195,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Journal Entry {0} não tem qualquer {1} entrada incomparável
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de Remessa
-DocType: Grading Structure,Grading Intervals,Intervalos de Nota de Avaliação
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base em artigo ou Armazém"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma do peso líquido dos itens)
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Faturar
@@ -1208,13 +1202,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,LDM {0} deve ser enviada
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha # {0}: Armazén Rejeitado é obrigatório para o item rejeitado {1}
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gerir seus pedidos
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gerir seus pedidos
 DocType: Production Order Operation,Actual Time and Cost,Tempo e Custo Real
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Requisição de Material de no máximo {0} pode ser feita para item {1} relacionado à ordem de venda {2}
 DocType: Course,Course Abbreviation,Abreviação do Curso
 DocType: Student Leave Application,Student Leave Application,Pedido de Licença do Aluno
 DocType: Item,Will also apply for variants,Também se aplica às variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Empacotar itens no momento da venda.
 DocType: Quotation Item,Actual Qty,Qtde Real
 apps/erpnext/erpnext/public/js/setup_wizard.js +289,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste os produtos ou serviços que você comprar ou vender.
@@ -1273,7 +1267,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Isto é baseado no movimento de estoque. Veja o {0} para maiores detalhes
 DocType: Employee,Salary Information,Informação Salarial
 DocType: Sales Person,Name and Employee ID,Nome e ID do Colaborador
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,A data de vencimento não pode ser anterior à data de postagem
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,A data de vencimento não pode ser anterior à data de postagem
 DocType: Website Item Group,Website Item Group,Grupo de Itens do Site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Impostos e Contribuições
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, indique data de referência"
@@ -1314,7 +1308,7 @@
 DocType: Task,Total Billing Amount (via Time Sheet),Total Faturado (via Registro de Tempo)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Clientes Repetidos
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
 DocType: Asset,Depreciation Schedule,Tabela de Depreciação
 DocType: Bank Reconciliation Detail,Against Account,Contra à Conta
 DocType: Item,Has Batch No,Tem nº de Lote
@@ -1326,7 +1320,7 @@
 DocType: Task,Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo)
 ,Quotation Trends,Tendência de Orçamentos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
 DocType: Shipping Rule Condition,Shipping Amount,Valor do Transporte
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Total pendente
 ,Vehicle Expenses,Despesas com Veículos
@@ -1347,7 +1341,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Total do Desconto Adicional
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo para Não-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esportes
 DocType: Loan Type,Loan Name,Nome do Empréstimo
@@ -1386,7 +1380,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra o **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço do Cliente/Cliente em Potencial
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descrição do Trabalho
@@ -1412,7 +1406,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selecione a Empresa...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente , contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Custo da Nova Compra
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Pedido de Venda necessário para o item {0}
@@ -1456,7 +1450,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não serão mostrados se a lista de preços não estiver configurada
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta regra de envio ou verifique Transporte mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total Recebido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Para Débito é necessária
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Para Débito é necessária
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
 DocType: Offer Letter Term,Offer Term,Termos da Oferta
 DocType: Quality Inspection,Quality Manager,Gerente de Qualidade
@@ -1482,7 +1476,7 @@
 DocType: Item,Customer Item Codes,Código do Item para o Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Ganho/Perda com Câmbio
 DocType: Opportunity,Lost Reason,Motivo da Perda
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Por favor insira o Documento de Recibo
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Por favor insira o Documento de Recibo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitos em grupos, mas as entradas podem ser feitas contra os Não-Grupos"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuários e Permissões
@@ -1493,7 +1487,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado
 DocType: Scheduling Tool,Student Batch,Série de Alunos
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Clientes
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Fazer Aluno
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Fazer Aluno
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplique agora
 ,Bank Clearance Summary,Resumo da Liquidação Bancária
@@ -1530,14 +1524,14 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Mostrar Contracheque
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custos operacionais e dar um número único de operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está fora do limite {0} {1} para o item {4}. Você está fazendo outro(a) {3} relacionado(a) a(o) mesmo(a) {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Selecione a conta de troco
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Selecione a conta de troco
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
 DocType: Topic,Topic,Tópico
 DocType: Quality Inspection,Verified By,Verificado por
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
-DocType: Grade Interval,Grade Description,Descrição da Nota de Avaliação
+DocType: Grading Scale Interval,Grade Description,Descrição da Nota de Avaliação
 DocType: Stock Entry,Purchase Receipt No,Nº do Recibo de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Sinal/Garantia em Dinheiro
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
@@ -1565,7 +1559,7 @@
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Item Bom Acabado
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
 DocType: Warranty Claim,Raised By,Levantadas por
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,compensatória Off
 DocType: Offer Letter,Accepted,Aceito
 DocType: SG Creation Tool Course,Student Group Name,Nome do Grupo de Alunos
@@ -1575,7 +1569,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Rótudo da Regra de Envio
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Usuários
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Lançamento no Livro Diário Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa se a LDM é mencionada em algum item
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
@@ -1586,7 +1580,7 @@
 ,Minutes to First Response for Issues,Minutos para Primeira Resposta em Incidentes
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Condições
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registros contábeis congelados até a presente data, ninguém pode criar/modificar registros com exceção do perfil especificado abaixo."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Por favor, salve o documento antes de gerar programação de manutenção"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, salve o documento antes de gerar programação de manutenção"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opção para não permitir frações. (Para n)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,As ordens de produção seguintes foram criadas:
@@ -1686,7 +1680,7 @@
 DocType: Purchase Invoice,Currency and Price List,Moeda e Preço
 DocType: Opportunity,Customer / Lead Name,Nome do Cliente/Cliente em Potencial
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Linha {0}: Data de início deve ser anterior a data de término
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Linha {0}: Data de início deve ser anterior a data de término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
 DocType: Installation Note Item,Installed Qty,Qtde Instalada
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
@@ -1717,7 +1711,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global de POS perfil {0} já criado para a empresa {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Substituir item / LDM em todas as LDMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,O Documento de Recibo precisa ser enviado
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,O Documento de Recibo precisa ser enviado
 DocType: Purchase Invoice Item,Received Qty,Qtde Recebida
 DocType: Stock Entry Detail,Serial No / Batch,N º de Série / lote
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Não pago e não entregue
@@ -1726,7 +1720,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Deixe tipo {0} não pode ser encaminhado carry-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerada para todos os itens. Por favor, clique em ""Gerar Agenda"""
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Fazer Usuário
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Fazer Usuário
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a Entrega (para impressão)
 DocType: Landed Cost Voucher,Purchase Receipt Items,Itens do Recibo de Compra
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Total de Depreciação durante o período
@@ -1753,7 +1747,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como Pedido de Venda, Pedido de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Valor na Lista de Preços""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,"Rastreia Clientes em Potencial, por Segmento."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1}
 DocType: Company,Stock Settings,Configurações de Estoque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Ganho/Perda no Descarte de Ativo
@@ -1790,7 +1784,7 @@
 DocType: Price List,Price List Master,Cadastro da Lista de Preços
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,Número da Ordem de Venda
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Somente pedidos de licença com o status ""Aprovado"" ou ""Rejeitado"" podem ser enviados"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Nome do Grupo de Alunos é obrigatório na linha {0}
@@ -1831,6 +1825,7 @@
 DocType: Packing Slip,If more than one package of the same type (for print),Se mais do que uma embalagem do mesmo tipo (para impressão)
 DocType: Warehouse,Parent Warehouse,Armazén Pai
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Defina vários tipos de empréstimos
+DocType: Bin,FCFS Rate,Taxa FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Valor Devido
 DocType: Project Task,Working,Trabalhando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Fila do estoque (PEPS)
@@ -1860,14 +1855,14 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Percentual de desconto pode ser aplicado contra uma lista de preços ou para todos Lista de Preços.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Lançamento Contábil de Estoque
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 DocType: Employee Loan,Loan Details,Detalhes do Empréstimo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Linha {0}: A qtde concluída deve superior a zero.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar Desconto Adicional em
 DocType: Account,Root Type,Tipo de Raiz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível retornar mais de {1} para o item {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,enredo
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plotar
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta apresentação de slides no topo da página
 DocType: BOM,Item UOM,Unidade de Medida do Item
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto após desconto (moeda da empresa)
@@ -1902,7 +1897,7 @@
 DocType: Rename Tool,Rename Log,Renomear Log
 DocType: Maintenance Visit Purpose,Against Document No,Contra o Documento Nº
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gerenciar parceiros de vendas.
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Adicionar Alunos
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Adicionar Alunos
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Por favor selecione {0}
 DocType: C-Form,C-Form No,Nº do Formulário-C
 DocType: BOM,Exploded_items,Exploded_items
@@ -1977,7 +1972,7 @@
 DocType: Supplier,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Support Settings,Auto close Issue after 7 days,Fechar atuomaticamente o incidente após 7 dias
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser alocado antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Observação: Devido /  Data de referência excede dias de crédito de cliente permitido por {0} dia(s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Observação: Devido /  Data de referência excede dias de crédito de cliente permitido por {0} dia(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Inscrição do Aluno
 DocType: Stock Settings,Freeze Stock Entries,Congelar Lançamentos no Estoque
 DocType: Asset,Expected Value After Useful Life,Valor Esperado Após Sua Vida Útil
@@ -2013,7 +2008,7 @@
 DocType: Production Planning Tool,Create Material Requests,Criar Requisição de Material
 DocType: Employee Education,School/University,Escola / Universidade
 DocType: Payment Request,Reference Details,Detalhes Referência
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Valor Bruto de Compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Valor Bruto de Compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível no Estoque
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Total Faturado
 DocType: Asset,Double Declining Balance,Equilíbrio decrescente duplo
@@ -2032,7 +2027,7 @@
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status pois o aluno {0} está relacionado à candidatura à vaga de estudo {1}
 DocType: Asset,Fully Depreciated,Depreciados Totalmente
 ,Stock Projected Qty,Projeção de Estoque
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Presença marcante HTML
 DocType: Sales Order,Customer's Purchase Order,Pedido de Compra do Cliente
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de Série e Lote
@@ -2122,7 +2117,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Alunos
 DocType: Shopping Cart Settings,Quotation Series,Séries de Orçamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Selecione o cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Selecione o cliente
 DocType: Company,Asset Depreciation Cost Center,Centro de Custo do Ativo Depreciado
 DocType: Sales Order Item,Sales Order Date,Data do Pedido de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtde Entregue
@@ -2136,12 +2131,11 @@
 DocType: Account,Payable,A pagar
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Lucro Bruto %
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liberação
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
 DocType: Lead,Address Desc,Descrição do Endereço
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,É obrigatório colocar o sujeito
 DocType: Topic,Topic Name,Nome do tópico
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Pelo menos um dos Vendedores ou Compradores deve ser selecionado
-DocType: Grading Structure,Grade Intervals,Intervalos de Nota de Avaliação
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selecione a natureza do seu negócio.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Onde as operações de fabricação são realizadas.
 DocType: Asset Movement,Source Warehouse,Armazém de origem
@@ -2202,7 +2196,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qtde para Reposição
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Vagas Disponíveis Atualmente
 DocType: Company,Stock Adjustment Account,Conta de Ajuste
-DocType: Journal Entry,Write Off,Abatimento
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Abatimento
 DocType: Timesheet Detail,Operation ID,ID da Operação
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Identificação do usuário no sistema (login). Se for marcado, ele vai se tornar padrão para todos os formulários de RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: A partir de {1}
@@ -2211,8 +2205,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,O fornecedor entrega diretamente ao cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,Não há [{0}] ({0}) em estoque.
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Próxima Data deve ser maior que data de lançamento
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar imposto detalhado
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vencimento / Data de Referência não pode ser depois de {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Mostrar imposto detalhado
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vencimento / Data de Referência não pode ser depois de {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importação e Exportação de Dados
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nenhum Aluno Encontrado
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data do Lançamento da Fatura
@@ -2220,8 +2214,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Por favor, selecione data de lançamento antes de selecionar o sujeito"
 DocType: Serial No,Out of AMC,Fora do CAM
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Criar Visita de Manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente de Cadastros de Vendas"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Criar Visita de Manutenção
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente de Cadastros de Vendas"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,"Cadastro da Empresa  (a própria companhia, não se refere ao cliente, nem ao fornecedor)"
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Isto é baseado na frequência do aluno
@@ -2252,7 +2246,7 @@
 DocType: POS Item Group,Item Group,Grupo de Itens
 DocType: Item,Safety Stock,Estoque de Segurança
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas acrescidos (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Por favor, digite novamente o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total devido
 DocType: Journal Entry,Printing Settings,Configurações de impressão
@@ -2265,7 +2259,6 @@
 DocType: Notification Control,Custom Message,Mensagem personalizada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimento Bancário
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
-DocType: Purchase Invoice Item,Rate,Valor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,internar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Por favor, clique em ""Gerar Agenda"""
@@ -2292,13 +2285,11 @@
 DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Horário de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Armazén de Origem
 DocType: Assessment Plan,Supervisor Name,Nome do supervisor
-DocType: Grading Structure,Grading Structure,Estrutura de Nota de Avaliação
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
 DocType: Notification Control,Customize the Notification,Personalizar a Notificação
 DocType: Manufacturer,Limited to 12 characters,Limitados a 12 caracteres
 DocType: Journal Entry,Print Heading,Cabeçalho de Impressão
@@ -2334,7 +2325,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Quantia)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Quality Inspection,Item Serial No,Nº de série do Item
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Criar registros de colaboradores
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Criar registros de colaboradores
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Presente
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Demonstrativos Contábeis
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
@@ -2351,7 +2342,7 @@
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Data do Relatório
 DocType: Job Opening,Job Title,Cargo
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Criar Usuários
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Criar Usuários
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Relatório da visita da chamada de manutenção.
 DocType: Stock Entry,Update Rate and Availability,Atualizar Valor e Disponibilidade
@@ -2359,7 +2350,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: BOM,Website Description,Descrição do Site
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Mudança no Patrimônio Líquido
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
 DocType: Serial No,AMC Expiry Date,Data de Validade do CAM
 ,Sales Register,Registro de Vendas
 DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Emails em
@@ -2368,7 +2359,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referência da transação nº {0} em {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada a ser editado.
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstrativo de Fluxo de Caixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Encaminhar se você também quer incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,Contra o Tipo de Comprovante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Por favor, indique a conta de abatimento"
@@ -2392,11 +2383,11 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',"Linha {0} # A conta deve ser do tipo ""Ativo Imobilizado"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qtde Saída
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série é obrigatório
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série é obrigatório
 DocType: Student Sibling,Student ID,ID do Aluno
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipos de Atividades para Registros de Tempo
 DocType: Stock Entry Detail,Basic Amount,Valor Base
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} não está associado com a Conta do Sujeito {2}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
@@ -2492,8 +2483,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Todas as transações relacionadas a esta empresa foram excluídas com sucesso!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como na Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Provação
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Devolução / Nota de Crédito
-DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Devolução / Nota de Crédito
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Quantia total paga
 DocType: Production Order Item,Transferred Qty,Qtde Transferida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planejamento
@@ -2543,7 +2533,7 @@
 ,Item-wise Price List Rate,Lista de Preços por Item
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Orçamento de Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar o orçamento.
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar data ao calendário
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 DocType: Item,Opening Stock,Abertura de Estoque
@@ -2561,7 +2551,7 @@
 DocType: Customer,From Lead,Do Cliente em Potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordens liberadas para produção.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecione o Ano Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
 DocType: Program Enrollment Tool,Enroll Students,Matricular Alunos
 DocType: Hub Settings,Name Token,Nome do token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda padrão
@@ -2570,7 +2560,7 @@
 DocType: Production Order,Unstopped,Retomado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
 DocType: Sales Invoice,SINV-,NFV-
-DocType: Supplier,Mention if non-standard receivable account,Mencione se a conta a receber não for a conta padrão
+DocType: Customer,Mention if non-standard receivable account,Mencione se a conta a receber não for a conta padrão
 DocType: Journal Entry Account,If Income or Expense,Se é Receita ou Despesa
 DocType: Production Order,Required Items,Itens Necessários
 DocType: Stock Ledger Entry,Stock Value Difference,Diferença de valor do estoque
@@ -2608,7 +2598,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Data do Encerramento do Exercício Fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Criar Orçamento do Fornecedor
-DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
+DocType: BOM,Materials Required (Exploded),Materiais necessários (lista explodida)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Adicione usuários à sua organização, além de você mesmo"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Deixar
@@ -2645,7 +2635,8 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,ID do Cliente
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
+DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
 DocType: Homepage,Tag Line,Slogan
 DocType: Fee Component,Fee Component,Componente da Taxa
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: Conta Superior {1} não pertence à empresa {2}
@@ -2657,7 +2648,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Armazém {0} não existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Cadastre-se no ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,O item selecionado não pode ter Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,O item selecionado não pode ter Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% do material entregue contra esta Guia de Remessa
 DocType: Project,Customer Details,Detalhes do Cliente
 ,Unpaid Expense Claim,Reembolso de Despesas Não Pago
@@ -2666,7 +2657,7 @@
 ,Available Stock for Packing Items,Estoque Disponível para o Empacotamento de Itens
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} foi desativado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} foi desativado
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Histórico de Trabalho Externo do Colaborador
 DocType: Tax Rule,Purchase,Compras
@@ -2685,7 +2676,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Email do Aluno
 DocType: Employee,Notice (days),Aviso Prévio ( dias)
 DocType: Tax Rule,Sales Tax Template,Modelo de Impostos sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selecione os itens para salvar a nota
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Selecione os itens para salvar a nota
 DocType: Employee,Encashment Date,Data da cobrança
 DocType: Account,Stock Adjustment,Ajuste do estoque
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
@@ -2719,7 +2710,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha # {0}: Não é permitido mudar de fornecedor quando o Pedido de Compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selecionar Itens para Produzir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Selecionar Itens para Produzir
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Os dados estão sendo sincronizados, isto pode demorar algum tempo"
 DocType: Item Price,Item Price,Preço do Item
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & detergente
@@ -2749,7 +2740,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Junte-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Leave Application,LAP/,SDL/
 DocType: Salary Slip,Salary Slip,Contracheque
 DocType: Pricing Rule,Margin Rate or Amount,Percentual ou Valor de Margem
@@ -2761,14 +2752,14 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações marcadas são ""Enviadas"", um pop-up abre automaticamente para enviar um email para o ""Contato"" associado a transação, com a transação como um anexo. O usuário pode ou não enviar o email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configurações Globais
 DocType: Employee Education,Employee Education,Escolaridade do Colaborador
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
 DocType: Salary Slip,Net Pay,Pagamento Líquido
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nº de Série {0} já foi recebido
 ,Requested Items To Be Transferred,"Items Solicitados, mas não Transferidos"
 DocType: Expense Claim,Vehicle Log,Log do Veículo
 DocType: Purchase Invoice,Recurring Id,Id recorrente
 DocType: Customer,Sales Team Details,Detalhes da Equipe de Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Apagar de forma permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Apagar de forma permanente?
 DocType: Expense Claim,Total Claimed Amount,Quantia total reivindicada
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades potenciais para a venda.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Licença Médica
@@ -2776,7 +2767,7 @@
 DocType: Delivery Note,Billing Address Name,Endereço de Faturamento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
 DocType: Sales Invoice,Base Change Amount (Company Currency),Troco (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Taxável
 DocType: Company,Change Abbreviation,Mudança abreviação
@@ -2805,10 +2796,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar Estoque anterior a' deve ser menor que %d dias .
 DocType: Tax Rule,Purchase Tax Template,Modelo de Impostos sobre a compra
 ,Project wise Stock Tracking,Rastreio de Estoque por Projeto
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programação de manutenção {0} existe contra {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qtde Real (na origem / destino)
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de colaboradores.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Por favor configure a próxima data de depreciação
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Por favor configure a próxima data de depreciação
 DocType: HR Settings,Payroll Settings,Configurações da Folha de Pagamento
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Fazer pedido
@@ -2828,7 +2818,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques e depósitos apagados incorretamente
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode definir a própria conta como uma conta superior
 DocType: Purchase Invoice Item,Price List Rate,Preço na Lista de Preços
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Criar orçamentos de clientes
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Criar orçamentos de clientes
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""Em Estoque"" ou ""Esgotado"" baseado no estoque disponível neste armazén."
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário para entrega do fornecedor.
 DocType: Project,Expected Start Date,Data Prevista de Início
@@ -2841,13 +2831,13 @@
 DocType: Purchase Invoice,Submit on creation,Enviar ao criar
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os e-mails serão enviados para todos os colaboradores ativos da empresa na hora informada, caso não estejam de férias. O resumo das respostas serão enviadas à meia-noite."
 DocType: Employee Leave Approver,Employee Leave Approver,Licença do Colaborador Aprovada
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Linha {0}: Uma entrada de reposição já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Linha {0}: Uma entrada de reposição já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Não se pode declarar como perdido , porque foi realizado um Orçamento."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback do Treinamento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Ordem de produção {0} deve ser enviado
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor selecione a Data de início e a Data de Término do Item {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Até o momento não pode ser antes a partir da data
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Adicionar / Editar preços
 DocType: Cheque Print Template,Cheque Print Template,Template para Impressão de Cheques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,"Itens Solicitados, mas não Comprados"
@@ -2880,14 +2870,14 @@
 DocType: Naming Series,Help HTML,Ajuda HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Ferramenta de Criação de Grupos de Alunos
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total atribuído deve ser de 100%. É {0}
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Não é possível definir como Perdido uma vez que foi feito um Pedido de Venda
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não é possível definir como Perdido uma vez que foi feito um Pedido de Venda
 DocType: Request for Quotation Item,Supplier Part No,Nº da Peça no Fornecedor
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Recebido de
 DocType: Item,Has Serial No,Tem nº de Série
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: A partir de {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Linha # {0}: Defina o fornecedor para o item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Linha {0}: Horas deve ser um valor maior que zero
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos no site.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} não existe no sistema
@@ -2898,13 +2888,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Para o Armazén
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas Admissões de Alunos
 ,Average Commission Rate,Percentual de Comissão Médio
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo de desembarque dos itens
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,elétrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Adicione o resto de sua organização como seus usuários. Você também pode adicionar clientes convidados ao seu portal adicionando-os de Contatos
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Adicione o resto de sua organização como seus usuários. Você também pode adicionar clientes convidados ao seu portal adicionando-os de Contatos
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença do Valor Total (Saída - Entrada)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Linha {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuário não definida para Colaborador {0}
@@ -2912,7 +2902,7 @@
 DocType: Item,Customer Code,Código do Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias desde a última compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Código dos Documentos
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de início da cobertura do seguro deve ser inferior a data de término da cobertura
@@ -2925,7 +2915,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Contracheque do colaborador {0} já criado para o registro de tempo {1}
 DocType: Vehicle Log,Odometer,Odômetro
 DocType: Sales Order Item,Ordered Qty,Qtde Encomendada
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,LDM não contém nenhum item de estoque
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
@@ -2935,7 +2925,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Último valor de compra não encontrado
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Valor abatido (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprovante de Custos de Desembarque
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Defina {0}
 DocType: Employee,Health Details,Detalhes sobre a Saúde
@@ -3003,7 +2993,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeira Resposta em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Listagem cruzada dos produtos que pertencem à vários grupos
-DocType: Grade Interval,Grade Interval,Intervalo de Nota de Avaliação
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Data Planejada de Término
@@ -3039,7 +3028,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configurar um website simples para a minha organização
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta de Recebimento/Pagamento
 DocType: Delivery Note Item,Against Sales Order Item,Relacionado ao Item do Pedido de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir sem valores
@@ -3075,7 +3064,7 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar Registros de Tempo fora do horário de trabalho da estação de trabalho.
 ,Items To Be Requested,Itens para Requisitar
 DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selecione ou adicione um novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Selecione ou adicione um novo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicação de Recursos (Ativos)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Isto é baseado na frequência deste Colaborador
 DocType: Fiscal Year,Year Start Date,Data do início do ano
@@ -3086,7 +3075,7 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedir que usuários solicitem licenças em dias seguintes
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Valor de Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Orçamento do fornecedor {0} criado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,O ano final não pode ser antes do ano de início
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,O ano final não pode ser antes do ano de início
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Benefícios a Colaboradores
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde Fabricada
@@ -3099,7 +3088,7 @@
 DocType: Account,Parent Account,Conta Superior
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de Comprovante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento'
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Avaliação {0} criada para o Colaborador {1} no intervalo de datas informado
 DocType: Selling Settings,Campaign Naming By,Nomeação de Campanha por
@@ -3131,7 +3120,7 @@
 DocType: Sales Order,% of materials delivered against this Sales Order,% do material entregue deste Pedido de Venda
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Gravar o movimento item.
 DocType: Hub Settings,Hub Settings,Configurações Hub
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 DocType: Asset,Is Existing Asset,É Ativo Existente
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação da LDM
@@ -3186,7 +3175,7 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Cadastro de Projeto.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar nenhum símbolo como R$ etc ao lado de moedas.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Meio Período)
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Faça uma Série de Alunos
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Faça uma Série de Alunos
 DocType: Leave Type,Is Carry Forward,É encaminhado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Prazo de Entrega (em dias)
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, indique os pedidos de venda na tabela acima"
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 96da0cc..81870d7 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -57,22 +57,23 @@
 ,Batch Item Expiry Status,Batch item de status de validade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Depósito Bancário
 DocType: Mode of Payment Account,Mode of Payment Account,Modo da Conta de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostrar Variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostrar Variantes
 DocType: Academic Term,Academic Term,Período Letivo
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,A tabela de contas não pode estar vazia.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Empréstimos (Passivo)
-DocType: Employee Education,Year of Passing,Ano de Falecimento
+DocType: Employee Education,Year of Passing,Ano de conclusão
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referência: %s, Código do Artigo: %s e Cliente: %s"
 DocType: Item,Country of Origin,País de origem
-apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Em Estoque
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Em stock
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Incidentes em Aberto
 DocType: Production Plan Item,Production Plan Item,Artigo do Plano de Produção
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},O usuário {0} já está atribuído ao funcionário {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},O utilizador {0} já está atribuído ao funcionário {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistência Médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Atraso no pagamento (Dias)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa de Serviço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,O Ano Fiscal {0} é obrigatório
@@ -90,7 +91,7 @@
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor selecione a data
 DocType: Employee,Holiday List,Lista de Feriados
 apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Contabilista
-DocType: Cost Center,Stock User,Usuário de Estoque
+DocType: Cost Center,Stock User,Utilizador de Stock
 DocType: Company,Phone No,Nº de Telefone
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Cronogramas de Curso criados:
 apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},Novo {0}: #{1}
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidade
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Esta mesma empresa está inscrita mais do que uma vez
 DocType: Employee,Married,Casado/a
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não tem permissão para {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Não tem permissão para {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obter itens de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurar o sistema de nomeação de funcionários em recursos humanos&gt; Configurações de RH
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produto {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nenhum item listado
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 DocType: Process Payroll,Make Bank Entry,Efetuar Registo Bancário
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Próxima Depreciação A data não pode ser antes Data da compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Próxima Depreciação A data não pode ser antes Data da compra
 DocType: SMS Center,All Sales Person,Todos os Vendedores
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"A **Distribuição Mensal** ajuda-o a distribuir o Orçamento/Meta por vários meses, caso o seu negócio seja sazonal."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Não itens encontrados
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Não itens encontrados
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta a Estrutura Salarial
 DocType: Lead,Person Name,Nome da Pessoa
 DocType: Sales Invoice Item,Sales Invoice Item,Item de Fatura de Vendas
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","ex: ""Escola Primária"" ou ""Universidade"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Stock
 DocType: Warehouse,Warehouse Detail,Detalhe Armazém
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},O cliente {0} {1}/{2} ultrapassou o limite de crédito
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},O cliente {0} {1}/{2} ultrapassou o limite de crédito
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"O Prazo de Data de Término não pode ser posterior à Data de Término de Ano do Ano Letivo, com a qual está relacionado o termo (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É um Ativo Imobilizado"" não pode ser desmarcado, pois existe um registo de ativos desse item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É um Ativo Imobilizado"" não pode ser desmarcado, pois existe um registo de ativos desse item"
 DocType: Vehicle Service,Brake Oil,Óleo dos Travões
 DocType: Tax Rule,Tax Type,Tipo de imposto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Não está autorizado a adicionar ou atualizar registos antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for diapositivo de imagens)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um Cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo Real Operacional
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Selecionar BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Selecionar BOM
 DocType: SMS Log,SMS Log,Registo de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Itens Entregues
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,O feriado em {0} não é entre De Data e To Date
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Classe
 DocType: Sales Invoice Item,Delivered By Supplier,Entregue Pelo Fornecedor
 DocType: SMS Center,All Contact,Todos os Contactos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordem de produção já criado para todos os artigos com BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Ordem de produção já criado para todos os artigos com BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salário Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumo do Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,A Encerrar Ano Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} foi suspenso
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} foi suspenso
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione uma Empresa Existente para a criação do Plano de Contas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Despesas de Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecionar depósito de destino
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contrapartida
 DocType: Journal Entry Account,Credit in Company Currency,Crédito na Moeda da Empresa
 DocType: Delivery Note,Installation Status,Estado da Instalação
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Você deseja atualizar atendimento? <br> Presente: {0} \ <br> Ausente: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A Qtd Aceite + Rejeitada deve ser igual à quantidade Recebida pelo Item {0}
 DocType: Request for Quotation,RFQ-,SDC-
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para Compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,É necessário pelo menos um modo de pagamento para a fatura POS.
 DocType: Products Settings,Show Products as a List,Mostrar os Produtos como Lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Transfira o Modelo, preencha os dados apropriados e anexe o ficheiro modificado.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Efetuar Registo de Depreciação
 DocType: Appraisal Template Goal,KRA,ACR
 DocType: Lead,Request Type,Tipo de Solicitação
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tornar Funcionário
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tornar Funcionário
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmissão
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Execução
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Os dados das operações realizadas.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plano de visitas de manutenção.
 DocType: SMS Settings,Enter url parameter for message,Insira o parâmetro url da mensagem
 DocType: POS Profile,Customer Groups,Grupos de Clientes
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Declarações financeiras
 DocType: Guardian,Students,Estudantes
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,As regras para aplicação de preços e descontos.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,A Lista de Preços deve ser aplicável a Comprar ou Vender
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},O montante do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de Séries para esta Transação
 DocType: Company,Default Payroll Payable Account,Folha de pagamento padrão Contas a Pagar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Atualização Email Grupo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Atualização Email Grupo
 DocType: Sales Invoice,Is Opening Entry,É Registo de Entrada
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se é uma conta a receber não padrão
 DocType: Course Schedule,Instructor Name,Nome do Instrutor
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Na Nota Fiscal de Venda do Item
 ,Production Orders in Progress,Pedidos de Produção em Progresso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Caixa Líquido de Financiamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","O Armazenamento Local está cheio, não foi guardado"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","O Armazenamento Local está cheio, não foi guardado"
 DocType: Lead,Address & Contact,Endereço e Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adicionar licenças não utilizadas através de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},O próximo Recorrente {0} será criado em {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Quantia de Custo Total (através da Folha de Serviço)
 DocType: Item Website Specification,Item Website Specification,Especificação de Website do Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Licença Bloqueada
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Registos Bancários
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item de Reconciliação de Stock
@@ -318,11 +322,11 @@
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
 DocType: Course Scheduling Tool,Course Start Date,Data de Início do Curso
 ,Student Batch-Wise Attendance,Assiduidade de Estudantes em Classe
-DocType: POS Profile,Allow user to edit Rate,Permitir que o utilizador edite Taxa
+DocType: POS Profile,Allow user to edit Rate,Permitir que o utilizador altere o preço
 DocType: Item,Publish in Hub,Publicar na Plataforma
 DocType: Student Admission,Student Admission,Admissão de Estudante
 ,Terretory,Território
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,O Item {0} foi cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,O Item {0} foi cancelado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Solicitação de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data de Liquidação
 DocType: Item,Purchase Details,Dados de Compra
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por Email na criação de Solicitações de Material automáticas
 DocType: Journal Entry,Multi Currency,Múltiplas Moedas
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Guia de Remessa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Guia de Remessa
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,A Configurar Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Custo do Ativo Vendido
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"O Registo de Pagamento foi alterado após o ter retirado. Por favor, retire-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} entrou duas vezes na Taxa de Item
-DocType: Grade Interval,Min Score,min Pontuação
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} entrou duas vezes na Taxa de Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Student Applicant,Admitted,Admitido/a
 DocType: Workstation,Rent Cost,Custo de Aluguer
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valor do pedido
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transações Bancárias/Dinheiro de terceiros ou de transferências internas
 DocType: Shipping Rule,Valid for Countries,Válido para Países
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este Item é um Modelo e não pode ser utilizado nas transações. Os atributos doItem serão copiados para as variantes a menos que defina ""Não Copiar"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este Item é um Modelo e não pode ser utilizado nas transações. Os atributos doItem serão copiados para as variantes a menos que defina ""Não Copiar"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,PedidoTotal Considerado
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Categoria profissional do funcionário (por exemplo, Presidente Executivo , Diretor , etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Por favor, insira o valor do campo ""Repetir no Dia do Mês"""
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,Taxa de Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já foi alocado para o Funcionário {1} para o período de {2} a {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selecionar Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,A Fatura de Compra {0} já foi enviada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,A Fatura de Compra {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: O Nº de Lote deve ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converter a Fora do Grupo
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lote de um Item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da Fatura
 DocType: GL Entry,Debit Amount,Montante de Débito
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Só pode haver 1 Conta por Empresa em {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Só pode haver 1 Conta por Empresa em {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Por favor, veja o anexo"
 DocType: Purchase Order,% Received,% Recebida
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Estudantes
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,Solicitação de Cotação
 DocType: Salary Slip Timesheet,Working Hours,Horas de Trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Altera o número de sequência inicial / atual duma série existente.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Criar um novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Criar um novo cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias Regras de Fixação de Preços continuarem a prevalecer, será pedido aos utilizadores que definam a Prioridade manualmente para que este conflito seja resolvido."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Criar ordens de compra
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Criar ordens de compra
 ,Purchase Register,Registo de Compra
 DocType: Course Scheduling Tool,Rechedule,Remarcar
 DocType: Landed Cost Item,Applicable Charges,Encargos Aplicáveis
@@ -462,9 +465,9 @@
 DocType: Purchase Invoice,Yearly,Anual
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Por favor, insira o Centro de Custos"
 DocType: Journal Entry Account,Sales Order,Ordem de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Taxa de Venda Méd.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Preço de Venda Médio
 DocType: Assessment Plan,Examiner Name,Nome do Examinador
-DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Taxa
+DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
 DocType: Delivery Note,% Installed,% Instalada
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Salas de Aula / Laboratórios, etc. onde podem ser agendadas palestras."
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, insira o nome da empresa primeiro"
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As definições gerais para todos os processos de fabrico.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas Congeladas Até
 DocType: SMS Log,Sent On,Enviado Em
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registo de funcionário é criado ao utilizar o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Definidor de Feriados.
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Do Pacote Nr.
 DocType: Item Attribute,To Range,Para Gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e Depósitos
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Não é possível alterar o método de avaliação, uma vez que há transações contra alguns itens que não tem seu próprio método de avaliação"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,É obrigatório o total de licenças alocadas
 DocType: Job Opening,Description of a Job Opening,Descrição de uma Vaga de Emprego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Atividades pendentes para hoje
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, insira o Armazém em que será levantanda a Solicitação de Material"
 DocType: Production Order,Additional Operating Cost,Custos Operacionais Adicionais
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Para unir, as seguintes propriedades devem ser iguais para ambos items"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Para unir, as seguintes propriedades devem ser iguais para ambos items"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Telefone de Emergência
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Comprar
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Por favor defina o grau para o Limiar 0%
 DocType: Sales Order,To Deliver,A Entregar
 DocType: Purchase Invoice Item,Item,Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,O nr. de série do item não pode ser uma fração
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,O nr. de série do item não pode ser uma fração
 DocType: Journal Entry,Difference (Dr - Cr),Diferença (Db - Cr)
 DocType: Account,Profit and Loss,Lucros e Perdas
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestão de Subcontratação
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Nota de Instalação de Item
 DocType: Production Plan Item,Pending Qty,Qtd Pendente
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} não é activa
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} não é activa
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS enviado a seguintes números: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Defina as dimensões do cheque para impressão
 DocType: Salary Slip,Salary Slip Timesheet,Folha de Presença nas Folhas de Vencimento
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Comissão Total
 DocType: Pricing Rule,Sales Partner,Parceiro de Vendas
 DocType: Buying Settings,Purchase Receipt Required,É Obrigatório o Recibo de Compra
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,É obrigatório colocar a Taxa de Avaliação se foi introduzido o Stock de Abertura
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,É obrigatório colocar a Taxa de Avaliação se foi introduzido o Stock de Abertura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Não foram encontrados nenhuns registos na tabela da Fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, selecione primeiro a Empresa e o Tipo de Parte"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Ano fiscal / financeiro.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valores Acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Desculpe, mas os Nrs. de Série não podem ser unidos"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Criar Pedido de Venda
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Criar Pedido de Venda
 DocType: Project Task,Project Task,Tarefa do Projeto
 ,Lead Id,ID de Potencial Cliente
 DocType: C-Form Invoice Detail,Grand Total,Total Geral
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Anexo de Currículo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes Fiéis
 DocType: Leave Control Panel,Allocate,Atribuir
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Retorno de Vendas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Retorno de Vendas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Nota: O total de licenças atribuídas {0} não deve ser menor do que as licenças já aprovadas {1}, para esse período"
 DocType: Announcement,Posted By,Postado Por
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue pelo Fornecedor (Envio Direto)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,Orçamento Para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Inicial (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,O montante atribuído não pode ser negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Defina a Empresa
 DocType: Purchase Order Item,Billed Amt,Qtd Faturada
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Folha de Presença de Fatura de Vendas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},É necessário colocar o Nr. de Referência e a Data de Referência em {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selecione a Conta de Pagamento para efetuar um Registo Bancário
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Criar registos de funcionários para gerir faltas, declarações de despesas e folha de salários"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Criar registos de funcionários para gerir faltas, declarações de despesas e folha de salários"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Adicionar à Base de Conhecimento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Elaboração de Proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Dedução de Registo de Pagamento
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relação com Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gestor
 DocType: Payment Entry,Payment From / To,Pagamento De / Para
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervalo de datas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},O novo limite de crédito é inferior ao montante em dívida atual para o cliente. O limite de crédito tem que ser pelo menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},O novo limite de crédito é inferior ao montante em dívida atual para o cliente. O limite de crédito tem que ser pelo menos {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro do Recetor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e 'Agrupado por' não podem ser iguais
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,Data de Resolução
 DocType: Student Batch Name,Batch Name,Nome de Lote
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Folha de Presença criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Matricular
 DocType: Selling Settings,Customer Naming By,Nome de Cliente Por
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Irá mostrar ao aluno como Presente em Student Relatório de Frequência Mensal
@@ -684,7 +687,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converter a Grupo
 DocType: Activity Cost,Activity Type,Tipo de Atividade
 DocType: Request for Quotation,For individual supplier,Para cada fornecedor
-DocType: BOM Operation,Base Hour Rate(Company Currency),Valor Base por Hora (Moeda da Empresa)
+DocType: BOM Operation,Base Hour Rate(Company Currency),Preço Base por Hora (Moeda da Empresa)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Montante Entregue
 DocType: Supplier,Fixed Days,Dias Fixos
 DocType: Quotation Item,Item Balance,Saldo do Item
@@ -714,11 +717,11 @@
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Necessária
 DocType: Bank Guarantee,Bank Guarantee Number,Número de Garantia Bancária
 DocType: Assessment Criteria,Assessment Criteria,Critérios de avaliação
-DocType: BOM Item,Basic Rate (Company Currency),Taxa Básica (Moeda da Empresa)
+DocType: BOM Item,Basic Rate (Company Currency),Preço Unitário (Moeda da Empresa)
 DocType: Student Attendance,Student Attendance,Assiduidade de Estudante
 DocType: Sales Invoice Timesheet,Time Sheet,Folha de Presença
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmar Matérias-Primas com Base Em
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Por favor, insira os dados do item"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, insira os dados do item"
 DocType: Interest,Interest,Juros
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pré-vendas
 DocType: Purchase Receipt,Other Details,Outros Dados
@@ -736,7 +739,7 @@
 ,Absent Student Report,Relatório de Faltas de Estudante
 DocType: Email Digest,Next email will be sent on:,O próximo email será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Termo de Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,O Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,O Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Não foi encontrado o Item {0}
 DocType: Bin,Stock Value,Valor do Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,A Empresa {0} não existe
@@ -745,7 +748,6 @@
 DocType: Serial No,Warranty Expiry Date,Data de Validade da Garantia
 DocType: Material Request Item,Quantity and Warehouse,Quantidade e Armazém
 DocType: Sales Invoice,Commission Rate (%),Taxa de Comissão (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series para {0} através da Configuração&gt; Configurações&gt; Nomeação de Série
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecione o programa
 DocType: Project,Estimated Cost,Custo Estimado
 DocType: Purchase Order,Link to material requests,Link para pedidos de material
@@ -763,7 +765,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} não é um item de stock
 DocType: Mode of Payment Account,Default Account,Conta Padrão
 DocType: Payment Entry,Received Amount (Company Currency),Montante Recebido (Moeda da Empresa)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,O Potencial Cliente deve ser definido se for efetuada uma Oportunidade para um Potencial Cliente
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,O Potencial Cliente deve ser definido se for efetuada uma Oportunidade para um Potencial Cliente
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Por favor, seleccione os dias de folga semanal"
 DocType: Production Order Operation,Planned End Time,Tempo de Término Planeado
 ,Sales Person Target Variance Item Group-Wise,Item de Variância Alvo de Vendedores em Grupo
@@ -846,7 +848,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,A Lista de Preços não foi selecionada
 DocType: Employee,Family Background,Antecedentes Familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Sem Permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar com base nas Partes, selecione o Tipo de Parte primeiro"
@@ -859,7 +861,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Não foi encontrado nenhum funcionário
 DocType: Supplier Quotation,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se for subcontratado a um fornecedor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,O grupo de alunos já está atualizado.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,O grupo de alunos já está atualizado.
 DocType: SMS Center,All Customer Contact,Todos os Contactos de Clientes
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Carregar saldo de stock através de csv.
 DocType: Warehouse,Tree Details,Dados de Esquema
@@ -870,8 +872,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo da Fatura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: O Centro de Custo {2} não pertence à Empresa {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: A Conta {2} não pode ser um Grupo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,A Linha do Item {idx}: {doctype} {docname}  não existe na tabela '{doctype}'
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,A Folha de Presenças {0} já está concluída ou foi cancelada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,A Linha do Item {idx}: {doctype} {docname}  não existe na tabela '{doctype}'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,A Folha de Presenças {0} já está concluída ou foi cancelada
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,não há tarefas
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que a fatura automática será gerada. Por exemplo, 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,Depreciação Acumulada Inicial
@@ -887,7 +889,7 @@
 DocType: Bin,Moving Average Rate,Taxa Média de Mudança
 DocType: Production Planning Tool,Select Items,Selecionar Itens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} na Fatura {1} com a data de {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Cronograma de Curso
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Cronograma de Curso
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: HR Settings,Enter retirement age in years,Insira a idade da reforma em anos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Armazém Alvo
@@ -895,7 +897,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir  entrega ou receção em excesso até esta percentagem
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importar Assiduidade
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Todos os Grupos de Itens
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos os Grupos de Itens
 DocType: Process Payroll,Activity Log,Registo de Atividade
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Lucro / Prejuízo Líquido
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Criar mensagem automática no envio de transações.
@@ -906,7 +908,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ordem de Compra para pagamento
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtd Projetada
 DocType: Sales Invoice,Payment Due Date,Data Limite de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Abertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Tarefas Abertas
 DocType: Notification Control,Delivery Note Message,Mensagem de Guia de Remessa
@@ -922,7 +924,7 @@
 DocType: Item Reorder,Re-Order Qty,Qtd de Reencomenda
 DocType: Leave Block List Date,Leave Block List Date,Data de Lista de Bloqueio de Licenças
 DocType: Pricing Rule,Price or Discount,Preço ou Desconto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de encargos aplicáveis em Purchase mesa Itens recibo deve ser o mesmo que o total Tributos e Encargos
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de encargos aplicáveis em Purchase mesa Itens recibo deve ser o mesmo que o total Tributos e Encargos
 DocType: Sales Team,Incentives,Incentivos
 DocType: SMS Log,Requested Numbers,Números Solicitados
 DocType: Production Planning Tool,Only Obtain Raw Materials,Só Obter as Matérias-primas
@@ -960,7 +962,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar o Horário nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Planear material para subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Não é possível criar automaticamente conta como já existe saldo de estoque na conta. Você deve criar uma conta de correspondência antes de poder fazer uma entrada neste armazém
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Não é possível criar a conta automaticamente porque já existe saldo de stock na conta. Você deve criar uma conta de correspondência antes de poder fazer uma entrada neste armazém
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,A LDM {0} deve estar ativa
 DocType: Journal Entry,Depreciation Entry,Registo de Depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione primeiro o tipo de documento"
@@ -980,8 +982,7 @@
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,O(A) Funcionário(a) {0} não está ativo(a) ou não existe
 DocType: Fee Structure,Components,Componentes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Variantes do Item {0} atualizadas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avanço de Fatura de Compra
@@ -1033,8 +1034,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Linha {0}: O pagamento na Ordem de Venda/Compra deve ser sempre marcado como um adiantamento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Produto Químico
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"A conta Bancária / Dinheiro padrão será atualizada automaticamente no Registo de Lançamento Contabilístico, quando for selecionado este modo."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Os intervalos para a Classe de Código {0} sobrepõe-se com os intervalos de classes para outras classes. Por favor verifique os intervalos {0} e {1} e tente novamente
 DocType: BOM,Raw Material Cost(Company Currency),Custo da Matéria-prima (Moeda da Empresa)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta Ordem de Produção.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Linha # {0}: A taxa não pode ser maior que a taxa usada em {1} {2}
@@ -1047,14 +1046,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Site item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Carregue o cabeçalho e logótipo da carta. (Pode editá-los mais tarde.)
 DocType: Timesheet Detail,Bill,Fatura
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Branco
 DocType: SMS Center,All Lead (Open),Todos Potenciais Clientes (Abertos)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: A qtd não está disponível para {4} no armazém {1} no momento da postagem do registo ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obter Adiantamentos Pagos
 DocType: Item,Automatically Create New Batch,Criar novo lote automaticamente
 DocType: Item,Automatically Create New Batch,Criar novo lote automaticamente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Efetuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Registar
 DocType: Student Admission,Admission Start Date,Data de Início de Admissão
 DocType: Journal Entry,Total Amount in Words,Valor Total por Extenso
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Houve um erro. Um dos motivos prováveis para isto ter ocorrido, poderá ser por ainda não ter guardado o formulário. Se o problema persistir, por favor contacte support@erpnext.com."
@@ -1062,7 +1061,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},O Tipo de Pedido deve pertencer a {0}
 DocType: Lead,Next Contact Date,Data do Próximo Contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qtd Inicial
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
 DocType: Student Batch Name,Student Batch Name,Nome de Classe de Estudantes
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Valor do Empréstimo
@@ -1082,10 +1081,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Por favor especificar um {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entregue A
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Desconto
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Desconto
 DocType: Asset,Total Number of Depreciations,Número total de Depreciações
 DocType: Sales Invoice Item,Rate With Margin,Taxa com margem
 DocType: Sales Invoice Item,Rate With Margin,Taxa com margem
@@ -1114,7 +1113,7 @@
 DocType: Lead,Organization Name,Nome da Organização
 DocType: Tax Rule,Shipping State,Estado de Envio
 ,Projected Quantity as Source,Quantidade Projetada como Fonte
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"O item deve ser adicionado utilizando o botão ""Obter Itens de Recibos de Compra"""
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"O item deve ser adicionado utilizando o botão ""Obter Itens de Recibos de Compra"""
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Incluir itens não armazenáveis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Despesas com Vendas
@@ -1122,7 +1121,7 @@
 DocType: GL Entry,Against,Em
 DocType: Item,Default Selling Cost Center,Centro de Custo de Venda Padrão
 DocType: Sales Partner,Implementation Partner,Parceiro de Implementação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Código Postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Código Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},A Ordem de Venda {0} é {1}
 DocType: Opportunity,Contact Info,Informações de Contacto
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Efetuar Registos de Stock
@@ -1166,7 +1165,7 @@
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regra de Envio de Carrinho de Compras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,a Ordem de Produção {0} deve ser cancelado antes de cancelar esta Ordem de Vendas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Por favor, defina ""Aplicar Desconto Adicional Em"""
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Por favor, defina ""Aplicar Desconto Adicional Em"""
 ,Ordered Items To Be Billed,Itens Pedidos A Serem Faturados
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,A Faixa De tem de ser inferior à Faixa Para
 DocType: Global Defaults,Global Defaults,Padrões Gerais
@@ -1201,11 +1200,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Por favor insira o Código Item para obter número de lote
 DocType: Stock Settings,Default Item Group,Grupo de Item Padrão
 DocType: Employee Loan,Partially Disbursed,parcialmente Desembolso
-DocType: Grading Structure,Grading System Name,Nome Sistema de Classificação
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados de fornecedores.
 DocType: Account,Balance Sheet,Balanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',O Centro de Custo Para o Item com o Código de Item '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","O Modo de Pagamento não está configurado. Por favor, verifique se conta foi definida no Modo de Pagamentos ou no Perfil POS."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',O Centro de Custo Para o Item com o Código de Item '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","O Modo de Pagamento não está configurado. Por favor, verifique se conta foi definida no Modo de Pagamentos ou no Perfil POS."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,O seu vendedor receberá um lembrete nesta data para contatar o cliente
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Mesmo item não pode ser inserido várias vezes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Podem ser realizadas outras contas nos Grupos, e os registos podem ser efetuados em Fora do Grupo"
@@ -1242,11 +1240,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Trabalho Efetuado
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Por favor, especifique pelo menos um atributo na tabela de Atributos"
 DocType: Announcement,All Students,Todos os Alunos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,O Item {0} deve ser um item não inventariado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,O Item {0} deve ser um item não inventariado
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ver Livro
 DocType: Grading Scale,Intervals,intervalos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Já existe um Grupo de Itens com o mesmo nome, Por favor, altere o nome desse grupo de itens ou modifique o nome deste grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Já existe um Grupo de Itens com o mesmo nome, Por favor, altere o nome desse grupo de itens ou modifique o nome deste grupo de itens"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Nr. de Telemóvel de Estudante
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto Do Mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O Item {0} não pode ter um Lote
@@ -1287,8 +1285,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Não está autorizado a editar a Conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter Faturas Pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,A Ordem de Vendas {0} não é válida
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,As ordens de compra ajudá-lo a planejar e acompanhar suas compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,As ordens de compra ajudá-lo a planejar e acompanhar suas compras
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total da Emissão / Transferência {0} no Pedido de Material {1} \ não pode ser maior do que a quantidade pedida {2} para o Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pequeno
@@ -1312,7 +1310,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronização de Def. de Dados
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Os seus Produtos ou Serviços
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,LDM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este é um item principal e não pode ser editado.
@@ -1329,7 +1327,7 @@
 DocType: Student Group Student,Group Roll Number,Número de rolo de grupo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, só podem ser ligadas contas de crédito noutro registo de débito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,O total de todos os pesos da tarefa deve ser 1. Por favor ajuste os pesos de todas as tarefas do Projeto em conformidade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,O Item {0} deve ser um Item Subcontratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Bens de Equipamentos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","A Regra de Fixação de Preços é selecionada primeiro com base no campo ""Aplicar Em"", que pode ser um Item, Grupo de Itens ou Marca."
@@ -1356,7 +1354,7 @@
 DocType: Depreciation Schedule,Journal Entry,Lançamento Contabilístico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} itens em progresso
 DocType: Workstation,Workstation Name,Nome do Posto de Trabalho
-DocType: Grade Interval,Grade Code,Classe de Código
+DocType: Grading Scale Interval,Grade Code,Classe de Código
 DocType: POS Item Group,POS Item Group,Grupo de Itens POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email de Resumo:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
@@ -1368,12 +1366,12 @@
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impostos e Encargos
 DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Entrada de Depreciação de Ativos do Livro Automaticamente
 DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Entrada de Depreciação de Ativos do Livro Automaticamente
-DocType: BOM Operation,Workstation,Posto deTrabalho
+DocType: BOM Operation,Workstation,Posto de Trabalho
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitação de Cotação de Fornecedor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Recorrente Até
 DocType: Attendance,HR Manager,Gestor de RH
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Por favor, selecione uma Empresa"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Por favor, selecione uma Empresa"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Licença Especial
 DocType: Purchase Invoice,Supplier Invoice Date,Data de Fatura de Fornecedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
@@ -1389,7 +1387,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Idade 3
 DocType: Maintenance Schedule Item,No of Visits,Nº de Visitas
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Marcar Assiduidade
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Marcar Assiduidade
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},O Cronograma de Manutenção {0} existe contra {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,estudante de inscrição
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},A Moeda da Conta de Encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},A soma dos pontos para todos os objetivos deve ser 100. É {0}
@@ -1427,7 +1426,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variação Líquida no Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se for para todas as designações
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Armazém é obrigatória para contas não grupo do tipo da
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída na Taxa do Item"
+apps/erpnext/erpnext/controllers/accounts_controller.py +673,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída no preço do Item"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +260,Max: {0},Máx.: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Data e Hora De
 DocType: Email Digest,For Company,Para a Empresa
@@ -1438,13 +1437,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Conteúdo de Termos e Condições
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,O Item {0} não é um item de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,O Item {0} não é um item de stock
 DocType: Maintenance Visit,Unscheduled,Sem Marcação
 DocType: Employee,Owned,Pertencente
 DocType: Salary Detail,Depends on Leave Without Pay,Depende da Licença Sem Vencimento
 DocType: Pricing Rule,"Higher the number, higher the priority","Quanto maior o número, maior a prioridade"
 ,Purchase Invoice Trends,Tendências de Fatura de Compra
 DocType: Employee,Better Prospects,Melhores Perspetivas
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Linha # {0}: O lote {1} tem apenas {2} qty. Selecione outro lote com {3} qty disponível ou dividido a linha em várias linhas, para entregar / emitir de vários lotes"
 DocType: Vehicle,License Plate,Matrícula
 DocType: Appraisal,Goals,Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado CMA
@@ -1463,7 +1463,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,O Funcionário não pode reportar-se a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta está congelada, só são permitidos registos a utilizadores restritos."
 DocType: Email Digest,Bank Balance,Saldo Bancário
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},O Lançamento Contabilístico para {0}: {1} só pode ser criado na moeda: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},O Lançamento Contabilístico para {0}: {1} só pode ser criado na moeda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil de emprego, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da Conta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regra de Impostos para transações.
@@ -1474,7 +1474,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos P&L de ano fiscal não encerrado
 DocType: Shipping Rule,Shipping Account,Conta de Envio
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: A Conta {2} está inativa
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Faça Ordens de vendas para ajudar a planear o seu trabalho e entregar dentro do prazo
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Faça Ordens de vendas para ajudar a planear o seu trabalho e entregar dentro do prazo
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
 DocType: Course Schedule,SH,SH
@@ -1485,7 +1485,7 @@
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Asset Movement,Stock Manager,Gestor de Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},É obrigatório colocar o armazém de origem para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Nota Fiscal
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Nota Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Alugar Escritório
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurar definições de portal de SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha ao Importar!
@@ -1511,7 +1511,7 @@
 DocType: Sales Invoice,Source,Fonte
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar encerrado
 DocType: Leave Type,Is Leave Without Pay,É uma Licença Sem Vencimento
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,É obrigatório colocar a Categoria Ativo para um item de Ativo Imobilizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,É obrigatório colocar a Categoria Ativo para um item de Ativo Imobilizado
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Não foram encontrados nenhuns registos na tabela Pagamento
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este/a {0} entra em conflito com {1} por {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML de Estudantes
@@ -1529,7 +1529,7 @@
 DocType: Student,Date of Leaving,Data de saída
 DocType: Pricing Rule,For Price List,Para a Lista de Preços
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recrutamento de Executivos
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Criar Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Criar Leads
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº de Dados da LDM
@@ -1557,7 +1557,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Inscrições no Programa
 DocType: Sales Invoice Item,Brand Name,Nome da Marca
 DocType: Purchase Receipt,Transporter Details,Dados da Transportadora
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,É necessário colocar o armazém padrão para o item selecionado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,É necessário colocar o armazém padrão para o item selecionado
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Caixa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Fornecedor possível
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,A Organização
@@ -1591,7 +1591,7 @@
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM padrão para {0} não foi encontrado para o projeto {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Os reembolsos de despesa da empresa.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Os estudantes estão no centro do sistema, adicione todos os seus alunos"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Os estudantes estão no centro do sistema, adicione todos os seus alunos"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Linha #{0}: A Data de Liquidação {1} não pode ser anterior à Data do Cheque {2}
 DocType: Company,Default Holiday List,Lista de Feriados Padrão
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Linha {0}: A Periodicidade de {1} está a sobrepor-se com {2}
@@ -1603,20 +1603,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,O(s) dia(s) em que está a solicitar a licença são feriados. Não necessita solicitar uma licença.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar Email de Pagamento
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova tarefa
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Faça Cotação
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Faça Cotação
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Outros Relatórios
 DocType: Dependent Task,Dependent Task,Tarefa Dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},O fator de conversão da unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},O fator de conversão da unidade de medida padrão deve ser 1 na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},A licença do tipo {0} não pode ser mais longa do que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Lembretes de Aniversário
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Por favor definir Payroll Conta a Pagar padrão in Company {0}
 DocType: SMS Center,Receiver List,Lista de Destinatários
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Pesquisar Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Pesquisar Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Montante Consumido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variação Líquida na Caixa
 DocType: Assessment Plan,Grading Scale,Escala de classificação
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,A Unidade de Medida {0} foi inserido mais do que uma vez na Tabela de Conversão de Fatores
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,A Unidade de Medida {0} foi inserido mais do que uma vez na Tabela de Conversão de Fatores
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Já foi concluído
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},A Solicitação de Pagamento {0} já existe
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Itens Emitidos
@@ -1654,7 +1654,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Cobrar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Na Fatura de Fornecedor {0} datada de {1}
 DocType: Customer,Default Price List,Lista de Preços Padrão
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Não pode eliminar o Ano Fiscal de {0}. O Ano Fiscal de {0} está definido como padrão nas Definições Gerais
 DocType: Journal Entry,Entry Type,Tipo de Registo
 ,Customer Credit Balance,Saldo de Crédito de Cliente
@@ -1697,8 +1697,6 @@
 DocType: Student Sibling,Studying in Same Institute,Estudar no mesmo instituto
 DocType: Territory,Territory Manager,Gestor de Território
 DocType: Packed Item,To Warehouse (Optional),Para Armazém (Opcional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Grupo de Item&gt; Marca
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Grupo de Item&gt; Marca
 DocType: Payment Entry,Paid Amount (Company Currency),Montante Pago (Moeda da Empresa)
 DocType: Purchase Invoice,Additional Discount,Desconto Adicional
 DocType: Selling Settings,Selling Settings,Definições de Vendas
@@ -1708,9 +1706,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver Carrinho
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Comunicação de Falta de Item
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Foi mencionado um Peso,\n Por favor, mencione também a ""UNID de Peso"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Foi mencionado um Peso,\n Por favor, mencione também a ""UNID de Peso"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,A Solicitação de Material utilizada para efetuar este Registo de Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,É obrigatório colocar a Próxima Data de Depreciação em novos ativos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,É obrigatório colocar a Próxima Data de Depreciação em novos ativos
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo separado baseado em cursos para cada lote
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo separado baseado em cursos para cada lote
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Única unidade de um item.
@@ -1727,9 +1725,7 @@
 DocType: Course Assessment Criteria,Weightage,Peso
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: É necessário colocar o centro de custo para a conta ""Lucros e Perdas"" {2}. Por favor, crie um Centro de Custo padrão para a Empresa."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Já existe um Grupo de Clientes com o mesmo nome, por favor altere o nome do Cliente ou do Grupo de Clientes"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Já existe um Grupo de Clientes com o mesmo nome, por favor altere o nome do Cliente ou do Grupo de Clientes"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novo Contacto
 DocType: Territory,Parent Territory,Território Principal
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
@@ -1756,21 +1752,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Conciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Purchase Invoice Item,Batch No,Nº de Lote
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Incapaz de encontrar a taxa de câmbio para {0} para {1} data chave para {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias Ordens de Venda relacionadas a mesma Ordem de Compra do Cliente
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 móvel Não
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
 DocType: Employee Attendance Tool,Employees HTML,HTML de Funcionários
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,A LDM Padrão ({0}) deve estar ativa para este item ou para o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,A LDM Padrão ({0}) deve estar ativa para este item ou para o seu modelo
 DocType: Employee,Leave Encashed?,Sair de Pagos?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,É obrigatório colocar o campo Oportunidade De
 DocType: Email Digest,Annual Expenses,Despesas anuais
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Criar Ordem de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Criar Ordem de Compra
 DocType: SMS Center,Send To,Enviar para
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montante alocado
@@ -1790,7 +1785,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Avaliações
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Foi inserido um Nº de Série em duplicado para o Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uma condição para uma Regra de Envio
-DocType: Grading Structure,Grading Intervals,Intervalos de classificação
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Por favor, insira"
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","não pode overbill por item {0} na linha {1} mais de {2}. Para permitir que o excesso de faturamento, defina em Comprar Configurações"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base no Item ou no Armazém"
@@ -1803,16 +1797,17 @@
 DocType: Authorization Control,Authorization Control,Controlo de Autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha #{0}:  É obrigatório colocar o Armazém Rejeitado no Item Rejeitado {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pagamento
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gerir as suas encomendas
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gerir as suas encomendas
 DocType: Production Order Operation,Actual Time and Cost,Horas e Custos Efetivos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},"Para a Ordem de Venda {2},  o máximo do Pedido de Material para o Item {1} é {0}"
 DocType: Employee,Salutation,Saudação
 DocType: Course,Course Abbreviation,Abreviação de Curso
 DocType: Student Leave Application,Student Leave Application,Solicitação de Licença de Estudante
 DocType: Item,Will also apply for variants,Também se aplicará para as variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} no Meio dia em {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},O total de horas de trabalho não deve ser maior que o nr. máx. de horas de trabalho {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Em
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Pacote de itens no momento da venda.
 DocType: Quotation Item,Actual Qty,Qtd Efetiva
 DocType: Sales Invoice Item,References,Referências
@@ -1823,7 +1818,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Inseriu itens duplicados. Por favor retifique esta situação, e tente novamente."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Sócio
 DocType: Asset Movement,Asset Movement,Movimento de Ativo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,New Cart
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,New Cart
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,O Item {0} não é um item de série
 DocType: SMS Center,Create Receiver List,Criar Lista de Destinatários
 DocType: Vehicle,Wheels,Rodas
@@ -1855,10 +1850,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desativa a criação de registos de tempo dos Pedidos de Produção. As operações não devem ser acompanhadas no Pedido de Produção
 DocType: Student,Student Mobile Number,Número de telemóvel do Estudante
 DocType: Item,Has Variants,Tem Variantes
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da Distribuição Mensal
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,O ID do lote é obrigatório
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,O ID do lote é obrigatório
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,O ID do lote é obrigatório
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,O ID do lote é obrigatório
 DocType: Sales Person,Parent Sales Person,Vendedor Principal
 DocType: Purchase Invoice,Recurring Invoice,Fatura Recorrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestão de Projetos
@@ -1866,7 +1861,7 @@
 DocType: Budget,Fiscal Year,Ano Fiscal
 DocType: Vehicle Log,Fuel Price,Preço de Combustível
 DocType: Budget,Budget,Orçamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,O Item Ativo Imobilizado deve ser um item não inventariado.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,O Item Ativo Imobilizado deve ser um item não inventariado.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","O Orçamento não pode ser atribuído a {0}, pois não é uma conta de Rendimentos ou Despesas"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 DocType: Student Admission,Application Form Route,Percurso de Formulário de Candidatura
@@ -1898,7 +1893,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Montante {0} {1} deduzido em {2}
 DocType: Employee,Salary Information,Informação salarial
 DocType: Sales Person,Name and Employee ID,Nome e ID do Funcionário
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
 DocType: Website Item Group,Website Item Group,Website de Grupo de Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Impostos e Taxas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, insira a Data de referência"
@@ -1944,7 +1939,7 @@
 DocType: Room,Room Name,Nome da Sala
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser aplicada/cancelada antes de {0}, pois o saldo da licença já foi encaminhado no registo de atribuição de licenças futuras {1}"
 DocType: Activity Cost,Costing Rate,Taxa de Cálculo dos Custos
-,Customer Addresses And Contacts,Endereços e Contactos de Cliente
+,Customer Addresses And Contacts,Endereços e Contactos de Clientes
 ,Campaign Efficiency,Eficiência da Campanha
 ,Campaign Efficiency,Eficiência da Campanha
 DocType: Discussion,Discussion,Discussão
@@ -1957,7 +1952,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Rendimento de Cliente Fiel
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a função de 'Aprovador de Despesas'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
 DocType: Asset,Depreciation Schedule,Cronograma de Depreciação
 DocType: Bank Reconciliation Detail,Against Account,Na Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Metade Data Day deve estar entre De Data e To Date
@@ -1974,13 +1969,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Quantidade {0} {1} em {2} {3}
 ,Quotation Trends,Tendências de Cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},O Grupo do Item não foi mencionado no definidor de item para o item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
 DocType: Shipping Rule Condition,Shipping Amount,Montante de Envio
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Montante Pendente
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
 DocType: Purchase Order,Delivered,Entregue
 ,Vehicle Expenses,Despesas de Veículos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},O valor previsto após a vida útil deve ser maior ou igual a {0}
+DocType: Serial No,Invoice Details,Detalhes da fatura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},O valor previsto após a vida útil deve ser maior ou igual a {0}
 DocType: Purchase Receipt,Vehicle Number,Número de Veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente parará
 DocType: Employee Loan,Loan Amount,Montante do empréstimo
@@ -2004,7 +2000,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Quantia de Desconto Adicional
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
 DocType: Leave Block List Allow,Leave Block List Allow,Permissão de Lista de Bloqueio de Licenças
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo a Fora do Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Desportos
 DocType: Loan Type,Loan Name,Nome do empréstimo
@@ -2016,6 +2012,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Armazém onde está mantendo o stock de itens rejeitados
 DocType: Production Order,Skip Material Transfer,Ignorar transferência de material
 DocType: Production Order,Skip Material Transfer,Ignorar transferência de material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Não é possível encontrar a taxa de câmbio para {0} a {1} para a data-chave {2}. Crie um registro de troca de moeda manualmente
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,O seu ano fiscal termina em
 DocType: POS Profile,Price List,Lista de Preços
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize o seu navegador para a alteração poder ser efetuada."
@@ -2053,9 +2050,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,O Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um Ano de Exercício Financeiro. Todos os lançamentos contabilísticos e outras transações principais são controladas no **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço de Cliente / Potencial Cliente
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Aviso: Certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Aviso: Certificado SSL inválido no anexo {0}
 DocType: Student Admission,Eligibility,Elegibilidade
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads ajudá-lo a começar o negócio, adicione todos os seus contatos e mais como suas ligações"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads ajudá-lo a começar o negócio, adicione todos os seus contatos e mais como suas ligações"
 DocType: Production Order Operation,Actual Operation Time,Tempo Operacional Efetivo
 DocType: Authorization Rule,Applicable To (User),Aplicável Ao/À (Utilizador/a)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
@@ -2096,7 +2093,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selecionar Empresa...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se for para todos os departamentos
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente, a contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
 DocType: Process Payroll,Fortnightly,Quinzenal
 DocType: Currency Exchange,From Currency,De Moeda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione o Montante Alocado, o Tipo de Fatura e o Número de Fatura em pelo menos uma linha"
@@ -2112,7 +2109,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de cobrança como ""No Valor da Linha Anterior"" ou ""No Total da Linha Anterior"" para a primeira linha"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Um Subitem não deve ser um Pacote de Produtos. Por favor remova o item `{0}` e guarde-o
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Ativ. Bancária
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Adicionar Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Adicionar Timesheets
 DocType: Vehicle Service,Service Item,Item de Serviço
 DocType: Bank Guarantee,Bank Guarantee,Garantia bancária
 DocType: Bank Guarantee,Bank Guarantee,Garantia bancária
@@ -2162,8 +2159,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não será mostrado se Preço de tabela não está definido
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta Regra de Envio ou verifique o Envio Mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total de Entrada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,É necessário colocar o Débito Para
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ajudar a manter o controle de tempo, custo e faturamento para atividades feitas por sua equipe"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,É necessário colocar o Débito Para
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ajudar a manter o controle de tempo, custo e faturamento para atividades feitas por sua equipe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de Preços de Compra
 DocType: Offer Letter Term,Offer Term,Termo de Oferta
 DocType: Quality Inspection,Quality Manager,Gestor da Qualidade
@@ -2187,8 +2184,8 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,A Lista de Preços {0} está desativada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Linha {0}: A Qtd Concluída não pode ser superior a {1} para a operação {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir Horas Extra
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item serializado {0} não pode ser atualizado usando Reconciliação de estoque, use a Entrada de estoque"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item serializado {0} não pode ser atualizado usando Reconciliação de estoque, use a Entrada de estoque"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
 DocType: Training Event Employee,Training Event Employee,Evento de Formação de Funcionário
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,São necessários {0} Nrs. de Série para o Item {1}. Forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação Atual da Taxa
@@ -2197,14 +2194,14 @@
 DocType: Opportunity,Lost Reason,Motivo de Perda
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Novo Endereço
 DocType: Quality Inspection,Sample Size,Tamanho da Amostra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Por favor, insira o Documento de Recepção"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Por favor, insira o Documento de Recepção"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um ""De Nr. de Processo"" válido"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Podem ser criados outros centros de custo nos Grupos, e os registos podem ser criados em Fora do Grupo"
 DocType: Project,External,Externo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizadores e Permissões
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordens de produção Criado: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Ordens de produção Criado: {0}
 DocType: Branch,Branch,Filial
 DocType: Guardian,Mobile Number,Número de Telemóvel
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impressão e Branding
@@ -2213,7 +2210,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Nr. de Série {0} não foi encontrado
 DocType: Scheduling Tool,Student Batch,Classe de Estudantes
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Seus Clientes
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Faça Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Faça Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Foi convidado para colaborar com o projeto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear Data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Candidatar-me Já
@@ -2237,8 +2234,9 @@
 DocType: SMS Log,Sent To,Enviado Para
 DocType: Payment Request,Make Sales Invoice,Efetuar Fatura de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,A Próxima Data de Contacto não pode ocorrer no passado
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,A Próxima Data de Contacto não pode ocorrer no passado
 DocType: Company,For Reference Only.,Só para Referência.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Selecione lote não
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Inválido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,FPAG-DEV-
 DocType: Sales Invoice Advance,Advance Amount,Montante de Adiantamento
@@ -2252,7 +2250,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,O Nr. de Processo não pode ser 0
 DocType: Item,Show a slideshow at the top of the page,Ver uma apresentação de slides no topo da página
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Lojas
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Lojas
 DocType: Serial No,Delivery Time,Prazo de Entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Idade Baseada em
 DocType: Item,End of Life,Expiração
@@ -2268,8 +2266,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transferência de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custo operacional e dar um só Nr. Operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está acima do limite por {0} {1} para o item {4}. Está a fazer outra {3} no/a mesmo/a {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Selecionar alterar montante de conta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Selecionar alterar montante de conta
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O utilizador tem sempre que escolher
 DocType: Stock Settings,Allow Negative Stock,Permitir Stock Negativo
@@ -2280,7 +2278,7 @@
 DocType: Budget Account,Budget Account,Conta do Orçamento
 DocType: Quality Inspection,Verified By,Verificado Por
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações com a mesma. Deverá cancelar as transações para alterar a moeda padrão."
-DocType: Grade Interval,Grade Description,Descrição de Classe
+DocType: Grading Scale Interval,Grade Description,Descrição de Classe
 DocType: Stock Entry,Purchase Receipt No,Nº de Recibo de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Sinal
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Vencimento
@@ -2318,7 +2316,7 @@
 DocType: Upload Attendance,Attendance To Date,Assiduidade Até À Data
 DocType: Warranty Claim,Raised By,Levantado Por
 DocType: Payment Gateway Account,Payment Account,Conta de Pagamento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Por favor, especifique a Empresa para poder continuar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Por favor, especifique a Empresa para poder continuar"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Variação Líquida em Contas a Receber
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Descanso de Compensação
 DocType: Offer Letter,Accepted,Aceite
@@ -2331,7 +2329,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regra Rotulação de Envio
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Utilizadores
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,As Matérias-primas não podem ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Lançamento Contabilístico Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Não pode alterar a taxa se a LDM for mencionada nalgum item
 DocType: Employee,Previous Work Experience,Experiência Laboral Anterior
@@ -2345,7 +2343,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,O nome do instituto para o qual está a instalar este sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","O lançamento contabilístico está congelado até à presente data, ninguém pode efetuar / alterar o registo exceto alguém com as funções especificadas abaixo."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Por favor, guarde o documento antes de gerar o cronograma de manutenção"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, guarde o documento antes de gerar o cronograma de manutenção"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Selecione esta opção para não permitir frações. (Para Nrs.)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Foram criados os seguintes Pedidos de Produção:
@@ -2368,6 +2366,7 @@
 DocType: Email Digest,How frequently?,Com que frequência?
 DocType: Purchase Receipt,Get Current Stock,Obter Stock Atual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Esquema da Lista de Materiais
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Grupo de Item&gt; Marca
 DocType: Student,Joining Date,Data de Admissão
 ,Employees working on a holiday,Os funcionários que trabalham num feriado
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marcar Presença
@@ -2384,7 +2383,7 @@
 DocType: Production Order,Manufacture against Material Request,Fabrico em Solicitação de Material
 DocType: Item Reorder,Request for,Pedido para
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,O Utilizador Aprovador não pode o mesmo que o da regra Aplicável A
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Básica (de acordo com a UNID de Stock)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo com a UDM de Stock)
 DocType: SMS Log,No of Requested SMS,Nr. de SMS Solicitados
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,A Licença Sem Vencimento não coincide com os registos de Pedido de Licença aprovados
 DocType: Campaign,Campaign-.####,Campanha-.####
@@ -2469,7 +2468,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Data de Liquidação não mencionada
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produção
 DocType: Guardian,Occupation,Ocupação
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Linha {0}: A Data de Início deve ser anterior à Data de Término
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Linha {0}: A Data de Início deve ser anterior à Data de Término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtd)
 DocType: Sales Invoice,This Document,Este Documento
 DocType: Installation Note Item,Installed Qty,Qtd Instalada
@@ -2492,8 +2491,8 @@
 DocType: Notification Control,Sales Order Message,Mensagem da Ordem de Venda
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir Valores Padrão, como a Empresa, Moeda, Ano Fiscal Atual, etc."
 DocType: Payment Entry,Payment Type,Tipo de Pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
 DocType: Process Payroll,Select Employees,Selecionar Funcionários
 DocType: Opportunity,Potential Sales Deal,Potenciais Negócios de Vendas
 DocType: Payment Entry,Cheque/Reference Date,Data do Cheque/Referência
@@ -2510,7 +2509,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Já foi criado um Perfil Geral de POS {0} para a empresa {1}
 DocType: Purchase Order,Ref SQ,SQ de Ref
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Substituir Item / LDM em todas as LDMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Deve ser enviado o documento de entrega
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Deve ser enviado o documento de entrega
 DocType: Purchase Invoice Item,Received Qty,Qtd Recebida
 DocType: Stock Entry Detail,Serial No / Batch,Nr. de Série / Lote
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Não Pago e Não Entregue
@@ -2523,7 +2522,7 @@
 ,To Produce,Para Produzir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Folha de Pagamento
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para a linha {0} em {1}. Para incluir {2} na taxa do Item, também devem ser incluídas as linhas {3}"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Criar utilizador
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Criar utilizador
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a entrega (para impressão)
 DocType: Bin,Reserved Quantity,Quantidade Reservada
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor insira o endereço de e-mail válido
@@ -2537,11 +2536,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,O modelo desativado não deve ser o modelo padrão
 DocType: Account,Income Account,Conta de Rendimento
 DocType: Payment Request,Amount in customer's currency,Montante na moeda do cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtd Atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte a ""Taxa de Materiais Baseados Em"" na Seção de Custos"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidade Fundamental
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Os lotes de estudante ajudar a controlar assiduidade, avaliação e taxas para estudantes"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Os lotes de estudante ajudar a controlar assiduidade, avaliação e taxas para estudantes"
 DocType: Payment Entry,Total Allocated Amount,Valor Total Atribuído
 DocType: Item Reorder,Material Request Type,Tipo de Solicitação de Material
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural entrada de diário para salários de {0} para {1}
@@ -2564,7 +2564,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Acompanhar Potenciais Clientes por Tipo de Setor.
 DocType: Item Supplier,Item Supplier,Fornecedor do Item
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Definições de Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A união só é possível caso as seguintes propriedades sejam iguais em ambos os registos. Estes são o Grupo, Tipo Principal, Empresa"
@@ -2574,6 +2574,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"Enviará um email acerca do evento para os funcionários com estado ""Aberto"""
 DocType: Task,Depends on Tasks,Depende de Tarefas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gerir o Esquema de Grupo de Cliente.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Os anexos podem ser mostrados sem ativar o carrinho de compras
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novo Nome de Centro de Custos
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controlo de Licenças
@@ -2586,12 +2587,10 @@
 DocType: Sales Invoice,Debit To,Débito Para
 DocType: Delivery Note,Required only for sample item.,Só é necessário para o item de amostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtd Efetiva Após Transação
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sem folha de salário encontrada entre {0} e {1}
 ,Pending SO Items For Purchase Request,Itens Pendentes PV para Solicitação de Compra
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissão de Estudantes
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} está desativado
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} está desativado
 DocType: Supplier,Billing Currency,Moeda de Faturamento
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra-Grande
@@ -2608,7 +2607,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Página Inicial do Produto Em Destaque
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Todos os Grupos de Avaliação
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo Nome de Armazém
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Território
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, mencione o nr. de visitas necessárias"
 DocType: Stock Settings,Default Valuation Method,Método de Estimativa Padrão
@@ -2626,7 +2625,7 @@
 DocType: Price List,Price List Master,Definidor de Lista de Preços
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as Transações de Vendas podem ser assinaladas em vários **Vendedores** para que possa definir e monitorizar as metas.
 ,S.O. No.,Nr. de P.E.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, crie um Cliente a partir dum Potencial Cliente {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Por favor, crie um Cliente a partir dum Potencial Cliente {0}"
 DocType: Price List,Applicable for Countries,Aplicável aos Países
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Apenas Deixar Aplicações com status de &#39;Aprovado&#39; e &#39;Rejeitado&#39; podem ser submetidos
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},É obrigatório colocar o Nome do Grupo de Estudantes na linha {0}
@@ -2677,7 +2676,7 @@
 DocType: Warehouse,Parent Warehouse,Armazém Principal
 DocType: C-Form Invoice Detail,Net Total,Total Líquido
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definir vários tipos de empréstimo
-DocType: Bin,FCFS Rate,Taxa FCFS
+DocType: Bin,FCFS Rate,Preço FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Montante em Dívida
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (em minutos)
 DocType: Project Task,Working,A Trabalhar
@@ -2719,7 +2718,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Registo Contabilístico de Stock
 DocType: Vehicle Service,Engine Oil,Óleo de Motor
 DocType: Sales Invoice,Sales Team1,Equipa de Vendas1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,O Item {0} não existe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,O Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço de Cliente
 DocType: Employee Loan,Loan Details,Detalhes empréstimo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Linha {0}: A Qtd Concluída deve superior a zero.
@@ -2784,7 +2783,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Os Armazéns com a transação existente não podem ser convertidos num grupo.
 DocType: Assessment Result Tool,Result HTML,resultado HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira em
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Adicionar alunos
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Adicionar alunos
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Por favor, selecione {0}"
 DocType: C-Form,C-Form No,Nr. de Form-C
 DocType: BOM,Exploded_items,Vista_expandida_de_items
@@ -2849,7 +2848,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limite Ultrapassado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Já existe um prazo académico com este""Ano Lectivo"" {0} e ""Nome do Prazo"" {1}. Por favor, altere estes registos e tente novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Como existem transações existentes contra item de {0}, você não pode alterar o valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Como existem transações existentes contra item de {0}, você não pode alterar o valor de {1}"
 DocType: UOM,Must be Whole Number,Deve ser Número Inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novas Licenças Alocadas (Em Dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,O Nr. de Série {0} não existe
@@ -2893,13 +2892,13 @@
 DocType: Supplier,Last Day of the Next Month,Último Dia do Mês Seguinte
 DocType: Support Settings,Auto close Issue after 7 days,Fechar automáticamente incidentes após 7 dias
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser atribuída antes de {0}, pois o saldo de licenças já foi carregado no registo de atribuição de licenças {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A Data de Vencimento / Referência excede os dias de crédito permitidos por cliente em {0} dia(s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A Data de Vencimento / Referência excede os dias de crédito permitidos por cliente em {0} dia(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Candidatura de Estudante
 DocType: Asset Category Account,Accumulated Depreciation Account,Conta de Depreciação Acumulada
 DocType: Stock Settings,Freeze Stock Entries,Suspender Registos de Stock
 DocType: Asset,Expected Value After Useful Life,Valor Previsto Após Vida Útil
 DocType: Item,Reorder level based on Warehouse,Nível de reencomenda no Armazém
-DocType: Activity Cost,Billing Rate,Taxa de Faturamento
+DocType: Activity Cost,Billing Rate,Preço de faturação padrão
 ,Qty to Deliver,Qtd a Entregar
 ,Stock Analytics,Análise de Stock
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,As operações não podem ser deixadas em branco
@@ -2921,7 +2920,7 @@
 DocType: Asset,Item Code,Código do Item
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
 DocType: Serial No,Warranty / AMC Details,Garantia / Dados CMA
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
 DocType: Journal Entry,User Remark,Observação de Utiliz.
 DocType: Lead,Market Segment,Segmento de Mercado
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},O Montante Pago não pode ser superior ao montante em dívida total negativo {0}
@@ -2940,7 +2939,7 @@
 DocType: Production Planning Tool,Create Material Requests,Criar Solicitações de Materiais
 DocType: Employee Education,School/University,Escola/Universidade
 DocType: Payment Request,Reference Details,Dados de Referência
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,O Valor Previsto Após a Vida Útil deve ser inferior ao Valor de Compra a Grosso
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,O Valor Previsto Após a Vida Útil deve ser inferior ao Valor de Compra a Grosso
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qtd Disponível no Armazém
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Montante Faturado
 DocType: Asset,Double Declining Balance,Saldo Decrescente Duplo
@@ -2961,19 +2960,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","A Conta de Diferenças deve ser uma conta do tipo Ativo/Passivo, pois esta Conciliação de Stock é um Registo de Abertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Desembolso Valor não pode ser maior do que o valor do empréstimo {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Nº da Ordem de Compra necessário para o Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordem de produção não foi criado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Ordem de produção não foi criado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"A ""Data De"" deve ser depois da ""Data Para"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o estado pois o estudante {0} está ligado à candidatura de estudante {1}
 DocType: Asset,Fully Depreciated,Totalmente Depreciados
 ,Stock Projected Qty,Qtd Projetada de Stock
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML de Presenças Marcadas
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citações são propostas, as propostas que enviou aos seus clientes"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citações são propostas, as propostas que enviou aos seus clientes"
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,O Nr. de Série e de Lote
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Soma dos escores de critérios de avaliação precisa ser {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Por favor, defina o Número de Depreciações Marcado"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Por favor, defina o Número de Depreciações Marcado"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valor ou Qtd
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Não podem ser criados Pedidos de Produção para:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuto
@@ -3104,7 +3103,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo Estudantil
 DocType: Shopping Cart Settings,Quotation Series,Série de Cotação
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Já existe um item com o mesmo nome ({0}), por favor, altere o nome deste item ou altere o nome deste item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Por favor, selecione o cliente"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,"Por favor, selecione o cliente"
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,Centro de Custo de Depreciação de Ativo
 DocType: Sales Order Item,Sales Order Date,Data da Ordem de Venda
@@ -3123,19 +3122,18 @@
 DocType: Vehicle,Insurance Details,Dados de Seguro
 DocType: Account,Payable,A Pagar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Por favor, indique períodos de reembolso"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Devedores ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Devedores ({0})
 DocType: Pricing Rule,Margin,Margem
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novos Clientes
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,% de Lucro Bruto
 DocType: Appraisal Goal,Weightage (%),Peso (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liquidação
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,É obrigatório colocar o Montante de Compra Bruto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,É obrigatório colocar o Montante de Compra Bruto
 DocType: Lead,Address Desc,Descrição de Endereço
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,É obrigatório colocar a parte
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nome do Tópico
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Deverá ser selecionado pelo menos um dos Vendedores ou Compradores
-DocType: Grading Structure,Grade Intervals,Intervalos de Classe
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccione a natureza do seu negócio.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Sempre que são realizadas operações de fabrico.
 DocType: Asset Movement,Source Warehouse,Armazém Fonte
@@ -3164,6 +3162,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentagem de Distribuição Mensal
 DocType: Territory,Territory Targets,Metas de Território
 DocType: Delivery Note,Transporter Info,Informações do Transportador
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},"Por favor, defina o padrão {0} na Empresa {1}"
 DocType: Cheque Print Template,Starting position from top edge,Posição de início a partir do limite superior
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,O mesmo fornecedor foi inserido várias vezes
@@ -3176,7 +3175,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,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/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Uma UNID diferente para os itens levará a um Valor de Peso Líquido (Total) incorreto. Certifique-se de que o Peso Líquido de cada item está na mesma UNID.
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taxa da LDM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Preço na LDM
 DocType: Asset,Journal Entry for Scrap,Lançamento Contabilístico para Sucata
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, remova os itens da Guia de Remessa"
 apps/erpnext/erpnext/accounts/utils.py +470,Journal Entries {0} are un-linked,Os Lançamentos Contabilísticos {0} não estão vinculados
@@ -3204,8 +3203,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Preencha o formulário e guarde-o
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Transfira um relatório que contém todas as matérias-primas com o seu estado mais recente no inventário
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fórum Comunitário
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em estoque
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em estoque
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em stock
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em stock
 DocType: Homepage,"URL for ""All Products""","URL para ""Todos os Produtos"""
 DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças Antes do Pedido
 DocType: SMS Center,Send SMS,Enviar SMS
@@ -3217,7 +3216,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qtd de Reencomenda
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Vagas de Emprego Atuais
 DocType: Company,Stock Adjustment Account,Conta de Acerto de Stock
-DocType: Journal Entry,Write Off,Liquidar
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Liquidar
 DocType: Timesheet Detail,Operation ID,ID de Operação
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistema de ID do Utilizador (login). Se for definido, ele vai ser o padrão para todas as formas de RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
@@ -3228,8 +3227,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Entregas de Fornecedor ao Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,Não há stock de [{0}](#Formulário/Item/{0})
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,A Próxima Data deve ser mais antiga que a Data de Postagem
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar decomposição do imposto
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},A Data de Vencimento / Referência não pode ser após {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Mostrar decomposição do imposto
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},A Data de Vencimento / Referência não pode ser após {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dados de Importação e Exportação
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Existem registos de Stock no Armazém {0}, portanto, não pode voltar a atribuí-los ou modificá-los"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Não foi Encontrado nenhum aluno
@@ -3241,13 +3240,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Sem CMA
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selecione Citações
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Efetuar Visita de Manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, contacte o utilizador com a função de Gestor Definidor de Vendas {0}"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selecione Citações
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Efetuar Visita de Manutenção
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Por favor, contacte o utilizador com a função de Gestor Definidor de Vendas {0}"
 DocType: Company,Default Cash Account,Conta Caixa Padrão
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Definidor da Empresa (não Cliente ou Fornecedor).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Isto baseia-se na assiduidade deste Estudante
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Não alunos em
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Adicionar mais itens ou abrir formulário inteiro
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Por favor, insira a ""Data de Entrega Prevista"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Deverá cancelar as Guias de Remessa {0} antes de cancelar esta Ordem de Venda
@@ -3294,9 +3294,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes da conciliação
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e Taxas Adicionados (Moeda da Empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,A linha de Taxa do Item {0} deve ter em conta o tipo de Taxa ou de Rendimento ou de Despesa ou de Cobrança
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,A linha de Taxa do Item {0} deve ter em conta o tipo de Taxa ou de Rendimento ou de Despesa ou de Cobrança
 DocType: Sales Order,Partly Billed,Parcialmente Faturado
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,O Item {0} deve ser um Item de Ativo Imobilizado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,O Item {0} deve ser um Item de Ativo Imobilizado
 DocType: Item,Default BOM,LDM Padrão
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Por favor, reescreva o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Qtd Total Em Falta
@@ -3310,16 +3310,16 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Da Guia de Remessa
 DocType: Student,Student Email Address,Endereço de Email do Estudante
 DocType: Timesheet Detail,From Time,Hora De
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Em estoque:
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Em stock:
 DocType: Notification Control,Custom Message,Mensagem Personalizada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banco de Investimentos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,É obrigatório colocar o Dinheiro ou a Conta Bancária para efetuar um registo de pagamento
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Endereço do estudante
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Endereço do estudante
 DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
-DocType: Purchase Invoice Item,Rate,Taxa
+DocType: Purchase Invoice Item,Rate,Valor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Estagiário
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nome endereço
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Nome endereço
 DocType: Stock Entry,From BOM,Da LDM
 DocType: Assessment Code,Assessment Code,Código de Avaliação
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Básico
@@ -3344,7 +3344,7 @@
 DocType: Purchase Invoice,Print Language,Idioma de Impressão
 DocType: Salary Slip,Total Working Hours,Total de Horas de Trabalho
 DocType: Stock Entry,Including items for sub assemblies,A incluir itens para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,O valor introduzido deve ser positivo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,O valor introduzido deve ser positivo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Todos os Territórios
 DocType: Purchase Invoice,Items,Itens
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,O Estudante já está inscrito.
@@ -3364,17 +3364,15 @@
 DocType: Issue,Opening Time,Tempo de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,São necessárias as datas De e A
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcular com Base Em
 DocType: Delivery Note Item,From Warehouse,Armazém De
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
 DocType: Assessment Plan,Supervisor Name,Nome do Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscrição no programa
 DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscrição no programa
-DocType: Grading Structure,Grading Structure,Estrutura de Classificação
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
 DocType: Tax Rule,Shipping City,Cidade de Envio
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este Item é uma Variante de {0} (Modelo). Os Atributos serão copiados a partir do modelo, a menos que defina ""Não Copiar"""
 DocType: Notification Control,Customize the Notification,Personalizar Notificação
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Fluxo de Caixa das Operações
 DocType: Sales Invoice,Shipping Rule,Regra de Envio
@@ -3397,6 +3395,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Não existe nenhuma LDM padrão para o Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Por favor, selecione a Data de Postagem primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,A Data de Abertura deve ser antes da Data de Término
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure as séries de numeração para Atendimento via Configuração&gt; Série de numeração
 DocType: Leave Control Panel,Carry Forward,Continuar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"O Centro de Custo, com as operações existentes, não pode ser convertido em livro"
 DocType: Department,Days for which Holidays are blocked for this department.,Dias em que as Férias estão bloqueadas para este departamento.
@@ -3425,7 +3424,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Qtd)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento e Lazer
 DocType: Quality Inspection,Item Serial No,Nº de Série do Item
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Criar Funcionário Registros
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Criar Funcionário Registros
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Atual
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Demonstrações Contabilísticas
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
@@ -3440,21 +3439,19 @@
 DocType: BOM Replace Tool,The new BOM after replacement,A LDM nova após substituição
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Ponto de Venda
 DocType: Payment Entry,Received Amount,Montante Recebido
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurar o sistema de nomeação de funcionários em recursos humanos&gt; Configurações de RH
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurar o sistema de nomeação de funcionários em recursos humanos&gt; Configurações de RH
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Criar para a quantidade total, ignorando a quantidade já pedida"
 DocType: Account,Tax,Imposto
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Não Marcado
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planeamento de Produção
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de estoque, em vez disso, use Entrada de estoque"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de estoque, em vez disso, use Entrada de estoque"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
 DocType: Quality Inspection,Report Date,Data de Relatório
 DocType: Student,Middle Name,Nome do Meio
 DocType: C-Form,Invoices,Faturas
 DocType: Batch,Source Document Name,Nome do Documento de Origem
 DocType: Batch,Source Document Name,Nome do Documento de Origem
 DocType: Job Opening,Job Title,Título de Emprego
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Criar utilizadores
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Criar utilizadores
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,A Quantidade de Fabrico deve ser superior a 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Relatório de visita para a chamada de manutenção.
@@ -3465,8 +3462,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},É obrigatório ter uma conta de despesas para o item {0}
 DocType: BOM,Website Description,Descrição do Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variação Líquida na Equidade
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
 DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Recibo
 ,Sales Register,Registo de Vendas
@@ -3477,16 +3474,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada para editar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
 DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nenhum cliente ainda!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstração dos Fluxos de Caixa
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Valor do Empréstimo não pode exceder Máximo Valor do Empréstimo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licença
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Continuar se também deseja incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,No Tipo de Voucher
 DocType: Item,Attributes,Atributos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Por favor, insira a Conta de Liquidação"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data do Último Pedido
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A conta {0} não pertence à empresa {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
 DocType: Student,Guardian Details,Dados de Responsável
 DocType: C-Form,C-Form,Form-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Presença em vários funcionários
@@ -3511,14 +3510,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',"Linha {0}# A conta deve ser do tipo ""Ativo Fixo"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qtd de Saída
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,As regras para calcular o montante de envio duma venda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,É obrigatório colocar a Série
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,É obrigatório colocar a Série
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 DocType: Student Sibling,Student ID,Identidade estudantil
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipos de atividades para Registos de Tempo
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de Base
 DocType: Training Event,Exam,Exame
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
 DocType: Leave Allocation,Unused leaves,Licensas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Estado de Faturamento
@@ -3551,7 +3550,7 @@
 DocType: Payment Entry,Account Paid From,Conta Paga De
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matéria-prima
 DocType: Journal Entry,Write Off Based On,Liquidação Baseada Em
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Crie um Potencial Cliente
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Crie um Potencial Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impressão e artigos de papelaria
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo do Código de Barras
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar Emails de Fornecedores
@@ -3567,6 +3566,7 @@
 DocType: Offer Letter,Awaiting Response,A aguardar Resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Acima
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Atributo inválido {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Mencionar se a conta a pagar não padrão
 DocType: Salary Slip,Earning & Deduction,Remunerações e Deduções
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional. Esta definição será utilizada para filtrar várias transações.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Não são permitidas Percentagens de Avaliação Negativas
@@ -3603,7 +3603,7 @@
 DocType: Program Enrollment Tool,Get Students From,Obter Estudantes De
 DocType: Hub Settings,Seller Country,País do Vendedor
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar Itens no Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupo seus alunos em lotes
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupo seus alunos em lotes
 DocType: Authorization Rule,Authorization Rule,Regra de Autorização
 DocType: Sales Invoice,Terms and Conditions Details,Dados de Termos e Condições
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Especificações
@@ -3663,8 +3663,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,À Experiência
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componentes Salariais
 DocType: Program Enrollment Tool,New Academic Year,Novo Ano Letivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retorno / Nota de Crédito
-DocType: Stock Settings,Auto insert Price List rate if missing,Inserção automática da taxa da Lista de Preços caso a mesma esteja ausente
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Retorno / Nota de Crédito
+DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Montante Total Pago
 DocType: Production Order Item,Transferred Qty,Qtd Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
@@ -3704,6 +3704,7 @@
 ,Sales Funnel,Canal de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,É obrigatório colocar uma abreviatura
 DocType: Project,Task Progress,Progresso da Tarefa
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carrinho
 ,Qty to Transfer,Qtd a Transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Potenciais Clientes ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Função Com Permissão para editar o stock congelado
@@ -3737,7 +3738,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Cobrar Taxas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},O Código de Barras {0} já foi utilizado no Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},O Código de Barras {0} já foi utilizado no Item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,As regras para adicionar os custos de envio.
 DocType: Item,Opening Stock,Stock Inicial
@@ -3756,7 +3757,7 @@
 DocType: Customer,From Lead,Do Potencial Cliente
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pedidos lançados para a produção.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecione o Ano Fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
 DocType: Program Enrollment Tool,Enroll Students,Matricular Estudantes
 DocType: Hub Settings,Name Token,Nome do Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda Padrão
@@ -3767,7 +3768,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} nas Faturas de Vendas {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nome do Projeto
-DocType: Supplier,Mention if non-standard receivable account,Mencione se é uma conta a receber não padrão
+DocType: Customer,Mention if non-standard receivable account,Mencione se é uma conta a receber não padrão
 DocType: Journal Entry Account,If Income or Expense,Se forem Rendimentos ou Despesas
 DocType: Production Order,Required Items,Itens Obrigatórios
 DocType: Stock Ledger Entry,Stock Value Difference,Diferença de Valor de Stock
@@ -3798,6 +3799,7 @@
 DocType: Item,Taxes,Impostos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Pago e Não Entregue
 DocType: Project,Default Cost Center,Centro de Custo Padrão
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series para {0} através da Configuração&gt; Configurações&gt; Nomeação de Série
 DocType: Bank Guarantee,End Date,Data de Término
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Stock
 DocType: Budget,Budget Accounts,Contas do Orçamento
@@ -3836,7 +3838,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendências das Guias de Remessa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resumo da Semana
-,In Stock Qty,Em estoque Quantidade
+,In Stock Qty,Quantidade em stock
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,A Conta: {0} só pode ser atualizada através das Transações de Stock
 DocType: Program Enrollment,Get Courses,Obter Cursos
 DocType: GL Entry,Party,Parte
@@ -3848,7 +3850,7 @@
 DocType: Material Request,% Ordered,% Pedida
 DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",Insira o Endereço de Email separado por vírgulas. A fatura será enviada automaticamente numa determinada data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Trabalho à Peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Taxa de Compra Méd.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Preço de compra médio
 DocType: Task,Actual Time (in Hours),Tempo Real (em Horas)
 DocType: Employee,History In Company,Historial na Empresa
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
@@ -3862,7 +3864,7 @@
 DocType: Customer,Sales Partner and Commission,Parceiro e Comissão de Vendas
 DocType: Employee Loan,Rate of Interest (%) / Year,Taxa de juro (%) / Ano
 ,Project Quantity,Quantidade de Projeto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode ser que você deve mudar &#39;Distribuir taxas sobre&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode ser que você deve mudar &#39;Distribuir taxas sobre&#39;"
 DocType: Opportunity,To Discuss,Para Discutir
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,São necessárias {0} unidades de {1} em {2} para concluir esta transação.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa de juro (%) Anual
@@ -3884,8 +3886,8 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id de Cliente
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausência
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: A Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
-DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
+DocType: Journal Entry Account,Exchange Rate,Valor de Câmbio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
 DocType: Homepage,Tag Line,Linha de tag
 DocType: Fee Component,Fee Component,Componente de Propina
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestão de Frotas
@@ -3902,7 +3904,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,O Armazém {0} não existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inscreva-se na Plataforma ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens de Distribuição Mensal
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,O item selecionado não pode ter um Lote
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,O item selecionado não pode ter um Lote
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","taxa de valorização não encontrado para o item {0}, que é necessário para fazer lançamentos contábeis para {1} {2}. Se o item for negociado como um item de amostra no {1}, por favor mencione que na tabela do item do {1}. Caso contrário, crie uma transação de ações de entrada para a taxa de valorização item ou menção no registro de item e, em seguida, tentar submeter / cancelar esta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiais entregues desta Guia de Remessa
 DocType: Project,Customer Details,Dados do Cliente
@@ -3919,7 +3921,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ordens enviadas não pode ser excluído
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo da conta já está em débito, não tem permissão para definir o ""Saldo Deve Ser"" como ""Crédito"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestão da Qualidade
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,O Item {0} foi desativado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,O Item {0} foi desativado
 DocType: Employee Loan,Repay Fixed Amount per Period,Pagar quantia fixa por Período
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, insira a quantidade para o Item {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de Trabalho Externo do Funcionário
@@ -3946,7 +3948,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student E-mail ID
 DocType: Employee,Notice (days),Aviso (dias)
 DocType: Tax Rule,Sales Tax Template,Modelo do Imposto sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selecione os itens para guardar a fatura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Selecione os itens para guardar a fatura
 DocType: Employee,Encashment Date,Data de Pagamento
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajuste de Stock
@@ -3986,6 +3988,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota de Débito Emitida
 DocType: Production Order,Warehouses,Armazéns
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,O ativo {0} não pode ser transferido
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Este Item é uma Variante de {0} (Modelo).
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Aquisição
 DocType: Announcement,Announcement,Anúncio
@@ -4001,7 +4004,7 @@
 DocType: Account,Receivable,A receber
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha {0}: Não é permitido alterar o Fornecedor pois já existe uma Ordem de Compra
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,A função para a qual é permitida enviar transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selecione os itens para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Selecione os itens para Fabricação
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
 DocType: Item,Material Issue,Saída de Material
 DocType: Hub Settings,Seller Description,Descrição do Vendedor
@@ -4014,7 +4017,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pedido
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Critérios de Avaliação Grupo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},A Depreciação Acumulada Inicial deve ser menor ou igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},A Depreciação Acumulada Inicial deve ser menor ou igual a {0}
 DocType: Warehouse,Warehouse Name,Nome dp Armazém
 DocType: Naming Series,Select Transaction,Selecionar Transação
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, insira a Função Aprovadora ou o Utilizador Aprovador"
@@ -4049,7 +4052,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir este Ano Fiscal como Padrão, clique em ""Definir como Padrão"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Inscrição
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Qtd de Escassez
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
 DocType: Employee Loan,Repay from Salary,Reembolsar a partir de Salário
 DocType: Leave Application,LAP/,APL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Solicitando o pagamento contra {0} {1} para montante {2}
@@ -4067,7 +4070,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Avaliação Resultado Detalhe
 DocType: Employee Education,Employee Education,Educação do Funcionário
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Foi encontrado um grupo item duplicado na tabela de grupo de itens
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
 DocType: Salary Slip,Net Pay,Rem. Líquida
 DocType: Account,Account,Conta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,O Nr. de Série {0} já foi recebido
@@ -4076,7 +4079,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","O Armazém {0} não está vinculado a nenhuma conta, crie/vincule a conta correspondente (de Ativo) ao armazém."
 DocType: Purchase Invoice,Recurring Id,ID Recorrente
 DocType: Customer,Sales Team Details,Dados de Equipa de Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminar permanentemente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Eliminar permanentemente?
 DocType: Expense Claim,Total Claimed Amount,Montante Reclamado Total
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciais oportunidades de venda.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Inválido {0}
@@ -4087,13 +4090,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup sua escola em ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Montante de Modificação Base (Moeda da Empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Não foram encontrados registos contabilísticos para os seguintes armazéns
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Não foram encontrados registos contabilísticos para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Guarde o documento pela primeira vez.
 DocType: Account,Chargeable,Cobrável
 DocType: Company,Change Abbreviation,Alterar Abreviação
 DocType: Expense Claim Detail,Expense Date,Data da Despesa
 DocType: Item,Max Discount (%),Desconto Máx. (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Montante do Último Pedido
+DocType: Task,Is Milestone,É Milestone
 DocType: Daily Work Summary,Email Sent To,Email Enviado Para
 DocType: Budget,Warn,Aviso
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, dignas de serem mencionadas, que devem ir para os registos."
@@ -4126,11 +4130,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Congelar Stocks Mais Antigos Que"" deve ser menor que %d dias."
 DocType: Tax Rule,Purchase Tax Template,Modelo de Taxa de Compra
 ,Project wise Stock Tracking,Controlo de Stock por Projeto
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},O Cronograma de Manutenção {0} existe em {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qtd  Efetiva (na origem/destino)
 DocType: Item Customer Detail,Ref Code,Código de Ref.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registos de Funcionários.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Por favor, defina a Próximo Data de Depreciação"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, defina a Próximo Data de Depreciação"
 DocType: HR Settings,Payroll Settings,Definições de Folha de Pagamento
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Efetuar Ordem
@@ -4152,8 +4155,8 @@
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Atribuir licenças para um determinado período.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Os Cheques e Depósitos foram apagados incorretamente
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Conta {0}: Não pode atribuí-la como conta principal
-DocType: Purchase Invoice Item,Price List Rate,Taxa de Lista de Preços
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Criar cotações de clientes
+DocType: Purchase Invoice Item,Price List Rate,PReço na Lista de Preços
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Criar cotações de clientes
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""Em Stock"" ou ""Não Está em Stock"" com base no stock disponível neste armazém."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiais (LDM)
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário para o fornecedor efetuar a entrega
@@ -4175,7 +4178,7 @@
 DocType: Asset,Disposal Date,Data de Eliminação
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os emails serão enviados para todos os funcionários ativos da empresa na hora estabelecida, se não estiverem de férias. O resumo das respostas será enviado à meia-noite."
 DocType: Employee Leave Approver,Employee Leave Approver,Autorizador de Licenças do Funcionário
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Linha{0}: Já existe um registo de Reencomenda para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Linha{0}: Já existe um registo de Reencomenda para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido, porque foi efetuada uma Cotação."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback de Formação
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,A Ordem de Produção {0} deve ser enviado
@@ -4183,7 +4186,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},O Curso é obrigatório na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,A data a não pode ser anterior à data de
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Adicionar / Editar Preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Adicionar / Editar Preços
 DocType: Batch,Parent Batch,Lote pai
 DocType: Batch,Parent Batch,Lote pai
 DocType: Cheque Print Template,Cheque Print Template,Modelo de Impressão de Cheque
@@ -4228,7 +4231,7 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},O peso total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Seus Fornecedores
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Não pode definir como Oportunidade Perdida pois a Ordem de Venda já foi criado.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não pode definir como Oportunidade Perdida pois a Ordem de Venda já foi criado.
 DocType: Request for Quotation Item,Supplier Part No,Peça de Fornecedor Nr.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Não pode deduzir quando a categoria é para ""Estimativa"" ou ""Estimativa e Total"""
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Recebido De
@@ -4238,7 +4241,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: De {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Linha #{0}: Definir Fornecedor para o item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Linha {0}: O valor por hora deve ser maior que zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
 DocType: Issue,Content Type,Tipo de Conteúdo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos do website.
@@ -4247,20 +4250,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Não está autorizado a definir como valor Congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Registos Não Conciliados
 DocType: Payment Reconciliation,From Invoice Date,Data de Fatura De
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,deixar Cobrança
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,O que faz?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Armazém Para
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas as Admissão de Estudantes
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Tem um Nr. de Série"" não pode ser ""Sim"" para um item sem gestão de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Tem um Nr. de Série"" não pode ser ""Sim"" para um item sem gestão de stock"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,A presença não pode ser registada em datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ajuda da Regra Fixação de Preços
 DocType: School House,House Name,Nome casa
 DocType: Purchase Taxes and Charges,Account Head,Título de Conta
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Atualize os custos adicionais para calcular o custo de transporte de itens
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elétrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adicione o resto da sua organização como seus utilizadores. Você também pode adicionar convidar clientes para o seu portal, adicionando-os a partir de Contactos"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adicione o resto da sua organização como seus utilizadores. Você também pode adicionar convidar clientes para o seu portal, adicionando-os a partir de Contactos"
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença de Valor Total (Saída - Entrada)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Linha {0}: É obrigatório colocar a Taxa de Câmbio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Não está definido a ID do utilizador para o Funcionário {0}
@@ -4269,7 +4272,7 @@
 DocType: Item,Customer Code,Código de Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Lembrete de Aniversário para o/a {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias Desde a última Ordem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Série de Atrib. de Nomes
 DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de Início do Seguro deve ser anterior à data de Término do Seguro
@@ -4284,7 +4287,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},A Folha de Vencimento do funcionário {0} já foi criada para folha de vencimento {1}
 DocType: Vehicle Log,Odometer,Conta-km
 DocType: Sales Order Item,Ordered Qty,Qtd Pedida
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,O Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,O Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Stock Congelado Até
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,A LDM não contém nenhum item em stock
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},As datas do Período De e Período A são obrigatórias para os recorrentes {0}
@@ -4297,7 +4300,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montante de Liquidação (Moeda da Empresa)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Faturamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Não foi encontrado a LDM Padrão para {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Linha #{0}: Por favor, defina a quantidade de reencomenda"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Linha #{0}: Por favor, defina a quantidade de reencomenda"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toque em itens para adicioná-los aqui
 DocType: Fees,Program Enrollment,Inscrição no Programa
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher de Custo de Entrega
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, defina {0}"
@@ -4357,8 +4361,8 @@
 apps/erpnext/erpnext/config/accounts.py +257,Default settings for accounting transactions.,As definições padrão para as transações contabilísticas.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,A Data Prevista não pode ser anterior à Data de Solicitação de Materiais
-DocType: Purchase Invoice Item,Stock Qty,Quantidade de estoque
-DocType: Purchase Invoice Item,Stock Qty,Quantidade de estoque
+DocType: Purchase Invoice Item,Stock Qty,Quantidade de stock
+DocType: Purchase Invoice Item,Stock Qty,Quantidade de Stock
 DocType: Production Order,Source Warehouse (for reserving Items),Origem do Warehouse (para reserva de Itens)
 DocType: Employee Loan,Repayment Period in Months,Período de reembolso em meses
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erro: Não é uma ID válida?
@@ -4398,7 +4402,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retalho e Grosso
 DocType: Issue,First Responded On,Primeira Resposta Em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,A Lista Cruzada do Item em vários grupos
-DocType: Grade Interval,Grade Interval,Intervalo de Classe
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},A Data de Início do Ano Fiscal e a Data de Término do Ano Fiscal já está definida no Ano Fiscal de {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Data de Liquidação atualizada
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lote dividido
@@ -4407,6 +4410,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Transferir PDF
 DocType: Production Order,Planned End Date,Data de Término Planeada
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Onde os itens são armazenados.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
 DocType: Request for Quotation,Supplier Detail,Dados de Fornecedor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Erro na fórmula ou condição: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Montante Faturado
@@ -4452,7 +4456,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Instalar um website simples para a minha organização
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta A Receber / A Pagar
 DocType: Delivery Note Item,Against Sales Order Item,No Item da Ordem de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém Padrão
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},O Orçamento não pode ser atribuído à Conta de Grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, insira o centro de custos principal"
@@ -4490,7 +4494,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"O Prazo de Data Final não pode ser anterior ao Prazo de Data de Início. Por favor, corrija as datas e tente novamente."
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Contagem de quot
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Contagem de quot
-,BOM Stock Report,BOM Relatório de estoque
+,BOM Stock Report,Relatório de stock da LDM
 DocType: Stock Reconciliation Item,Quantity Difference,Diferença de Quantidade
 apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,A Processar Salários
 DocType: Opportunity Item,Basic Rate,Taxa Básica
@@ -4510,7 +4514,7 @@
 ,Items To Be Requested,Items a Serem Solicitados
 DocType: Purchase Order,Get Last Purchase Rate,Obter Última Taxa de Compra
 DocType: Company,Company Info,Informações da Empresa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selecionar ou adicionar novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Selecionar ou adicionar novo cliente
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,centro de custo é necessário reservar uma reivindicação de despesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicação de Fundos (Ativos)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esta baseia-se na assiduidade deste Funcionário
@@ -4523,13 +4527,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impeça os utilizadores de efetuar Pedidos de Licença nos dias seguintes.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Montante de Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Cotação de Fornecedor {0} criada
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,O Fim do Ano não pode ser antes do Início do Ano
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,O Fim do Ano não pode ser antes do Início do Ano
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Benefícios do Funcionário
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},A quantidade embalada deve ser igual à quantidade do Item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtd Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina uma Lista de Feriados padrão para o(a) Funcionário(a) {0} ou para a Empresa {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Contas levantadas a Clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID de Projeto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha Nr. {0}: O valor não pode ser superior ao Montante Pendente no Reembolso de Despesas {1}. O Montante Pendente é {2}
@@ -4538,15 +4542,17 @@
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
 ,Hub,Plataforma
 DocType: GL Entry,Voucher Type,Tipo de Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Lista de Preços não encontrada ou desativada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Lista de Preços não encontrada ou desativada
 DocType: Employee Loan Application,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"O Funcionário dispensado em {0} deve ser definido como ""Saiu"""
 DocType: Guardian,Guardian,Responsável
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Foi criada a Avaliação {0} para o Funcionário{1} no intervalo de datas determinado
 DocType: Employee,Education,Educação
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Nome da Campanha Dado Por
 DocType: Employee,Current Address Is,O Endereço Atual É
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Modificado
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Define a moeda padrão da empresa, se não for especificada."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Registo de Lançamentos Contabilísticos.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qtd Disponível Do Armazém
@@ -4583,7 +4589,7 @@
 DocType: Hub Settings,Hub Settings,Definições da Plataforma
 DocType: Project,Gross Margin %,Margem Bruta %
 DocType: BOM,With Operations,Com Operações
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Já foram efetuados lançamentos contabilísticos na moeda {0} para a empresa {1}. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Já foram efetuados lançamentos contabilísticos na moeda {0} para a empresa {1}. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 DocType: Asset,Is Existing Asset,É um Ativo Existente
 DocType: Salary Detail,Statistical Component,Componente estatística
 DocType: Salary Detail,Statistical Component,Componente estatística
@@ -4636,9 +4642,9 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Deve Guardar o formulário antes de continuar
 DocType: Item Attribute,Numeric Values,Valores Numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Anexar Logótipo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Os níveis de estoque
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Níveis de stock
 DocType: Customer,Commission Rate,Taxa de Comissão
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Criar Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Criar Variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear pedidos de licença por departamento.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","O Tipo de Pagamento deve ser Receber, Pagar ou Transferência Interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Análise
@@ -4651,6 +4657,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Produção nas Férias
 DocType: Sales Order,Customer's Purchase Order Date,Data de Ordem de Compra do Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
+DocType: Shopping Cart Settings,Show Public Attachments,Mostrar anexos públicos
 DocType: Packing Slip,Package Weight Details,Dados de Peso do Pacote
 DocType: Payment Gateway Account,Payment Gateway Account,Conta de Portal de Pagamento
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Após o pagamento ter sido efetuado, redireciona o utilizador para a página selecionada."
@@ -4675,7 +4682,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como $ ao lado das moedas.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de Crédito
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Criar Classe de Estudantes
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Criar Classe de Estudantes
 DocType: Leave Type,Is Carry Forward,É para Continuar
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obter itens da LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dias para Chegar ao Armazém
@@ -4694,8 +4701,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade Sancionada
 DocType: GL Entry,Is Opening,Está a Abrir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Um registo de débito não pode ser vinculado a {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure as séries de numeração para Atendimento via Configuração&gt; Série de numeração
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure as séries de numeração para Atendimento via Configuração&gt; Série de numeração
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,A conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o website e outras publicações.
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index e5694eb..cc787b7 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Lot Articol Stare de expirare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Ciorna bancară
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Arată Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Arată Variante
 DocType: Academic Term,Academic Term,termen academic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Cantitate
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Servicii de Sanatate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Întârziere de plată (zile)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Cheltuieli de serviciu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Anul fiscal {0} este necesară
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitate
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aceeași societate este înscris de mai multe ori
 DocType: Employee,Married,Căsătorit
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nu este permisă {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nu este permisă {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obține elemente din
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produs {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nu sunt enumerate elemente
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Băcănie
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,Asigurați-Bank intrare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondurile de pensii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,În continuare Amortizarea Data nu poate fi înainte Data achiziției
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,În continuare Amortizarea Data nu poate fi înainte Data achiziției
 DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Lunar Distribuție ** vă ajută să distribuie bugetul / Target peste luni dacă aveți sezonier în afacerea dumneavoastră.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nu au fost găsite articole
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nu au fost găsite articole
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Structura de salarizare lipsă
 DocType: Lead,Person Name,Nume persoană
 DocType: Sales Invoice Item,Sales Invoice Item,Factură de vânzări Postul
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","de exemplu, &quot;Școala primară&quot; sau &quot;Universitatea&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Rapoarte de stoc
 DocType: Warehouse,Warehouse Detail,Depozit Detaliu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Pe termen Data de încheiere nu poate fi mai târziu de Anul Data de încheiere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Este activ fix"" nu poate fi debifată deoarece există informații împotriva produsului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Este activ fix"" nu poate fi debifată deoarece există informații împotriva produsului"
 DocType: Vehicle Service,Brake Oil,Ulei de frână
 DocType: Tax Rule,Tax Type,Tipul de impozitare
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nu sunteți autorizat să adăugați sau să actualizați intrări înainte de {0}
 DocType: BOM,Item Image (if not slideshow),Imagine Articol (dacă nu exista prezentare)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Există un client cu același nume
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif orar / 60) * Timp efectiv de operare
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Selectați BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Selectați BOM
 DocType: SMS Log,SMS Log,SMS Conectare
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costul de articole livrate
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Vacanta pe {0} nu este între De la data si pana in prezent
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,calitate
 DocType: Sales Invoice Item,Delivered By Supplier,Livrate de Furnizor
 DocType: SMS Center,All Contact,Toate contactele
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Comanda de producție deja creat pentru toate elementele cu BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Comanda de producție deja creat pentru toate elementele cu BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salariu anual
 DocType: Daily Work Summary,Daily Work Summary,Sumar zilnic de lucru
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} este blocat
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} este blocat
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vă rugăm să selectați Companie pentru crearea Existent Plan de conturi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Cheltuieli stoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selectați Target Warehouse
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra intrare
 DocType: Journal Entry Account,Credit in Company Currency,Credit în companie valutar
 DocType: Delivery Note,Installation Status,Starea de instalare
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Doriți să actualizați prezență? <br> Prezent: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Materii prime de alimentare pentru cumparare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Cel puțin un mod de plată este necesară pentru POS factură.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Cel puțin un mod de plată este necesară pentru POS factură.
 DocType: Products Settings,Show Products as a List,Afișare produse ca o listă
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descărcați șablonul, umple de date corespunzătoare și atașați fișierul modificat.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Asigurați-vă Amortizarea Intrare
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Cerere tip
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Asigurați-angajat
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Asigurați-angajat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transminiune
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Executie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalii privind operațiunile efectuate.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planul de de vizite de întreținere.
 DocType: SMS Settings,Enter url parameter for message,Introduceți parametru url pentru mesaj
 DocType: POS Profile,Customer Groups,grupurile de clienti
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Situațiile financiare
 DocType: Guardian,Students,Elevi
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Normele de aplicare de stabilire a prețurilor și de scont.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de prețuri trebuie să fie aplicabilă pentru cumpărarea sau vânzarea de
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de serie pentru această tranzacție
 DocType: Company,Default Payroll Payable Account,Implicit Salarizare cont de plati
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Actualizare e-mail Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Actualizare e-mail Group
 DocType: Sales Invoice,Is Opening Entry,Deschiderea este de intrare
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menționa dacă non-standard de cont primit aplicabil
 DocType: Course Schedule,Instructor Name,Nume instructor
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Comparativ articolului facturii de vânzări
 ,Production Orders in Progress,Comenzile de producție în curs de desfășurare
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Numerar net din Finantare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
 DocType: Lead,Address & Contact,Adresă și contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adauga frunze neutilizate de alocări anterioare
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Suma totală de calculație a costurilor (prin timp Sheet)
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Intrările bancare
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,Publica in Hub
 DocType: Student Admission,Student Admission,Admiterea studenților
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Articolul {0} este anulat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 DocType: Item,Purchase Details,Detalii de cumpărare
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica prin e-mail la crearea de cerere automată Material
 DocType: Journal Entry,Multi Currency,Multi valutar
 DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota de Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Nota de Livrare
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costul de active vândute
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Plata intrare a fost modificat după ce-l tras. Vă rugăm să trage din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
-DocType: Grade Interval,Min Score,min Scor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
 DocType: Student Applicant,Admitted,A recunoscut că
 DocType: Workstation,Rent Cost,Chirie Cost
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valoarea comenzii
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,tranzacții bancare / numerar contra partidului sau pentru transfer intern
 DocType: Shipping Rule,Valid for Countries,Valabil pentru țările
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Comanda total Considerat
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Va rugam sa introduceti ""Repeat la zi a lunii"" valoare de câmp"
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,Cota de impozitare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} deja alocate pentru Angajat {1} pentru perioada {2} {3} pentru a
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selectați articol
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converti la non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lotul (lot) unui articol.
 DocType: C-Form Invoice Detail,Invoice Date,Data facturii
 DocType: GL Entry,Debit Amount,Suma debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creați Grupurile de studenți
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,Cerere de ofertă
 DocType: Salary Slip Timesheet,Working Hours,Ore de lucru
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Creați un nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Creați un nou client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","În cazul în care mai multe reguli de stabilire a prețurilor continuă să prevaleze, utilizatorii sunt rugați să setați manual prioritate pentru a rezolva conflictul."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Creare comenzi de aprovizionare
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Creare comenzi de aprovizionare
 ,Purchase Register,Cumpărare Inregistrare
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Taxe aplicabile
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Maestru de vacanta.
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Din Pachetul Nr.
 DocType: Item Attribute,To Range,La gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titluri de valoare și depozite
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda de evaluare nu poate fi schimbată, deoarece există tranzacții împotriva anumitor elemente care nu au metoda de evaluare proprie"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total frunze alocate este obligatorie
 DocType: Job Opening,Description of a Job Opening,Descrierea unei slujbe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activități în așteptare pentru ziua de azi
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
 DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
 DocType: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,A cumpara
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vă rugăm să definiți gradul pentru pragul 0%
 DocType: Sales Order,To Deliver,A Livra
 DocType: Purchase Invoice Item,Item,Obiect
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial nici un articol nu poate fi o fracție
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial nici un articol nu poate fi o fracție
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
 DocType: Account,Profit and Loss,Profit și pierdere
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestionarea Subcontracte
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 DocType: Production Plan Item,Pending Qty,Așteptare Cantitate
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nu este activ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nu este activ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS expediat la următoarele numere: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Dimensiunile de instalare pentru imprimare de verificare
 DocType: Salary Slip,Salary Slip Timesheet,Salariu alunecare Pontaj
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Total de Comisie
 DocType: Pricing Rule,Sales Partner,Partener de vânzări
 DocType: Buying Settings,Purchase Receipt Required,Cumpărare de primire Obligatoriu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Evaluarea Rata este obligatorie în cazul în care a intrat Deschiderea stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Evaluarea Rata este obligatorie în cazul în care a intrat Deschiderea stoc
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valorile acumulate
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Realizeaza Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Realizeaza Comandă de Vânzări
 DocType: Project Task,Project Task,Proiect Sarcina
 ,Lead Id,Id Conducere
 DocType: C-Form Invoice Detail,Grand Total,Total general
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,CV-Atașamentul
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
 DocType: Leave Control Panel,Allocate,Alocaţi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Vânzări de returnare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Notă: Totalul frunzelor alocate {0} nu ar trebui să fie mai mică decât frunzele deja aprobate {1} pentru perioada
 DocType: Announcement,Posted By,Postat de
 DocType: Item,Delivered by Supplier (Drop Ship),Livrate de Furnizor (Drop navelor)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stabiliți compania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stabiliți compania
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Vânzări factură Pontaj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selectați Cont de plăți pentru a face Banca de intrare
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Crearea de înregistrări angajaților pentru a gestiona frunze, cheltuieli și salarizare creanțe"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Crearea de înregistrări angajaților pentru a gestiona frunze, cheltuieli și salarizare creanțe"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Adaugă în Baza de cunoștințe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Propunere de scriere
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plată Deducerea intrare
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relația cu Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Plata De la / la
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Interval de date
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Noua limită de credit este mai mică decât valoarea curentă restante pentru client. Limita de credit trebuie să fie atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Noua limită de credit este mai mică decât valoarea curentă restante pentru client. Limita de credit trebuie să fie atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
 DocType: SMS Settings,Receiver Parameter,Receptor Parametru
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Bazat pe' și 'Grupat dupa' nu pot fi identice
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,Data rezoluție
 DocType: Student Batch Name,Batch Name,Nume lot
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Pontajul creat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,A se inscrie
 DocType: Selling Settings,Customer Naming By,Numire Client de catre
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Va arăta studentului așa cum sunt prezente Student Raport lunar de prezență
@@ -722,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,Participarea studenților
 DocType: Sales Invoice Timesheet,Time Sheet,Fișa de timp
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materii Prime bazat pe
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Va rugam sa introduceti detalii element
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Va rugam sa introduceti detalii element
 DocType: Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vânzări pre
 DocType: Purchase Receipt,Other Details,Alte detalii
@@ -740,7 +743,7 @@
 ,Absent Student Report,Raport de student absent
 DocType: Email Digest,Next email will be sent on:,E-mail viitor va fi trimis la:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Scrisoare Termen
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Element are variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolul {0} nu a fost găsit
 DocType: Bin,Stock Value,Valoare stoc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} nu există
@@ -749,8 +752,6 @@
 DocType: Serial No,Warranty Expiry Date,Garanție Data expirării
 DocType: Material Request Item,Quantity and Warehouse,Cantitatea și Warehouse
 DocType: Sales Invoice,Commission Rate (%),Rata de Comision (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selectați Program
 DocType: Project,Estimated Cost,Cost estimat
 DocType: Purchase Order,Link to material requests,Link la cererile de materiale
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nu este un articol de stoc
 DocType: Mode of Payment Account,Default Account,Cont Implicit
 DocType: Payment Entry,Received Amount (Company Currency),Suma primită (companie Moneda)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vă rugăm să selectați zi liberă pe săptămână
 DocType: Production Order Operation,Planned End Time,Planificate End Time
 ,Sales Person Target Variance Item Group-Wise,Persoana de vânzări țintă varianță Articol Grupa Înțelept
@@ -851,7 +852,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Lista de prețuri nu selectat
 DocType: Employee,Family Background,Context familial
 DocType: Request for Quotation Supplier,Send Email,Trimiteți-ne email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nici o permisiune
 DocType: Company,Default Bank Account,Cont Bancar Implicit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
@@ -864,8 +865,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nu a fost gasit angajat
 DocType: Supplier Quotation,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupul de studenți este deja actualizat.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupul de studenți este deja actualizat.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupul de studenți este deja actualizat.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupul de studenți este deja actualizat.
 DocType: SMS Center,All Customer Contact,Toate contactele clienților
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Încărcați echilibru stoc prin csv.
 DocType: Warehouse,Tree Details,copac Detalii
@@ -876,8 +877,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Factură cantitate minimă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} nu aparține Companiei {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cont {2} nu poate fi un grup
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Postul rând {IDX}: {DOCTYPE} {DOCNAME} nu există în sus &quot;{DOCTYPE} &#39;masă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizată sau anulată
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Postul rând {IDX}: {DOCTYPE} {DOCNAME} nu există în sus &quot;{DOCTYPE} &#39;masă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizată sau anulată
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nu există nicio sarcină
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
 DocType: Asset,Opening Accumulated Depreciation,Deschidere Amortizarea Acumulate
@@ -893,7 +894,7 @@
 DocType: Bin,Moving Average Rate,Rata medie mobilă
 DocType: Production Planning Tool,Select Items,Selectați Elemente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Program de curs de
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Program de curs de
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: HR Settings,Enter retirement age in years,Introdu o vârsta de pensionare în anii
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Țintă Warehouse
@@ -901,7 +902,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
 DocType: Stock Entry,STE-,sterilizabile
 DocType: Upload Attendance,Import Attendance,Import Spectatori
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Toate grupurile articolului
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Toate grupurile articolului
 DocType: Process Payroll,Activity Log,Jurnal Activitate
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Profit / pierdere net
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
@@ -912,7 +913,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Comandă de aprovizionare de plata
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Deschiderea&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Deschideți To Do
 DocType: Notification Control,Delivery Note Message,Nota de Livrare Mesaj
@@ -928,7 +929,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-comanda Cantitate
 DocType: Leave Block List Date,Leave Block List Date,Data Lista Concedii Blocate
 DocType: Pricing Rule,Price or Discount,Preț sau Reducere
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Taxe totale aplicabile în tabelul de achiziție Chitanță Elementele trebuie să fie la fel ca total impozite și taxe
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Taxe totale aplicabile în tabelul de achiziție Chitanță Elementele trebuie să fie la fel ca total impozite și taxe
 DocType: Sales Team,Incentives,Stimulente
 DocType: SMS Log,Requested Numbers,Numere solicitate
 DocType: Production Planning Tool,Only Obtain Raw Materials,Se obține numai Materii prime
@@ -986,8 +987,7 @@
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Fee Structure,Components,Componente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} fără nici o factură negativă restante
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
@@ -1039,8 +1039,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimic
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default cont bancar / numerar vor fi actualizate automat în Jurnalul de intrare a salariului când este selectat acest mod.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervalele de cod Grad {0} se suprapune cu intervalele de grad pentru alte clase. Vă rugăm să verificați intervalele de {0} și {1} și încercați din nou
 DocType: BOM,Raw Material Cost(Company Currency),Brut Costul materialelor (companie Moneda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Rândul # {0}: Rata nu poate fi mai mare decât rata folosită în {1} {2}
@@ -1053,7 +1051,7 @@
 DocType: BOM Website Item,BOM Website Item,Site-ul BOM Articol
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
 DocType: Timesheet Detail,Bill,Factură
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,În continuare Amortizarea Data este introdusă ca dată rămas singur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,În continuare Amortizarea Data este introdusă ca dată rămas singur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Alb
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rândul {0}: Cant nu este disponibil pentru {4} în depozit {1} în postarea momentul înscrierii ({2} {3})
@@ -1068,7 +1066,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Pentru Tipul trebuie să fie una dintre {0}
 DocType: Lead,Next Contact Date,Următor Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Deschiderea Cantitate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
 DocType: Student Batch Name,Student Batch Name,Nume elev Lot
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
 DocType: Repayment Schedule,Balance Loan Amount,Soldul Suma creditului
@@ -1088,10 +1086,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Vă rugăm să specificați un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
 DocType: Delivery Note,Delivery To,De Livrare la
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nu poate fi negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Reducere
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Reducere
 DocType: Asset,Total Number of Depreciations,Număr total de Deprecieri
 DocType: Sales Invoice Item,Rate With Margin,Rate cu marjă
 DocType: Sales Invoice Item,Rate With Margin,Rate cu marjă
@@ -1120,7 +1118,7 @@
 DocType: Lead,Organization Name,Numele organizației
 DocType: Tax Rule,Shipping State,Stat de transport maritim
 ,Projected Quantity as Source,Cantitatea ca sursă proiectată
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Includ elemente non-stoc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Cheltuieli de vânzare
@@ -1128,7 +1126,7 @@
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Cod postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Cod postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
 DocType: Opportunity,Contact Info,Informaţii Persoana de Contact
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Efectuarea de stoc Entries
@@ -1171,7 +1169,7 @@
 DocType: Sales Partner,Distributor,Distribuitor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 DocType: Global Defaults,Global Defaults,Valori Implicite Globale
@@ -1206,11 +1204,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vă rugăm să introduceți codul de articol pentru a obține numărul de lot
 DocType: Stock Settings,Default Item Group,Group Articol Implicit
 DocType: Employee Loan,Partially Disbursed,parţial Se eliberează
-DocType: Grading Structure,Grading System Name,Nume sistem de clasificare a
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza de date furnizor.
 DocType: Account,Balance Sheet,Bilant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modul de plată nu este configurat. Vă rugăm să verificați, dacă contul a fost setat pe modul de plăți sau la POS Profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modul de plată nu este configurat. Vă rugăm să verificați, dacă contul a fost setat pe modul de plăți sau la POS Profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Persoană de vânzări va primi un memento la această dată pentru a lua legătura cu clientul
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Același articol nu poate fi introdus de mai multe ori.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Conturile suplimentare pot fi făcute sub Groups, dar intrările pot fi făcute împotriva non-Grupuri"
@@ -1249,11 +1246,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Activitatea desfășurată
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Vă rugăm să specificați cel puțin un atribut în tabelul Atribute
 DocType: Announcement,All Students,toţi elevii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Postul {0} trebuie să fie un element de bază non-stoc
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Postul {0} trebuie să fie un element de bază non-stoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vezi Ledger
 DocType: Grading Scale,Intervals,intervale
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Elev mobil Nr
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Restul lumii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
@@ -1293,8 +1290,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Comenzile de aprovizionare vă ajuta să planificați și să urmați pe achizițiile dvs.
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Comenzile de aprovizionare vă ajuta să planificați și să urmați pe achizițiile dvs.
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Cantitatea totală de emisie / transfer {0} din solicitarea materialului {1} nu poate fi mai mare decât cantitatea cerută {2} pentru articolul {3}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
@@ -1320,7 +1317,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronizare Date
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Produsele sau serviciile dvs.
 DocType: Mode of Payment,Mode of Payment,Mod de plata
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
@@ -1337,7 +1334,7 @@
 DocType: Student Group Student,Group Roll Number,Numărul rolurilor de grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totală a tuturor greutăților sarcinii trebuie să fie 1. Ajustați greutățile tuturor sarcinilor de proiect în consecință
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Echipamente de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
@@ -1364,7 +1361,7 @@
 DocType: Depreciation Schedule,Journal Entry,Intrare în jurnal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elemente în curs
 DocType: Workstation,Workstation Name,Stație de lucru Nume
-DocType: Grade Interval,Grade Code,Cod grad
+DocType: Grading Scale Interval,Grade Code,Cod grad
 DocType: POS Item Group,POS Item Group,POS Articol Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
@@ -1381,7 +1378,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,recurente upto
 DocType: Attendance,HR Manager,Manager Resurse Umane
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vă rugăm să selectați o companie
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vă rugăm să selectați o companie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege concediu
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizor Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
@@ -1397,7 +1394,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Produse Alimentare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Clasă de uzură 3
 DocType: Maintenance Schedule Item,No of Visits,Nu de vizite
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,marcă de prezență
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,marcă de prezență
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Planul de întreținere {0} există împotriva {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,student inregistrat
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta contului de închidere trebuie să fie {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puncte pentru toate obiectivele ar trebui să fie 100. este {0}
@@ -1446,13 +1444,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Grafic Conturi
 DocType: Material Request,Terms and Conditions Content,Termeni și condiții de conținut
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Maintenance Visit,Unscheduled,Neprogramat
 DocType: Employee,Owned,Deținut
 DocType: Salary Detail,Depends on Leave Without Pay,Depinde de concediu fără plată
 DocType: Pricing Rule,"Higher the number, higher the priority","Este mai mare numărul, mai mare prioritate"
 ,Purchase Invoice Trends,Cumpărare Tendințe factură
 DocType: Employee,Better Prospects,Perspective îmbunătăţite
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rândul # {0}: lotul {1} are doar {2} qty. Selectați un alt lot care are {3} qty disponibil sau împărți rândul în mai multe rânduri, pentru a livra / emite din mai multe loturi"
 DocType: Vehicle,License Plate,Înmatriculare
 DocType: Appraisal,Goals,Obiective
 DocType: Warranty Claim,Warranty / AMC Status,Garanție / AMC Starea
@@ -1471,7 +1470,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Angajat nu pot raporta la sine.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","În cazul în care contul este blocat, intrările sunt permite utilizatorilor restricționati."
 DocType: Email Digest,Bank Balance,Banca Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilul postului, calificări necesare, etc"
 DocType: Journal Entry Account,Account Balance,Soldul contului
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
@@ -1482,7 +1481,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afișați soldurile L P &amp; anul fiscal unclosed lui
 DocType: Shipping Rule,Shipping Account,Contul de transport maritim
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Cont {2} este inactiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Asigurați-vă Comenzi de vânzări pentru a vă ajuta să planificați munca și să livreze la timp
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Asigurați-vă Comenzi de vânzări pentru a vă ajuta să planificați munca și să livreze la timp
 DocType: Quality Inspection,Readings,Lecturi
 DocType: Stock Entry,Total Additional Costs,Costuri totale suplimentare
 DocType: Course Schedule,SH,SH
@@ -1493,7 +1492,7 @@
 DocType: Shipping Rule Condition,To Value,La valoarea
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depozit sursă este obligatorie pentru rând {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Slip de ambalare
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Slip de ambalare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Birou inchiriat
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import a eșuat!
@@ -1519,7 +1518,7 @@
 DocType: Sales Invoice,Source,Sursă
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afișează închis
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Categoria activ este obligatorie pentru postul de activ fix
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Categoria activ este obligatorie pentru postul de activ fix
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Acest {0} conflicte cu {1} pentru {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML studenții
@@ -1537,7 +1536,7 @@
 DocType: Student,Date of Leaving,Data Părăsirea
 DocType: Pricing Rule,For Price List,Pentru Lista de Preturi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cautare Executiva
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Creați Oportunitati
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Creați Oportunitati
 DocType: Maintenance Schedule,Schedules,Orarele
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
@@ -1565,7 +1564,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Inscrierile pentru programul
 DocType: Sales Invoice Item,Brand Name,Denumire marcă
 DocType: Purchase Receipt,Transporter Details,Detalii Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Cutie
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,posibil furnizor
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizația
@@ -1600,7 +1599,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM implicit pentru {0} nu a fost găsit pentru Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Cererile pentru cheltuieli companie.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenții sunt în centrul sistemului, adăugați toți elevii"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenții sunt în centrul sistemului, adăugați toți elevii"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rând # {0}: Data de lichidare {1} nu poate fi înainte de Cheque Data {2}
 DocType: Company,Default Holiday List,Implicit Listă de vacanță
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rândul {0}: De la timp și Ora {1} se suprapune cu {2}
@@ -1612,20 +1611,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,A doua zi (e) pe care se aplica pentru concediu sunt sărbători. Nu trebuie să se aplice pentru concediu.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Retrimite e-mail de plată
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Sarcina noua
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Face ofertă
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Face ofertă
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,alte rapoarte
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Încercați planificarea operațiunilor de X zile în avans.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Vă rugăm să setați Cont Cheltuieli suplimentare salarizare implicit în companie {0}
 DocType: SMS Center,Receiver List,Receptor Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,căutare articol
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,căutare articol
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumat Suma
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Schimbarea net în numerar
 DocType: Assessment Plan,Grading Scale,Scala de notare
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,deja finalizat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Cerere de plată există deja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
@@ -1663,7 +1662,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Colectarea
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nu puteți șterge Anul fiscal {0}. Anul fiscal {0} este setat ca implicit în Setări globale
 DocType: Journal Entry,Entry Type,Tipul de intrare
 ,Customer Credit Balance,Balanța Clienți credit
@@ -1706,8 +1705,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studiind în același Institut
 DocType: Territory,Territory Manager,Teritoriu Director
 DocType: Packed Item,To Warehouse (Optional),Pentru a Depozit (opțional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Plătit Suma (Compania de valuta)
 DocType: Purchase Invoice,Additional Discount,Discount suplimentar
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
@@ -1717,9 +1714,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vizualizare Coș
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Cerere de material utilizat pentru a face acest stoc de intrare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,În continuare Amortizarea Data este obligatoriu pentru nou activ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,În continuare Amortizarea Data este obligatoriu pentru nou activ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separați un grup bazat pe cursuri pentru fiecare lot
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separați un grup bazat pe cursuri pentru fiecare lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unitate unică a unui articol.
@@ -1736,9 +1733,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Centru de cost este necesară pentru &quot;profit și pierdere&quot; cont de {2}. Vă rugăm să configurați un centru de cost implicit pentru companie.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Contact nou
 DocType: Territory,Parent Territory,Teritoriul părinte
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1765,21 +1760,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliere JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
 DocType: Purchase Invoice Item,Batch No,Lot nr.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nu se poate găsi rata de schimb pentru {0} la {1} pentru data cheie {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permite mai multor comenzi de vânzări împotriva Ordinului de Procurare unui client
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 mobil nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variantă
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variantă
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
 DocType: Employee Attendance Tool,Employees HTML,Angajații HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
 DocType: Employee,Leave Encashed?,Concediu Incasat ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitatea de la câmp este obligatoriu
 DocType: Email Digest,Annual Expenses,Cheltuielile anuale
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Suma alocată
@@ -1799,7 +1793,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Cotatie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o normă de transport
-DocType: Grading Structure,Grading Intervals,Intervale de notare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Te rog intra
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nu se poate overbill pentru postul {0} în rândul {1} mai mult {2}. Pentru a permite supra-facturare, vă rugăm să setați în Setări de cumpărare"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Vă rugăm să setați filtru bazat pe postul sau depozit
@@ -1812,16 +1805,17 @@
 DocType: Authorization Control,Authorization Control,Control de autorizare
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Respins Warehouse este obligatorie împotriva postul respins {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Plată
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestionați comenzile
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestionați comenzile
 DocType: Production Order Operation,Actual Time and Cost,Timp și cost efective
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Cerere de material de maximum {0} se poate face pentru postul {1} împotriva comandă de vânzări {2}
 DocType: Employee,Salutation,Salut
 DocType: Course,Course Abbreviation,Abreviere curs de
 DocType: Student Leave Application,Student Leave Application,Aplicație elev Concediul
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Activ nu poate fi anulat, deoarece este deja {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Activ nu poate fi anulat, deoarece este deja {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Angajat {0} pe jumătate de zi pe {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Numărul total de ore de lucru nu trebuie sa fie mai mare de ore de lucru max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pornit
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Set de articole în momemntul vânzării.
 DocType: Quotation Item,Actual Qty,Cant efectivă
 DocType: Sales Invoice Item,References,Referințe
@@ -1831,7 +1825,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ați introdus elemente cu dubluri. Vă rugăm să rectifice și să încercați din nou.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Asociaţi
 DocType: Asset Movement,Asset Movement,Mișcarea activelor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nou Coș
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,nou Coș
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
 DocType: Vehicle,Wheels,roţi
@@ -1863,10 +1857,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Dezactivează crearea de busteni de timp împotriva comenzi de producție. Operațiunile nu trebuie să fie urmărite împotriva producției Ordine
 DocType: Student,Student Mobile Number,Elev Număr mobil
 DocType: Item,Has Variants,Are variante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ați selectat deja un produs de la {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ați selectat deja un produs de la {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID-ul lotului este obligatoriu
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID-ul lotului este obligatoriu
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID-ul lotului este obligatoriu
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID-ul lotului este obligatoriu
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Factura recurent
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managementul Proiectelor
@@ -1874,7 +1868,7 @@
 DocType: Budget,Fiscal Year,An Fiscal
 DocType: Vehicle Log,Fuel Price,Preț de combustibil
 DocType: Budget,Budget,Buget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bugetul nu pot fi atribuite în {0}, deoarece nu este un cont venituri sau cheltuieli"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Realizat
 DocType: Student Admission,Application Form Route,Forma de aplicare Calea
@@ -1905,7 +1899,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Suma {0} {1} dedusă împotriva {2}
 DocType: Employee,Salary Information,Informațiile de salarizare
 DocType: Sales Person,Name and Employee ID,Nume și ID angajat
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
 DocType: Website Item Group,Website Item Group,Site-ul Grupa de articole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Impozite și taxe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vă rugăm să introduceți data de referință
@@ -1964,7 +1958,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetați Venituri Clienți
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pereche
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
 DocType: Asset,Depreciation Schedule,Program de amortizare
 DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Jumătate Data zi ar trebui să fie între De la data si pana in prezent
@@ -1981,13 +1975,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
 DocType: Purchase Order,Delivered,Livrat
 ,Vehicle Expenses,Cheltuielile pentru vehicule
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
+DocType: Serial No,Invoice Details,Detaliile facturii
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
 DocType: Purchase Receipt,Vehicle Number,Numărul de vehicule
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data la care factura recurente vor fi opri
 DocType: Employee Loan,Loan Amount,Sumă împrumutată
@@ -2011,7 +2006,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grup non-grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,Nume de împrumut
@@ -2023,6 +2018,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Depozit în cazul în care se menține stocul de articole respinse
 DocType: Production Order,Skip Material Transfer,Transmiteți transferul materialului
 DocType: Production Order,Skip Material Transfer,Transmiteți transferul materialului
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Imposibil de găsit rata de schimb pentru {0} până la {1} pentru data cheie {2}. Creați manual un registru de schimb valutar
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Anul dvs. financiar se încheie pe
 DocType: POS Profile,Price List,Lista de prețuri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum anul fiscal implicit. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
@@ -2060,9 +2056,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Articolul {0} a fost deja returnat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anul fiscal** reprezintă un an financiar. Toate intrările contabile și alte tranzacții majore sunt monitorizate comparativ cu ** Anul fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Adresa principala
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 DocType: Student Admission,Eligibility,Eligibilitate
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Oportunitati de afaceri ajuta să obțineți, adăugați toate contactele și mai mult ca dvs. conduce"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Oportunitati de afaceri ajuta să obțineți, adăugați toate contactele și mai mult ca dvs. conduce"
 DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
@@ -2102,7 +2098,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selectați compania ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lăsați necompletat dacă se consideră pentru toate departamentele
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Process Payroll,Fortnightly,bilunară
 DocType: Currency Exchange,From Currency,Din moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
@@ -2118,7 +2114,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Postul copil nu ar trebui să fie un pachet de produse. Vă rugăm să eliminați elementul `{0}` și de a salva
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancar
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Adăugați pontaje
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Adăugați pontaje
 DocType: Vehicle Service,Service Item,Postul de servicii
 DocType: Bank Guarantee,Bank Guarantee,Garantie bancara
 DocType: Bank Guarantee,Bank Guarantee,Garantie bancara
@@ -2168,8 +2164,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prețurile nu vor fi afișate în cazul în care Prețul de listă nu este setat
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vă rugăm să specificați o țară pentru această regulă Transport sau verificați Expediere
 DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Pentru debit este necesar
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Pentru debit este necesar
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
 DocType: Offer Letter Term,Offer Term,Termen oferta
 DocType: Quality Inspection,Quality Manager,Manager de calitate
@@ -2203,14 +2199,14 @@
 DocType: Opportunity,Lost Reason,Motiv Pierdere
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Adresa noua
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vă rugăm să introduceți Document Primirea
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Toate articolele au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vă rugăm să introduceți Document Primirea
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Toate articolele au fost deja facturate
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vă rugăm să specificați un valabil ""Din cauza nr"""
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizatori și permisiuni
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Comenzi de producție Creat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Comenzi de producție Creat: {0}
 DocType: Branch,Branch,Ramură
 DocType: Guardian,Mobile Number,Numar de mobil
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Imprimarea și Branding
@@ -2219,7 +2215,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial nr {0} nu a fost găsit
 DocType: Scheduling Tool,Student Batch,Lot de student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Clienții dvs.
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Asigurați-Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Asigurați-Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ați fost invitat să colaboreze la proiect: {0}
 DocType: Leave Block List Date,Block Date,Dată blocare
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplica acum
@@ -2243,8 +2239,9 @@
 DocType: SMS Log,Sent To,Trimis La
 DocType: Payment Request,Make Sales Invoice,Realizeaza Factura de Vanzare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,În continuare Contact Data nu poate fi în trecut
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,În continuare Contact Data nu poate fi în trecut
 DocType: Company,For Reference Only.,Numai Pentru referință.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Selectați numărul lotului
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Sumă în avans
@@ -2258,7 +2255,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cazul Nr. nu poate fi 0
 DocType: Item,Show a slideshow at the top of the page,Arata un slideshow din partea de sus a paginii
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Magazine
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Magazine
 DocType: Serial No,Delivery Time,Timp de Livrare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Uzură bazată pe
 DocType: Item,End of Life,Sfârsitul vieții
@@ -2274,8 +2271,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material de transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Acest document este peste limita de {0} {1} pentru elementul {4}. Faci un alt {3} împotriva aceleași {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Vă rugăm să setați recurente după salvare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,cont Selectați suma schimbare
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Vă rugăm să setați recurente după salvare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,cont Selectați suma schimbare
 DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
 DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
@@ -2286,7 +2283,7 @@
 DocType: Budget Account,Budget Account,Contul bugetar
 DocType: Quality Inspection,Verified By,Verificate de
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nu se poate schimba moneda implicita a companiei, deoarece există tranzacții in desfasurare. Tranzacțiile trebuie să fie anulate pentru a schimba moneda implicita."
-DocType: Grade Interval,Grade Description,grad Descriere
+DocType: Grading Scale Interval,Grade Description,grad Descriere
 DocType: Stock Entry,Purchase Receipt No,Primirea de cumpărare Nu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Banii cei mai castigati
 DocType: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
@@ -2324,7 +2321,7 @@
 DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
 DocType: Warranty Claim,Raised By,Ridicate de
 DocType: Payment Gateway Account,Payment Account,Cont de plăți
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Schimbarea net în conturile de creanțe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Fara Masuri Compensatorii
 DocType: Offer Letter,Accepted,Acceptat
@@ -2337,7 +2334,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utilizator
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
 DocType: Employee,Previous Work Experience,Anterior Work Experience
@@ -2351,7 +2348,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Numele institutului pentru care configurați acest sistem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Intrare contabilitate blocată până la această dată, nimeni nu poate crea / modifica intrarea cu excepția rolului specificat mai jos."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status Proiect
 DocType: UOM,Check this to disallow fractions. (for Nos),Bifati pentru a nu permite fracțiuni. (Pentru Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Au fost create următoarele comenzi de producție:
@@ -2374,6 +2371,7 @@
 DocType: Email Digest,How frequently?,Cât de frecvent?
 DocType: Purchase Receipt,Get Current Stock,Obține stocul curent
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arborele de Bill de materiale
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 DocType: Student,Joining Date,Daca va aflati Data
 ,Employees working on a holiday,Numar de angajati care lucreaza in vacanta
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Prezent
@@ -2474,7 +2472,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Data Aprobare nespecificata
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producţie
 DocType: Guardian,Occupation,Ocupaţie
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
 DocType: Sales Invoice,This Document,Acest document de
 DocType: Installation Note Item,Installed Qty,Instalat Cantitate
@@ -2497,8 +2495,8 @@
 DocType: Notification Control,Sales Order Message,Comandă de vânzări Mesaj
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Seta valorile implicite, cum ar fi Compania, valutar, Current Anul fiscal, etc"
 DocType: Payment Entry,Payment Type,Tip de plată
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
 DocType: Process Payroll,Select Employees,Selectați angajati
 DocType: Opportunity,Potential Sales Deal,Oferta potențiale Vânzări
 DocType: Payment Entry,Cheque/Reference Date,Cecul / Data de referință
@@ -2515,7 +2513,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},POS Profile Global {0} deja create pentru companie {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Înlocuiți Articol / BOM în toate extraselor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Document primire trebuie să fie depuse
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Document primire trebuie să fie depuse
 DocType: Purchase Invoice Item,Received Qty,Primit Cantitate
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / lot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nu sunt plătite și nu sunt livrate
@@ -2528,7 +2526,7 @@
 ,To Produce,Pentru a produce
 apps/erpnext/erpnext/config/hr.py +93,Payroll,stat de plată
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pentru rândul {0} în {1}. Pentru a include {2} ratei punctul, randuri {3} De asemenea, trebuie să fie incluse"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Asigurați-vă utilizatorului
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Asigurați-vă utilizatorului
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificarea pachetului pentru livrare (pentru imprimare)
 DocType: Bin,Reserved Quantity,Rezervat Cantitate
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Introduceți adresa de e-mail validă
@@ -2542,11 +2540,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,șablon cu handicap nu trebuie să fie șablon implicit
 DocType: Account,Income Account,Contul de venit
 DocType: Payment Request,Amount in customer's currency,Suma în moneda clientului
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Livrare
 DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","A se vedea ""Rate de materiale bazate pe"" în Costing Secțiunea"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Sarjele ajută să urmăriți prezență, evaluările și taxele pentru studenți"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Sarjele ajută să urmăriți prezență, evaluările și taxele pentru studenți"
 DocType: Payment Entry,Total Allocated Amount,Suma totală alocată
 DocType: Item Reorder,Material Request Type,Material Cerere tip
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Jurnal de intrare pentru salarii din {0} la {1}
@@ -2569,7 +2568,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track conduce de Industrie tip.
 DocType: Item Supplier,Item Supplier,Furnizor Articol
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
@@ -2579,6 +2578,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Va trimite un e-mail despre eveniment angajaților cu statut &quot;Open&quot;
 DocType: Task,Depends on Tasks,Depinde de Sarcini
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gestioneaza Ramificatiile de Group a Clientului.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Atașamentele pot fi afișate fără a permite coșul de cumpărături
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Numele noului centru de cost
 DocType: Leave Control Panel,Leave Control Panel,Panou de Control Concediu
@@ -2591,12 +2591,10 @@
 DocType: Sales Invoice,Debit To,Debit Pentru
 DocType: Delivery Note,Required only for sample item.,Necesar numai pentru element de probă.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant efectivă după tranzacție
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nu slip salariu gasit între {0} și {1}
 ,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admitere Student
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} este dezactivat
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} este dezactivat
 DocType: Supplier,Billing Currency,Moneda de facturare
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra mare
@@ -2613,7 +2611,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Pagina de intrare de produse recomandate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Toate grupurile de evaluare
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nume nou depozit
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritoriu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
 DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
@@ -2631,7 +2629,7 @@
 DocType: Price List,Price List Master,Lista de preturi Masterat
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
 DocType: Price List,Applicable for Countries,Aplicabile pentru țările
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Lăsați numai aplicațiile cu statut „Aprobat“ și „Respins“ pot fi depuse
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Grupul studențesc Nume este obligatoriu în rândul {0}
@@ -2724,7 +2722,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Intrare contabilitate pentru stoc
 DocType: Vehicle Service,Engine Oil,Ulei de motor
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă clientului
 DocType: Employee Loan,Loan Details,Creditul Detalii
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rândul {0}: Completat Cant trebuie să fie mai mare decât zero.
@@ -2789,7 +2787,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Depozite tranzacție existente nu pot fi convertite în grup.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira la
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Adăugați studenți
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Adăugați studenți
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vă rugăm să selectați {0}
 DocType: C-Form,C-Form No,Nr. formular-C
 DocType: BOM,Exploded_items,Exploded_items
@@ -2854,7 +2852,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limita Traversat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risc
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Un termen academic cu acest &quot;An universitar&quot; {0} și &quot;Numele Termenul&quot; {1} există deja. Vă rugăm să modificați aceste intrări și încercați din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Deoarece există tranzacții existente la postul {0}, nu puteți modifica valoarea {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Deoarece există tranzacții existente la postul {0}, nu puteți modifica valoarea {1}"
 DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Cereri noi de concediu alocate (în zile)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial Nu {0} nu există
@@ -2898,7 +2896,7 @@
 DocType: Supplier,Last Day of the Next Month,Ultima zi a lunii următoare
 DocType: Support Settings,Auto close Issue after 7 days,Auto închidere Problemă după 7 zile
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Concediu nu poate fi repartizat înainte {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Solicitantul elev
 DocType: Asset Category Account,Accumulated Depreciation Account,Cont Amortizarea cumulată
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
@@ -2926,7 +2924,7 @@
 DocType: Asset,Item Code,Cod articol
 DocType: Production Planning Tool,Create Production Orders,Creare Comenzi de Producție
 DocType: Serial No,Warranty / AMC Details,Garanție / AMC Detalii
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
 DocType: Journal Entry,User Remark,Observație utilizator
 DocType: Lead,Market Segment,Segmentul de piață
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Suma plătită nu poate fi mai mare decât suma totală negativă restante {0}
@@ -2945,7 +2943,7 @@
 DocType: Production Planning Tool,Create Material Requests,Creare Necesar de Materiale
 DocType: Employee Education,School/University,Școlar / universitar
 DocType: Payment Request,Reference Details,Detalii de referință
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valoarea așteptată după viață utilă trebuie să fie mai mică Sumă brută Cumpărare
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valoarea așteptată după viață utilă trebuie să fie mai mică Sumă brută Cumpărare
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantitate disponibilă în depozit
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Sumă facturată
 DocType: Asset,Double Declining Balance,Dublu degresive
@@ -2966,19 +2964,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma debursate nu poate fi mai mare decât Suma creditului {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Comanda de producție nu a fost creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Comanda de producție nu a fost creat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie dupã 'Până în Data'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
 DocType: Asset,Fully Depreciated,Depreciata pe deplin
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Participarea marcat HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Cotațiile sunt propuneri, sumele licitate le-ați trimis clienților dvs."
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Cotațiile sunt propuneri, sumele licitate le-ați trimis clienților dvs."
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial și Lot nr
 DocType: Warranty Claim,From Company,De la Compania
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma Scorurile de criterii de evaluare trebuie să fie {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Vă rugăm să setați Numărul de Deprecieri rezervat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vă rugăm să setați Numărul de Deprecieri rezervat
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valoare sau Cantitate
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
@@ -3109,7 +3107,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupul studențesc
 DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vă rugăm să selectați Clienți
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Vă rugăm să selectați Clienți
 DocType: C-Form,I,eu
 DocType: Company,Asset Depreciation Cost Center,Amortizarea activului Centru de cost
 DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
@@ -3128,19 +3126,18 @@
 DocType: Vehicle,Insurance Details,Detalii de asigurare
 DocType: Account,Payable,Plătibil
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vă rugăm să introduceți perioada de rambursare
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitorilor ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitorilor ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clienți noi
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Profit Brut%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Aprobare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Valoarea brută Achiziția este obligatorie
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Valoarea brută Achiziția este obligatorie
 DocType: Lead,Address Desc,Adresă Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party este obligatorie
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nume subiect
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Cel puţin una din opţiunile de vânzare sau cumpărare trebuie să fie selectată
-DocType: Grading Structure,Grade Intervals,Intervale de grad
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selectați natura afacerii dumneavoastră.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,În cazul în care operațiunile de fabricație sunt efectuate.
 DocType: Asset Movement,Source Warehouse,Depozit sursă
@@ -3169,6 +3166,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
 DocType: Territory,Territory Targets,Obiective Territory
 DocType: Delivery Note,Transporter Info,Info Transporter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Vă rugăm să setați implicit {0} în {1} companie
 DocType: Cheque Print Template,Starting position from top edge,Poziția de la muchia superioară de pornire
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Același furnizor a fost introdus de mai multe ori
@@ -3222,7 +3220,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reordonare Cantitate
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Locuri de munca disponibile
 DocType: Company,Stock Adjustment Account,Cont Ajustarea stoc
-DocType: Journal Entry,Write Off,Achita
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Achita
 DocType: Timesheet Detail,Operation ID,Operațiunea ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Utilizator de sistem (login) de identitate. Dacă este setat, el va deveni implicit pentru toate formele de resurse umane."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: de la {1}
@@ -3233,8 +3231,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizor livrează la client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Postul / {0}) este din stoc
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Următoarea dată trebuie să fie mai mare de postare Data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Arată impozit break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datele de import și export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","intrările de stoc există împotriva Warehouse {0}, prin urmare, nu se poate re-atribui sau modifica"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nu există elevi găsit
@@ -3246,14 +3244,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Din AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selectați Cotațiile
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selectați Cotațiile
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selectați Cotațiile
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selectați Cotațiile
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
 DocType: Company,Default Cash Account,Cont de Numerar Implicit
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Aceasta se bazează pe prezența acestui student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nu există studenți în
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Adăugați mai multe elemente sau sub formă deschis complet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
@@ -3300,9 +3299,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Pentru a {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impozite și Taxe adăugate (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
 DocType: Sales Order,Partly Billed,Parțial Taxat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Postul {0} trebuie să fie un element activ fix
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Postul {0} trebuie să fie un element activ fix
 DocType: Item,Default BOM,FDM Implicit
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Vă rugăm să re-tip numele companiei pentru a confirma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totală restantă Amt
@@ -3325,7 +3324,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Lista de prețuri Cursul de schimb
 DocType: Purchase Invoice Item,Rate,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interna
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Numele adresei
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Numele adresei
 DocType: Stock Entry,From BOM,De la BOM
 DocType: Assessment Code,Assessment Code,Codul de evaluare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Elementar
@@ -3350,7 +3349,7 @@
 DocType: Purchase Invoice,Print Language,Limba de imprimare
 DocType: Salary Slip,Total Working Hours,Numărul total de ore de lucru
 DocType: Stock Entry,Including items for sub assemblies,Inclusiv articole pentru subansambluri
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Toate teritoriile
 DocType: Purchase Invoice,Items,Articole
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student este deja înscris.
@@ -3370,17 +3369,15 @@
 DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Datele De La și Pana La necesare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
 DocType: Assessment Plan,Supervisor Name,Nume supervizor
 DocType: Program Enrollment Course,Program Enrollment Course,Curs de înscriere la curs
 DocType: Program Enrollment Course,Program Enrollment Course,Curs de înscriere la curs
-DocType: Grading Structure,Grading Structure,Structura de notare
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
 DocType: Tax Rule,Shipping City,Transport Oraș
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Acest post este o variantă de {0} (Template). Atributele vor fi copiate pe de modelul cu excepția cazului este setat ""Nu Copy"""
 DocType: Notification Control,Customize the Notification,Personalizare Notificare
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash Flow din Operațiuni
 DocType: Sales Invoice,Shipping Rule,Regula de transport maritim
@@ -3403,6 +3400,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Deschiderea Data ar trebui să fie, înainte de Data inchiderii"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 DocType: Leave Control Panel,Carry Forward,Transmite Inainte
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrul de Cost cu tranzacții existente nu poate fi transformat în registru contabil
 DocType: Department,Days for which Holidays are blocked for this department.,Zile pentru care Sărbătorile sunt blocate pentru acest departament.
@@ -3431,7 +3429,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Crearea angajaților Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Crearea angajaților Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Raport Prezent
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Declarațiile contabile
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Oră
@@ -3446,8 +3444,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Noul BOM după înlocuirea
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Suma primită
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Creați pentru întreaga cantitate, ignorând cantitatea deja la comandă"
 DocType: Account,Tax,Impozite
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nemarcate
@@ -3460,7 +3456,7 @@
 DocType: Batch,Source Document Name,Numele sursei de document
 DocType: Batch,Source Document Name,Numele sursei de document
 DocType: Job Opening,Job Title,Denumire post
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Creați Utilizatori
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Creați Utilizatori
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitați raport de apel de întreținere.
@@ -3472,8 +3468,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
 DocType: BOM,Website Description,Site-ul Descriere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Schimbarea net în capitaluri proprii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,primire
 ,Sales Register,Vânzări Inregistrare
@@ -3484,16 +3480,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nu este nimic pentru a edita.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
 DocType: Customer Group,Customer Group Name,Nume Group Client
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nu există clienți încă!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Situația fluxurilor de trezorerie
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licență
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
 DocType: GL Entry,Against Voucher Type,Comparativ tipului de voucher
 DocType: Item,Attributes,Atribute
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Ultima comandă Data
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
 DocType: Student,Guardian Details,Detalii tutore
 DocType: C-Form,C-Form,Formular-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcă Participarea pentru mai mulți angajați
@@ -3518,14 +3516,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rândul {0} # cont trebuie să fie de tip &quot;Activ fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Cantitate
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reguli pentru a calcula suma de transport maritim pentru o vânzare
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seria este obligatorie
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seria este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicii financiare
 DocType: Student Sibling,Student ID,Carnet de student
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipuri de activități pentru busteni Timp
 DocType: Tax Rule,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
 DocType: Leave Allocation,Unused leaves,Frunze neutilizate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Stat de facturare
@@ -3558,7 +3556,7 @@
 DocType: Payment Entry,Account Paid From,Contul plătit De la
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Material brut Articol Cod
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Asigurați-vă de plumb
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Asigurați-vă de plumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Imprimare și articole de papetărie
 DocType: Stock Settings,Show Barcode Field,Afișează coduri de bare Câmp
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Trimite email-uri Furnizor
@@ -3574,6 +3572,7 @@
 DocType: Offer Letter,Awaiting Response,Se aşteaptă răspuns
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Sus
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut nevalid {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Menționați dacă contul de plată non-standard
 DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
@@ -3610,7 +3609,7 @@
 DocType: Program Enrollment Tool,Get Students From,Elevii de la a lua
 DocType: Hub Settings,Seller Country,Vânzător Țară
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publica Articole pe site-ul
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa elevii în loturi
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa elevii în loturi
 DocType: Authorization Rule,Authorization Rule,Regulă de autorizare
 DocType: Sales Invoice,Terms and Conditions Details,Termeni și condiții Detalii
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specificaţii:
@@ -3670,7 +3669,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probă
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componente salariale
 DocType: Program Enrollment Tool,New Academic Year,Anul universitar nou
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Revenire / credit Notă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Revenire / credit Notă
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserați Auto rata Lista de prețuri, dacă lipsește"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Total Suma plătită
 DocType: Production Order Item,Transferred Qty,Transferat Cantitate
@@ -3711,6 +3710,7 @@
 ,Sales Funnel,De vânzări pâlnie
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abreviere este obligatorie
 DocType: Project,Task Progress,Progresul sarcină
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Cart
 ,Qty to Transfer,Cantitate de a transfera
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
@@ -3744,7 +3744,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Colectarea taxelor
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
 DocType: Lead,Add to calendar on this date,Adăugaţi în calendar la această dată
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
 DocType: Item,Opening Stock,deschidere stoc
@@ -3763,7 +3763,7 @@
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comenzi lansat pentru producție.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Program Enrollment Tool,Enroll Students,Studenți Enroll
 DocType: Hub Settings,Name Token,Numele Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vanzarea Standard
@@ -3774,7 +3774,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Denumirea proiectului
-DocType: Supplier,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
+DocType: Customer,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
 DocType: Journal Entry Account,If Income or Expense,In cazul Veniturilor sau Cheltuielilor
 DocType: Production Order,Required Items,Elemente obligatorii
 DocType: Stock Ledger Entry,Stock Value Difference,Valoarea Stock Diferența
@@ -3805,6 +3805,7 @@
 DocType: Item,Taxes,Impozite
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Plătite și nu sunt livrate
 DocType: Project,Default Cost Center,Cost Center Implicit
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 DocType: Bank Guarantee,End Date,Dată finalizare
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Tranzacții de stoc
 DocType: Budget,Budget Accounts,Conturile bugetare
@@ -3869,7 +3870,7 @@
 DocType: Customer,Sales Partner and Commission,Partener de vânzări și a Comisiei
 DocType: Employee Loan,Rate of Interest (%) / Year,Rata dobânzii (%) / An
 ,Project Quantity,proiectul Cantitatea
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} pentru toate articolele este zero, poate fi ar trebui să schimbați „Distribuirea cheltuielilor pe baza“"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} pentru toate articolele este zero, poate fi ar trebui să schimbați „Distribuirea cheltuielilor pe baza“"
 DocType: Opportunity,To Discuss,Pentru a discuta
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unități de {1} necesare în {2} pentru a finaliza această tranzacție.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rata dobânzii (%) anual
@@ -3892,7 +3893,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rând {0}: Moneda de BOM # {1} ar trebui să fie egal cu moneda selectată {2}
 DocType: Journal Entry Account,Exchange Rate,Rata de schimb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
 DocType: Homepage,Tag Line,Eticheta linie
 DocType: Fee Component,Fee Component,Taxa de Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Conducerea flotei
@@ -3909,7 +3910,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Depozitul {0} nu există
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inregistreaza-te pentru ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Procente de distribuție lunare
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Rata de evaluare nu a fost găsit pentru elementul {0}, care trebuie să facă înregistrări contabile pentru {1} {2}. În cazul în care elementul este ca un element transacting probă în {1}, vă rugăm să menționați că în {1} tabel element. În caz contrar, vă rugăm să creați o tranzacție stoc de intrare pentru element sau menționează rata de evaluare în înregistrarea element și apoi încercați submiting / anulare această intrare"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiale livrate versus notele livrarii
 DocType: Project,Customer Details,Detalii Client
@@ -3926,7 +3927,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,comenzile trimise nu pot fi șterse
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Managementul calității
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Postul {0} a fost dezactivat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Postul {0} a fost dezactivat
 DocType: Employee Loan,Repay Fixed Amount per Period,Rambursa Suma fixă pentru fiecare perioadă
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
 DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
@@ -3953,7 +3954,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ID-ul de student e-mail
 DocType: Employee,Notice (days),Preaviz (zile)
 DocType: Tax Rule,Sales Tax Template,Format impozitul pe vânzări
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selectați elemente pentru a salva factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Selectați elemente pentru a salva factura
 DocType: Employee,Encashment Date,Data plata in Numerar
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajustarea stoc
@@ -3986,6 +3987,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Notă Eliberat
 DocType: Production Order,Warehouses,Depozite
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activul nu poate fi transferat
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Acest element este o variantă de {0} (șablon).
 DocType: Workstation,per hour,pe oră
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,cumpărare
 DocType: Announcement,Announcement,Anunţ
@@ -4001,7 +4003,7 @@
 DocType: Account,Receivable,De încasat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol care i se permite să prezinte tranzacțiile care depășesc limitele de credit stabilite.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selectați elementele de Fabricare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Selectați elementele de Fabricare
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","datele de bază de sincronizare, ar putea dura ceva timp"
 DocType: Item,Material Issue,Problema de material
 DocType: Hub Settings,Seller Description,Descriere vânzător
@@ -4014,7 +4016,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordonat
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Criterii de evaluare de grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Amortizarea de deschidere trebuie să fie mai mică Acumulate decât egală cu {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Amortizarea de deschidere trebuie să fie mai mică Acumulate decât egală cu {0}
 DocType: Warehouse,Warehouse Name,Denumire depozit
 DocType: Naming Series,Select Transaction,Selectați Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vă rugăm să introduceți Aprobarea Rolul sau aprobarea de utilizare
@@ -4049,7 +4051,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,A adera
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Employee Loan,Repay from Salary,Rambursa din salariu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Solicitarea de plată contra {0} {1} pentru suma {2}
@@ -4067,7 +4069,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Evaluare Rezultat Detalii
 DocType: Employee Education,Employee Education,Educație Angajat
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Grup de element dublu exemplar găsit în tabelul de grup de elemente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
 DocType: Salary Slip,Net Pay,Plată netă
 DocType: Account,Account,Cont
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Nu {0} a fost deja primit
@@ -4076,7 +4078,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Depozit {0} nu este legată de nici un cont, vă rugăm să creați / link contul corespunzător (activ) pentru depozit."
 DocType: Purchase Invoice,Recurring Id,Recurent Id
 DocType: Customer,Sales Team Details,Detalii de vânzări Echipa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Șterge definitiv?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Șterge definitiv?
 DocType: Expense Claim,Total Claimed Amount,Total suma pretinsă
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potențiale oportunități de vânzare.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4087,13 +4089,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup Școala în ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),De schimbare a bazei Suma (Companie Moneda)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salvați documentul primul.
 DocType: Account,Chargeable,Taxabil/a
 DocType: Company,Change Abbreviation,Schimbarea abreviere
 DocType: Expense Claim Detail,Expense Date,Data cheltuieli
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Ultima cantitate
+DocType: Task,Is Milestone,Este Milestone
 DocType: Daily Work Summary,Email Sent To,Email trimis catre
 DocType: Budget,Warn,Avertiza
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate."
@@ -4127,11 +4130,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic de %d zile.
 DocType: Tax Rule,Purchase Tax Template,Achiziționa Format fiscală
 ,Project wise Stock Tracking,Proiect înțelept Tracking Stock
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programul de Mentenanta {0} există comparativ cu {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cant efectivă (la sursă/destinaţie)
 DocType: Item Customer Detail,Ref Code,Cod de Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Înregistrări angajat.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
 DocType: HR Settings,Payroll Settings,Setări de salarizare
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Locul de comandă
@@ -4154,7 +4156,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cecuri și Depozite respingă incorect
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
 DocType: Purchase Invoice Item,Price List Rate,Lista de prețuri Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Creați citate client
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Creați citate client
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Arata ""Pe stoc"" sau ""nu este pe stoc"", bazat pe stoc disponibil în acest depozit."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Factură de materiale (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Timpul mediu luate de către furnizor de a livra
@@ -4176,7 +4178,7 @@
 DocType: Asset,Disposal Date,eliminare Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailuri vor fi trimise tuturor angajaților activi ai companiei la ora dat, în cazul în care nu au vacanță. Rezumatul răspunsurilor vor fi trimise la miezul nopții."
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback formare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
@@ -4184,7 +4186,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},"Desigur, este obligatorie în rândul {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Până în prezent nu poate fi înainte de data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Adăugați / editați preturi
 DocType: Batch,Parent Batch,Lotul părinte
 DocType: Batch,Parent Batch,Lotul părinte
 DocType: Cheque Print Template,Cheque Print Template,Format Print cecului
@@ -4229,7 +4231,7 @@
 DocType: Item,Variant Based On,Varianta Bazat pe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Furnizorii dumneavoastră
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
 DocType: Request for Quotation Item,Supplier Part No,Furnizor de piesa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nu se poate deduce atunci când este categoria de &quot;evaluare&quot; sau &quot;Vaulation și Total&quot;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Primit de la
@@ -4239,7 +4241,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: de la {0} pentru {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rândul {0}: Valoarea ore trebuie să fie mai mare decât zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
 DocType: Issue,Content Type,Tip Conținut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
@@ -4248,20 +4250,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
 DocType: Payment Reconciliation,From Invoice Date,De la data facturii
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"monedă de facturare trebuie să fie egală cu moneda sau contul de partid valută, fie implicit comapany lui"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"monedă de facturare trebuie să fie egală cu moneda sau contul de partid valută, fie implicit comapany lui"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lasă încasări
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ce face?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Pentru Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Toate Admitere Student
 ,Average Commission Rate,Rată de comision medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
 DocType: School House,House Name,Numele casei
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Actualizati costuri suplimentare pentru a calcula costul aterizat de articole
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Electric
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adăugați restul organizației dvs. ca utilizatorii. Puteți adăuga, de asemenea, invita clienții să portalul prin adăugarea acestora din Contacte"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adăugați restul organizației dvs. ca utilizatorii. Puteți adăuga, de asemenea, invita clienții să portalul prin adăugarea acestora din Contacte"
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID-ul de utilizator nu este setat pentru Angajat {0}
@@ -4270,7 +4272,7 @@
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Memento dată naştere pentru {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Zile de la ultima comandă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Asigurare Data de pornire ar trebui să fie mai mică de asigurare Data terminării
@@ -4285,7 +4287,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Salariu de alunecare angajat al {0} deja creat pentru foaie de timp {1}
 DocType: Vehicle Log,Odometer,Contorul de kilometraj
 DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nu conține nici un element de stoc
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Perioada de la si perioadă la datele obligatorii pentru recurente {0}
@@ -4298,7 +4300,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore de facturare
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM implicit pentru {0} nu a fost găsit
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Atingeți elementele pentru a le adăuga aici
 DocType: Fees,Program Enrollment,programul de înscriere
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vă rugăm să setați {0}
@@ -4400,7 +4403,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Primul Răspuns la
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Crucea Listarea de punctul în mai multe grupuri
-DocType: Grade Interval,Grade Interval,grad Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Data începerii anului fiscal și se termină anul fiscal la data sunt deja stabilite în anul fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance-ul Data actualizat
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Lot
@@ -4408,6 +4410,7 @@
 DocType: Request for Quotation Supplier,Download PDF,descarcă PDF
 DocType: Production Order,Planned End Date,Planificate Data de încheiere
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,În cazul în care elementele sunt stocate.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
 DocType: Request for Quotation,Supplier Detail,Detalii furnizor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Eroare în formulă sau o condiție: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Suma facturată
@@ -4453,7 +4456,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configurarea unui site simplu pentru organizația mea
 DocType: Payment Reconciliation,Receivable / Payable Account,De încasat de cont / de plătit
 DocType: Delivery Note Item,Against Sales Order Item,Comparativ articolului comenzii de vânzări
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vă rugăm să introduceți centru de cost părinte
@@ -4512,7 +4515,7 @@
 ,Items To Be Requested,Articole care vor fi solicitate
 DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
 DocType: Company,Company Info,Informatii Companie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selectați sau adăugați client nou
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Selectați sau adăugați client nou
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,centru de cost este necesar pentru a rezerva o cerere de cheltuieli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Aceasta se bazează pe prezența a acestui angajat
@@ -4525,13 +4528,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Opri utilizatorii de la a face aplicații concediu pentru următoarele zile.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Suma cumpărată
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Furnizor de oferta {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Sfârșitul anului nu poate fi înainte de Anul de început
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Sfârșitul anului nu poate fi înainte de Anul de început
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Beneficiile angajatului
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Production Order,Manufactured Qty,Produs Cantitate
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vă rugăm să setați o valoare implicită Lista de vacanță pentru angajat {0} sau companie {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nu există
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nu există
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
@@ -4540,15 +4543,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Butuc
 DocType: GL Entry,Voucher Type,Tip Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Employee Loan Application,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
 DocType: Guardian,Guardian,gardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creată pentru angajatul {1} în intervalul de timp dat
 DocType: Employee,Education,Educație
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Campanie denumita de
 DocType: Employee,Current Address Is,Adresa Actuală Este
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificată
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opțional. Setează implicit moneda companiei, în cazul în care nu este specificat."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Inregistrari contabile de jurnal.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
@@ -4585,7 +4590,7 @@
 DocType: Hub Settings,Hub Settings,Setări Hub
 DocType: Project,Gross Margin %,Marja Bruta%
 DocType: BOM,With Operations,Cu Operațiuni
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
 DocType: Asset,Is Existing Asset,Este activ existent
 DocType: Salary Detail,Statistical Component,Componenta statistică
 DocType: Salary Detail,Statistical Component,Componenta statistică
@@ -4641,7 +4646,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Atașați logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveluri stoc
 DocType: Customer,Commission Rate,Rata de Comision
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Face Varianta
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipul de plată trebuie să fie unul dintre Primire, Pay și de transfer intern"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Google Analytics
@@ -4654,6 +4659,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Permiteţi operaţii de producție pe durata sărbătorilor
 DocType: Sales Order,Customer's Purchase Order Date,Data Comanda de Aprovizionare Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Afișați atașamentele publice
 DocType: Packing Slip,Package Weight Details,Pachetul Greutate Detalii
 DocType: Payment Gateway Account,Payment Gateway Account,Plata cont Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,După finalizarea plății de redirecționare utilizator la pagina selectată.
@@ -4678,7 +4684,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nu afisa nici un simbol de genul $ etc alături de valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Asigurați-Lot Student
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Asigurați-Lot Student
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obține articole din FDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Timpul in Zile Conducere
@@ -4697,8 +4703,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sancționate Suma
 DocType: GL Entry,Is Opening,Se deschide
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Contul {0} nu există
 DocType: Account,Cash,Numerar
 DocType: Employee,Short biography for website and other publications.,Scurta biografie pentru site-ul web și alte publicații.
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 733f3f4..00a91c5 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Пакетная Пункт экспирации Статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банковский счет
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Показать варианты
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Показать варианты
 DocType: Academic Term,Academic Term,академический срок
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материал
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Количество
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравоохранение
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задержка в оплате (дни)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Услуги Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Счет
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Финансовый год {0} требуется
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,То же компания вошла более чем один раз
 DocType: Employee,Married,Замужем
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускается для {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не допускается для {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Получить товары от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Установите систему присвоения имен сотрудникам в разделе «Персонал»&gt; «Настройки персонала».
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,"Нет элементов, перечисленных"
 DocType: Payment Reconciliation,Reconcile,Согласовать
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовый
 DocType: Quality Inspection Reading,Reading 1,Чтение 1
 DocType: Process Payroll,Make Bank Entry,Создать проводку по Банку
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следующая амортизация Дата не может быть перед покупкой Даты
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следующая амортизация Дата не может быть перед покупкой Даты
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**Распределение по месяцам** позволяет распределить бюджет/цель по месяцам при наличии сезонности в вашем бизнесе.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Не нашли товар
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Не нашли товар
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Структура заработной платы Отсутствующий
 DocType: Lead,Person Name,Имя лица
 DocType: Sales Invoice Item,Sales Invoice Item,Счет продаж товара
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","например, &quot;Начальная школа&quot; или &quot;Университет&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Отчеты по Запасам
 DocType: Warehouse,Warehouse Detail,Склад Подробно
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Срок Дата окончания не может быть позднее, чем за год Дата окончания учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","Нельзя отменить выбор ""Является основным средством"", поскольку по данному пункту имеется запись по активам"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","Нельзя отменить выбор ""Является основным средством"", поскольку по данному пункту имеется запись по активам"
 DocType: Vehicle Service,Brake Oil,Тормозные масла
 DocType: Tax Rule,Tax Type,Налоги Тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавить или обновить записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Пункт изображения (если не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Часовая Ставка / 60) * Фактическое время работы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Выберите BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Выберите BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Стоимость доставленных изделий
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Праздник на {0} не между From Date и To Date
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,класс
 DocType: Sales Invoice Item,Delivered By Supplier,Поставленные Поставщиком
 DocType: SMS Center,All Contact,Все Связаться
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производственный заказ уже создан для всех элементов с BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Производственный заказ уже создан для всех элементов с BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годовой оклад
 DocType: Daily Work Summary,Daily Work Summary,Ежедневно Резюме Работа
 DocType: Period Closing Voucher,Closing Fiscal Year,Закрытие финансового года
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} заморожен
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} заморожен
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Пожалуйста, выберите существующую компанию для создания плана счетов"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Расходы по Запасам
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Выберите целевое хранилище
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra запись
 DocType: Journal Entry Account,Credit in Company Currency,Кредит в валюте компании
 DocType: Delivery Note,Installation Status,Состояние установки
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Вы хотите обновить посещаемость? <br> Присутствуют: {0} \ <br> Отсутствовали: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Кол-во Принято + Отклонено должно быть равно полученному количеству по позиции {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Поставка сырья для покупки
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,По крайней мере один способ оплаты требуется для POS счета.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,По крайней мере один способ оплаты требуется для POS счета.
 DocType: Products Settings,Show Products as a List,Показать продукты списком
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Скачать шаблон, заполнить соответствующие данные и приложить измененный файл.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Сделать запись амортизации
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип запроса
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Сделать Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Сделать Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Вещание
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Реализация
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Информация о выполненных операциях.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Запланируйте для посещения технического обслуживания.
 DocType: SMS Settings,Enter url parameter for message,Введите параметр URL для сообщения
 DocType: POS Profile,Customer Groups,Группы клиентов
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Финансовые отчеты
 DocType: Guardian,Students,Студенты
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила применения цен и скидки.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список Серия для этого сделки
 DocType: Company,Default Payroll Payable Account,По умолчанию Payroll оплаты счетов
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Обновление Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Обновление Email Group
 DocType: Sales Invoice,Is Opening Entry,Открывает запись
 DocType: Customer Group,Mention if non-standard receivable account applicable,Упоминание если нестандартная задолженность счет применимо
 DocType: Course Schedule,Instructor Name,Имя инструктора
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладная Пункт
 ,Production Orders in Progress,Производственные заказы в Прогресс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чистые денежные средства от финансовой деятельности
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
 DocType: Lead,Address & Contact,Адрес и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользованные отпуска с прошлых периодов
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Общая калькуляция Сумма (с помощью Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банковские записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Товар с Сверки Запасов
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,Опубликовать в Hub
 DocType: Student Admission,Student Admission,приёму студентов
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Пункт {0} отменяется
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 DocType: Item,Purchase Details,Покупка Подробности
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Сообщите по электронной почте по созданию автоматической запрос материалов
 DocType: Journal Entry,Multi Currency,Мульти валюта
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Документы  Отгрузки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Документы  Отгрузки
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Себестоимость проданных активов
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} введен дважды в налог по позиции
-DocType: Grade Interval,Min Score,Минимальная Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} введен дважды в налог по позиции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
 DocType: Student Applicant,Admitted,Признался
 DocType: Workstation,Rent Cost,Стоимость аренды
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ценность заказа
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банк / Кассовые операции против партии или для внутренней передачи
 DocType: Shipping Rule,Valid for Countries,Действительно для странам
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Итоговый заказ считается
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите 'Repeat на день месяца' значения поля"
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,Размер налога
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} уже выделено сотруднику  {1} на период с {2} по {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Выбрать пункт
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Счет на закупку {0} уже проведен
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Счет на закупку {0} уже проведен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Преобразовать в негрупповой
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Партия позиций.
 DocType: C-Form Invoice Detail,Invoice Date,Дата Счета
 DocType: GL Entry,Debit Amount,Дебет Сумма
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Создание студенческих групп
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,Запрос предложения
 DocType: Salary Slip Timesheet,Working Hours,Часы работы
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Изменение начального / текущий порядковый номер существующей серии.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Создание нового клиента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Создание нового клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Если несколько правил ценообразования продолжают преобладать, пользователям предлагается установить приоритет вручную разрешить конфликт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Создание заказов на поставку
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Создание заказов на поставку
 ,Purchase Register,Покупка Становиться на учет
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальные настройки для всех производственных процессов.
 DocType: Accounts Settings,Accounts Frozen Upto,Счета заморожены До
 DocType: SMS Log,Sent On,Направлено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха.
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Из пакета №
 DocType: Item Attribute,To Range,В диапазоне
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Невозможно изменить метод оценки, так как существуют транзакции в отношении некоторых товаров, у которых нет собственного метода оценки"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всего листья, выделенные является обязательным"
 DocType: Job Opening,Description of a Job Opening,Описание работу Открытие
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В ожидании деятельность на сегодняшний день
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
 DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,купить
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Пожалуйста, определите оценку для Threshold 0%"
 DocType: Sales Order,To Deliver,Для доставки
 DocType: Purchase Invoice Item,Item,Элемент
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Серийный ни один элемент не может быть дробным
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Серийный ни один элемент не может быть дробным
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управление субподряда
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 DocType: Production Plan Item,Pending Qty,В ожидании Кол-во
 DocType: Budget,Ignore,Игнорировать
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не активен
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не активен
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS отправлено следующих номеров: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Размеры Проверьте настройки для печати
 DocType: Salary Slip,Salary Slip Timesheet,Зарплата скольжению Timesheet
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Всего комиссия
 DocType: Pricing Rule,Sales Partner,Партнер по продажам
 DocType: Buying Settings,Purchase Receipt Required,Покупка Получение необходимое
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Оценка Оцените является обязательным, если введен Открытие изображения"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Оценка Оцените является обязательным, если введен Открытие изображения"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не записи не найдено в таблице счетов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансовый / отчетный год.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Накопленные значения
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Сделать заказ клиента
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Сделать заказ клиента
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,резюме Приложение
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постоянных клиентов
 DocType: Leave Control Panel,Allocate,Выделить
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Возвраты с продаж
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Возвраты с продаж
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Примечание: Суммарное количество выделенных листьев {0} не должно быть меньше, чем уже утвержденных листьев {1} на период"
 DocType: Announcement,Posted By,Сообщение от
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляется Поставщиком (прямая поставка)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Начальное сальдо (кредит)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Укажите компанию
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Укажите компанию
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Накладная Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Выберите Учетная запись Оплата сделать Банк Стажер
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Создание записей сотрудников для управления листьев, расходов и заработной платы претензий"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Создание записей сотрудников для управления листьев, расходов и заработной платы претензий"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Добавить в базы знаний
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Предложение Написание
 DocType: Payment Entry Deduction,Payment Entry Deduction,Оплата запись Вычет
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Связь с Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менеджер
 DocType: Payment Entry,Payment From / To,Оплата с / по
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Диапазон дат
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новый кредитный лимит меньше текущей суммы задолженности для клиента. Кредитный лимит должен быть зарегистрировано не менее {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новый кредитный лимит меньше текущей суммы задолженности для клиента. Кредитный лимит должен быть зарегистрировано не менее {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметр
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,Разрешение Дата
 DocType: Student Batch Name,Batch Name,Пакетная Имя
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet создано:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,зачислять
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Покажу студент как присутствующий в студенческой Monthly посещаемости отчета
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,Student Участники
 DocType: Sales Invoice Timesheet,Time Sheet,Время Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,На основе обратного отнесения затрат на сырье и материалы
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Пожалуйста, введите детали деталя"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Interest,Interest,Интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предпродажа
 DocType: Purchase Receipt,Other Details,Другие детали
@@ -739,7 +742,7 @@
 ,Absent Student Report,Отсутствует Student Report
 DocType: Email Digest,Next email will be sent on:,Следующее письмо будет отправлено на:
 DocType: Offer Letter Term,Offer Letter Term,Условие письма с предложением
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Пункт имеет варианты.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компания {0} не существует
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,Гарантия срок действия
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
 DocType: Sales Invoice,Commission Rate (%),Комиссия ставка (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Установите серию присвоения имен для {0} с помощью меню «Настройка»&gt; «Настройки»&gt; «Название серии»
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Установите серию присвоения имен для {0} с помощью меню «Настройка»&gt; «Настройки»&gt; «Название серии»
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Выберите программу
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Выберите программу
 DocType: Project,Estimated Cost,Ориентировочная стоимость
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не является складской позицией
 DocType: Mode of Payment Account,Default Account,По умолчанию учетная запись
 DocType: Payment Entry,Received Amount (Company Currency),Полученная сумма (Компания Валюта)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планируемые Время окончания
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
@@ -851,7 +852,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Request for Quotation Supplier,Send Email,Отправить e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Нет разрешения
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
@@ -864,8 +865,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Сотрудник не найден
 DocType: Supplier Quotation,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студенческая группа уже обновлена.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студенческая группа уже обновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студенческая группа уже обновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студенческая группа уже обновлена.
 DocType: SMS Center,All Customer Contact,Все клиентов Связаться
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Загрузить складские остатки с помощью CSV.
 DocType: Warehouse,Tree Details,Детали Дерево
@@ -876,8 +877,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимальная Сумма счета
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: МВЗ {2} не принадлежит Компании {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Счет {2} не может быть группой
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Строка {IDX}: {доктайп} {DOCNAME} не существует в выше &#39;{доктайп}&#39; таблица
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Строка {IDX}: {доктайп} {DOCNAME} не существует в выше &#39;{доктайп}&#39; таблица
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Нет задачи
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День месяца, в который автоматически счет-фактура будет создан, например, 05, 28 и т.д."
 DocType: Asset,Opening Accumulated Depreciation,Начальная Накопленная амортизация
@@ -893,7 +894,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Выберите товары
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Расписание курсов
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Расписание курсов
 DocType: Maintenance Visit,Completion Status,Статус завершения
 DocType: HR Settings,Enter retirement age in years,Введите возраст выхода на пенсию в ближайшие годы
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целевая Склад
@@ -901,7 +902,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Все группы товаров
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Все группы товаров
 DocType: Process Payroll,Activity Log,Журнал активности
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Чистая прибыль / убытки
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
@@ -912,7 +913,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Заказ на Оплата
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Открытие&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Открыть To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
@@ -928,7 +929,7 @@
 DocType: Item Reorder,Re-Order Qty,Кол-во перезаказа
 DocType: Leave Block List Date,Leave Block List Date,Оставьте Блок-лист Дата
 DocType: Pricing Rule,Price or Discount,Цена или Скидка
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всего Применимые сборы в таблице Purchase квитанций Элементов должны быть такими же, как все налоги и сборы"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всего Применимые сборы в таблице Purchase квитанций Элементов должны быть такими же, как все налоги и сборы"
 DocType: Sales Team,Incentives,Стимулы
 DocType: SMS Log,Requested Numbers,Требуемые Номера
 DocType: Production Planning Tool,Only Obtain Raw Materials,Получить только сырье
@@ -986,8 +987,7 @@
 DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,Компоненты
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
@@ -1008,7 +1008,7 @@
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Дата открытия и Дата закрытия должны быть внутри одного финансового года
 DocType: Lead,Request for Information,Запрос на предоставление информации
 apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Синхронизация Offline счетов-фактур
-DocType: Payment Request,Paid,Платный
+DocType: Payment Request,Paid,Оплачено
 DocType: Program Fee,Program Fee,Стоимость программы
 DocType: Salary Slip,Total in words,Всего в словах
 DocType: Material Request Item,Lead Time Date,Время выполнения Дата
@@ -1039,8 +1039,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химический
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"По умолчанию банк / Наличный счет будет автоматически обновляться в Зарплатный Запись в журнале, когда выбран этот режим."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Интервалы для кода Grade {0} пересекается с интервалами класса для других классов. Пожалуйста, проверьте интервалы {0} и {1} и попробуйте еще раз"
 DocType: BOM,Raw Material Cost(Company Currency),Стоимость сырья (Компания Валюта)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Строка # {0}: ставка не может быть больше ставки, используемой в {1} {2}"
@@ -1053,7 +1051,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Сайт товара
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Загрузить шапку фирменного бланка и логотип. (Вы можете отредактировать их позднее).
 DocType: Timesheet Detail,Bill,Билл
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Белый
 DocType: SMS Center,All Lead (Open),Все лиды (Открыть)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Строка {0}: Кол-во не доступен для {4} на складе {1} при проводки время вступления ({2} {3})
@@ -1068,7 +1066,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Тип заказа должен быть одним из {0}
 DocType: Lead,Next Contact Date,Следующая контакты
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Начальное количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
 DocType: Student Batch Name,Student Batch Name,Student Пакетное Имя
 DocType: Holiday List,Holiday List Name,Имя Список праздников
 DocType: Repayment Schedule,Balance Loan Amount,Баланс Сумма кредита
@@ -1088,10 +1086,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Введите {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Таблица атрибутов является обязательной
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Таблица атрибутов является обязательной
 DocType: Production Planning Tool,Get Sales Orders,Получить заказ клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не может быть отрицательным
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Скидка
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Скидка
 DocType: Asset,Total Number of Depreciations,Общее количество отчислений на амортизацию
 DocType: Sales Invoice Item,Rate With Margin,Оценить с маржой
 DocType: Sales Invoice Item,Rate With Margin,Оценить с маржой
@@ -1120,7 +1118,7 @@
 DocType: Lead,Organization Name,Название организации
 DocType: Tax Rule,Shipping State,Государственный Доставка
 ,Projected Quantity as Source,Планируемое количество как источник
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Включить внебиржевые пункты
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Расходы на продажи
@@ -1128,7 +1126,7 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Почтовый индекс
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Почтовый индекс
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Заказ клиента {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Создание изображения в дневнике
@@ -1170,7 +1168,7 @@
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
 ,Ordered Items To Be Billed,"Заказал пунктов, которые будут Объявленный"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"С Диапазон должен быть меньше, чем диапазон"
 DocType: Global Defaults,Global Defaults,Глобальные вводные по умолчанию
@@ -1205,11 +1203,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Пожалуйста, введите код товара, чтобы получить номер партии"
 DocType: Stock Settings,Default Item Group,По умолчанию Пункт Группа
 DocType: Employee Loan,Partially Disbursed,Частично Освоено
-DocType: Grading Structure,Grading System Name,Название системы классификации
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База данных поставщиков.
 DocType: Account,Balance Sheet,Балансовый отчет
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплаты не настроен. Пожалуйста, проверьте, имеет ли учетная запись была установлена на режим платежей или на POS Profile."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплаты не настроен. Пожалуйста, проверьте, имеет ли учетная запись была установлена на режим платежей или на POS Profile."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ваш продавец получит напоминание в этот день, чтобы связаться с клиентом"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Тот же элемент не может быть введен несколько раз.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
@@ -1247,18 +1244,18 @@
 DocType: Maintenance Visit Purpose,Work Done,Сделано
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Пожалуйста, укажите как минимум один атрибут в таблице атрибутов"
 DocType: Announcement,All Students,Все студенты
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Пункт {0} должен быть не складской товар
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Пункт {0} должен быть не складской товар
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Посмотреть Леджер
 DocType: Grading Scale,Intervals,Интервалы
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Пункт {0} не может иметь Batch
 ,Budget Variance Report,Бюджет Разница Сообщить
 DocType: Salary Slip,Gross Pay,Зарплата до вычетов
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Строка {0}: Вид деятельности является обязательным.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,"Дивиденды, выплачиваемые"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Оплачено дивидендов
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Главная книга
 DocType: Stock Reconciliation,Difference Amount,Разница Сумма
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Нераспределенная Прибыль
@@ -1292,8 +1289,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Заказы помогут вам планировать и следить за ваши покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Заказы помогут вам планировать и следить за ваши покупки
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общее количество выпуска / передачи {0} в Material Request {1} \ не может быть больше требуемого количества {2} для п {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Небольшой
@@ -1317,7 +1314,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Синхронизация Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
@@ -1335,7 +1332,7 @@
 DocType: Student Group Student,Group Roll Number,Номер рулона группы
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с дебетовой записью"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сумма всех весов задача должна быть 1. Пожалуйста, измените веса всех задач проекта, соответственно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
@@ -1362,7 +1359,7 @@
 DocType: Depreciation Schedule,Journal Entry,Запись в дневнике
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} элементов в обработке
 DocType: Workstation,Workstation Name,Имя рабочей станции
-DocType: Grade Interval,Grade Code,Код Оценка
+DocType: Grading Scale Interval,Grade Code,Код Оценка
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Электронная почта Дайджест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
@@ -1379,7 +1376,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Оборудование
 DocType: Sales Order,Recurring Upto,Повторяющиеся Upto
 DocType: Attendance,HR Manager,Менеджер по подбору кадров
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Пожалуйста, выберите компанию"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Пожалуйста, выберите компанию"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Дата выставления счета поставщиком
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Вам необходимо включить Корзину
@@ -1395,7 +1392,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Продукты питания
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старение Диапазон 3
 DocType: Maintenance Schedule Item,No of Visits,Нет посещений
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},График обслуживания {0} существует против {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,поступив студент
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закрытии счета должны быть {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сумма баллов за все цели должны быть 100. Это {0}
@@ -1444,13 +1442,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,План счетов
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Detail,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
 DocType: Pricing Rule,"Higher the number, higher the priority","Чем выше число, тем выше приоритет"
 ,Purchase Invoice Trends,Счета-фактуры Тенденции
 DocType: Employee,Better Prospects,Потенциальные покупатели
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Строка # {0}: партия {1} имеет только {2} qty. Выберите другой пакет, в котором имеется {3} qty, или разбейте строку на несколько строк, чтобы доставлять / выпускать из нескольких партий"
 DocType: Vehicle,License Plate,Номерной знак
 DocType: Appraisal,Goals,Цели
 DocType: Warranty Claim,Warranty / AMC Status,Гарантия / АМК Статус
@@ -1469,7 +1468,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Сотрудник не может сообщить себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Если счет замораживается, записи разрешается ограниченных пользователей."
 DocType: Email Digest,Bank Balance,Банковский баланс
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Бухгалтерская Проводка для {0}: {1} может быть сделана только в валюте: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Бухгалтерская Проводка для {0}: {1} может быть сделана только в валюте: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы, необходимая квалификация и т.д."
 DocType: Journal Entry Account,Account Balance,Остаток на счете
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Налоговый Правило для сделок.
@@ -1480,7 +1479,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Показать P &amp; L сальдо Unclosed финансовый год
 DocType: Shipping Rule,Shipping Account,Доставка счета
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Счет {2} неактивен
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Сделать заказы клиентов, чтобы помочь вам спланировать работу и поставить на время"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Сделать заказы клиентов, чтобы помочь вам спланировать работу и поставить на время"
 DocType: Quality Inspection,Readings,Показания
 DocType: Stock Entry,Total Additional Costs,Всего Дополнительные расходы
 DocType: Course Schedule,SH,SH
@@ -1491,7 +1490,7 @@
 DocType: Shipping Rule Condition,To Value,Произвести оценку
 DocType: Asset Movement,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Упаковочный лист
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Упаковочный лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Настройка SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
@@ -1517,7 +1516,7 @@
 DocType: Sales Invoice,Source,Источник
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показать закрыто
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Категория активов является обязательным для фиксированного элемента активов
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Категория активов является обязательным для фиксированного элемента активов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не записи не найдено в таблице оплаты
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Это {0} конфликты с {1} для {2} {3}
 DocType: Student Attendance Tool,Students HTML,Студенты HTML
@@ -1535,7 +1534,7 @@
 DocType: Student,Date of Leaving,Дата Покидая
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Создание потенциальных
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Создание потенциальных
 DocType: Maintenance Schedule,Schedules,Расписание
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детали №
@@ -1563,7 +1562,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Программа Учащихся
 DocType: Sales Invoice Item,Brand Name,Имя Бренда
 DocType: Purchase Receipt,Transporter Details,Transporter Детали
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,По умолчанию склад требуется для выбранного элемента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,По умолчанию склад требуется для выбранного элемента
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Рамка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Возможный поставщик
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организация
@@ -1596,7 +1595,7 @@
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},По умолчанию BOM для {0} не найдено для проекта {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Претензии по счет компании.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студенты в центре системы, добавьте все студенты"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студенты в центре системы, добавьте все студенты"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Строка # {0}: дате зазора {1} не может быть до того Cheque Дата {2}
 DocType: Company,Default Holiday List,По умолчанию Список праздников
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Строка {0}: От времени и времени {1} перекрывается с {2}
@@ -1608,20 +1607,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплаты на e-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Новое задание
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Сделать цитаты
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Сделать цитаты
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Другие отчеты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Попробуйте планировании операций для X дней.
 DocType: HR Settings,Stop Birthday Reminders,Стоп День рождения Напоминания
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Пожалуйста, установите по умолчанию Payroll расчётный счёт в компании {0}"
 DocType: SMS Center,Receiver List,Список приемщика
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Поиск товара
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Поиск товара
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Израсходованное количество
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чистое изменение денежных средств
 DocType: Assessment Plan,Grading Scale,Оценочная шкала
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Уже закончено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Оплата Запрос уже существует {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость эмиссионных пунктов
@@ -1659,7 +1658,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,собирать
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,запись Движение активов {0} создано
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,запись Движение активов {0} создано
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вы не можете удалять финансовый год {0}. Финансовый год {0} устанавливается по умолчанию в разделе Глобальные параметры
 DocType: Journal Entry,Entry Type,Тип записи
 ,Customer Credit Balance,Заказчик Кредитный Баланс
@@ -1702,8 +1701,6 @@
 DocType: Student Sibling,Studying in Same Institute,Обучение в том же институте
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),На склад (Необязательно)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа позиций&gt; Бренд
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа позиций&gt; Бренд
 DocType: Payment Entry,Paid Amount (Company Currency),Платные Сумма (Компания валют)
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
@@ -1713,9 +1710,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Смотрите в корзину
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Пункт Нехватка Сообщить
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Материал Запрос используется, чтобы сделать эту Stock запись"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следующий Износ Дата является обязательным для нового актива
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следующий Износ Дата является обязательным для нового актива
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Отдельная группа на основе курса для каждой партии
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Отдельная группа на основе курса для каждой партии
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Одно устройство элемента.
@@ -1732,9 +1729,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: МВЗ обязателен для счета {2} «Отчет о прибылях и убытках». Укажите МВЗ по умолчанию для Компании.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Новый контакт
 DocType: Territory,Parent Territory,Родитель Территория
 DocType: Quality Inspection Reading,Reading 2,Чтение 2
@@ -1761,21 +1756,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Примирение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Слишком много столбцов. Экспортируйте отчет и распечатайте его с помощью приложения для электронных таблиц.
 DocType: Purchase Invoice Item,Batch No,№ партии
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Невозможно найти обменный курс {0} до {1} для ключа дату {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Разрешить несколько заказов на продажу от Заказа Клиента
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Нет
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Основные
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Вариант
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Основные
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
 DocType: Employee Attendance Tool,Employees HTML,Сотрудники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
 DocType: Employee,Leave Encashed?,Оставьте инкассированы?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Email Digest,Annual Expenses,годовые расходы
 DocType: Item,Variants,Варианты
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Сделать Заказ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Сделать Заказ
 DocType: SMS Center,Send To,Отправить
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
@@ -1795,7 +1789,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Аттестации
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие для правила перевозки
-DocType: Grading Structure,Grading Intervals,Интервалы Оценивание
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Пожалуйста входите
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не может overbill для пункта {0} в строке {1} больше, чем {2}. Чтобы разрешить завышенные счета, пожалуйста, установите в покупке Настройки"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Пожалуйста, установите фильтр, основанный на пункте или на складе"
@@ -1808,16 +1801,17 @@
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Оплата
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Управляйте свои заказы
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Управляйте свои заказы
 DocType: Production Order Operation,Actual Time and Cost,Фактическое время и стоимость
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Обращение
 DocType: Course,Course Abbreviation,Аббревиатура для гольфа
 DocType: Student Leave Application,Student Leave Application,Студент Оставить заявку
 DocType: Item,Will also apply for variants,Будет также применяться для вариантов
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Сотрудник {0} на полдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Всего продолжительность рабочего времени не должна быть больше, чем максимальное рабочее время {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Вкл
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle детали на момент продажи.
 DocType: Quotation Item,Actual Qty,Фактический Кол-во
 DocType: Sales Invoice Item,References,Рекомендации
@@ -1827,7 +1821,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Вы ввели повторяющихся элементов. Пожалуйста, исправить и попробовать еще раз."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Помощник
 DocType: Asset Movement,Asset Movement,Движение активов
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Новая корзина
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Новая корзина
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Создание приемника Список
 DocType: Vehicle,Wheels,Колеса
@@ -1859,10 +1853,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,"Отключение создание временных журналов против производственных заказов. Операции, не будет отслеживаться в отношении производственного заказа"
 DocType: Student,Student Mobile Number,Студент Мобильный телефон
 DocType: Item,Has Variants,Имеет Варианты
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Вы уже выбрали элементы из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Вы уже выбрали элементы из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Идентификатор партии является обязательным
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Идентификатор партии является обязательным
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификатор партии является обязательным
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификатор партии является обязательным
 DocType: Sales Person,Parent Sales Person,Лицо Родительские продаж
 DocType: Purchase Invoice,Recurring Invoice,Периодический Счет
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управление проектами
@@ -1870,7 +1864,7 @@
 DocType: Budget,Fiscal Year,Отчетный год
 DocType: Vehicle Log,Fuel Price,Топливо Цена
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Элемент основных средств не может быть элементом запасов.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Элемент основных средств не может быть элементом запасов.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не может быть назначен на {0}, так как это не доход или расход счета"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Достигнутый
 DocType: Student Admission,Application Form Route,Заявка на маршрут
@@ -1902,7 +1896,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Сумма {0} {1} вычтены {2}
 DocType: Employee,Salary Information,Информация о зарплате
 DocType: Sales Person,Name and Employee ID,Имя и ID сотрудника
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сайт Пункт Группа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -1961,7 +1955,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторите Выручка клиентов
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) должен иметь роль ""Согласующего Расходы"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Носите
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
 DocType: Asset,Depreciation Schedule,Амортизация Расписание
 DocType: Bank Reconciliation Detail,Against Account,Против Счет
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Поаяся Дата должна быть в пределах от даты и до настоящего времени
@@ -1978,13 +1972,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3}
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
 DocType: Purchase Order,Delivered,Доставлено
 ,Vehicle Expenses,Расходы транспортных средств
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
+DocType: Serial No,Invoice Details,Сведения о счете
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
 DocType: Employee Loan,Loan Amount,Сумма кредита
@@ -2008,7 +2003,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Группа не-группы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 DocType: Loan Type,Loan Name,Кредит Имя
@@ -2020,6 +2015,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, где вы работаете запас отклоненных элементов"
 DocType: Production Order,Skip Material Transfer,Пропустить перенос материала
 DocType: Production Order,Skip Material Transfer,Пропустить перенос материала
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Невозможно найти обменный курс {0} до {1} за контрольную дату {2}. Создайте запись обмена валюты вручную.
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Ваш финансовый год заканчивается
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется как основной Фискальный Год. Пожалуйста, обновите страницу в браузере, чтобы изменения вступили в силу."
@@ -2057,9 +2053,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискальный год** представляет собой финансовый год. Все бухгалтерские записи и другие крупные сделки отслеживаются по **Фискальному году**.
 DocType: Opportunity,Customer / Lead Address,Заказчик / Ведущий Адрес
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
 DocType: Student Admission,Eligibility,приемлемость
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Ведет помочь вам получить бизнес, добавить все ваши контакты и многое другое в ваших потенциальных клиентов"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Ведет помочь вам получить бизнес, добавить все ваши контакты и многое другое в ваших потенциальных клиентов"
 DocType: Production Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
@@ -2100,7 +2096,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Выберите компанию ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Process Payroll,Fortnightly,раз в две недели
 DocType: Currency Exchange,From Currency,Из валюты
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
@@ -2116,7 +2112,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда, как «О предыдущего ряда Сумма» или «О предыдущего ряда Всего 'для первой строки"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Ребенок Пункт не должен быть Bundle продукта. Пожалуйста, удалите пункт `{0}` и сохранить"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банковские операции
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Добавить расписания
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Добавить расписания
 DocType: Vehicle Service,Service Item,Услуги Пункт
 DocType: Bank Guarantee,Bank Guarantee,Банковская гарантия
 DocType: Bank Guarantee,Bank Guarantee,Банковская гарантия
@@ -2166,8 +2162,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цены не будут показаны, если прайс-лист не установлен"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Пожалуйста, укажите страну этом правиле судоходства или проверить Доставка по всему миру"
 DocType: Stock Entry,Total Incoming Value,Всего входное значение
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебет требуется
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебет требуется
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Прайс-лист
 DocType: Offer Letter Term,Offer Term,Условие предложения
 DocType: Quality Inspection,Quality Manager,Менеджер по качеству
@@ -2201,14 +2197,14 @@
 DocType: Opportunity,Lost Reason,Забыли Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Новый адрес
 DocType: Quality Inspection,Sample Size,Размер выборки
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Пожалуйста, введите Квитанция документ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,На все товары уже выписаны счета
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Пожалуйста, введите Квитанция документ"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,На все товары уже выписаны счета
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 DocType: Project,External,Внешний  GPS с RS232
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Пользователи и разрешения
 DocType: Vehicle Log,VLOG.,Видеоблога.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производственные заказы Создано: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Производственные заказы Создано: {0}
 DocType: Branch,Branch,Ветвь
 DocType: Guardian,Mobile Number,Мобильный номер
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг
@@ -2217,7 +2213,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серийный номер {0} не найден
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваши клиенты
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Сделать Студент
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Сделать Студент
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Вы были приглашены для совместной работы над проектом: {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Применить сейчас
@@ -2241,8 +2237,9 @@
 DocType: SMS Log,Sent To,Отправить
 DocType: Payment Request,Make Sales Invoice,Сделать Расходная накладная
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следующая Контактные Дата не может быть в прошлом
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следующая Контактные Дата не может быть в прошлом
 DocType: Company,For Reference Only.,Только для справки.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Выберите номер партии
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неверный {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Предварительная сумма
@@ -2256,7 +2253,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Дело № не может быть 0
 DocType: Item,Show a slideshow at the top of the page,Показ слайдов в верхней части страницы
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазины
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазины
 DocType: Serial No,Delivery Time,Время доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Проблемам старения, на основе"
 DocType: Item,End of Life,Конец срока службы
@@ -2272,8 +2269,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,О передаче материала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Этот документ находится над пределом {0} {1} для элемента {4}. Вы делаете другой {3} против того же {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Сумма счета Выберите изменения
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Сумма счета Выберите изменения
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
@@ -2284,7 +2281,7 @@
 DocType: Budget Account,Budget Account,Бюджет аккаунта
 DocType: Quality Inspection,Verified By,Verified By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании, потому что есть существующие операции. Сделки должны быть отменены, чтобы поменять валюту."
-DocType: Grade Interval,Grade Description,Оценка Описание
+DocType: Grading Scale Interval,Grade Description,Оценка Описание
 DocType: Stock Entry,Purchase Receipt No,Покупка Получение Нет
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задаток
 DocType: Process Payroll,Create Salary Slip,Создание Зарплата Слип
@@ -2322,7 +2319,7 @@
 DocType: Upload Attendance,Attendance To Date,Посещаемость To Date
 DocType: Warranty Claim,Raised By,Поднятый По
 DocType: Payment Gateway Account,Payment Account,Оплата счета
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Чистое изменение дебиторской задолженности
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсационные Выкл
 DocType: Offer Letter,Accepted,Принято
@@ -2335,7 +2332,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум пользователей
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сырье не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Быстрый журнал запись
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
@@ -2349,7 +2346,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Название института, для которого вы устанавливаете эту систему."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерская запись заморожена до этой даты, никто не может сделать / изменить запись, кроме роли, указанной ниже."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Пожалуйста, сохраните документ перед генерацией график технического обслуживания"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Пожалуйста, сохраните документ перед генерацией график технического обслуживания"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),"Проверьте это, чтобы запретить фракции. (Для №)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Были созданы следующие Производственные заказы:
@@ -2372,6 +2369,7 @@
 DocType: Email Digest,How frequently?,Как часто?
 DocType: Purchase Receipt,Get Current Stock,Получить Текущие запасы
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дерево Билла материалов
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа позиций&gt; Бренд
 DocType: Student,Joining Date,Дата вступления
 ,Employees working on a holiday,"Сотрудники, работающие на празднике"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марк Присутствует
@@ -2472,7 +2470,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
 DocType: Guardian,Occupation,Род занятий
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-во)
 DocType: Sales Invoice,This Document,Этот документ
 DocType: Installation Note Item,Installed Qty,Установленная Кол-во
@@ -2495,7 +2493,7 @@
 DocType: Notification Control,Sales Order Message,Заказ клиента Сообщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию, как Болгарии, Валюта, текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Вид оплаты
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Выберите пакет для элемента {0}. Не удалось найти единицу, которая удовлетворяет этому требованию."
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Выберите пакет для элемента {0}. Не удалось найти единицу, которая удовлетворяет этому требованию."
 DocType: Process Payroll,Select Employees,Выберите Сотрудников
 DocType: Opportunity,Potential Sales Deal,Сделка потенциальных продаж
 DocType: Payment Entry,Cheque/Reference Date,Чеками / Исходная дата
@@ -2512,10 +2510,10 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобальный профиля POS {0} уже создана для компании {1}
 DocType: Purchase Order,Ref SQ,Ссылка SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Заменить пункт / BOM во всех спецификациях
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Документ о получении должен быть проведен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Документ о получении должен быть проведен
 DocType: Purchase Invoice Item,Received Qty,Поступило Кол-во
 DocType: Stock Entry Detail,Serial No / Batch,Серийный номер / Партия
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не оплачиваются и не доставляется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не оплачено и не доставлено
 DocType: Product Bundle,Parent Item,Родитель Пункт
 DocType: Account,Account Type,Тип учетной записи
 DocType: Delivery Note,DN-RET-,DN-RET-
@@ -2525,7 +2523,7 @@
 ,To Produce,Чтобы продукты
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Начисление заработной платы
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Сделать пользователя
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Сделать пользователя
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификация пакета на поставку (для печати)
 DocType: Bin,Reserved Quantity,Зарезервировано Количество
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Пожалуйста, введите действующий адрес электронной почты"
@@ -2539,11 +2537,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Шаблон для инвалидов не должно быть по умолчанию шаблон
 DocType: Account,Income Account,Счет Доходов
 DocType: Payment Request,Amount in customer's currency,Сумма в валюте клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущий Кол-во
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","См. ""Оценить материалов на основе"" в калькуляции раздел"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Предыдущая
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студенческие Порции помогают отслеживать посещаемость, оценки и сборы для студентов"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студенческие Порции помогают отслеживать посещаемость, оценки и сборы для студентов"
 DocType: Payment Entry,Total Allocated Amount,Общая сумма Обозначенная
 DocType: Item Reorder,Material Request Type,Материал Тип запроса
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural журнал запись на зарплату от {0} до {1}
@@ -2566,7 +2565,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Трек Ведет по Отрасль Тип.
 DocType: Item Supplier,Item Supplier,Пункт Поставщик
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Все адреса.
 DocType: Company,Stock Settings,Настройки Запасов
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
@@ -2576,6 +2575,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Будет ли отправить по электронной почте о событии сотрудникам со статусом &#39;Open&#39;
 DocType: Task,Depends on Tasks,В зависимости от задач
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управление групповой клиентов дерево.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Вложения могут быть показаны без включения корзины покупок.
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Новый Центр Стоимость Имя
 DocType: Leave Control Panel,Leave Control Panel,Оставьте панели управления
@@ -2588,12 +2588,10 @@
 DocType: Sales Invoice,Debit To,Дебет Для
 DocType: Delivery Note,Required only for sample item.,Требуется только для образца пункта.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Нет зарплаты скольжения находится между {0} и {1}
 ,Pending SO Items For Purchase Request,В ожидании SO предметы для покупки запрос
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зачисляемых студентов
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} отключен
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} отключен
 DocType: Supplier,Billing Currency,Платежная валюта
 DocType: Sales Invoice,SINV-RET-,СИНВ-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Очень Большой
@@ -2610,7 +2608,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Главная Рекомендуемые продукт
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Все группы по оценке
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Новый склад Имя
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Общая {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Общая {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Территория
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
@@ -2628,7 +2626,7 @@
 DocType: Price List,Price List Master,Прайс-лист Мастер
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
 ,S.O. No.,КО №
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Применимо для стран
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Только оставьте приложения со статусом «Одобрено» и «Отклонено» могут быть представлены
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Студенческая группа Имя является обязательным в строке {0}
@@ -2721,7 +2719,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
 DocType: Vehicle Service,Engine Oil,Машинное масло
 DocType: Sales Invoice,Sales Team1,Продажи Команда1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
 DocType: Employee Loan,Loan Details,Кредит Подробнее
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Строка {0}: Завершенный Кол-во должно быть больше нуля.
@@ -2786,7 +2784,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
 DocType: Assessment Result Tool,Result HTML,Результат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Годен до
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Добавить студентов
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Добавить студентов
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,C-образный Нет
 DocType: BOM,Exploded_items,Exploded_items
@@ -2851,7 +2849,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,предел Скрещенные
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурный капитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академический термин с этим &quot;Академический год&quot; {0} и &#39;Term Name&#39; {1} уже существует. Пожалуйста, измените эти записи и повторите попытку."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Как есть существующие операции против пункта {0}, вы не можете изменить значение {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Как есть существующие операции против пункта {0}, вы не можете изменить значение {1}"
 DocType: UOM,Must be Whole Number,Должно быть Целое число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Новые листья Выделенные (в днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серийный номер {0} не существует
@@ -2895,7 +2893,7 @@
 DocType: Supplier,Last Day of the Next Month,Последний день следующего месяца
 DocType: Support Settings,Auto close Issue after 7 days,Авто близко Issue через 7 дней
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставить не могут быть выделены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Студент Абитуриент
 DocType: Asset Category Account,Accumulated Depreciation Account,Начисленной амортизации Счет
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
@@ -2923,8 +2921,8 @@
 DocType: Asset,Item Code,Код элемента
 DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
 DocType: Serial No,Warranty / AMC Details,Гарантия / АМК Подробнее
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
 DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
@@ -2943,7 +2941,7 @@
 DocType: Production Planning Tool,Create Material Requests,Создать запросы Материал
 DocType: Employee Education,School/University,Школа / университет
 DocType: Payment Request,Reference Details,Ссылка Подробнее
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступное Кол-во на складе
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Счетов выдано количество
 DocType: Asset,Double Declining Balance,Двойной баланс Отклонение
@@ -2964,19 +2962,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоено Сумма не может быть больше, чем сумма займа {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производственный заказ не создан
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Производственный заказ не создан
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
 DocType: Asset,Fully Depreciated,Полностью Амортизируется
 ,Stock Projected Qty,Прогнозируемое Кол-во Запасов
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Выраженное Посещаемость HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Котировки являются предложениями, предложениями отправленных к своим клиентам"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Котировки являются предложениями, предложениями отправленных к своим клиентам"
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серийный номер и пакетная
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Сумма десятков критериев оценки должно быть {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Пожалуйста, установите Количество отчислений на амортизацию бронирования"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Пожалуйста, установите Количество отчислений на амортизацию бронирования"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Значение или Кол-во
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Минута
@@ -3106,7 +3104,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студенческая группа
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Пожалуйста, выберите клиента"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,"Пожалуйста, выберите клиента"
 DocType: C-Form,I,я
 DocType: Company,Asset Depreciation Cost Center,Центр Амортизация Стоимость активов
 DocType: Sales Order Item,Sales Order Date,Дата Заказа клиента
@@ -3125,19 +3123,18 @@
 DocType: Vehicle,Insurance Details,Страхование Подробнее
 DocType: Account,Payable,К оплате
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Пожалуйста, введите сроки погашения"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Должники ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Должники ({0})
 DocType: Pricing Rule,Margin,Разница
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Новые клиенты
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Валовая Прибыль%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Клиренс Дата
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Валовая сумма покупки является обязательным
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Валовая сумма покупки является обязательным
 DocType: Lead,Address Desc,Адрес по убыванию
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Партия является обязательным
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Название темы
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,По крайней мере один из продажи или покупки должен быть выбран
-DocType: Grading Structure,Grade Intervals,Интервалы Оценка
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Выберите характер вашего бизнеса.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Где производственные операции проводятся.
 DocType: Asset Movement,Source Warehouse,Источник Склад
@@ -3166,6 +3163,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ежемесячный Процентное распределение
 DocType: Territory,Territory Targets,Территория Цели
 DocType: Delivery Note,Transporter Info,Transporter информация
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в компании {1}"
 DocType: Cheque Print Template,Starting position from top edge,Исходное положение от верхнего края
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,То же поставщик был введен несколько раз
@@ -3219,7 +3217,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Изменить порядок Кол-во
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Текущие вакансии Вакансии
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
-DocType: Journal Entry,Write Off,Списать
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списать
 DocType: Timesheet Detail,Operation ID,Код операции
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Система Пользователь (Войти) ID. Если установлено, то это станет по умолчанию для всех форм HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: От {1}
@@ -3230,8 +3228,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Поставщик поставляет Покупателю
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# форма / Пункт / {0}) нет в наличии
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Следующая дата должна быть больше, чем Дата публикации"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Показать налог распад
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Импорт и экспорт данных
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","записи изображения существуют против Склад {0}, следовательно, вы не можете повторно назначить или изменить его"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Нет студентов не найдено
@@ -3243,14 +3241,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Из КУА
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Выберите Котировки
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Выберите Котировки
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Выберите Котировки
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Выберите Котировки
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
 DocType: Company,Default Cash Account,Расчетный счет по умолчанию
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Это основано на посещаемости этого студента
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Нет
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Добавьте больше деталей или открытую полную форму
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
@@ -3297,9 +3296,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирения
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Налоги и сборы Добавил (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Небольшая Объявленный
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Пункт {0} должен быть Fixed Asset Item
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Пункт {0} должен быть Fixed Asset Item
 DocType: Item,Default BOM,По умолчанию BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общая сумма задолженности по Amt
@@ -3321,7 +3320,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
 DocType: Purchase Invoice Item,Rate,Оценить
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Стажер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адрес
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Адрес
 DocType: Stock Entry,From BOM,Из спецификации
 DocType: Assessment Code,Assessment Code,Код оценки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основной
@@ -3346,7 +3345,7 @@
 DocType: Purchase Invoice,Print Language,Язык печати
 DocType: Salary Slip,Total Working Hours,Всего часов работы
 DocType: Stock Entry,Including items for sub assemblies,В том числе предметы для суб собраний
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Введите значение должно быть положительным
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Введите значение должно быть положительным
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Все Территории
 DocType: Purchase Invoice,Items,Элементы
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент уже поступил.
@@ -3366,17 +3365,15 @@
 DocType: Issue,Opening Time,Открытие Время
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты, необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
 DocType: Assessment Plan,Supervisor Name,Имя супервизора
 DocType: Program Enrollment Course,Program Enrollment Course,Курсы по зачислению в программу
 DocType: Program Enrollment Course,Program Enrollment Course,Курсы по зачислению в программу
-DocType: Grading Structure,Grading Structure,Градация Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
 DocType: Tax Rule,Shipping City,Доставка Город
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Этот деталь Вариант {0} (шаблон). Атрибуты будет скопирован из шаблона, если ""не копировать"" не установлен"
 DocType: Notification Control,Customize the Notification,Настроить уведомления
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Поток денежных средств от операций
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
@@ -3399,6 +3396,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Дата открытия должна быть ранее Даты закрытия
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для посещаемости через Setup&gt; Numbering Series"
 DocType: Leave Control Panel,Carry Forward,Переносить
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
 DocType: Department,Days for which Holidays are blocked for this department.,"Дни, для которых Праздники заблокированные для этого отдела."
@@ -3427,7 +3425,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (АМТ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 DocType: Quality Inspection,Item Serial No,Пункт Серийный номер
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Создание Employee записей
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Создание Employee записей
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Итого Текущая
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Бухгалтерская отчетность
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
@@ -3442,8 +3440,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Новая спецификация после замены
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Точки продаж
 DocType: Payment Entry,Received Amount,полученная сумма
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Установите систему присвоения имен сотрудникам в разделе «Персонал»&gt; «Настройки персонала».
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Установите систему присвоения имен сотрудникам в разделе «Персонал»&gt; «Настройки персонала».
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Создать для полного количества, игнорируя количество уже на заказ"
 DocType: Account,Tax,Налог
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,без маркировки
@@ -3456,7 +3452,7 @@
 DocType: Batch,Source Document Name,Имя исходного документа
 DocType: Batch,Source Document Name,Имя исходного документа
 DocType: Job Opening,Job Title,Должность
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Создание пользователей
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Создание пользователей
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грамм
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетите отчет за призыв обслуживания.
@@ -3468,8 +3464,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чистое изменение в капитале
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
 DocType: Serial No,AMC Expiry Date,КУА срок действия
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Квитанция
 ,Sales Register,Книга продаж
@@ -3480,16 +3476,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там нет ничего, чтобы изменить."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Клиентов еще нет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,О движении денежных средств
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Лицензия
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Пожалуйста, выберите переносить, если вы также хотите включить баланс предыдущего финансового года оставляет в этом финансовом году"
 DocType: GL Entry,Against Voucher Type,Против Сертификаты Тип
 DocType: Item,Attributes,Атрибуты
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последняя дата заказа
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
 DocType: Student,Guardian Details,Подробнее Гардиан
 DocType: C-Form,C-Form,C-образный
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посещаемости для нескольких сотрудников
@@ -3514,14 +3512,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Строка {0} # Счет должен быть типа &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Из Кол-во
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила для расчета количества груза для продажи
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансовые услуги
 DocType: Student Sibling,Student ID,Студенческий билет
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Виды деятельности для Время Журналы
 DocType: Tax Rule,Sales,Продажи
 DocType: Stock Entry Detail,Basic Amount,Основное количество
 DocType: Training Event,Exam,Экзамен
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Государственный счетов
@@ -3554,7 +3552,7 @@
 DocType: Payment Entry,Account Paid From,Счет Оплачено из
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сырье Код товара
 DocType: Journal Entry,Write Off Based On,Списание на основе
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Сделать Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Сделать Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Печать и канцелярские
 DocType: Stock Settings,Show Barcode Field,Показать поле Штрих-код
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Отправить Поставщик электронных писем
@@ -3570,6 +3568,7 @@
 DocType: Offer Letter,Awaiting Response,В ожидании ответа
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Выше
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Упомяните, если нестандартный подлежащий оплате счет"
 DocType: Salary Slip,Earning & Deduction,Заработок & Вычет
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
@@ -3605,7 +3604,7 @@
 DocType: Program Enrollment Tool,Get Students From,Получить студентов из
 DocType: Hub Settings,Seller Country,Продавец Страна
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Опубликовать товары на сайте
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Группа ваших студентов в партиях
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Группа ваших студентов в партиях
 DocType: Authorization Rule,Authorization Rule,Правило Авторизации
 DocType: Sales Invoice,Terms and Conditions Details,Условия Подробности
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Спецификации
@@ -3665,7 +3664,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Испытательный срок
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатные Компоненты
 DocType: Program Enrollment Tool,New Academic Year,Новый учебный год
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Возвращение / Кредит Примечание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Возвращение / Кредит Примечание
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Всего уплаченной суммы
 DocType: Production Order Item,Transferred Qty,Переведен Кол-во
@@ -3706,6 +3705,7 @@
 ,Sales Funnel,Воронка продаж
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Аббревиатура является обязательной
 DocType: Project,Task Progress,Задача о ходе работы
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Тележка
 ,Qty to Transfer,Кол-во для передачи
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Котировки в снабжении или клиентов.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
@@ -3739,7 +3739,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,взимать сборы
 DocType: Attendance,ATT-,попыт-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
 DocType: Lead,Add to calendar on this date,Добавить в календарь в этот день
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
 DocType: Item,Opening Stock,Начальный запас
@@ -3758,7 +3758,7 @@
 DocType: Customer,From Lead,От Ведущий
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,"Заказы, выпущенные для производства."
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Выберите финансовый год ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Program Enrollment Tool,Enroll Students,зачислить студентов
 DocType: Hub Settings,Name Token,Имя маркера
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартный Продажа
@@ -3769,7 +3769,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} против чека {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Название проекта
-DocType: Supplier,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
+DocType: Customer,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
 DocType: Journal Entry Account,If Income or Expense,Если доходов или расходов
 DocType: Production Order,Required Items,Требуемые товары
 DocType: Stock Ledger Entry,Stock Value Difference,Расхождение Стоимости Запасов
@@ -3800,6 +3800,7 @@
 DocType: Item,Taxes,Налоги
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Платные и не доставляется
 DocType: Project,Default Cost Center,По умолчанию Центр Стоимость
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Установите серию присвоения имен для {0} с помощью меню «Настройка»&gt; «Настройки»&gt; «Название серии»
 DocType: Bank Guarantee,End Date,Дата окончания
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Операции с Запасами
 DocType: Budget,Budget Accounts,Счета бюджета
@@ -3864,7 +3865,7 @@
 DocType: Customer,Sales Partner and Commission,Партнеры по продажам и комиссия
 DocType: Employee Loan,Rate of Interest (%) / Year,Процентная ставка (%) / год
 ,Project Quantity,Проект Количество
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равно нулю, может быть, вы должны изменить «Распределить плату на основе»"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равно нулю, может быть, вы должны изменить «Распределить плату на основе»"
 DocType: Opportunity,To Discuss,Для обсуждения
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} единиц {1} требуется в {2} для завершения этой транзакции..
 DocType: Loan Type,Rate of Interest (%) Yearly,Процентная ставка (%) Годовой
@@ -3887,7 +3888,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Отметка отсутствует
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Строка {0}: Валюта BOM # {1} должен быть равен выбранной валюте {2}
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Компонент платы
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управление флотом
@@ -3904,14 +3905,14 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Склад {0} не существует
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зарегистрироваться на Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ежемесячные Проценты распределения
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Выбранный элемент не может быть Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Выбранный элемент не может быть Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Скорость оценки не найдено для пункта {0}, которое требуется делать бухгалтерские записи для {1} {2}. Если элемент сделок как элемент образца в {1}, пожалуйста, отметить, что в {1} таблицы Item. В противном случае, пожалуйста, создать входящие акции сделку по ст или упоминания ставки оценки в записи товара, а затем попытаться завершением заполнения / отменой этой записи"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% материалов доставлено по данной Накладной
 DocType: Project,Customer Details,Данные клиента
 DocType: Employee,Reports to,Доклады
 ,Unpaid Expense Claim,Неоплаченные Авансовые Отчеты
 DocType: SMS Settings,Enter url parameter for receiver nos,Введите параметр URL для приемника NOS
-DocType: Payment Entry,Paid Amount,Выплаченная сумма
+DocType: Payment Entry,Paid Amount,Оплаченная сумма
 DocType: Assessment Plan,Supervisor,Руководитель
 apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,В сети
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
@@ -3921,7 +3922,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Отправил заказы не могут быть удалены
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Управление качеством
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Пункт {0} отключена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Пункт {0} отключена
 DocType: Employee Loan,Repay Fixed Amount per Period,Погашать фиксированную сумму за период
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
@@ -3948,7 +3949,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Уведомление (дней)
 DocType: Tax Rule,Sales Tax Template,Шаблон Налога с продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
 DocType: Employee,Encashment Date,Инкассация Дата
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Регулирование запасов
@@ -3982,6 +3983,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Дебет Примечание Выпущенный
 DocType: Production Order,Warehouses,Склады
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} актив не может быть перемещён
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Этот элемент является Вариантом {0} (Шаблон).
 DocType: Workstation,per hour,в час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,покупка
 DocType: Announcement,Announcement,Объявление
@@ -3997,7 +3999,7 @@
 DocType: Account,Receivable,Дебиторская задолженность
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не разрешено изменять Поставщик как уже существует заказа
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, позволяющая проводить операции, превышающие кредитный лимит, установлена."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Выбор элементов для изготовления
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Выбор элементов для изготовления
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
 DocType: Item,Material Issue,Материал выпуск
 DocType: Hub Settings,Seller Description,Продавец Описание
@@ -4010,7 +4012,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,В обработке
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии оценки Группа
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Начальная Накопленная амортизация должна быть меньше или равна {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Начальная Накопленная амортизация должна быть меньше или равна {0}
 DocType: Warehouse,Warehouse Name,Название склада
 DocType: Naming Series,Select Transaction,Выберите операцию
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
@@ -4045,7 +4047,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Для установки в этом финансовом году, как по умолчанию, нажмите на кнопку ""Установить по умолчанию"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Присоединиться
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Employee Loan,Repay from Salary,Погашать из заработной платы
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Запрос платеж против {0} {1} на сумму {2}
@@ -4063,7 +4065,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Оценка результата Detail
 DocType: Employee Education,Employee Education,Сотрудник Образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Повторяющаяся группа находке в таблице группы товаров
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
 DocType: Salary Slip,Net Pay,Чистая Платное
 DocType: Account,Account,Аккаунт
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серийный номер {0} уже существует
@@ -4072,7 +4074,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не связан с какой-либо учетной записи, пожалуйста, создайте / связать соответствующий счет (актив) для склада."
 DocType: Purchase Invoice,Recurring Id,Периодическое Id
 DocType: Customer,Sales Team Details,Описание отдела продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Удалить навсегда?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Удалить навсегда?
 DocType: Expense Claim,Total Claimed Amount,Всего заявленной суммы
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциальные возможности для продажи.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неверный {0}
@@ -4083,13 +4085,14 @@
 DocType: Warehouse,PIN,ШТЫРЬ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Настройка вашей школы в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базовая Изменение Сумма (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Сохранить документ в первую очередь.
 DocType: Account,Chargeable,Ответственный
 DocType: Company,Change Abbreviation,Изменить Аббревиатура
 DocType: Expense Claim Detail,Expense Date,Дата расхода
 DocType: Item,Max Discount (%),Макс Скидка (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последняя сумма заказа
+DocType: Task,Is Milestone,Это этап
 DocType: Daily Work Summary,Email Sent To,Е-мейл отправлен
 DocType: Budget,Warn,Warn
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
@@ -4122,11 +4125,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
 DocType: Tax Rule,Purchase Tax Template,Налог на покупку шаблон
 ,Project wise Stock Tracking,Проект мудрый слежения со
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Фактический Кол-во (в источнике / цели)
 DocType: Item Customer Detail,Ref Code,Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Сотрудник записей.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
 DocType: HR Settings,Payroll Settings,Настройки по заработной плате
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Разместить заказ
@@ -4149,7 +4151,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чеки и депозиты неправильно очищена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Счет {0}: Вы не можете назначить себя как родительским счетом
 DocType: Purchase Invoice Item,Price List Rate,Прайс-лист Оценить
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Создание котировки клиентов
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Создание котировки клиентов
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Показать ""На складе"" или ""нет на складе"", основанный на складе имеющейся в этом складе."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Ведомость материалов (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Среднее время поставки
@@ -4171,7 +4173,7 @@
 DocType: Asset,Disposal Date,Утилизация Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Электронные письма будут отправлены во все активные работники компании на данный час, если у них нет отпуска. Резюме ответов будет отправлен в полночь."
 DocType: Employee Leave Approver,Employee Leave Approver,Сотрудник Оставить утверждающий
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Обучение Обратная связь
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производственный заказ {0} должен быть проведен
@@ -4179,7 +4181,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курс является обязательным в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Добавить / Изменить цены
 DocType: Batch,Parent Batch,Родительская партия
 DocType: Cheque Print Template,Cheque Print Template,Чеками печати шаблона
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,План МВЗ
@@ -4223,7 +4225,7 @@
 DocType: Item,Variant Based On,Вариант Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ваши Поставщики
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
 DocType: Request for Quotation Item,Supplier Part No,Деталь поставщика №
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Не можете вычесть, когда категория для &quot;Оценка&quot; или &quot;Vaulation и Total &#39;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Получено от
@@ -4233,7 +4235,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: От {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Строка {0}: значение часов должно быть больше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
 DocType: Issue,Content Type,Тип контента
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Перечислите этот пункт в нескольких группах на веб-сайте.
@@ -4242,20 +4244,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить несверенные записи
 DocType: Payment Reconciliation,From Invoice Date,От Дата Счета
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Платежная валюта должна быть равна либо по умолчанию comapany в валюте или партии валюты счета
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Платежная валюта должна быть равна либо по умолчанию comapany в валюте или партии валюты счета
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставьте Инкассацию
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Что оно делает?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Для Склад
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Все Поступающим Student
 ,Average Commission Rate,Средний Уровень Комиссии
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
 DocType: Pricing Rule,Pricing Rule Help,Цены Правило Помощь
 DocType: School House,House Name,Название дома
 DocType: Purchase Taxes and Charges,Account Head,Основной счет
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Обновление дополнительных затрат для расчета приземлился стоимость товаров
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Электрический
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавьте остальную часть вашей организации в качестве пользователей. Вы можете также добавить приглашать клиентов на ваш портал, добавив их из списка контактов"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавьте остальную часть вашей организации в качестве пользователей. Вы можете также добавить приглашать клиентов на ваш портал, добавив их из списка контактов"
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен для сотрудника {0}
@@ -4264,7 +4266,7 @@
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Напоминание о дне рождения для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни с последнего Заказать
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
 DocType: Buying Settings,Naming Series,Наименование серии
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхование начала должна быть меньше, чем дата страхование End"
@@ -4279,7 +4281,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM не содержит какой-либо элемент запаса
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
@@ -4292,7 +4294,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Платежная часы
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,По умолчанию BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Нажмите элементы, чтобы добавить их сюда."
 DocType: Fees,Program Enrollment,Программа подачи заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
@@ -4394,7 +4397,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
 DocType: Issue,First Responded On,Впервые ответил
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крест Листинг пункта в нескольких группах
-DocType: Grade Interval,Grade Interval,Интервал Оценка
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Дата начала и Дата окончания Финансового года уже установлены в финансовом году {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Зазор Дата обновления
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит-пакет
@@ -4403,6 +4405,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Скачать PDF
 DocType: Production Order,Planned End Date,Планируемая Дата завершения
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Где элементы хранятся.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 DocType: Request for Quotation,Supplier Detail,Поставщик: Подробности
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Ошибка в формуле или условие: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Сумма по счетам
@@ -4448,7 +4451,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Настройка простой веб-сайт для моей организации
 DocType: Payment Reconciliation,Receivable / Payable Account,Счет Дебиторской / Кредиторской задолженности
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
@@ -4507,7 +4510,7 @@
 ,Items To Be Requested,"Предметы, будет предложено"
 DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Company,Company Info,Информация о компании
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Выберите или добавить новый клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Выберите или добавить новый клиент
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,МВЗ требуется заказать требование о расходах
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Это основано на посещаемости этого сотрудника
@@ -4520,13 +4523,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Сумма покупки
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Ценовое предложение поставщика {0} создано
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Вознаграждения работникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Изготовлено Кол-во
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не существует
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не существует
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Платежи Заказчиков
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд № {0}: Сумма не может быть больше, чем указанная в Авансовом Отчете {1}. Указанная сумма {2}"
@@ -4535,15 +4538,17 @@
 DocType: Quality Inspection Reading,Reading 3,Чтение 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Прайс-лист не найден или отключен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Employee Loan Application,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
 DocType: Guardian,Guardian,блюститель
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,Образование
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Текущий адрес
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модифицированный
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
@@ -4580,7 +4585,7 @@
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Валовая маржа %
 DocType: BOM,With Operations,С операций
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские проводки для компании {1}, уже были сделаны в валюте {0} . Пожалуйста, выберите счет дебиторской или кредиторской задолженности в валютой {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские проводки для компании {1}, уже были сделаны в валюте {0} . Пожалуйста, выберите счет дебиторской или кредиторской задолженности в валютой {0}."
 DocType: Asset,Is Existing Asset,Является ли существующего актива
 DocType: Salary Detail,Statistical Component,Статистический компонент
 DocType: Salary Detail,Statistical Component,Статистический компонент
@@ -4636,7 +4641,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикрепить логотип
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Сток Уровни
 DocType: Customer,Commission Rate,Комиссия
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Сделать Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок отпуска приложений отделом.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплаты должен быть одним из Присылать, Pay и внутренний перевод"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,аналитика
@@ -4649,6 +4654,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Позволяют производить на праздниках
 DocType: Sales Order,Customer's Purchase Order Date,Клиентам Дата Заказ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал
+DocType: Shopping Cart Settings,Show Public Attachments,Показать общедоступные приложения
 DocType: Packing Slip,Package Weight Details,Вес упаковки Подробнее
 DocType: Payment Gateway Account,Payment Gateway Account,Платежный шлюз аккаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,После завершения оплаты перенаправить пользователя на выбранную страницу.
@@ -4673,7 +4679,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показывать любой символ вроде $ и т.д. рядом с валютами.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитных дней
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Является ли переносить
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Получить элементы из спецификации
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время выполнения дни
@@ -4692,8 +4698,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: GL Entry,Is Opening,Открывает
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для посещаемости через Setup&gt; Numbering Series"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для посещаемости через Setup&gt; Numbering Series"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Аккаунт {0} не существует
 DocType: Account,Cash,Наличные
 DocType: Employee,Short biography for website and other publications.,Краткая биография для веб-сайта и других изданий.
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 6a3cc1e..1d4fabe 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,කණ්ඩායම අයිතමය කල් ඉකුත් වීමේ තත්ත්වය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,බැංකු අණකරයකින් ෙගවිය
 DocType: Mode of Payment Account,Mode of Payment Account,ගෙවීම් ගිණුම වන ආකාරය
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ප්රභේද පෙන්වන්න
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ප්රභේද පෙන්වන්න
 DocType: Academic Term,Academic Term,අධ්යයන කාලීන
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ද්රව්ය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ප්රමාණය
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,සෞඛ්ය සත්කාර
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ෙගවීම පමාද (දින)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,සේවා වියදම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ඉන්වොයිසිය
 DocType: Maintenance Schedule Item,Periodicity,ආවර්තයක්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,මුදල් වර්ෂය {0} අවශ්ය වේ
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,වෙළඳ ප්රචාරණ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,එම සමාගම එක් වරකට වඩා ඇතුලත් කර
 DocType: Employee,Married,විවාහක
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} සඳහා අවසර නැත
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} සඳහා අවසර නැත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,සිට භාණ්ඩ ලබා ගන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},නිෂ්පාදන {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ලැයිස්තුගත අයිතමයන් කිසිවක් නොමැත
 DocType: Payment Reconciliation,Reconcile,සංහිඳියාවකට
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,සිල්ලර බඩු
 DocType: Quality Inspection Reading,Reading 1,කියවීම 1
 DocType: Process Payroll,Make Bank Entry,බැංකුව සටහන් කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,විශ්රාම වැටුප් අරමුදල්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ඊළඟ ක්ෂය වීම දිනය මිල දී ගත් දිනය පෙර විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ඊළඟ ක්ෂය වීම දිනය මිල දී ගත් දිනය පෙර විය නොහැකි
 DocType: SMS Center,All Sales Person,සියලු විකුණුම් පුද්ගලයෙක්
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** මාසික බෙදාහැරීම් ** ඔබගේ ව්යාපාරය තුළ යමක සෘතුමය බලපෑම ඇති නම්, ඔබ මාස හරහා අයවැය / ඉලක්ක, බෙදා හැරීමට උපකාරී වේ."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,හමු වූ භාණ්ඩ නොවේ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,හමු වූ භාණ්ඩ නොවේ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
 DocType: Lead,Person Name,පුද්ගලයා නම
 DocType: Sales Invoice Item,Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",උදා: &quot;ප්රාථමික පාසල්&quot; හෝ &quot;&quot; විශ්වවිද්යාල
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,කොටස් වාර්තා
 DocType: Warehouse,Warehouse Detail,පොත් ගබඩාව විස්තර
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,හදුන්වන අවසානය දිනය පසුව කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසර අවසාන දිනය වඩා විය නොහැකිය. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ස්ථාවර වත්කම් ද&quot; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ස්ථාවර වත්කම් ද&quot; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
 DocType: Vehicle Service,Brake Oil,බ්රේක් ඔයිල්
 DocType: Tax Rule,Tax Type,බදු වර්ගය
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ඔබ {0} පෙර සටහන් ඇතුළත් කිරීම් එකතු කිරීම හෝ යාවත්කාලීන කිරීම කිරීමට තමන්ට අවසර නොමැති
 DocType: BOM,Item Image (if not slideshow),අයිතමය අනුරුව (Slideshow නොවේ නම්)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ක පාරිභෝගික එකම නමින් පවතී
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(පැය අනුපාතිකය / 60) * සත මෙහෙයුම කාල
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
 DocType: SMS Log,SMS Log,කෙටි පණිවුඩ ලොග්
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,භාර අයිතම පිරිවැය
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} මත වන නිවාඩු අතර දිනය සිට මේ දක්වා නැත
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,ශ්රේණියේ
 DocType: Sales Invoice Item,Delivered By Supplier,සැපයුම්කරු විසින් ඉදිරිපත්
 DocType: SMS Center,All Contact,සියලු විමසීම්
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ද්රව්ය ලේඛණය සමග සියලු භාණ්ඩ සඳහා දැනටමත් නිර්මාණය නිෂ්පාදනය සාමය
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ද්රව්ය ලේඛණය සමග සියලු භාණ්ඩ සඳහා දැනටමත් නිර්මාණය නිෂ්පාදනය සාමය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,වාර්ෂික වැටුප
 DocType: Daily Work Summary,Daily Work Summary,ඩේලි වැඩ සාරාංශය
 DocType: Period Closing Voucher,Closing Fiscal Year,වසා මුදල් වර්ෂය
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,කරුණාකර ගිණුම් සටහන නිර්මාණය කිරීම සඳහා පවතින සමාගම තෝරා
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,කොටස් වෙළඳ වියදම්
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,කොන්ට්රා සටහන්
 DocType: Journal Entry Account,Credit in Company Currency,"සමාගම ව්යවහාර මුදල්, නය"
 DocType: Delivery Note,Installation Status,ස්ථාපනය තත්ත්වය
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",ඔබ පැමිණීම යාවත්කාලීන කිරීමට අවශ්යද? <br> වර්තමාන: {0} \ <br> නැති කල: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},පිළිගත් + යවන ලද අයිතමය {0} සඳහා ලැබී ප්රමාණය සමාන විය යුතුය ප්රතික්ෂේප
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,"මිලදී ගැනීම සඳහා සම්පාදන, අමු ද්රව්ය"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ගෙවීම් අවම වශයෙන් එක් මාදිලිය POS ඉන්වොයිසිය සඳහා අවශ්ය වේ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ගෙවීම් අවම වශයෙන් එක් මාදිලිය POS ඉන්වොයිසිය සඳහා අවශ්ය වේ.
 DocType: Products Settings,Show Products as a List,ලැයිස්තුවක් ලෙස නිෂ්පාදන පෙන්වන්න
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","මෙම සැකිල්ල බාගත නිසි දත්ත පුරවා විකරිත ගොනුව අමුණන්න. තෝරාගත් කාලය තුළ සියලු දිනයන් හා සේවක එකතුවක් පවත්නා පැමිණීම වාර්තා සමග, සැකිල්ල පැමිණ ඇත"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ක්ෂය සටහන් කරන්න
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ඉල්ලීම වර්ගය
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,සේවක කරන්න
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,සේවක කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ගුවන් විදුලි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ක්රියාකරවීම
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,මෙහෙයුම් පිළිබඳ විස්තර සිදු කරන ලදී.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,නඩත්තු සංචාර සඳහා සැලැස්ම.
 DocType: SMS Settings,Enter url parameter for message,පණිවිඩය සඳහා url එක පරාමිතිය ඇතුලත් කරන්න
 DocType: POS Profile,Customer Groups,පාරිභෝගික කණ්ඩායම්
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,මුල්ය ප්රකාශනය
 DocType: Guardian,Students,සිසු
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,මිල ගණන් හා වට්ටම් අයදුම් කිරීම සඳහා නීති.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,මිල ලැයිස්තුව මිලදී ගැනීම හෝ විකිණීම සඳහා අදාළ විය යුතුය
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},{0} {1} වඩා වැඩි උසස් ප්රමාණය විය නොහැකි
 DocType: Naming Series,Series List for this Transaction,මෙම ගනුදෙනු සඳහා මාලාවක් ලැයිස්තුව
 DocType: Company,Default Payroll Payable Account,පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,යාවත්කාලීන විද්යුත් සමූහ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,යාවත්කාලීන විද්යුත් සමූහ
 DocType: Sales Invoice,Is Opening Entry,විවෘත වේ සටහන්
 DocType: Customer Group,Mention if non-standard receivable account applicable,සම්මතයට අයත් නොවන ලැබිය අදාළ නම් සඳහන්
 DocType: Course Schedule,Instructor Name,උපදේශක නම
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය එරෙහිව
 ,Production Orders in Progress,ප්රගති නිෂ්පාදනය නියෝග
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,මූල්ය පහසුකම් ශුද්ධ මුදල්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
 DocType: Lead,Address & Contact,ලිපිනය සහ ඇමතුම්
 DocType: Leave Allocation,Add unused leaves from previous allocations,පෙර ප්රතිපාදනවලින් භාවිතා නොකරන කොළ එකතු කරන්න
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ඊළඟට නැවත නැවත {0} {1} මත නිර්මාණය කරනු ඇත
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු සැඳුම්ලත් මුදල
 DocType: Item Website Specification,Item Website Specification,අයිතමය වෙබ් අඩවිය පිරිවිතර
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,අවසරය ඇහිරීම
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,බැංකු අයැදුම්පත්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,වාර්ෂික
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,කොටස් ප්රතිසන්ධාන අයිතමය
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Hub දී ප්රකාශයට පත් කරනු ලබයි
 DocType: Student Admission,Student Admission,ශිෂ්ය ඇතුළත් කිරීම
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,"ද්රව්ය, ඉල්ලීම්"
 DocType: Bank Reconciliation,Update Clearance Date,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 DocType: Item,Purchase Details,මිලදී විස්තර
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ස්වයංක්රීය ද්රව්ය ඉල්ලීම් නිර්මානය කිරීම මත ඊ-මේල් මගින් දැනුම් දෙන්න
 DocType: Journal Entry,Multi Currency,බහු ව්යවහාර මුදල්
 DocType: Payment Reconciliation Invoice,Invoice Type,ඉන්වොයිසිය වර්ගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,සැපයුම් සටහන
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,සැපයුම් සටහන
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,බදු සකස් කිරීම
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,අලෙවි වත්කම් පිරිවැය
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ඔබ එය ඇද පසු ගෙවීම් සටහන් වෙනස් කර ඇත. කරුණාකර එය නැවත නැවත අදින්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} අයිතමය බදු දී දෙවරක් ඇතුළත්
-DocType: Grade Interval,Min Score,විනාඩි ලකුණු
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} අයිතමය බදු දී දෙවරක් ඇතුළත්
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,මේ සතියේ හා ෙ කටයුතු සඳහා සාරාංශය
 DocType: Student Applicant,Admitted,ඇතුළත්
 DocType: Workstation,Rent Cost,කුලියට වියදම
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,සඳහා අගය
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,පක්ෂයට එරෙහිව හෝ අභ්යන්තර ස්ථාන මාරු සඳහා බැංකුව / මුදල් ගනුෙදනු
 DocType: Shipping Rule,Valid for Countries,රටවල් සඳහා වලංගු
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,මෙම අයිතමය මඟින් සැකිල්ල වන අතර ගනුදෙනු භාවිතා කළ නොහැකි වනු ඇත. &#39;කිසිම පිටපත්&#39; නියම නොකරන්නේ නම් අයිතමය ගුණාංග එම ප්රභේද තුලට පිටපත් කරනු ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,මෙම අයිතමය මඟින් සැකිල්ල වන අතර ගනුදෙනු භාවිතා කළ නොහැකි වනු ඇත. &#39;කිසිම පිටපත්&#39; නියම නොකරන්නේ නම් අයිතමය ගුණාංග එම ප්රභේද තුලට පිටපත් කරනු ඇත
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,මුළු සාමය සලකා බලන
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ක්ෂේත්රයේ අගය දිනය මාසික මත නැවත නැවත &#39;ඇතුලත් කරන්න
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,බදු අනුපාතය
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} කාලයක් සඳහා සේවක {1} සඳහා වන විටත් වෙන් {2} {3} වෙත
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,විෂය තෝරා
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ෙරෝ # {0}: කණ්ඩායම කිසිදු {1} {2} ලෙස සමාන විය යුතුයි
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,නොවන සමූහ පරිවර්තනය
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,කණ්ඩායම (ගොඩක්) යනු විෂය ය.
 DocType: C-Form Invoice Detail,Invoice Date,ඉන්වොයිසිය දිනය
 DocType: GL Entry,Debit Amount,ඩෙබිට් මුදල
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,කරුණාකර ඇමුණුම බලන්න
 DocType: Purchase Order,% Received,% ලැබී
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ශිෂ්ය කණ්ඩායම් නිර්මාණය කරන්න
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,උද්ධෘත සඳහා ඉල්ලුම්
 DocType: Salary Slip Timesheet,Working Hours,වැඩ කරන පැය
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,දැනට පවතින මාලාවේ ආරම්භක / වත්මන් අනුක්රමය අංකය වෙනස් කරන්න.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,නව පාරිභෝගික නිර්මාණය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,නව පාරිභෝගික නිර්මාණය
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","බහු මිල නියම රීති පවතින දිගටම සිදු වන්නේ නම්, පරිශීලකයන් ගැටුම විසඳීමට අතින් ප්රමුඛ සකස් කරන ලෙස ඉල්ලා ඇත."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,මිලදී ගැනීම නියෝග නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,මිලදී ගැනීම නියෝග නිර්මාණය
 ,Purchase Register,මිලදී රෙජිස්ටර්
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,අදාළ ගාස්තු
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,සියලු නිෂ්පාදන ක්රියාවලීන් සඳහා වන ගෝලීය සැකසුම්.
 DocType: Accounts Settings,Accounts Frozen Upto,ගිණුම් ශීත කළ තුරුත්
 DocType: SMS Log,Sent On,දා යවන
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
 DocType: HR Settings,Employee record is created using selected field. ,සේවක වාර්තාවක් තෝරාගත් ක්ෂේත්ර භාවිතා කිරීමෙන්ය.
 DocType: Sales Order,Not Applicable,අදාළ නොවේ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,නිවාඩු ස්වාමියා.
@@ -506,6 +509,7 @@
 DocType: Packing Slip,From Package No.,පැකේජය අංක සිට
 DocType: Item Attribute,To Range,රංගේ කිරීමට
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,සුරැකුම්පත් හා තැන්පතු
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","එය ම ඇගයීමේ ක්රමය නැති අතර සමහර භාණ්ඩ එරෙහිව ගනුදෙනු ඇත ලෙස, ඇගයීමේ ක්රමය වෙනස් කළ නොහැක"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,වෙන් මුළු කොළ අනිවාර්ය වේ
 DocType: Job Opening,Description of a Job Opening,රැකියාවක් ආරම්භ කිරීම පිළිබඳ විස්තරය
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,අද විභාග කටයුතු
@@ -533,7 +537,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
 DocType: Production Order,Additional Operating Cost,අතිරේක මෙහෙයුම් පිරිවැය
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,අලංකාර ආලේපන
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
 DocType: Shipping Rule,Net Weight,ශුද්ධ බර
 DocType: Employee,Emergency Phone,හදිසි දුරකථන
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,මිලට ගන්න
@@ -543,7 +547,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,සීමකය 0% සඳහා ශ්රේණියේ නිර්වචනය කරන්න
 DocType: Sales Order,To Deliver,ගලවාගනියි
 DocType: Purchase Invoice Item,Item,අයිතමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
 DocType: Journal Entry,Difference (Dr - Cr),වෙනස (ආචාර්ය - Cr)
 DocType: Account,Profit and Loss,ලාභ සහ අලාභ
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,කළමනාකාර උප කොන්ත්රාත්
@@ -569,7 +573,7 @@
 DocType: Installation Note Item,Installation Note Item,ස්ථාපන සටහන අයිතමය
 DocType: Production Plan Item,Pending Qty,විභාග යවන ලද
 DocType: Budget,Ignore,නොසලකා හරිනවා
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} සක්රීය නොවන
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} සක්රීය නොවන
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},පහත දුරකථන අංක වෙත යොමු කෙටි පණිවුඩ: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,මුද්රණය සඳහා පිහිටුවීම් චෙක්පත මාන
 DocType: Salary Slip,Salary Slip Timesheet,වැටුප් පුරවා Timesheet
@@ -578,13 +582,13 @@
 DocType: Sales Invoice,Total Commission,මුළු කොමිෂන් සභාව
 DocType: Pricing Rule,Sales Partner,විකුණුම් සහයෝගිතාකරු
 DocType: Buying Settings,Purchase Receipt Required,මිලදී ගැනීම කුවිතාන්සිය අවශ්ය
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"ආරම්භක තොගය තිබේ නම්, තක්සේරු අනුපාත අනිවාර්ය වේ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"ආරම්භක තොගය තිබේ නම්, තක්සේරු අනුපාත අනිවාර්ය වේ"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,වාර්තා ඉන්ෙවොයිසිය වගුව සොයාගැනීමට නොමැත
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,කරුණාකර ප්රථම සමාගම හා පක්ෂ වර්ගය තෝරා
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,මූල්ය / ගිණුම් වර්ෂය.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,සමුච්චිත අගයන්
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","සමාවන්න, අනු අංක ඒකාබද්ධ කළ නොහැකි"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,විකුණුම් සාමය කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,විකුණුම් සාමය කරන්න
 DocType: Project Task,Project Task,ව්යාපෘති කාර්ය සාධක
 ,Lead Id,ඊයම් අංකය
 DocType: C-Form Invoice Detail,Grand Total,මුලු එකතුව
@@ -601,7 +605,7 @@
 DocType: Job Applicant,Resume Attachment,නැවත ආරම්භ ඇමුණුම්
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,නැවත ගනුදෙනුකරුවන්
 DocType: Leave Control Panel,Allocate,වෙන්
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,විකුණුම් ප්රතිලාභ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,විකුණුම් ප්රතිලාභ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,සටහන: මුළු වෙන් කොළ {0} කාලය සඳහා දැනටමත් අනුමැතිය කොළ {1} ට අඩු නොවිය යුතු ය
 DocType: Announcement,Posted By,පලකරන්නා
 DocType: Item,Delivered by Supplier (Drop Ship),සැපයුම්කරුවන් (Drop නෞකාව) විසින් පවත්වන
@@ -611,7 +615,7 @@
 DocType: Quotation,Quotation To,උද්ධෘත කිරීම
 DocType: Lead,Middle Income,මැදි ආදායම්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),විවෘත කිරීමේ (බැර)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ඔබ මේ වන විටත් තවත් UOM සමග සමහර ගනුදෙනු (ව) කර ඇති නිසා අයිතමය සඳහා නු පෙරනිමි ඒකකය {0} සෘජුවම වෙනස් කළ නොහැක. ඔබ වෙනස් පෙරනිමි UOM භාවිතා කිරීම සඳහා නව විෂය නිර්මාණය කිරීමට අවශ්ය වනු ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ඔබ මේ වන විටත් තවත් UOM සමග සමහර ගනුදෙනු (ව) කර ඇති නිසා අයිතමය සඳහා නු පෙරනිමි ඒකකය {0} සෘජුවම වෙනස් කළ නොහැක. ඔබ වෙනස් පෙරනිමි UOM භාවිතා කිරීම සඳහා නව විෂය නිර්මාණය කිරීමට අවශ්ය වනු ඇත.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,වෙන් කල මුදල සෘණ විය නොහැකි
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,සමාගම සකස් කරන්න
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,සමාගම සකස් කරන්න
@@ -623,7 +627,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,විකුණුම් ඉන්වොයිසිය Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ෙයොමු අංකය සහ විමර්ශන දිනය {0} සඳහා අවශ්ය
 DocType: Process Payroll,Select Payment Account to make Bank Entry,බැංකුව සටහන් කිරීමට ගෙවීම් ගිණුම තෝරන්න
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","කොළ, වියදම් හිමිකම් සහ වැටුප් කළමනාකරණය සේවක වාර්තා නිර්මාණය"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","කොළ, වියදම් හිමිකම් සහ වැටුප් කළමනාකරණය සේවක වාර්තා නිර්මාණය"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,දැනුම මූලික එකතු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,යෝජනාව ලේඛන
 DocType: Payment Entry Deduction,Payment Entry Deduction,ගෙවීම් සටහන් අඩු
@@ -664,8 +668,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 සමඟ සම්බන්ධය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,කළමනාකරු
 DocType: Payment Entry,Payment From / To,/ සිට දක්වා ගෙවීම්
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,දිනය රංගේ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},නව ණය සීමාව පාරිභෝගික වත්මන් හිඟ මුදල වඩා අඩු වේ. ණය සීමාව බෙ {0} විය යුතුය
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},නව ණය සීමාව පාරිභෝගික වත්මන් හිඟ මුදල වඩා අඩු වේ. ණය සීමාව බෙ {0} විය යුතුය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,එම අයිතමය කිහිපවතාවක් ඇතුළත් කර නොමැත.
 DocType: SMS Settings,Receiver Parameter,ලබන්නා පරාමිති
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;මත පදනම් වූ&#39; සහ &#39;කණ්ඩායම විසින්&#39; සමාන විය නොහැකි
@@ -675,7 +678,7 @@
 DocType: Issue,Resolution Date,යෝජනාව දිනය
 DocType: Student Batch Name,Batch Name,කණ්ඩායම නම
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet නිර්මාණය:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ලියාපදිංචි
 DocType: Selling Settings,Customer Naming By,පාරිභෝගික නම් කිරීම මගින්
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ශිෂ්ය මාසික පැමිණීම වාර්තා තුළ වර්තමාන ලෙස ශිෂ්ය පෙන්වයි
@@ -719,7 +722,7 @@
 DocType: Student Attendance,Student Attendance,ශිෂ්ය පැමිණීම
 DocType: Sales Invoice Timesheet,Time Sheet,කාලය පත්රය
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush, අමු ද්රව්ය මත පදනම් වන දින"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,අයිතමය විස්තර ඇතුලත් කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,අයිතමය විස්තර ඇතුලත් කරන්න
 DocType: Interest,Interest,පොලී
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,පෙර විකුණුම්
 DocType: Purchase Receipt,Other Details,වෙනත් විස්තර
@@ -737,7 +740,7 @@
 ,Absent Student Report,නැති කල ශිෂ්ය වාර්තාව
 DocType: Email Digest,Next email will be sent on:,ඊළඟ ඊ-තැපැල් යවා වනු ඇත:
 DocType: Offer Letter Term,Offer Letter Term,ලිපිය කාලීන ඉදිරිපත්
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,අයිතමය ප්රභේද ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,අයිතමය ප්රභේද ඇත.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,අයිතමය {0} සොයාගත නොහැකි
 DocType: Bin,Stock Value,කොටස් අගය
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,සමාගම {0} නොපවතියි
@@ -746,8 +749,6 @@
 DocType: Serial No,Warranty Expiry Date,"වගකීම්, කල් ඉකුත්වන දිනය,"
 DocType: Material Request Item,Quantity and Warehouse,ප්රමාණය හා ගබඩා
 DocType: Sales Invoice,Commission Rate (%),කොමිසම අනුපාතිකය (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,සැකසුම&gt; සැකසීම්&gt; කිරීම අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි කිරීම අනුප්රාප්තිකයා නම් කිරීම සකස් කරන්න
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,සැකසුම&gt; සැකසීම්&gt; කිරීම අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි කිරීම අනුප්රාප්තිකයා නම් කිරීම සකස් කරන්න
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,කරුණාකර වැඩසටහන තෝරා
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,කරුණාකර වැඩසටහන තෝරා
 DocType: Project,Estimated Cost,තක්සේරු කළ පිරිවැය
@@ -766,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} කොටස් අයිතමය නොවේ
 DocType: Mode of Payment Account,Default Account,පෙරනිමි ගිණුම
 DocType: Payment Entry,Received Amount (Company Currency),ලැබී ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,කරුණාකර සතිපතා ලකුණු දින තෝරා
 DocType: Production Order Operation,Planned End Time,සැලසුම්ගත අවසන් වන වේලාව
 ,Sales Person Target Variance Item Group-Wise,විකුණුම් පුද්ගලයා ඉලක්ක විචලතාව අයිතමය සමූහ ප්රාඥ
@@ -830,7 +831,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,මිල ලැයිස්තුව තෝරා ගෙන නොමැති
 DocType: Employee,Family Background,පවුල් පසුබිම
 DocType: Request for Quotation Supplier,Send Email,යවන්න විද්යුත්
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,කිසිදු අවසරය
 DocType: Company,Default Bank Account,පෙරනිමි බැංකු ගිණුම්
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","පක්ෂය මත පදනම් පෙරහන් කිරීමට ප්රථම, පක්ෂය වර්ගය තෝරා"
@@ -843,8 +844,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,සොයා ගත් සේවකයෙකු කිසිදු
 DocType: Supplier Quotation,Stopped,නතර
 DocType: Item,If subcontracted to a vendor,එය ඔබම කිරීමට උප කොන්ත්රාත්තු නම්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
 DocType: SMS Center,All Customer Contact,සියලු පාරිභෝගික ඇමතුම්
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV හරහා කොටස් ඉතිරි උඩුගත කරන්න.
 DocType: Warehouse,Tree Details,රුක් විස්තර
@@ -855,8 +856,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,අවම ඉන්වොයිසි මුදල
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: පිරිවැය මධ්යස්ථානය {2} සමාගම {3} අයත් නොවේ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ගිණුම් {2} සහිත සමූහය විය නොහැකි
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,අයිතමය ෙරෝ {idx}: {doctype} {docname} ඉහත &#39;{doctype}&#39; වගුවේ නොපවතියි
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,අයිතමය ෙරෝ {idx}: {doctype} {docname} ඉහත &#39;{doctype}&#39; වගුවේ නොපවතියි
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,කිසිදු කාර්යයන්
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","මෝටර් රථ ඉන්වොයිස් 05, 28 ආදී උදා ජනනය කරන මාසික දවස"
 DocType: Asset,Opening Accumulated Depreciation,සමුච්චිත ක්ෂය විවෘත
@@ -872,7 +873,7 @@
 DocType: Bin,Moving Average Rate,වෙනස්වන සාමාන්යය අනුපාතිකය
 DocType: Production Planning Tool,Select Items,අයිතම තෝරන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} පනත් කෙටුම්පත {1} එරෙහිව දිනැති {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,පාඨමාලා කාලසටහන
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,පාඨමාලා කාලසටහන
 DocType: Maintenance Visit,Completion Status,අවසන් වූ තත්ත්වය
 DocType: HR Settings,Enter retirement age in years,වසර විශ්රාම ගන්නා වයස අවුරුදු ඇතුලත් කරන්න
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ඉලක්ක ගබඩාව
@@ -880,7 +881,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,මෙම සියයට දක්වා බෙදා හැරීමේ හෝ රිසිට් කට ඉඩ දෙන්න
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ආනයන පැමිණීම
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
 DocType: Process Payroll,Activity Log,ක්රියාකාරකම් ලොග්
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ශුද්ධ ලාභය / අඞු කිරීමට
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ස්වයංක්රීයව ගනුදෙනු ඉදිරිපත් කරන පණිවිඩය රචනා.
@@ -891,7 +892,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ගෙවීම සාමය මිලදී
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ප්රක්ෂේපිත යවන ලද
 DocType: Sales Invoice,Payment Due Date,ගෙවීම් නියමිත දිනය
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;විවෘත&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,විවෘත එක්කෙනාගේ
 DocType: Notification Control,Delivery Note Message,සැපයුම් සටහන පණිවුඩය
@@ -907,7 +908,7 @@
 DocType: Item Reorder,Re-Order Qty,නැවත සාමය යවන ලද
 DocType: Leave Block List Date,Leave Block List Date,වාරණ ලැයිස්තුව දිනය නිවාඩු
 DocType: Pricing Rule,Price or Discount,මිල හෝ වට්ටම්
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,මිලදී ගැනීම රිසිට්පත අයිතම වගුවේ මුළු අදාළ ගාස්තු මුළු බදු හා ගාස්තු ලෙස එම විය යුතුය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,මිලදී ගැනීම රිසිට්පත අයිතම වගුවේ මුළු අදාළ ගාස්තු මුළු බදු හා ගාස්තු ලෙස එම විය යුතුය
 DocType: Sales Team,Incentives,සහන
 DocType: SMS Log,Requested Numbers,ඉල්ලන ගණන්
 DocType: Production Planning Tool,Only Obtain Raw Materials,", අමු ද්රව්ය පමණක් ලබා"
@@ -965,8 +966,7 @@
 DocType: Supplier,Default Payable Accounts,පෙරනිමි ගෙවිය යුතු ගිණුම්
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Fee Structure,Components,සංරචක
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
 DocType: Quality Inspection Reading,Reading 6,කියවීම 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,මිලදී ගැනීම ඉන්වොයිසිය අත්තිකාරම්
@@ -1018,8 +1018,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ෙරෝ {0}: විකුණුම් / මිලදී ගැනීමේ නියෝගයක් සෑම විටම අත්තිකාරම් වශයෙන් සටහන් කළ යුතුය එරෙහිව ගෙවීම්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,රසායනික
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,මෙම ප්රකාරයේදී තෝරාගත් විට ප්රකෘති බැංකුව / මුදල් ගිණුම ස්වංක්රීයව වැටුප ජර්නල් සටහන් දී යාවත්කාලීන වේ.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","ශ්රේණියේ සංග්රහයේ {0} සඳහා කාල අන්තරයන් අනෙකුත් ශ්රේණි සඳහා ශ්රේණියේ පරාසය සමඟ ගැටේ,. කාල අන්තරයන් {0} සහ {1} පරීක්ෂා කර නැවත උත්සාහ කරන්න"
 DocType: BOM,Raw Material Cost(Company Currency),අමු ද්රව්ය වියදම (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,සියලු අයිතම දැනටමත් මෙම නිෂ්පාදන නියෝග සඳහා ස්ථාන මාරුවීම් ලබාදී තිබේ.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},පේළියේ # {0}: අනුපාත {1} {2} භාවිතා අනුපාතය ට වඩා වැඩි විය නොහැක
@@ -1032,7 +1030,7 @@
 DocType: BOM Website Item,BOM Website Item,ද්රව්ය ලේඛණය වෙබ් අඩවිය අයිතමය
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ඔබේ ලිපිය හිස සහ ලාංඡනය උඩුගත කරන්න. (ඔබ ඔවුන්ට පසුව සංස්කරණය කළ හැකි).
 DocType: Timesheet Detail,Bill,පනත් කෙටුම්පත
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,සුදු
 DocType: SMS Center,All Lead (Open),සියලු ඊයම් (විවෘත)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ෙරෝ {0}: පිවිසුම් කාලය පළකිරීම ගුදම් තුළ යවන ලද {4} සඳහා ලබා ගත හැකි {1} ({2} {3}) නොවේ
@@ -1047,7 +1045,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},සාමය වර්ගය {0} එකක් විය යුතුය
 DocType: Lead,Next Contact Date,ඊළඟට අප අමතන්න දිනය
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,විවෘත යවන ලද
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
 DocType: Student Batch Name,Student Batch Name,ශිෂ්ය කණ්ඩායම නම
 DocType: Holiday List,Holiday List Name,නිවාඩු ලැයිස්තු නම
 DocType: Repayment Schedule,Balance Loan Amount,ඉතිරි ණය මුදල
@@ -1067,10 +1065,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ඇති {0} කරුණාකර සඳහන් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ප්රමාණය සහ වටිනාකම කිසිදු වෙනසක් සමග භාණ්ඩ ඉවත් කර ඇත.
 DocType: Delivery Note,Delivery To,වෙත බෙදා හැරීමේ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
 DocType: Production Planning Tool,Get Sales Orders,විකුණුම් නියෝග ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} සෘණ විය නොහැකි
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,වට්ටමක්
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,වට්ටමක්
 DocType: Asset,Total Number of Depreciations,අගය පහත මුළු සංඛ්යාව
 DocType: Sales Invoice Item,Rate With Margin,ආන්තිකය සමග අනුපාතය
 DocType: Sales Invoice Item,Rate With Margin,ආන්තිකය සමග අනුපාතය
@@ -1099,7 +1097,7 @@
 DocType: Lead,Organization Name,සංවිධානයේ නම
 DocType: Tax Rule,Shipping State,නැව් රාජ්ය
 ,Projected Quantity as Source,මූලාශ්රය ලෙස ප්රක්ෂේපණය ප්රමාණ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,අයිතමය බොත්තම &#39;මිලදී ගැනීම ලැබීම් සිට අයිතම ලබා ගන්න&#39; භාවිතා එකතු කල යුතුය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,අයිතමය බොත්තම &#39;මිලදී ගැනීම ලැබීම් සිට අයිතම ලබා ගන්න&#39; භාවිතා එකතු කල යුතුය
 DocType: Employee,A-,ඒ-
 DocType: Production Planning Tool,Include non-stock items,නොවන කොටස් භාණ්ඩ ඇතුළත්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,විකුණුම් වියදම්
@@ -1107,7 +1105,7 @@
 DocType: GL Entry,Against,එරෙහි
 DocType: Item,Default Selling Cost Center,පෙරනිමි විකිණීම පිරිවැය මධ්යස්ථානය
 DocType: Sales Partner,Implementation Partner,ක්රියාත්මක කිරීම සහකරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,කලාප කේතය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,කලාප කේතය
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
 DocType: Opportunity,Contact Info,සම්බන්ධ වීම
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,කොටස් අයැදුම්පත් කිරීම
@@ -1150,7 +1148,7 @@
 DocType: Sales Partner,Distributor,බෙදාහැරීමේ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,සාප්පු සවාරි කරත්ත නැව් පාලනය
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,නිෂ්පාදන න්යාය {0} මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර අවලංගු කළ යුතුය
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',&#39;යොමු කරන්න අතිරේක වට්ටම් මත&#39; සකස් කරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',&#39;යොමු කරන්න අතිරේක වට්ටම් මත&#39; සකස් කරන්න
 ,Ordered Items To Be Billed,නියෝග අයිතම බිල්පතක්
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,රංගේ සිට රංගේ කිරීම වඩා අඩු විය යුතුය
 DocType: Global Defaults,Global Defaults,ගෝලීය Defaults
@@ -1185,11 +1183,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,කණ්ඩායම අංකය ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
 DocType: Stock Settings,Default Item Group,පෙරනිමි අයිතමය සමූහ
 DocType: Employee Loan,Partially Disbursed,අර්ධ වශයෙන් මුදාහැරේ
-DocType: Grading Structure,Grading System Name,උප්පාදනය පද්ධතිය නම
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,සැපයුම්කරු දත්ත සමුදාය.
 DocType: Account,Balance Sheet,ශේෂ පත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ඔබේ විකිණුම් පුද්ගලයා පාරිභෝගික සම්බන්ධ කර ගැනීමට මෙම දිනට මතක් ලැබෙනු ඇත
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,එම අයිතමය වාර කිහිපයක් ඇතුළත් කළ නොහැක.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","කණ්ඩායම් යටතේ තව දුරටත් ගිණුම් කළ හැකි නමුත්, ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි"
@@ -1228,11 +1225,11 @@
 DocType: Maintenance Visit Purpose,Work Done,කළ වැඩ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,මෙම දන්ත ධාතුන් වගුවේ අවම වශයෙන් එක් විශේෂණය සඳහන් කරන්න
 DocType: Announcement,All Students,සියලු ශිෂ්ය
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} අයිතමය නොවන කොටස් අයිතමය විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} අයිතමය නොවන කොටස් අයිතමය විය යුතුය
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,දැක්ම ලේජර
 DocType: Grading Scale,Intervals,කාල අන්තරයන්
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ආදිතම
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","ක අයිතමය සමූහ එකම නමින් පවතී, අයිතමය නම වෙනස් කිරීම හෝ අයිතමය පිරිසක් නැවත නම් කරුණාකර"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","ක අයිතමය සමූහ එකම නමින් පවතී, අයිතමය නම වෙනස් කිරීම හෝ අයිතමය පිරිසක් නැවත නම් කරුණාකර"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ශිෂ්ය ජංගම අංක
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ලෝකයේ සෙසු
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,අයිතමය {0} කණ්ඩායම ලබා ගත නොහැකි
@@ -1273,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ශීත කළ ගිණුම් {0} සංස්කරණය කිරීමට අවසර නැත
 DocType: Journal Entry,Get Outstanding Invoices,විශිෂ්ට ඉන්වොයිසි ලබා ගන්න
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,මිලදී ගැනීමේ නියෝග ඔබ ඔබේ මිලදී ගැනීම සැලසුම් සහ පසුවිපරම් උදව්
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,මිලදී ගැනීමේ නියෝග ඔබ ඔබේ මිලදී ගැනීම සැලසුම් සහ පසුවිපරම් උදව්
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",මුළු නිකුත් / ස්ථාන මාරු ප්රමාණය {0} ද්රව්ය ඉල්ලීම ගැන {1} \ ඉල්ලා ප්රමාණය {2} අයිතමය {3} සඳහා වඩා වැඩි විය නොහැකි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,කුඩා
@@ -1298,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ඔබගේ නිෂ්පාදන හෝ සේවා
 DocType: Mode of Payment,Mode of Payment,ගෙවීම් ක්රමය
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
 DocType: Student Applicant,AP,පුද්ගල නාශක
 DocType: Purchase Invoice Item,BOM,ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"මෙය මූල අයිතමය පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
@@ -1316,7 +1313,7 @@
 DocType: Student Group Student,Group Roll Number,සමූහ Roll අංකය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} සඳහා පමණක් ණය ගිණුම් තවත් හර සටහන හා සම්බන්ධ කර ගත හැකි
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,සියලු කාර්ය බර මුළු 1. ඒ අනුව සියලු ව්යාපෘති කාර්යයන් ෙහොන්ඩර වෙනස් කළ යුතු කරුණාකර
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,අයිතමය {0} උප කොන්ත්රාත් අයිතමය විය යුතුය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ප්රාග්ධන උපකරණ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","මිල ගණන් පාලනය පළමු අයිතමය, විෂය සමූහය හෝ වෙළඳ නාමය විය හැකි ක්ෂේත්ර, &#39;මත යොමු කරන්න&#39; මත පදනම් වූ තෝරා ගනු ලැබේ."
@@ -1343,7 +1340,7 @@
 DocType: Depreciation Schedule,Journal Entry,ජර්නල් සටහන්
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ප්රගතිය භාණ්ඩ
 DocType: Workstation,Workstation Name,සේවා පරිගණකයක් නම
-DocType: Grade Interval,Grade Code,ශ්රේණියේ සංග්රහයේ
+DocType: Grading Scale Interval,Grade Code,ශ්රේණියේ සංග්රහයේ
 DocType: POS Item Group,POS Item Group,POS අයිතමය සමූහ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,විද්යුත් Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
@@ -1360,7 +1357,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,දෘඩාංග
 DocType: Sales Order,Recurring Upto,තුරුත් නැවත නැවත
 DocType: Attendance,HR Manager,මානව සම්පත් කළමනාකාර
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,කරුණාකර සමාගම තෝරා
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,කරුණාකර සමාගම තෝරා
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,වරප්රසාද සහිත
 DocType: Purchase Invoice,Supplier Invoice Date,සැපයුම්කරු ගෙවීම් දිනය
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,ඔබ සාප්පු සවාරි කරත්ත සක්රිය කර ගැනීමට අවශ්ය
@@ -1376,7 +1373,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ආහාර
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,වයස්ගතවීම රංගේ 3
 DocType: Maintenance Schedule Item,No of Visits,සංචාර අංක
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,මාක් පැමිණීම්
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,මාක් පැමිණීම්
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},{1} එරෙහිව නඩත්තු උපෙල්ඛනෙය් {0} පවතී
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ඇතුළත් ශිෂ්ය
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},සමාප්ති ගිණුම ව්යවහාර මුදල් විය යුතුය {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},සියලු අරමුණු සඳහා ලකුණු මුදල 100. විය යුතුය එය {0} වේ
@@ -1425,13 +1423,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ගිණුම් සටහන
 DocType: Material Request,Terms and Conditions Content,නියමයන් හා කොන්දේසි අන්තර්ගත
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
 DocType: Maintenance Visit,Unscheduled,කලින් නොදන්වා
 DocType: Employee,Owned,අයත්
 DocType: Salary Detail,Depends on Leave Without Pay,වැටුප් නැතිව නිවාඩු මත රඳා පවතී
 DocType: Pricing Rule,"Higher the number, higher the priority",උසස් සංඛ්යාව ඉහළ ප්රමුඛත්වය
 ,Purchase Invoice Trends,මිලදී ගැනීම ඉන්වොයිසිය ප්රවණතා
 DocType: Employee,Better Prospects,වඩා හොඳ අපේක්ෂා
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","පේළියේ # {0}: මෙම කණ්ඩායම {1} පමණක් {2} යවන ලද ඇත. කරුණාකර {3} ලබා ගත යවන ලද ඇති තවත් කණ්ඩායම තෝරා ගැනීමට හෝ බහු කාණ්ඩ සිට / ප්රශ්නය ඉදිරිපත් කිරීමට, බහු පේළි බවට පේළිය බෙදී"
 DocType: Vehicle,License Plate,බලපත්ර පළඟ
 DocType: Appraisal,Goals,ඉලක්ක
 DocType: Warranty Claim,Warranty / AMC Status,වගකීම් / විදේශ මුදල් හුවමාරු කරන්නන් තත්ත්වය
@@ -1449,7 +1448,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,සේවක තමා වෙත වාර්තා කළ නොහැක.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ගිණුම කැටි නම්, ඇතුළත් කිරීම් සීමා පරිශීලකයන්ට ඉඩ දෙනු ලැබේ."
 DocType: Email Digest,Bank Balance,බැංකු ශේෂ
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} සඳහා මුල්ය සටහන්: {1} පමණක් මුදල් කළ හැකි: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} සඳහා මුල්ය සටහන්: {1} පමණක් මුදල් කළ හැකි: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","රැකියා පැතිකඩ, සුදුසුකම් අවශ්ය ආදිය"
 DocType: Journal Entry Account,Account Balance,ගිණුම් ශේෂය
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ගනුදෙනු සඳහා බදු පාලනය.
@@ -1460,7 +1459,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,unclosed රාජ්ය මූල්ය වසරේ P &amp; L ශේෂයන් පෙන්වන්න
 DocType: Shipping Rule,Shipping Account,නැව් ගිණුම
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ගිණුම් {2} අක්රීය
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ඔබ ඔබේ වැඩ කටයුතු සැලසුම් උදව් සහ නිසි වේලාවට ලබාදීමට විකුණුම් නියෝග කරන්න
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ඔබ ඔබේ වැඩ කටයුතු සැලසුම් උදව් සහ නිසි වේලාවට ලබාදීමට විකුණුම් නියෝග කරන්න
 DocType: Quality Inspection,Readings,කියවීම්
 DocType: Stock Entry,Total Additional Costs,මුළු අතිරේක පිරිවැය
 DocType: Course Schedule,SH,එච්
@@ -1471,7 +1470,7 @@
 DocType: Shipping Rule Condition,To Value,අගය කිරීමට
 DocType: Asset Movement,Stock Manager,කොටස් වෙළඳ කළමනාකරු
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},මූලාශ්රය ගබඩා සංකීර්ණය පේළිය {0} සඳහා අනිවාර්ය වේ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,කාර්යාලය කුලියට
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup කෙටි පණ්වුඩ සැකසුම්
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ආනයන අසාර්ථක විය!
@@ -1497,7 +1496,7 @@
 DocType: Sales Invoice,Source,මූලාශ්රය
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,පෙන්වන්න වසා
 DocType: Leave Type,Is Leave Without Pay,වැටුප් නැතිව නිවාඩු
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,වත්කම් ප්රවර්ගය ස්ථාවර වත්කම් භාණ්ඩයක් සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,වත්කම් ප්රවර්ගය ස්ථාවර වත්කම් භාණ්ඩයක් සඳහා අනිවාර්ය වේ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,වාර්තා ගෙවීම් වගුව සොයාගැනීමට නොමැත
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},මෙම {0} {2} {3} සඳහා {1} සමග ගැටුම්
 DocType: Student Attendance Tool,Students HTML,සිසුන් සඳහා HTML
@@ -1515,7 +1514,7 @@
 DocType: Student,Date of Leaving,බැහැරවීම දිනය
 DocType: Pricing Rule,For Price List,මිල ලැයිස්තුව සඳහා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,විධායක පිරික්සුම්
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ආදර්ශ නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ආදර්ශ නිර්මාණය
 DocType: Maintenance Schedule,Schedules,කාලසටහන්
 DocType: Purchase Invoice Item,Net Amount,ශුද්ධ මුදල
 DocType: Purchase Order Item Supplied,BOM Detail No,ද්රව්ය ලේඛණය විස්තර නොමැත
@@ -1543,7 +1542,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,වැඩසටහන බදවා ගැනීම්
 DocType: Sales Invoice Item,Brand Name,වෙළඳ නාමය නම
 DocType: Purchase Receipt,Transporter Details,ප්රවාහනය විස්තර
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,කොටුව
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,හැකි සැපයුම්කරු
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,එම සංවිධානය
@@ -1577,7 +1576,7 @@
 DocType: Quality Inspection Reading,Reading 4,කියවීම 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} ව්යාපෘතිය {1} සඳහා සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,සමාගම වියදම් සඳහා හිමිකම්.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","සිසුන් පද්ධතියේ හදවත වන අතර, ඔබගේ සියලු සිසුන් එකතු"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","සිසුන් පද්ධතියේ හදවත වන අතර, ඔබගේ සියලු සිසුන් එකතු"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ෙරෝ # {0}: නිශ්කාෂණ දිනය {1} {2} චෙක්පත් දිනය පෙර විය නොහැකි
 DocType: Company,Default Holiday List,පෙරනිමි නිවාඩු ලැයිස්තුව
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ෙරෝ {0}: කාලය හා සිට දක්වා {1} ගතවන කාලය {2} සමග අතිච්ඡාදනය වේ
@@ -1589,20 +1588,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ඔබ නිවාඩු සඳහා අයදුම් කරන්නේ කරන දින (ව) නිවාඩු දින වේ. ඔබ නිවාඩු සඳහා අයදුම් අවශ්ය නැහැ.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,නැවත භාරදුන් ගෙවීම් විද්යුත්
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,නව කාර්ය
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,උද්ධෘත කරන්න
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,උද්ධෘත කරන්න
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,වෙනත් වාර්තා
 DocType: Dependent Task,Dependent Task,රඳා කාර්ය සාධක
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"වර්ගයේ අවසරය, {0} තවදුරටත් {1} වඩා කෙටි විය හැකි"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,කල්තියා X දින සඳහා මෙහෙයුම් සැලසුම් උත්සාහ කරන්න.
 DocType: HR Settings,Stop Birthday Reminders,උපන්දින මතක් නතර
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},සමාගම {0} හි පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම් සකස් කරන්න
 DocType: SMS Center,Receiver List,ලබන්නා ලැයිස්තුව
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,සොයන්න අයිතමය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,සොයන්න අයිතමය
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,පරිභෝජනය ප්රමාණය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,මුදල් ශුද්ධ වෙනස්
 DocType: Assessment Plan,Grading Scale,ශ්රේණිගත පරිමාණ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,නු {0} ඒකකය වරක් පරිවර්තන සාධකය වගුව වඩා ඇතුලත් කර ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,නු {0} ඒකකය වරක් පරිවර්තන සාධකය වගුව වඩා ඇතුලත් කර ඇත
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,මේ වන විටත් අවසන්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ගෙවීම් ඉල්ලීම් මේ වන විටත් {0} පවතී
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,නිකුත් කර ඇත්තේ අයිතම පිරිවැය
@@ -1640,7 +1639,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,එකතු
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
 DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ඔබ මුදල් වර්ෂය {0} මකා දැමිය නොහැකි. මුදල් වර්ෂය {0} ගෝලීය සැකසුම් සුපුරුදු ලෙස සකසා ඇත
 DocType: Journal Entry,Entry Type,ප්රවේශය වර්ගය
 ,Customer Credit Balance,පාරිභෝගික ණය ශේෂ
@@ -1682,8 +1681,6 @@
 DocType: Student Sibling,Studying in Same Institute,එකම ආයතනය අධ්යාපනය ලැබීම
 DocType: Territory,Territory Manager,කළාපීය කළමනාකාර
 DocType: Packed Item,To Warehouse (Optional),ගබඩාව (විකල්ප) වෙත
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
 DocType: Payment Entry,Paid Amount (Company Currency),ගෙවුම් ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 DocType: Purchase Invoice,Additional Discount,අතිරේක වට්ටම්
 DocType: Selling Settings,Selling Settings,සැකසුම් විකිණීම
@@ -1693,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,කරත්ත තුළ බලන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,අලෙවි වියදම්
 ,Item Shortage Report,අයිතමය හිඟය වාර්තාව
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,මෙම කොටස් සටහන් කිරීමට භාවිතා කෙරෙන ද්රව්ය ඉල්ලීම්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ඊළඟ ක්ෂය දිනය නව වත්කම් සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ඊළඟ ක්ෂය දිනය නව වත්කම් සඳහා අනිවාර්ය වේ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,සෑම කණ්ඩායම සඳහා පදනම් සමූහ වෙනම පාඨමාලාව
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,සෑම කණ්ඩායම සඳහා පදනම් සමූහ වෙනම පාඨමාලාව
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ක අයිතමය තනි ඒකකය.
@@ -1712,9 +1709,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: පිරිවැය මධ්යස්ථානය ලාභ සහ අලාභ ගිණුම {2} සඳහා අවශ්ය වේ. එම සමාගමේ පෙරනිමි වියදම මධ්යස්ථානයක් පිහිටුවා කරන්න.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ඒ කස්ටමර් සමූහයේ එකම නමින් පවතී පාරිභෝගික නම වෙනස් හෝ කස්ටමර් සමූහයේ නම වෙනස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ඒ කස්ටමර් සමූහයේ එකම නමින් පවතී පාරිභෝගික නම වෙනස් හෝ කස්ටමර් සමූහයේ නම වෙනස් කරන්න
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,නව අමතන්න
 DocType: Territory,Parent Territory,මව් දේශසීමාවේ
 DocType: Quality Inspection Reading,Reading 2,කියවීම 2
@@ -1741,21 +1736,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ප්රතිසන්ධාන JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,බොහෝ තීරු. එම වාර්තාව අපනයනය සහ පැතුරුම්පත් උපයෝගයක් භාවිතා කරමින් එය මුද්රණය කරන්න.
 DocType: Purchase Invoice Item,Batch No,කණ්ඩායම කිසිදු
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},"{1} ප්රධාන දිනය සඳහා {2} කර ගැනීම සඳහා, {0} සඳහා විනිමය අනුපාතය සොයා ගැනීමට නොහැකි"
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,හැකි පාරිභෝගික ගේ මිලදී ගැනීමේ නියෝගයක් එරෙහිව බහු විකුණුම් නියෝග ඉඩ දෙන්න
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ජංගම නොමැත
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ප්රධාන
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ප්රභේද්යයක්
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ප්රධාන
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ප්රභේද්යයක්
 DocType: Naming Series,Set prefix for numbering series on your transactions,ඔබගේ ගනුදෙනු මාලාවක් සංඛ්යාවක් සඳහා උපසර්ගය සකසන්න
 DocType: Employee Attendance Tool,Employees HTML,සේවක HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,පෙරනිමි ද්රව්ය ලේඛණය ({0}) මෙම අයිතමය ශ්රේණිගත කරන්න හෝ එහි සැකිල්ල සඳහා ක්රියාකාරී විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,පෙරනිමි ද්රව්ය ලේඛණය ({0}) මෙම අයිතමය ශ්රේණිගත කරන්න හෝ එහි සැකිල්ල සඳහා ක්රියාකාරී විය යුතුය
 DocType: Employee,Leave Encashed?,Encashed ගියාද?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ක්ෂේත්රයේ සිට අවස්ථාව අනිවාර්ය වේ
 DocType: Email Digest,Annual Expenses,වාර්ෂික වියදම්
 DocType: Item,Variants,ප්රභේද
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
 DocType: SMS Center,Send To,කිරීම යවන්න
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
 DocType: Payment Reconciliation Payment,Allocated amount,වෙන් කල මුදල
@@ -1775,7 +1769,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ඇගයීම්
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},අනු අංකය අයිතමය {0} සඳහා ඇතුල් අනුපිටපත්
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,"එය නාවික, නීතියේ ආධිපත්යය සඳහා වන තත්ත්වය"
-DocType: Grading Structure,Grading Intervals,උප්පාදනය ප්රාන්තර
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,කරුණාකර ඇතුලත් කරන්න
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","{0} පේළියේ {1} {2} වඩා වැඩි අයිතමය සඳහා overbill නොහැක. කට-බිල් ඉඩ, කරුණාකර සැකසුම් මිලට ගැනීම පිහිටුවා"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,විෂය හෝ ගබඩා මත පදනම් පෙරහන සකස් කරන්න
@@ -1788,16 +1781,17 @@
 DocType: Authorization Control,Authorization Control,බලය පැවරීමේ පාලන
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ෙරෝ # {0}: ප්රතික්ෂේප ගබඩාව ප්රතික්ෂේප අයිතමය {1} එරෙහිව අනිවාර්ය වේ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ගෙවීම
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ඔබේ ඇණවුම් කළමනාකරණය
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ඔබේ ඇණවුම් කළමනාකරණය
 DocType: Production Order Operation,Actual Time and Cost,සැබෑ කාලය හා වියදම
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},උපරිම ද්රව්ය ඉල්ලීම් {0} විකුණුම් සාමය {2} එරෙහිව අයිතමය {1} සඳහා කළ හැකි
 DocType: Employee,Salutation,ආචාර
 DocType: Course,Course Abbreviation,පාඨමාලා කෙටි යෙදුම්
 DocType: Student Leave Application,Student Leave Application,ශිෂ්ය නිවාඩු ඉල්ලුම්
 DocType: Item,Will also apply for variants,ද ප්රභේද සඳහා අයදුම් කරනු ඇත
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} මත සේවක {0} අඩක් දින
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},මුළු කම්කරු පැය වැඩ කරන පැය {0} උපරිම වඩා වැඩි විය යුතු නැහැ
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,මත
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,පාවිච්චි කරන කාලය වන භාණ්ඩ ලැබුනු.
 DocType: Quotation Item,Actual Qty,සැබෑ යවන ලද
 DocType: Sales Invoice Item,References,ආශ්රිත
@@ -1807,7 +1801,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ඔබ අනුපිටපත් භාණ්ඩ ඇතුළු වී තිබේ. නිවැරදි කර නැවත උත්සාහ කරන්න.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ආශ්රිත
 DocType: Asset Movement,Asset Movement,වත්කම් ව්යාපාරය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,නව කරත්ත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,නව කරත්ත
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,අයිතමය {0} ක් serialized අයිතමය නොවේ
 DocType: SMS Center,Create Receiver List,Receiver ලැයිස්තුව නිර්මාණය
 DocType: Vehicle,Wheels,රෝද
@@ -1839,10 +1833,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,නිෂ්පාදන නියෝග එරෙහිව කාලය ලඝු-සටහන් හි නිර්මාණය අක්රීය කරයි. මෙහෙයුම් නිෂ්පාදන න්යාය එරෙහිව දම්වැල් මත ධාවනය වන නොලැබේ
 DocType: Student,Student Mobile Number,ශිෂ්ය ජංගම දුරකතන අංකය
 DocType: Item,Has Variants,ප්රභේද ඇත
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
 DocType: Monthly Distribution,Name of the Monthly Distribution,මාසික බෙදාහැරීම් නම
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
 DocType: Sales Person,Parent Sales Person,මව් විකුණුම් පුද්ගලයෙක්
 DocType: Purchase Invoice,Recurring Invoice,පුනරාවර්තනය ඉන්වොයිසිය
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,කළමනාකාර ව්යාපෘති
@@ -1850,7 +1844,7 @@
 DocType: Budget,Fiscal Year,මුදල් වර්ෂය
 DocType: Vehicle Log,Fuel Price,ඉන්ධන මිල
 DocType: Budget,Budget,අයවැය
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","එය ආදායම් හෝ වියදම් ගිණුම නෑ ලෙස අයවැය, {0} එරෙහිව පවරා ගත නොහැකි"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,අත්පත් කර
 DocType: Student Admission,Application Form Route,ඉල්ලූම්පත් ආකෘතිය මාර්ගය
@@ -1881,7 +1875,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},මුදල {0} {1} {2} එරෙහිව අඩු
 DocType: Employee,Salary Information,වැටුප් තොරතුරු
 DocType: Sales Person,Name and Employee ID,නම සහ සේවක හැඳුනුම්පත
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
 DocType: Website Item Group,Website Item Group,වෙබ් අඩවිය අයිතමය සමූහ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,තීරු බදු හා බදු
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,විමර්ශන දිනය ඇතුලත් කරන්න
@@ -1940,7 +1934,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,නැවත පාරිභෝගික ආදායම්
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) භූමිකාව &#39;වියදම් Approver&#39; තිබිය යුතුය
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pair
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
 DocType: Asset,Depreciation Schedule,ක්ෂය උපෙල්ඛනෙය්
 DocType: Bank Reconciliation Detail,Against Account,ගිණුම එරෙහිව
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,අර්ධ දින දිනය දිනය සිට මේ දක්වා අතර විය යුතුය
@@ -1957,13 +1951,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
 ,Quotation Trends,උද්ධෘත ප්රවණතා
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},අයිතමය {0} සඳහා අයිතමය ස්වාමියා සඳහන් කර නැත අයිතමය සමූහ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
 DocType: Shipping Rule Condition,Shipping Amount,නැව් ප්රමාණය
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,විභාග මුදල
 DocType: Purchase Invoice Item,Conversion Factor,පරිවර්තන සාධකය
 DocType: Purchase Order,Delivered,පාවා
 ,Vehicle Expenses,වාහන වියදම්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
+DocType: Serial No,Invoice Details,ඉන්වොයිසිය විස්තර
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
 DocType: Purchase Receipt,Vehicle Number,වාහන අංක
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,පුනරාවර්තනය ඉන්වොයිස් මත නැවතුම් වනු ඇත දිනය
 DocType: Employee Loan,Loan Amount,ණය මුදල
@@ -1987,7 +1982,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,අතිරේක වට්ටම් මුදල
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
 DocType: Leave Block List Allow,Leave Block List Allow,වාරණ ලැයිස්තුව තබන්න ඉඩ දෙන්න
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,නොවන සමූහ සමූහ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ක්රීඩා
 DocType: Loan Type,Loan Name,ණය නම
@@ -1998,6 +1993,7 @@
 ,Customer Acquisition and Loyalty,පාරිභෝගික අත්කරගැනීම සහ සහෘද
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ඔබ ප්රතික්ෂේප භාණ්ඩ තොගය පවත්වා කොහෙද පොත් ගබඩාව
 DocType: Production Order,Skip Material Transfer,ද්රව්ය හුවමාරු සිංහල
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"ප්රධාන දිනය {2} සඳහා {1} කර ගැනීම සඳහා, {0} සඳහා විනිමය අනුපාතය සොයා ගැනීමට නොහැකි විය. මුදල් හුවමාරු වාර්තා අතින් නිර්මාණය කරන්න"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ඔබේ මූල්ය වසර අවසන්
 DocType: POS Profile,Price List,මිල දර්ශකය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} දැන් ප්රකෘති මුදල් වර්ෂය වේ. බලපැවැත් වීමට වෙනසක් සඳහා ඔබේ බ්රවුසරය නැවුම් කරන්න.
@@ -2035,9 +2031,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,අයිතමය {0} දැනටමත් ආපසු යවා ඇත
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** මුදල් වර්ෂය ** මූල්ය වර්ෂය නියෝජනය කරයි. ** ** මුදල් වර්ෂය එරෙහි සියලු ගිණුම් සටහන් ඇතුළත් කිරීම් සහ අනෙකුත් ප්රධාන ගනුදෙනු දම්වැල් මත ධාවනය වන ඇත.
 DocType: Opportunity,Customer / Lead Address,ගණුදෙනුකරු / ඊයම් ලිපිනය
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
 DocType: Student Admission,Eligibility,සුදුසුකම්
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ආදර්ශ ඔබේ නායකත්වය ලෙස ඔබගේ සියලු සම්බන්ධතා සහ තවත් එකතු කරන්න, ඔබ ව්යාපාරය ලබා ගැනීමට උදව්"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ආදර්ශ ඔබේ නායකත්වය ලෙස ඔබගේ සියලු සම්බන්ධතා සහ තවත් එකතු කරන්න, ඔබ ව්යාපාරය ලබා ගැනීමට උදව්"
 DocType: Production Order Operation,Actual Operation Time,සැබෑ මෙහෙයුම කාල
 DocType: Authorization Rule,Applicable To (User),(පරිශීලක) අදාළ
 DocType: Purchase Taxes and Charges,Deduct,අඩු
@@ -2077,7 +2073,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,සමාගම තෝරන්න ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,සියළුම දෙපාර්තමේන්තු සඳහා සලකා නම් හිස්ව තබන්න
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
 DocType: Process Payroll,Fortnightly,දෙසතියකට වරක්
 DocType: Currency Exchange,From Currency,ව්යවහාර මුදල් වලින්
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",කරුණාකර බෙ එක් පේළිය වෙන් කළ මුදල ඉන්වොයිසිය වර්ගය හා ඉන්වොයිසිය අංකය තෝරා
@@ -2093,7 +2089,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,පළමු පේළි සඳහා &#39;පෙර ෙරෝ මුදල මත&#39; හෝ &#39;පෙර ෙරෝ මුළු දා&#39; ලෙස භාර වර්ගය තෝරන්න බැහැ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ළමා අයිතමය නිෂ්පාදනයක් පැකේජය විය යුතු නොවේ. අයිතමය ඉවත් කරන්න &#39;{0}&#39; හා බේරා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,බැංකු
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets එකතු
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets එකතු
 DocType: Vehicle Service,Service Item,සේවා විෂය
 DocType: Bank Guarantee,Bank Guarantee,බැංකු ඇපකරයක්
 DocType: Bank Guarantee,Bank Guarantee,බැංකු ඇපකරයක්
@@ -2143,8 +2139,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,මිල ලැයිස්තුව සකස් වී නොමැති නම් මිල ගණන් පෙන්වා ඇත කළ නොහැකි වනු ඇත
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"මෙම නැව්, නීතියේ ආධිපත්යය සඳහා වන රට සඳහන් හෝ ලෝක ව්යාප්ත නැව් කරුණාකර පරීක්ෂා කරන්න"
 DocType: Stock Entry,Total Incoming Value,මුළු එන අගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,මිලදී ගැනීම මිල ලැයිස්තුව
 DocType: Offer Letter Term,Offer Term,ඉල්ලුමට කාලීන
 DocType: Quality Inspection,Quality Manager,තත්ත්ව කළමනාකාර
@@ -2177,14 +2173,14 @@
 DocType: Opportunity,Lost Reason,අහිමි හේතුව
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,නව ලිපිනය
 DocType: Quality Inspection,Sample Size,නියැදියේ ප්රමාණය
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,රිසිට්පත ලේඛන ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,සියලු අයිතම දැනටමත් ඉන්වොයිස් කර ඇත
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,රිසිට්පත ලේඛන ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,සියලු අයිතම දැනටමත් ඉන්වොයිස් කර ඇත
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;නඩු අංක සිට&#39; වලංගු සඳහන් කරන්න
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,තව දුරටත් වියදම් මධ්යස්ථාන කණ්ඩායම් යටතේ ඉදිරිපත් කළ හැකි නමුත් සටහන් ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි
 DocType: Project,External,බාහිර
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,පරිශීලකයන් හා අවසර
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},නිර්මාණය කරන ලද්දේ නිෂ්පාදනය නියෝග: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},නිර්මාණය කරන ලද්දේ නිෂ්පාදනය නියෝග: {0}
 DocType: Branch,Branch,ශාඛාව
 DocType: Guardian,Mobile Number,ජංගම දූරකථන අංකය
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,මුද්රණ හා ෙවළඳ නාමකරණ
@@ -2193,7 +2189,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} සොයාගත නොහැකි අනු අංකය
 DocType: Scheduling Tool,Student Batch,ශිෂ්ය කණ්ඩායම
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ඔබගේ ගනුදෙනුකරුවන්
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ශිෂ්ය කරන්න
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ශිෂ්ය කරන්න
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},ඔබ මෙම ව්යාපෘතිය පිළිබඳව සහයෝගයෙන් කටයුතු කිරීමට ආරාධනා කර ඇත: {0}
 DocType: Leave Block List Date,Block Date,වාරණ දිනය
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,දැන් ඉල්ලුම් කරන්න
@@ -2217,8 +2213,9 @@
 DocType: SMS Log,Sent To,කිරීම සඳහා යවා
 DocType: Payment Request,Make Sales Invoice,විකුණුම් ඉන්වොයිසිය කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,මෘදුකාංග
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ඊළඟට අප අමතන්න දිනය අතීතයේ දී කළ නොහැකි
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ඊළඟට අප අමතන්න දිනය අතීතයේ දී කළ නොහැකි
 DocType: Company,For Reference Only.,විමර්ශන පමණක් සඳහා.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,කණ්ඩායම තේරීම් නොමැත
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},වලංගු නොවන {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,උසස් මුදල
@@ -2232,7 +2229,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,නඩු අංක 0 වෙන්න බෑ
 DocType: Item,Show a slideshow at the top of the page,පිටුවේ ඉහළ ඇති වූ අතිබහුතරයකගේ පෙන්වන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ස්ටෝර්ස්
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ස්ටෝර්ස්
 DocType: Serial No,Delivery Time,භාරදීමේ වේලාව
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,වයස්ගතවීම ආශ්රිත දා
 DocType: Item,End of Life,ජීවිතයේ අවසානය
@@ -2248,8 +2245,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ද්රව්ය මාරු
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", මෙහෙයුම් විශේෂයෙන් සඳහන් මෙහෙයුම් පිරිවැය සහ අද්විතීය මෙහෙයුම ඔබේ ක්රියාකාරිත්වය සඳහා කිසිදු දෙන්න."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,මෙම ලේඛනය අයිතමය {4} සඳහා {0} {1} විසින් සීමාව ඉක්මවා ඇත. ඔබ එකම {2} එරෙහිව තවත් {3} ගන්නවාද?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
 DocType: Purchase Invoice,Price List Currency,මිල ලැයිස්තුව ව්යවහාර මුදල්
 DocType: Naming Series,User must always select,පරිශීලක සෑම විටම තෝරාගත යුතුය
 DocType: Stock Settings,Allow Negative Stock,ඍණ කොටස් ඉඩ දෙන්න
@@ -2260,7 +2257,7 @@
 DocType: Budget Account,Budget Account,අයවැය ගිණුම්
 DocType: Quality Inspection,Verified By,වන විට තහවුරු කර
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","දැනට පවතින ගනුදෙනු නැති නිසා, සමාගම පෙරනිමි මුදල් වෙනස් කළ නොහැක. ගනුදෙනු පෙරනිමි මුදල් වෙනස් කිරීමට අවලංගු කළ යුතුය."
-DocType: Grade Interval,Grade Description,ශ්රේණියේ විස්තරය
+DocType: Grading Scale Interval,Grade Description,ශ්රේණියේ විස්තරය
 DocType: Stock Entry,Purchase Receipt No,මිලදී ගැනීම රිසිට්පත නොමැත
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,අර්නස්ට් මුදල්
 DocType: Process Payroll,Create Salary Slip,වැටුප පුරවා නිර්මාණය
@@ -2298,7 +2295,7 @@
 DocType: Upload Attendance,Attendance To Date,දිනය සඳහා සහභාගී
 DocType: Warranty Claim,Raised By,විසින් මතු
 DocType: Payment Gateway Account,Payment Account,ගෙවීම් ගිණුම
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ලැබිය යුතු ගිණුම් ශුද්ධ වෙනස්
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Off වන්දි
 DocType: Offer Letter,Accepted,පිළිගත්තා
@@ -2312,7 +2309,7 @@
 DocType: Shipping Rule,Shipping Rule Label,නැව් පාලනය ලේබල්
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,පරිශීලක සංසදය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,ඔබ අනුපාතය වෙනස් කළ නොහැක ද්රව්ය ලේඛණය යම් භාණ්ඩයක agianst සඳහන් නම්
 DocType: Employee,Previous Work Experience,පසුගිය සේවා පළපුරුද්ද
@@ -2326,7 +2323,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,නියමයන් හා Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ආයතනයේ නම.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","මෙම දිනය දක්වා කැටි මුල්ය ප්රවේශය, කිසිවෙක් කරන්න පුළුවන් / පහත සඳහන් නියමිත කාර්යභාරය හැර ප්රවේශය වෙනස් කරගත හැක."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,නඩත්තු කාලසටහන ජනනය පෙර ලිපිය සුරැකීම කරුණාකර
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,නඩත්තු කාලසටහන ජනනය පෙර ලිපිය සුරැකීම කරුණාකර
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ව්යාපෘති තත්ත්වය
 DocType: UOM,Check this to disallow fractions. (for Nos),භාග බලය පැවරෙන මෙම පරීක්ෂා කරන්න. (අංක සඳහා)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,පහත සඳහන් නිෂ්පාදන නියෝග නිර්මාණය කරන ලදී:
@@ -2349,6 +2346,7 @@
 DocType: Email Digest,How frequently?,කොහොමද නිතර?
 DocType: Purchase Receipt,Get Current Stock,වත්මන් කොටස් ලබා ගන්න
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ද්රව්ය පනත් කෙටුම්පත රුක්
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
 DocType: Student,Joining Date,එක්වීමට දිනය
 ,Employees working on a holiday,නිවාඩු මත සේවය කරන සේවක
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,මාක් වර්තමාන
@@ -2430,7 +2428,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,නිශ්කාශනෙය් දිනය සඳහන් නොවීම
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,නිෂ්පාදනය
 DocType: Guardian,Occupation,රැකියාව
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ෙරෝ {0}: ඇරඹුම් දිනය අවසානය දිනය පෙර විය යුතුය
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ෙරෝ {0}: ඇරඹුම් දිනය අවසානය දිනය පෙර විය යුතුය
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),එකතුව (යවන ලද)
 DocType: Sales Invoice,This Document,මෙම ලේඛන
 DocType: Installation Note Item,Installed Qty,ස්ථාපනය යවන ලද
@@ -2453,8 +2451,8 @@
 DocType: Notification Control,Sales Order Message,විකුණුම් සාමය පණිවුඩය
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","සමාගම, මුදල්, මුදල් වර්ෂය ආදිය සකස් පෙරනිමි අගයන්"
 DocType: Payment Entry,Payment Type,ගෙවීම් වර්ගය
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
 DocType: Process Payroll,Select Employees,සේවක තෝරන්න
 DocType: Opportunity,Potential Sales Deal,අනාගත විකුණුම් ගනුදෙනුව
 DocType: Payment Entry,Cheque/Reference Date,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් / යොමුව දිනය"
@@ -2471,7 +2469,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},{0} දැනටමත් සමාගම {1} සඳහා නිර්මාණය ගෝලීය POS නරඹන්න
 DocType: Purchase Order,Ref SQ,ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,අයිතමය / ද්රව්ය ලේඛණය සියලු BOMs තුළ ආදේශ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,රිසිට්පත ලියවිලි ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,රිසිට්පත ලියවිලි ඉදිරිපත් කළ යුතුය
 DocType: Purchase Invoice Item,Received Qty,යවන ලද ලැබී
 DocType: Stock Entry Detail,Serial No / Batch,අනු අංකය / කණ්ඩායම
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,ගෙවුම් හා නැති කතාව නොවේ
@@ -2484,7 +2482,7 @@
 ,To Produce,නිර්මාණය කිරීම සඳහා
 apps/erpnext/erpnext/config/hr.py +93,Payroll,වැටුප්
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{0} පේළියේ සඳහා {1} දී. {2} අයිතමය අනුපාතය, පේළි {3} ද ඇතුළත් විය යුතු අතර ඇතුළත් කිරීමට"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,පරිශීලක කරන්න
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,පරිශීලක කරන්න
 DocType: Packing Slip,Identification of the package for the delivery (for print),ප්රසූතියට සඳහා පැකේජය හඳුනා ගැනීම (මුද්රිත)
 DocType: Bin,Reserved Quantity,ඇවිරිණි ප්රමාණ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,වලංගු ඊ-තැපැල් ලිපිනයක් ඇතුලත් කරන්න
@@ -2498,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ආබාධිත සැකිල්ල පෙරනිමි සැකිලි නොවිය යුතුයි
 DocType: Account,Income Account,ආදායම් ගිණුම
 DocType: Payment Request,Amount in customer's currency,පාරිභෝගික මුදල් ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,සැපයුම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,සැපයුම්
 DocType: Stock Reconciliation Item,Current Qty,වත්මන් යවන ලද
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",වගන්තිය සැඳුම්ලත් දී &quot;ද්රව්ය මත පදනම් මත අනුපාතිකය&quot; බලන්න
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,පෙර
 DocType: Appraisal Goal,Key Responsibility Area,ප්රධාන වගකීම් ප්රදේශය
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ශිෂ්ය කාණ්ඩ ඔබ සිසුන් සඳහා පැමිණීම, ඇගයීම හා ගාස්තු නිරීක්ෂණය උදව්"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ශිෂ්ය කාණ්ඩ ඔබ සිසුන් සඳහා පැමිණීම, ඇගයීම හා ගාස්තු නිරීක්ෂණය උදව්"
 DocType: Payment Entry,Total Allocated Amount,මුළු වෙන් කළ මුදල
 DocType: Item Reorder,Material Request Type,ද්රව්ය ඉල්ලීම් වර්ගය
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} {1} දක්වා වැටුප් සඳහා Accural ජර්නල් සටහන්
@@ -2525,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ධාවන කර්මාන්ත ස්වභාවය අනුව මඟ පෙන්වන.
 DocType: Item Supplier,Item Supplier,අයිතමය සැපයුම්කරු
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,සියළු ලිපිනයන්.
 DocType: Company,Stock Settings,කොටස් සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","පහත සඳහන් ලක්ෂණ වාර්තා දෙකම එකම නම් යනවාත් පමණි. සමූහය, රූට් වර්ගය, සමාගම,"
@@ -2535,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',තත්වය සමග සේවකයින්ට සිදුවීම පිළිබඳ ඊමේල් එකක් එවන්නෙමු &#39;විවෘත&#39;
 DocType: Task,Depends on Tasks,කාර්යයන් මත රඳා පවතී
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,කස්ටමර් සමූහයේ රුක් කළමනාකරණය කරන්න.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ඇමුණුම් කරත්තයක් හැකියාව තොරව පෙන්විය හැක
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,නව පිරිවැය මධ්යස්ථානය නම
 DocType: Leave Control Panel,Leave Control Panel,පාලක පැනලය තබන්න
@@ -2547,12 +2547,10 @@
 DocType: Sales Invoice,Debit To,ඩෙබිට් කිරීම
 DocType: Delivery Note,Required only for sample item.,නියැදි අයිතමය සඳහා පමණක් අවශ්ය විය.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ගනුදෙනු කිරීමෙන් පසු සැබෑ යවන ලද
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0} සහ {1} අතර සොයා කිසිම වැටුප් ස්ලිප්
 ,Pending SO Items For Purchase Request,විභාග SO අයිතම මිලදී ගැනීම ඉල්ලීම් සඳහා
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ශිෂ්ය ප්රවේශ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} අක්රීය
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} අක්රීය
 DocType: Supplier,Billing Currency,බිල්පත් ව්යවහාර මුදල්
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,මහා පරිමාණ
@@ -2569,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,මුල් පිටුව Featured නිෂ්පාදන
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,සියලු තක්සේරු කණ්ඩායම්
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,නව ගබඩා නම
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),මුළු {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),මුළු {0} ({1})
 DocType: C-Form Invoice Detail,Territory,භූමි ප්රදේශය
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,අවශ්ය සංචාර ගැන කිසිදු සඳහනක් කරන්න
 DocType: Stock Settings,Default Valuation Method,පෙරනිමි තක්සේරු ක්රමය
@@ -2587,7 +2585,7 @@
 DocType: Price List,Price List Master,මිල ලැයිස්තුව මාස්ටර්
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,සියලු විකුණුම් ගනුදෙනු බහු ** විකුණුම් පුද්ගලයින් එරෙහිව tagged කළ හැකි ** ඔබ ඉලක්ක තබා නිරීක්ෂණය කළ හැකි බව එසේ.
 ,S.O. No.,SO අංක
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ඊයම් සිට පාරිභෝගික {0} නිර්මාණය කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ඊයම් සිට පාරිභෝගික {0} නිර්මාණය කරන්න
 DocType: Price List,Applicable for Countries,රටවල් සඳහා අදාළ වන
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;අනුමත&#39; සහ &#39;ප්රතික්ෂේප&#39; ඉදිරිපත් කළ හැකි එකම තත්ත්වය සහිත යෙදුම් තබන්න
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ශිෂ්ය සමූහය නම පේළිය {0} අනිවාර්ය වේ
@@ -2668,7 +2666,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,කොටස් සඳහා මුල්ය සටහන්
 DocType: Vehicle Service,Engine Oil,එන්ජින් ඔයිල්
 DocType: Sales Invoice,Sales Team1,විකුණුම් Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,අයිතමය {0} නොපවතියි
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,අයිතමය {0} නොපවතියි
 DocType: Sales Invoice,Customer Address,පාරිභෝගික ලිපිනය
 DocType: Employee Loan,Loan Details,ණය තොරතුරු
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද බිංදුවට වඩා වැඩි විය යුතුය.
@@ -2733,7 +2731,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව පිරිසක් බවට පරිවර්තනය කළ නොහැක.
 DocType: Assessment Result Tool,Result HTML,ප්රතිඵල සඳහා HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,දින අවසන් වීමට නියමිතය
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,සිසුන් එක් කරන්න
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,සිසුන් එක් කරන්න
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},කරුණාකර {0} තෝරා
 DocType: C-Form,C-Form No,C-අයදුම්පත් නොමැත
 DocType: BOM,Exploded_items,Exploded_items
@@ -2798,7 +2796,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,සීමාව ඉක්මවා ගොස්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ෙවන්චර් කැපිටල්
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,මෙම &#39;අධ්යයන වර්ෂය&#39; {0} සහ {1} දැනටමත් පවතී &#39;කාලීන නම&#39; සමග ශාස්ත්රීය පදය. මෙම ඇතුළත් කිරීම් වෙනස් කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","අයිතමය {0} එරෙහිව දැනට පවතින ගනුදෙනු ඇත ලෙස, ඔබ {1} වටිනාකම වෙනස් කළ නොහැක"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","අයිතමය {0} එරෙහිව දැනට පවතින ගනුදෙනු ඇත ලෙස, ඔබ {1} වටිනාකම වෙනස් කළ නොහැක"
 DocType: UOM,Must be Whole Number,මුළු අංකය විය යුතුය
 DocType: Leave Control Panel,New Leaves Allocated (In Days),වෙන් අලුත් කොළ (දින දී)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,අනු අංකය {0} නොපවතියි
@@ -2842,7 +2840,7 @@
 DocType: Supplier,Last Day of the Next Month,ඊළඟ මාසය අවසන් දිනය
 DocType: Support Settings,Auto close Issue after 7 days,7 දින පසු වාහන සමීප නිකුත්
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","නිවාඩු ඉතිරි දැනටමත් අනාගත නිවාඩු වෙන් වාර්තා {1} තුළ රැගෙන යන ඉදිරිපත් කර ඇති පරිදි අවසරය, {0} පෙර වෙන් කළ නොහැකි"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ශිෂ්ය අයදුම්කරු
 DocType: Asset Category Account,Accumulated Depreciation Account,සමුච්චිත ක්ෂය ගිණුම
 DocType: Stock Settings,Freeze Stock Entries,කැටි කොටස් අයැදුම්පත්
@@ -2870,8 +2868,8 @@
 DocType: Asset,Item Code,අයිතමය සංග්රහයේ
 DocType: Production Planning Tool,Create Production Orders,නිෂ්පාදන නියෝග නිර්මාණය
 DocType: Serial No,Warranty / AMC Details,වගකීම් / විදේශ මුදල් හුවමාරු කරන්නන් විස්තර
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
 DocType: Journal Entry,User Remark,පරිශීලක අදහස් දැක්වීම්
 DocType: Lead,Market Segment,වෙළෙඳපොළ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
@@ -2890,7 +2888,7 @@
 DocType: Production Planning Tool,Create Material Requests,ද්රව්ය ඉල්ලීම් නිර්මාණය
 DocType: Employee Education,School/University,පාසල් / විශ්ව
 DocType: Payment Request,Reference Details,විමර්ශන විස්තර
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය දළ මිලදී ගැනීම මුදල වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය දළ මිලදී ගැනීම මුදල වඩා අඩු විය යුතුය
 DocType: Sales Invoice Item,Available Qty at Warehouse,ගබඩා ලබා ගත හැක යවන ලද
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,බිල්පතක් මුදල
 DocType: Asset,Double Declining Balance,ද්විත්ව පහත වැටෙන ශේෂ
@@ -2911,19 +2909,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","මෙම කොටස් ප්රතිසන්ධාන ක විවෘත කිරීම සටහන් වන බැවින්, වෙනසක් ගිණුම, එය වත්කම් / වගකීම් වර්ගය ගිණුමක් විය යුතුය"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},උපෙයෝජන ණය මුදල {0} ට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී ගැනීමේ නියෝගයක් අංකය
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,නිෂ්පාදනය සාමය නිර්මාණය නොවන
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,නිෂ්පාදනය සාමය නිර්මාණය නොවන
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;දිනය සිට&#39; &#39;මේ දක්වා&#39; &#39;පසුව විය යුතුය
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ශිෂ්ය {0} ශිෂ්ය අයදුම් {1} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
 DocType: Asset,Fully Depreciated,සම්පූර්ණෙයන් ක්ෂය
 ,Stock Projected Qty,කොටස් යවන ලද ප්රක්ෂේපිත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
 DocType: Employee Attendance Tool,Marked Attendance HTML,කැපී පෙනෙන පැමිණීම HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","මිල ගණන් යෝජනා, ඔබගේ පාරිභෝගිකයන් වෙත යවා ඇති ලංසු"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","මිල ගණන් යෝජනා, ඔබගේ පාරිභෝගිකයන් වෙත යවා ඇති ලංසු"
 DocType: Sales Order,Customer's Purchase Order,පාරිභෝගික මිලදී ගැනීමේ නියෝගයක්
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,අනු අංකය හා කණ්ඩායම
 DocType: Warranty Claim,From Company,සමාගම වෙතින්
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,තක්සේරු නිර්ණායකයන් ලකුණු මුදලක් {0} විය යුතුය.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව සකස් කරන්න
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,හෝ වටිනාකම යවන ලද
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,නිෂ්පාදන නියෝග මතු කල නොහැකි ය:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ව්යවස්ථාව
@@ -3054,7 +3052,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ශිෂ්ය සමූහය
 DocType: Shopping Cart Settings,Quotation Series,උද්ධෘත ශ්රේණි
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","අයිතමයක් ම නම ({0}) සමග පවතී, අයිතමය කණ්ඩායමේ නම වෙනස් කිරීම හෝ අයිතමය නැවත නම් කරුණාකර"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,කරුණාකර පාරිභෝගික තෝරා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,කරුණාකර පාරිභෝගික තෝරා
 DocType: C-Form,I,මම
 DocType: Company,Asset Depreciation Cost Center,වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය
 DocType: Sales Order Item,Sales Order Date,විකුණුම් සාමය දිනය
@@ -3073,19 +3071,18 @@
 DocType: Vehicle,Insurance Details,රක්ෂණ විස්තර
 DocType: Account,Payable,ගෙවිය යුතු
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ණය ආපසු ගෙවීමේ කාල සීමාවක් ඇතුල් කරන්න
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ණය ගැතියන් ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ණය ගැතියන් ({0})
 DocType: Pricing Rule,Margin,ආන්තිකය
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,නව ගනුදෙනුකරුවන්
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,දළ ලාභය %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,නිශ්කාශනෙය් දිනය
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,දළ මිලදී ගැනීම මුදල අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,දළ මිලදී ගැනීම මුදල අනිවාර්ය වේ
 DocType: Lead,Address Desc,ෙමරට ලිපිනය DESC
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,පක්ෂය අනිවාර්ය වේ
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,මාතෘකාව නම
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,මෙම විකිණීම හෝ මිලදී ගැනීමේ ආයෝජිත තෝරාගත් කළ යුතුය
-DocType: Grading Structure,Grade Intervals,ශ්රේණියේ ප්රාන්තර
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ඔබේ ව්යාපාරයේ ස්වභාවය තෝරන්න.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,නිෂ්පාදන මෙහෙයුම් සිදු කරනු ලැබේ කොහෙද.
 DocType: Asset Movement,Source Warehouse,මූලාශ්රය ගබඩාව
@@ -3114,6 +3111,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,මාසික බෙදාහැරීම් ප්රතිශතය
 DocType: Territory,Territory Targets,භූමි ප්රදේශය ඉලක්ක
 DocType: Delivery Note,Transporter Info,ප්රවාහනය තොරතුරු
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},සමාගම {1} පැහැර {0} සකස් කරන්න
 DocType: Cheque Print Template,Starting position from top edge,ඉහළ දාරය ආස්ථානය ආරම්භ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,අදාළ සැපයුම්කරු කිහිපවතාවක් ඇතුලත් කර ඇත
@@ -3167,7 +3165,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,සීරුමාරු කිරීමේ යවන ලද
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,වත්මන් රැකියා අවස්ථා
 DocType: Company,Stock Adjustment Account,කොටස් ගැලපුම් ගිණුම
-DocType: Journal Entry,Write Off,ලියා හරින්න
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ලියා හරින්න
 DocType: Timesheet Detail,Operation ID,මෙහෙයුම හැඳුනුම්පත
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ධ (ලොගින් වන්න) හැඳුනුම්. සකස් නම්, එය සියලු මානව සම්පත් ආකෘති සඳහා පෙරනිමි බවට පත් වනු ඇත."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} සිට
@@ -3178,8 +3176,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,සැපයුම්කරු පාරිභෝගික බාර
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ආකෘතිය / අයිතමය / {0}) කොටස් ඉවත් වේ
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"ඊළඟ දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල වඩා වැඩි විය යුතුය"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,බදු බිඳී පෙන්වන්න
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},නිසා / යොමුව දිනය {0} පසු විය නොහැකි
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,බදු බිඳී පෙන්වන්න
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},නිසා / යොමුව දිනය {0} පසු විය නොහැකි
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,දත්ත ආනයන හා අපනයන
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","කොටස් ඇතුළත් කිරීම්, ගබඩා {0} එරෙහිව පවතින නිසා ඔබ නැවත භාර කිරීමට හෝ වෙනස් කිරීම කළ හැක"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,සිසුන් හමු කිසිදු
@@ -3191,14 +3189,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
 DocType: Program Enrollment,School House,ස්කූල් හවුස්
 DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,මිල ගණන් තෝරන්න
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,මිල ගණන් තෝරන්න
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,මිල ගණන් තෝරන්න
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,මිල ගණන් තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
 DocType: Company,Default Cash Account,පෙරනිමි මුදල් ගිණුම්
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,සමාගම (නැති පාරිභෝගික හෝ සැපයුම්කරු) ස්වාමියා.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,මෙය මේ ශිෂ්ය ඊට සහභාගී මත පදනම් වේ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,කිසිදු ශිෂ්ය
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,වැඩිපුර භාණ්ඩ ෙහෝ විවෘත පූර්ණ ආකෘති පත්රය එක් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;අපේක්ෂිත භාර දීම දිනය&#39; ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,සැපයුම් සටහන් {0} මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර අවලංගු කළ යුතුය
@@ -3245,9 +3244,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,සංහිඳියාව පෙර
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} වෙත
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),එකතු කරන බදු හා ගාස්තු (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"අයිතමය බදු ෙරෝ {0} වර්ගය බදු හෝ ආදායම් හෝ වියදම් හෝ අයකරනු ලබන ගාස්තු, ක ගිණුමක් තිබිය යුතු"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"අයිතමය බදු ෙරෝ {0} වර්ගය බදු හෝ ආදායම් හෝ වියදම් හෝ අයකරනු ලබන ගාස්තු, ක ගිණුමක් තිබිය යුතු"
 DocType: Sales Order,Partly Billed,අර්ධ වශයෙන් අසූහත
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,අයිතමය {0} ස්ථාවර වත්කම් අයිතමය විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,අයිතමය {0} ස්ථාවර වත්කම් අයිතමය විය යුතුය
 DocType: Item,Default BOM,පෙරනිමි ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,තහවුරු කිරීමට සමාගමේ නම වර්ගයේ නැවත කරුණාකර
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,මුළු විශිෂ්ට ඒඑම්ටී
@@ -3270,7 +3269,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,මිල ලැයිස්තුව විනිමය අනුපාත
 DocType: Purchase Invoice Item,Rate,අනුපාතය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ආධුනිකයා
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ලිපිනය නම
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,ලිපිනය නම
 DocType: Stock Entry,From BOM,ද්රව්ය ලේඛණය සිට
 DocType: Assessment Code,Assessment Code,තක්සේරු සංග්රහයේ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,මූලික
@@ -3295,7 +3294,7 @@
 DocType: Purchase Invoice,Print Language,මුද්රණය භාෂා
 DocType: Salary Slip,Total Working Hours,මුළු වැඩ කරන වේලාවන්
 DocType: Stock Entry,Including items for sub assemblies,උප එකලස්කිරීම් සඳහා ද්රව්ය ඇතුළු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,සියලු ප්රදේශ
 DocType: Purchase Invoice,Items,අයිතම
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ශිෂ්ය දැනටමත් ලියාපදිංචි කර ඇත.
@@ -3315,17 +3314,15 @@
 DocType: Issue,Opening Time,විවෘත වේලාව
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,හා අවශ්ය දිනයන් සඳහා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,සුරැකුම්පත් සහ වෙළඳ භාණ්ඩ විනිමය
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,පදනම් කරගත් දින ගණනය
 DocType: Delivery Note Item,From Warehouse,ගබඩාව සිට
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
 DocType: Assessment Plan,Supervisor Name,සුපරීක්ෂක නම
 DocType: Program Enrollment Course,Program Enrollment Course,වැඩසටහන ඇතුලත් පාඨමාලා
 DocType: Program Enrollment Course,Program Enrollment Course,වැඩසටහන ඇතුලත් පාඨමාලා
-DocType: Grading Structure,Grading Structure,ශ්රේණිගත කිරීම ව්යුහය
 DocType: Purchase Taxes and Charges,Valuation and Total,වටිනාකම හා මුළු
 DocType: Tax Rule,Shipping City,නැව් නගරය
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ෙමම අයිතමය {0} (සැකිල්ල) ක ප්රභේද්යයක් වේ. &#39;කිසිම පිටපත්&#39; නියම නොකරන්නේ නම් දන්ත ධාතුන් සැකිල්ල සිට පුරා පිටපත් කරනු ඇත
 DocType: Notification Control,Customize the Notification,මෙම නිවේදනය රිසිකරණය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,මෙහෙයුම් වලින් මුදල් ප්රවාහ
 DocType: Sales Invoice,Shipping Rule,නැව් පාලනය
@@ -3348,6 +3345,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},ද්රව්ය ලේඛණය අයිතමය {0} සඳහා පවතී පෙරනිමි කිසිදු
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"කරුණාකර ගිය තැන, දිනය පළමු තෝරා"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,විවෘත දිනය දිනය අවසන් පෙර විය යුතුය
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
 DocType: Leave Control Panel,Carry Forward,ඉදිරියට ගෙන
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,පවත්නා ගනුදෙනු වියදම මධ්යස්ථානය ලෙජර් බවට පරිවර්තනය කළ නොහැකි
 DocType: Department,Days for which Holidays are blocked for this department.,නිවාඩු මෙම දෙපාර්තමේන්තුව සඳහා අවහිර කර ඇත ඒ සඳහා දින.
@@ -3376,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),එකතුව (ඒඑම්ටී)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,විනෝදාස්වාදය සහ විනෝද
 DocType: Quality Inspection,Item Serial No,අයිතමය අනු අංකය
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,සේවක වාර්තා නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,සේවක වාර්තා නිර්මාණය
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,මුළු වර්තමාන
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,මුල්ය ප්රකාශන
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,පැය
@@ -3391,8 +3389,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,වෙනුවට පසු නව ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,", විකුණුම් පේදුරු"
 DocType: Payment Entry,Received Amount,ලැබී මුදල
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","නියෝගයක් මත මේ වන විටත් ප්රමාණය නොසලකා හරිමින්, සම්පූර්ණ ප්රමාණයක් මේ සඳහා නිර්මාණය"
 DocType: Account,Tax,බද්ද
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,සලකුණු කළ නොහැකි
@@ -3405,7 +3401,7 @@
 DocType: Batch,Source Document Name,මූලාශ්රය ලේඛන නම
 DocType: Batch,Source Document Name,මූලාශ්රය ලේඛන නම
 DocType: Job Opening,Job Title,රැකියා තනතුර
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,පරිශීලකයන් නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,පරිශීලකයන් නිර්මාණය
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ඇට
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,නිෂ්පාදනය කිරීමට ප්රමාණය 0 ට වඩා වැඩි විය යුතුය.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,නඩත්තු ඇමතුම් සඳහා වාර්තාව පිවිසෙන්න.
@@ -3417,8 +3413,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},වියදම් ගිණුම අයිතමය {0} සඳහා අනිවාර්ය වේ
 DocType: BOM,Website Description,වෙබ් අඩවිය විස්තරය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,කොටස් ශුද්ධ වෙනස්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
 DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,රිසිට්පත
 ,Sales Register,විකුණුම් රෙජිස්ටර්
@@ -3429,16 +3425,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,සංස්කරණය කරන්න කිසිම දෙයක් නැහැ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,මේ මාසය සඳහා සාරාංශය හා ෙ කටයුතු
 DocType: Customer Group,Customer Group Name,කස්ටමර් සමූහයේ නම
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,තවමත් ගනුදෙනුකරුවන් නැත!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,බලපත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ඔබ ද පෙර මූල්ය වර්ෂය ශේෂ මෙම මුදල් වසරේදී පිටත්ව ඇතුළත් කිරීමට අවශ්ය නම් ඉදිරියට ගෙන කරුණාකර තෝරා
 DocType: GL Entry,Against Voucher Type,වවුචරයක් වර්ගය එරෙහිව
 DocType: Item,Attributes,දන්ත ධාතුන්
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,ගිණුම අක්රිය ලියන්න ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,පසුගිය සාමය දිනය
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
 DocType: Student,Guardian Details,ගාඩියන් විස්තර
 DocType: C-Form,C-Form,C-ආකෘතිය
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,බහු සේවකයන් සඳහා ලකුණ පැමිණීම
@@ -3463,14 +3461,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ෙරෝ {0} # ගිණුම් වර්ගය විය යුතුයි &#39;ස්ථාවර වත්කම්&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,යවන ලද අතරින්
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,විකිණීම සඳහා නාවික මුදල ගණනය කිරීමට නීති රීති
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,මාලාවක් අනිවාර්ය වේ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,මාලාවක් අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,මූල්යමය සේවා
 DocType: Student Sibling,Student ID,ශිෂ්ය හැඳුනුම්පතක්
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,වේලාව ලඝු-සටහන් සඳහා ක්රියාකාරකම් වර්ග
 DocType: Tax Rule,Sales,විකුණුම්
 DocType: Stock Entry Detail,Basic Amount,මූලික මුදල
 DocType: Training Event,Exam,විභාග
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
 DocType: Leave Allocation,Unused leaves,භාවිතයට නොගත් කොළ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,බිල්පත් රාජ්ය
@@ -3503,7 +3501,7 @@
 DocType: Payment Entry,Account Paid From,සිට ගෙවුම් ගිණුම
 DocType: Purchase Order Item Supplied,Raw Material Item Code,අමු ද්රව්ය අයිතමය සංග්රහයේ
 DocType: Journal Entry,Write Off Based On,පදනම් කරගත් දින Off ලියන්න
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ඊයම් කරන්න
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ඊයම් කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,මුද්රිත හා ලිපි ද්රව්ය
 DocType: Stock Settings,Show Barcode Field,Barcode ක්ෂේත්ර පෙන්වන්න
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
@@ -3519,6 +3517,7 @@
 DocType: Offer Letter,Awaiting Response,බලා සිටින ප්රතිචාර
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ඉහත
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
+DocType: Supplier,Mention if non-standard payable account,සම්මත නොවන ගෙවිය යුතු ගිණුම් නම් සඳහන්
 DocType: Salary Slip,Earning & Deduction,උපයන සහ අඩු කිරීම්
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,විකල්ප. මෙම සිටුවම විවිධ ගනුදෙනු පෙරහන් කිරීමට භාවිතා කරනු ඇත.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ඍණ තක්සේරු අනුපාත ඉඩ නැත
@@ -3555,7 +3554,7 @@
 DocType: Program Enrollment Tool,Get Students From,සිට ශිෂ්ය ලබා ගන්න
 DocType: Hub Settings,Seller Country,විකුණන්නා රට
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,වෙබ් අඩවිය මත අයිතම ප්රකාශයට පත් කරනු ලබයි
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,කාණ්ඩ සමූහය ඔබේ සිසුන්
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,කාණ්ඩ සමූහය ඔබේ සිසුන්
 DocType: Authorization Rule,Authorization Rule,බලය පැවරීමේ පාලනය
 DocType: Sales Invoice,Terms and Conditions Details,නියමයන් හා කොන්දේසි විස්තර
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,පිරිවිතර
@@ -3615,7 +3614,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,පරිවාස
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,වැටුප් සංරචක
 DocType: Program Enrollment Tool,New Academic Year,නව අධ්යයන වර්ෂය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ආපසු / ක්රෙඩිට් සටහන
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,ආපසු / ක්රෙඩිට් සටහන
 DocType: Stock Settings,Auto insert Price List rate if missing,වාහන ළ මිල ලැයිස්තුව අනුපාතය අතුරුදහන් නම්
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,මුළු ු ර්
 DocType: Production Order Item,Transferred Qty,මාරු යවන ලද
@@ -3656,6 +3655,7 @@
 ,Sales Funnel,විකුණුම් පොම්ප
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,කෙටි යෙදුම් අනිවාර්ය වේ
 DocType: Project,Task Progress,කාර්ය සාධක ප්රගති
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,කරත්ත
 ,Qty to Transfer,ස්ථාන මාරු කිරීමට යවන ලද
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ආදර්ශ හෝ ගනුදෙනුකරුවන් වෙත උපුටා දක්වයි.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ශීත කළ කොටස් සංස්කරණය කිරීමට අවසර කාර්යභාරය
@@ -3689,7 +3689,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ගාස්තු එකතු
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
 DocType: Lead,Add to calendar on this date,මෙම දිනට දින දර්ශනය එක් කරන්න
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,නාවික වියදම් එකතු කිරීම සඳහා වන නීති.
 DocType: Item,Opening Stock,ආරම්භක තොගය
@@ -3707,7 +3707,7 @@
 DocType: Customer,From Lead,ඊයම් සිට
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,නිෂ්පාදනය සඳහා නිකුත් නියෝග.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,රාජ්ය මූල්ය වර්ෂය තෝරන්න ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
 DocType: Program Enrollment Tool,Enroll Students,ශිෂ්ය ලියාපදිංචි
 DocType: Hub Settings,Name Token,නම ටෝකනය
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,සම්මත විකිණීම
@@ -3718,7 +3718,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} විකුණුම් ඉන්වොයිසිය {1} එරෙහිව
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ව්යාපෘතියේ නම
-DocType: Supplier,Mention if non-standard receivable account,සම්මත නොවන ලැබිය නම් සඳහන්
+DocType: Customer,Mention if non-standard receivable account,සම්මත නොවන ලැබිය නම් සඳහන්
 DocType: Journal Entry Account,If Income or Expense,ආදායම් හෝ වියදම් නම්
 DocType: Production Order,Required Items,අවශ්ය අයිතම
 DocType: Stock Ledger Entry,Stock Value Difference,කොටස් අගය වෙනස
@@ -3749,6 +3749,7 @@
 DocType: Item,Taxes,බදු
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,ගෙවුම් හා නොවේ භාර
 DocType: Project,Default Cost Center,පෙරනිමි පිරිවැය මධ්යස්ථානය
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,සැකසුම&gt; සැකසීම්&gt; කිරීම අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි කිරීම අනුප්රාප්තිකයා නම් කිරීම සකස් කරන්න
 DocType: Bank Guarantee,End Date,අවසාන දිනය
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,කොටස් ගනුදෙනු
 DocType: Budget,Budget Accounts,අයවැය ගිණුම්
@@ -3813,7 +3814,7 @@
 DocType: Customer,Sales Partner and Commission,විකුණුම් සහකරු හා කොමිෂන් සභාව
 DocType: Employee Loan,Rate of Interest (%) / Year,පොලී අනුපාතය (%) / අවුරුද්ද
 ,Project Quantity,ව්යාපෘති ප්රමාණය
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",මුළු {0} සියළුම ශුන්ය වේ ඔබ &#39;මත පදනම් වූ ගාස්තු බෙදා හරින්න&#39; වෙනස් කළ යුතු ය විය හැකිය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",මුළු {0} සියළුම ශුන්ය වේ ඔබ &#39;මත පදනම් වූ ගාස්තු බෙදා හරින්න&#39; වෙනස් කළ යුතු ය විය හැකිය
 DocType: Opportunity,To Discuss,සාකච්චා කිරීමට
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} මෙම ගනුදෙනුව සම්පූර්ණ කර ගැනීම සඳහා, {2} අවශ්ය {1} ඒකක."
 DocType: Loan Type,Rate of Interest (%) Yearly,පොලී අනුපාතය (%) වාර්ෂික
@@ -3836,7 +3837,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,මාක් නැති කල
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ෙරෝ {0}: සිටිමට # ව්යවහාර මුදල් {1} තෝරාගත් මුදල් {2} සමාන විය යුතුයි
 DocType: Journal Entry Account,Exchange Rate,විනිමය අනුපාතය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
 DocType: Homepage,Tag Line,ටැග ලයින්
 DocType: Fee Component,Fee Component,ගාස්තු සංරචක
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,රථ වාහන කළමනාකරණය
@@ -3853,7 +3854,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,පොත් ගබඩාව {0} නොපවතියි
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub සඳහා ලියාපදිංචි
 DocType: Monthly Distribution,Monthly Distribution Percentages,මාසික බෙදාහැරීම් ප්රතිශත
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,තෝරාගත් අයිතමය කණ්ඩායම ලබා ගත නොහැකි
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,තෝරාගත් අයිතමය කණ්ඩායම ලබා ගත නොහැකි
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} සඳහා ගිණුම් සටහන් කරන්න අවශ අයිතමය {0}, තක්සේරු අනුපාතය සොයාගත නොහැකි විය. මෙම අයිතමය {1} නිදසුන් අයිතමයක් ලෙස ගනුදෙනු කරන්නේ නම්, එම {1} අයිතමය වගුවේ බව සඳහන් කරන්න. එසේ නැත්නම්, අයිතමය වාර්තාගත තක්සේරු අනුපාතය අයිතමය සඳහා ලැබෙන කොටස් ගනුදෙනුව නිර්මාණය කරන්න හෝ සඳහන්, පසුව submiting / මෙම ප්රවේශය අවලංගු කරන්න"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,මෙම බෙදීම සටහන එරෙහිව පවත්වන ද්රව්ය%
 DocType: Project,Customer Details,පාරිභෝගික විස්තර
@@ -3870,7 +3871,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ඉදිරිපත් නියෝග ඉවත් කල නොහැක
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ඩෙබිට් දැනටමත් ගිණුම් ශේෂය, ඔබ &#39;ක්රෙඩිට්&#39; ලෙස &#39;ශේෂ විය යුතුයි&#39; නියම කිරීමට අවසර නැත"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,තත්ත්ව කළමනාකරණ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,අයිතමය {0} අක්රීය කොට ඇත
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,අයිතමය {0} අක්රීය කොට ඇත
 DocType: Employee Loan,Repay Fixed Amount per Period,කාලය අනුව ස්ථාවර මුදල ආපසු ගෙවීම
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},විෂය {0} සඳහා ප්රමාණය ඇතුලත් කරන්න
 DocType: Employee External Work History,Employee External Work History,සේවක විදේශ රැකියා ඉතිහාසය
@@ -3897,7 +3898,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ශිෂ්ය විද්යුත් හැඳුනුම්පත
 DocType: Employee,Notice (days),නිවේදනය (දින)
 DocType: Tax Rule,Sales Tax Template,විකුණුම් බදු සැකිල්ල
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
 DocType: Employee,Encashment Date,හැකි ඥාතීන් නොවන දිනය
 DocType: Training Event,Internet,අන්තර්ජාල
 DocType: Account,Stock Adjustment,කොටස් ගැලපුම්
@@ -3931,6 +3932,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ඩෙබිට් සටහන නිකුත් කර ඇත්තේ
 DocType: Production Order,Warehouses,බඞු ගබඞාව
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} වත්කම් මාරු කල නොහැක
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,මෙම අයිතමය {0} (සැකිල්ල) ක ප්රභේද්යයක් වේ.
 DocType: Workstation,per hour,පැයකට
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,මිලදී ගැනීම
 DocType: Announcement,Announcement,නිවේදනය
@@ -3946,7 +3948,7 @@
 DocType: Account,Receivable,ලැබිය යුතු
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ෙරෝ # {0}: මිලදී ගැනීමේ නියෝගයක් දැනටමත් පවතී ලෙස සැපයුම්කරුවන් වෙනස් කිරීමට අවසර නැත
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,සකස් ණය සීමා ඉක්මවා යන ගනුදෙනු ඉදිරිපත් කිරීමට අවසර තිබේ එම භූමිකාව.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
 DocType: Item,Material Issue,ද්රව්ය නිකුත්
 DocType: Hub Settings,Seller Description,විකුණන්නා විස්තරය
@@ -3959,7 +3961,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,නියෝග
 DocType: Salary Detail,Component,සංරචකය
 DocType: Assessment Criteria,Assessment Criteria Group,තක්සේරු නිර්ණායක සමූහ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},සමුච්චිත ක්ෂය විවෘත {0} සමාන වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},සමුච්චිත ක්ෂය විවෘත {0} සමාන වඩා අඩු විය යුතුය
 DocType: Warehouse,Warehouse Name,පොත් ගබඩාව නම
 DocType: Naming Series,Select Transaction,ගනුදෙනු තෝරන්න
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,කාර්යභාරය අනුමත හෝ පරිශීලක අනුමත ඇතුලත් කරන්න
@@ -3994,7 +3996,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","මෙම මුදල් වර්ෂය පෙරනිමි ලෙස සැකසීම සඳහා, &#39;&#39; පෙරනිමි ලෙස සකසන්න &#39;මත ක්ලික් කරන්න"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,එක්වන්න
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,හිඟය යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
 DocType: Employee Loan,Repay from Salary,වැටුප් සිට ආපසු ගෙවීම
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},මුදල සඳහා {0} {1} එරෙහිව ගෙවීම් ඉල්ලා {2}
@@ -4012,7 +4014,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,තක්සේරු ප්රතිඵල විස්තර
 DocType: Employee Education,Employee Education,සේවක අධ්යාපන
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,අයිතමය පිරිසක් වගුව සොයා ගෙන අනුපිටපත් අයිතමය පිරිසක්
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
 DocType: Salary Slip,Net Pay,ශුද්ධ වැටුප්
 DocType: Account,Account,ගිණුම
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,අනු අංකය {0} දැනටමත් ලැබී ඇත
@@ -4021,7 +4023,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","පොත් ගබඩාව {0} ඕනෑම ගිණුමක් සම්බන්ධ නොවේ, කරුණාකර නිර්මාණ / අනුරූප (වත්කම්) ගිණුම් ගබඩාව සඳහා සබැඳී නොමැත."
 DocType: Purchase Invoice,Recurring Id,පුනරාවර්තනය අංකය
 DocType: Customer,Sales Team Details,විකුණුම් කණ්ඩායම විස්තර
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ස්ථිර මකන්නද?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,ස්ථිර මකන්නද?
 DocType: Expense Claim,Total Claimed Amount,මුළු හිමිකම් කියන අය මුදල
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,විකිණීම සඳහා ලබාදිය හැකි අවස්ථා.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},වලංගු නොවන {0}
@@ -4032,13 +4034,14 @@
 DocType: Warehouse,PIN,PIN අංකය
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,සැකසුම ERPNext ඔබේ පාසල්
 DocType: Sales Invoice,Base Change Amount (Company Currency),මූලික වෙනස් ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,පහත සඳහන් ගබඩා වෙනුවෙන් කිසිදු වගකීමක් සටහන් ඇතුළත් කිරීම්
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,පහත සඳහන් ගබඩා වෙනුවෙන් කිසිදු වගකීමක් සටහන් ඇතුළත් කිරීම්
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,පළමු ලිපිය සුරැකීම.
 DocType: Account,Chargeable,"අයකරනු ලබන ගාස්තු,"
 DocType: Company,Change Abbreviation,කෙටි යෙදුම් වෙනස්
 DocType: Expense Claim Detail,Expense Date,වියදම් දිනය
 DocType: Item,Max Discount (%),මැක්ස් වට්ටම් (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,පසුගිය සාමය මුදල
+DocType: Task,Is Milestone,සංධිස්ථානයක් වන
 DocType: Daily Work Summary,Email Sent To,ඊ-තැපැල් වෙත යවන
 DocType: Budget,Warn,බිය ගන්වා අනතුරු අඟවනු
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","වෙනත් ඕනෑම ප්රකාශ, වාර්තාවන් යා යුතු බව විශේෂයෙන් සඳහන් කළ යුතු උත්සාහයක්."
@@ -4071,11 +4074,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;&#39; කණ්ඩරාව කොටස් පැරණි Than` දින% d ට වඩා කුඩා විය යුතුය.
 DocType: Tax Rule,Purchase Tax Template,මිලදී ගැනීම බදු සැකිල්ල
 ,Project wise Stock Tracking,ව්යාපෘති ප්රඥාවන්ත කොටස් ට්රැකින්
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},{0} එරෙහිව නඩත්තු උපෙල්ඛනෙය් {0} පවතී
 DocType: Stock Entry Detail,Actual Qty (at source/target),සැබෑ යවන ලද (මූල / ඉලක්ක දී)
 DocType: Item Customer Detail,Ref Code,ref සංග්රහයේ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,සේවක වාර්තා.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
 DocType: HR Settings,Payroll Settings,වැටුප් සැකසුම්
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,නොවන සම්බන්ධ ඉන්වොයිසි හා ගෙවීම් නොගැලපේ.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ඇනවුම කරන්න
@@ -4098,7 +4100,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,වැරදි ලෙස එළි පෙහෙළි චෙක්පත් සහ තැන්පතු
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ගිණුම {0}: ඔබ මව් ගිණුම ලෙස ම යෙදිය නොහැක
 DocType: Purchase Invoice Item,Price List Rate,මිල ලැයිස්තුව අනුපාතිකය
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,පාරිභෝගික මිල කැඳවීම් නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,පාරිභෝගික මිල කැඳවීම් නිර්මාණය
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",මෙම ගබඩා සංකීර්ණය ලබා ගත කොටස් මත පදනම් පෙන්වන්න &quot;කොටස් වෙළඳ&quot; හෝ &quot;දී කොටස් නොවේ.&quot;
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ද්රව්ය පනත් කෙටුම්පත (ලේඛණය)
 DocType: Item,Average time taken by the supplier to deliver,ඉදිරිපත් කිරීමට සැපයුම්කරු විසින් ගන්නා සාමාන්ය කාලය
@@ -4120,7 +4122,7 @@
 DocType: Asset,Disposal Date,බැහැර කිරීමේ දිනය
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","විද්යුත් තැපැල් පණිවුඩ ඔවුන් නිවාඩු නැති නම්, ලබා දී ඇති පැයක දී සමාගමේ සියළු ක්රියාකාරී සේවක වෙත යවනු ලැබේ. ප්රතිචාර සාරාංශය මධ්යම රාත්රියේ යවනු ඇත."
 DocType: Employee Leave Approver,Employee Leave Approver,සේවක නිවාඩු Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","උද්ධෘත කර ඇති නිසා, අහිමි ලෙස ප්රකාශයට පත් කළ නොහැක."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,පුහුණු ඔබෙන් ලැබෙන ප්රයෝජනාත්මක ප්රතිචාරය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,නිෂ්පාදන න්යාය {0} ඉදිරිපත් කළ යුතුය
@@ -4128,7 +4130,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},පාඨමාලා පේළිය {0} අනිවාර්ය වේ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,මේ දක්වා දින සිට පෙර විය නොහැකි
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ එක් කරන්න සංස්කරණය කරන්න මිල ගණන්
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ එක් කරන්න සංස්කරණය කරන්න මිල ගණන්
 DocType: Batch,Parent Batch,මව් කණ්ඩායම
 DocType: Batch,Parent Batch,මව් කණ්ඩායම
 DocType: Cheque Print Template,Cheque Print Template,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් මුද්රණය සැකිල්ල"
@@ -4173,7 +4175,7 @@
 DocType: Item,Variant Based On,ප්රභේද්යයක් පදනම් මත
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},පවරා මුළු weightage 100% ක් විය යුතුය. එය {0} වේ
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ඔබේ සැපයුම්කරුවන්
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,විකුණුම් සාමය සෑදී ලෙස ලොස්ට් ලෙස සිටුවම් කල නොහැක.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,විකුණුම් සාමය සෑදී ලෙස ලොස්ට් ලෙස සිටුවම් කල නොහැක.
 DocType: Request for Quotation Item,Supplier Part No,සැපයුම්කරු අඩ නොමැත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; Vaulation හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,සිට ලැබුණු
@@ -4183,7 +4185,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} {1} සඳහා සිට
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ෙරෝ # {0}: අයිතමය සඳහා සැපයුම්කරු සකසන්න {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ෙරෝ {0}: පැය අගය බිංදුවට වඩා වැඩි විය යුතුය.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,වෙබ් අඩවිය රූප {0} අයිතමය අනුයුක්ත {1} සොයාගත නොහැකි
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,වෙබ් අඩවිය රූප {0} අයිතමය අනුයුක්ත {1} සොයාගත නොහැකි
 DocType: Issue,Content Type,අන්තර්ගතයේ වර්ගය
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,පරිගණක
 DocType: Item,List this Item in multiple groups on the website.,එම වෙබ් අඩවිය බහු කණ්ඩායම් ෙමම අයිතමය ලැයිස්තුගත කරන්න.
@@ -4192,20 +4194,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,ඔබ ශීත කළ අගය නියම කිරීමට අවසර නැත
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled අයැදුම්පත් ලබා ගන්න
 DocType: Payment Reconciliation,From Invoice Date,ඉන්වොයිසිය දිනය
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,බිල්පත් මුදල් එක්කෝ පෙරනිමි comapany ගේ මුදල් පක්ෂයක් හෝ ගිණුමක් මුදල සමාන විය යුතුයි
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,බිල්පත් මුදල් එක්කෝ පෙරනිමි comapany ගේ මුදල් පක්ෂයක් හෝ ගිණුමක් මුදල සමාන විය යුතුයි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,හැකි ඥාතීන් නොවන තබන්න
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,එය කරන්නේ කුමක්ද?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ගබඩා කිරීමට
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,සියලු ශිෂ්ය ප්රවේශ
 ,Average Commission Rate,සාමාන්ය කොමිසම අනුපාතිකය
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,පැමිණීම අනාගත දිනයන් සඳහා සලකුණු කල නොහැක
 DocType: Pricing Rule,Pricing Rule Help,මිල ගණන් පාලනය උදවු
 DocType: School House,House Name,හවුස් නම
 DocType: Purchase Taxes and Charges,Account Head,ගිණුම් අංශයේ ප්රධානී
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,භාණ්ඩ ගොඩ බස්වන ලදී පිරිවැය ගණනය කිරීමට අතිරේක වියදම් යාවත්කාලීන
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,විදුලි
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ඔබේ පරිශීලකයන් ලෙස ඔබගේ සංවිධානය සෙසු එකතු කරන්න. ඔබ ද අප අමතන්න ඔවුන් එකතු කිරීම මඟින් ඔබගේ භාව්ත කිරීමට ගනුදෙනුකරුවන් ආරාධනා එකතු කල හැක
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ඔබේ පරිශීලකයන් ලෙස ඔබගේ සංවිධානය සෙසු එකතු කරන්න. ඔබ ද අප අමතන්න ඔවුන් එකතු කිරීම මඟින් ඔබගේ භාව්ත කිරීමට ගනුදෙනුකරුවන් ආරාධනා එකතු කල හැක
 DocType: Stock Entry,Total Value Difference (Out - In),(- දී අතරින්) මුළු අගය වෙනස
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,ෙරෝ {0}: විනිමය අනුපාතය අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},සේවක {0} සඳහා පරිශීලක අනන්යාංකය පිහිටුවා නැත
@@ -4214,7 +4216,7 @@
 DocType: Item,Customer Code,පාරිභෝගික සංග්රහයේ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} සඳහා උපන් දිනය මතක්
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,පසුගිය සාමය නිසා දින
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
 DocType: Buying Settings,Naming Series,ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
 DocType: Leave Block List,Leave Block List Name,"අවසරය, වාරණ ලැයිස්තුව නම"
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,රක්ෂණ අරඹන්න දිනය රක්ෂණ අවසාන දිනය වඩා අඩු විය යුතුය
@@ -4229,7 +4231,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,නියෝග යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
 DocType: Stock Settings,Stock Frozen Upto,කොටස් ශීත කළ තුරුත්
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},සිට හා කාලය {0} නැවත නැවත අනිවාර්ය දින සඳහා කාලය
@@ -4242,7 +4244,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Off ලියන්න ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 DocType: Sales Invoice Timesheet,Billing Hours,බිල්පත් පැය
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,භාණ්ඩ ඒවා මෙහි එකතු කරන්න තට්ටු කරන්න
 DocType: Fees,Program Enrollment,වැඩසටහන ඇතුළත්
 DocType: Landed Cost Voucher,Landed Cost Voucher,වියදම වවුචරයක් ගොඩ බස්වන ලදී
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},කරුණාකර {0} සකස්
@@ -4342,7 +4345,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,සිල්ලර සහ ෙතොග ෙවළඳ
 DocType: Issue,First Responded On,පළමු වන දින ලෙස ප්රතිචාර දක්වන
 DocType: Website Item Group,Cross Listing of Item in multiple groups,බහු කණ්ඩායම් අයිතමය හරස් ලැයිස්තුගත
-DocType: Grade Interval,Grade Interval,ශ්රේණියේ පරතරය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},"මුදල් වර්ෂය ආරම්භය දිනය හා රාජ්ය මූල්ය, වසර අවසාන දිනය වන විටත් මුදල් වර්ෂය {0} තුළ සකසා ඇත"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,භේදය කණ්ඩායම
@@ -4351,6 +4353,7 @@
 DocType: Request for Quotation Supplier,Download PDF,බාගත PDF
 DocType: Production Order,Planned End Date,සැලසුම් අවසානය දිනය
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,කොහෙද භාණ්ඩ ගබඩා කර ඇත.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 DocType: Request for Quotation,Supplier Detail,සැපයුම්කරු විස්තර
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},සූත්රය හෝ තත්ත්වය දෝෂය: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,ඉන්වොයිස් මුදල
@@ -4396,7 +4399,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup මගේ සංවිධානය කිරීම සඳහා සරල වෙබ් අඩවිය
 DocType: Payment Reconciliation,Receivable / Payable Account,ලැබිය යුතු / ගෙවිය යුතු ගිණුම්
 DocType: Delivery Note Item,Against Sales Order Item,විකුණුම් සාමය අයිතමය එරෙහිව
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
 DocType: Item,Default Warehouse,පෙරනිමි ගබඩාව
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},අයවැය සමූහ ගිණුම {0} එරෙහිව පවරා ගත නොහැකි
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,මව් වියදම් මධ්යස්ථානය ඇතුලත් කරන්න
@@ -4456,7 +4459,7 @@
 ,Items To Be Requested,අයිතම ඉල්ලන කිරීමට
 DocType: Purchase Order,Get Last Purchase Rate,ලබා ගන්න අවසන් මිලදී ගැනීම අනුපාත
 DocType: Company,Company Info,සමාගම තොරතුරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,වියදම් මධ්යස්ථානය ක වියදමක් ප්රකාශය වෙන්කර ගැනීමට අවශ්ය වේ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),අරමුදල් ඉල්ලුම් පත්රය (වත්කම්)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,මෙය මේ සේවක පැමිණීම මත පදනම් වේ
@@ -4469,13 +4472,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,පහත සඳහන් දිනවල නිවාඩු ඉල්ලුම් කිරීමෙන් පරිශීලකයන් එක නතර කරන්න.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,මිලදී ගැනීම මුදල
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,සැපයුම්කරු උද්ධෘත {0} නිර්මාණය
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,සේවක ප්රතිලාභ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},හැකිළු ප්රමාණය පේළිය {1} තුළ අයිතමය {0} සඳහා ප්රමාණය සමාන විය යුතුය
 DocType: Production Order,Manufactured Qty,නිෂ්පාදනය යවන ලද
 DocType: Purchase Receipt Item,Accepted Quantity,පිළිගත් ප්රමාණ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} පවතී නැත
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} පවතී නැත
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ගනුදෙනුකරුවන් වෙත මතු බිල්පත්.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ව්යාපෘති අංකය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ෙරෝ නැත {0}: ප්රමාණය වියදම් හිමිකම් {1} එරෙහිව මුදල තෙක් ට වඩා වැඩි විය නොහැක. විභාග මුදල වේ {2}
@@ -4484,15 +4487,17 @@
 DocType: Quality Inspection Reading,Reading 3,කියවීම 3
 ,Hub,මධ්යස්ථානයක්
 DocType: GL Entry,Voucher Type,වවුචරය වර්ගය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
 DocType: Employee Loan Application,Approved,අනුමත
 DocType: Pricing Rule,Price,මිල
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} &#39;වමේ&#39; ලෙස සකස් කළ යුතු ය මත මුදා සේවක
 DocType: Guardian,Guardian,ගාඩියන්
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ඇගයීෙම් {0} ලබා දී දින පරාසයක් තුළ සේවක {1} සඳහා නිර්මාණය
 DocType: Employee,Education,අධ්යාපන
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ඩෙල්
 DocType: Selling Settings,Campaign Naming By,ව්යාපාරය විසින් නම් කිරීම
 DocType: Employee,Current Address Is,දැනට පදිංචි ලිපිනය
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,වෙනස්
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","විකල්ප. සමාගමේ පෙරනිමි මුදල්, නිශ්චිතව දක්වා නැති නම් සකසනු ලබයි."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,මුල්ය සඟරාව සටහන් ඇතුළත් කිරීම්.
 DocType: Delivery Note Item,Available Qty at From Warehouse,ලබා ගත හැකි යවන ලද පොත් ගබඩාව සිට දී
@@ -4529,7 +4534,7 @@
 DocType: Hub Settings,Hub Settings,මධ්යස්ථානයක් සැකසුම්
 DocType: Project,Gross Margin %,දළ ආන්තිකය%
 DocType: BOM,With Operations,මෙහෙයුම් සමග
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,මුල්ය සටහන් ඇතුළත් කිරීම් මේ වන විටත් සමාගම {1} සඳහා මුදල් {0} තුළ සිදු කර ඇත. මුදල් {0} සමග කරුණාකර ලැබිය හෝ ගෙවිය යුතු ගිණුම් තෝරන්න.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,මුල්ය සටහන් ඇතුළත් කිරීම් මේ වන විටත් සමාගම {1} සඳහා මුදල් {0} තුළ සිදු කර ඇත. මුදල් {0} සමග කරුණාකර ලැබිය හෝ ගෙවිය යුතු ගිණුම් තෝරන්න.
 DocType: Asset,Is Existing Asset,දැනට පවතින වත්කම් වේ
 DocType: Salary Detail,Statistical Component,සංඛ්යාන සංරචක
 DocType: Salary Detail,Statistical Component,සංඛ්යාන සංරචක
@@ -4585,7 +4590,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ලාංඡනය අමුණන්න
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,කොටස් පෙළ
 DocType: Customer,Commission Rate,කොමිසම අනුපාතිකය
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ප්රභේද්යයක් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ප්රභේද්යයක් කරන්න
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,දෙපාර්තමේන්තුව විසින් නිවාඩු අයදුම්පත් අවහිර කරයි.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ගෙවීම් වර්ගය පිළිගන්න එකක් විය යුතුය, වැටුප් හා අභ තර ස්ථ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,විශ්ලේෂණ
@@ -4598,6 +4603,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,නිවාඩු දින නිෂ්පාදන ඉඩ දෙන්න
 DocType: Sales Order,Customer's Purchase Order Date,පාරිභෝගික මිලදී ගැනීමේ නියෝගයක් දිනය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,කැපිටල් කොටස්
+DocType: Shopping Cart Settings,Show Public Attachments,රාජ්ය ඇමුණුම් පෙන්වන්න
 DocType: Packing Slip,Package Weight Details,පැකේජය සිරුරේ බර විස්තර
 DocType: Payment Gateway Account,Payment Gateway Account,ගෙවීම් ගේට්වේ ගිණුම
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ගෙවීම් අවසන් කිරීමෙන් පසු තෝරාගත් පිටුවට පරිශීලක වි.
@@ -4622,7 +4628,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,මුදල් ලබන $ ආදිය මෙන් කිසිදු සංකේතයක් පෙන්වන්න එපා.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(අඩක් දිනය)
 DocType: Supplier,Credit Days,ක්රෙඩිට් දින
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ශිෂ්ය කණ්ඩායම කරන්න
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ශිෂ්ය කණ්ඩායම කරන්න
 DocType: Leave Type,Is Carry Forward,ඉදිරියට ගෙන ඇත
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ඉදිරියට ඇති කාලය දින
@@ -4641,8 +4647,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,අනුමැතිය ලත් මුදල
 DocType: GL Entry,Is Opening,විවෘත වේ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ෙරෝ {0}: හර සටහන ඇති {1} සමග සම්බන්ධ විය නොහැකි
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,ගිණුම {0} නොපවතියි
 DocType: Account,Cash,මුදල්
 DocType: Employee,Short biography for website and other publications.,වෙබ් අඩවිය සහ අනෙකුත් ප්රකාශන සඳහා කෙටි චරිතාපදානය.
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index cc19f7c..5ff2f12 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Item Zánik Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Zobraziť Varianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Zobraziť Varianty
 DocType: Academic Term,Academic Term,akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Množstvo
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Oneskorenie s platbou (dni)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,service Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiškálny rok {0} je vyžadovaná
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Rovnaký Spoločnosť je zapísaná viac ako raz
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nepovolené pre {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nepovolené pre {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Získať predmety z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti Ľudské zdroje&gt; Osobné nastavenie"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nie sú uvedené žiadne položky
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 DocType: Process Payroll,Make Bank Entry,Proveďte Bank Vstup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Vedľa Odpisy dátum nemôže byť pred nákupom Dátum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedľa Odpisy dátum nemôže byť pred nákupom Dátum
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mesačný Distribúcia ** umožňuje distribuovať Rozpočet / Target celé mesiace, ak máte sezónnosti vo vašej firme."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,nenájdený položiek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,nenájdený položiek
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plat Štruktúra Chýbajúce
 DocType: Lead,Person Name,Osoba Meno
 DocType: Sales Invoice Item,Sales Invoice Item,Prodejní faktuře položka
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",napríklad &quot;Základná škola&quot; alebo &quot;univerzita&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,stock Reports
 DocType: Warehouse,Warehouse Detail,Sklad Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum ukončenia nemôže byť neskôr ako v roku Dátum ukončenia akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Typ dane
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutočná Prevádzková doba
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,select BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Dovolenka na {0} nie je medzi Dátum od a do dnešného dňa
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,stupeň
 DocType: Sales Invoice Item,Delivered By Supplier,Dodáva sa podľa dodávateľa
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Zákazková výroba už vytvorili u všetkých položiek s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Zákazková výroba už vytvorili u všetkých položiek s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Ročné Plat
 DocType: Daily Work Summary,Daily Work Summary,Denná práca Súhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zmrazený
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vyberte existujúci spoločnosti pre vytváranie účtový rozvrh
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Náklady
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vyberte položku Target Warehouse
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Úverové spoločnosti v mene
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Chcete aktualizovať dochádzku? <br> Súčasná: {0} \ <br> Prítomných {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamietnuté množstvo sa musí rovnať Prijatému množstvu pre položku {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pre nákup
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,pre POS faktúru je nutná aspoň jeden spôsob platby.
 DocType: Products Settings,Show Products as a List,Zobraziť produkty ako zoznam
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Urobiť Odpisy Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,urobiť zamestnanca
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,urobiť zamestnanca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plán pro návštěvy údržby.
 DocType: SMS Settings,Enter url parameter for message,Zadejte url parametr zprávy
 DocType: POS Profile,Customer Groups,skupiny zákazníkov
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finančné výkazy
 DocType: Guardian,Students,študenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Company,Default Payroll Payable Account,"Predvolené mzdy, splatnú Account"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aktualizácia e-Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aktualizácia e-Group
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmienka v prípade neštandardnej pohľadávky účet použiteľná
 DocType: Course Schedule,Instructor Name,inštruktor Name
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Čistý peňažný tok z financovania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridať nevyužité listy z predchádzajúcich prídelov
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulácie Čiastka (cez Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankový Príspevky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,študent Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Položka {0} je zrušená
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Viac mien
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Náklady predaných aktív
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
 DocType: Student Applicant,Admitted,"pripustil,"
 DocType: Workstation,Rent Cost,Rent Cost
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Hodnota objednávky
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Banka / Hotovostné operácie proti osobe alebo pre interný prevod
 DocType: Shipping Rule,Valid for Countries,"Platí pre krajiny,"
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,Sadzba dane
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} už pridelené pre zamestnancov {1} na dobu {2} až {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Previesť na non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Dátum fakturácie
 DocType: GL Entry,Debit Amount,Debetné Suma
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Prijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvorenie skupiny študentov
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,Žiadosť o cenovú ponuku
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Vytvoriť nový zákazník
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Vytvoriť nový zákazník
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,vytvorenie objednávok
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,vytvorenie objednávok
 ,Purchase Register,Nákup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Od č balíčku
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metódu oceňovania nemožno zmeniť, pretože existujú transakcie proti niektorým položkám, ktoré nemajú vlastnú metódu oceňovania"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkom listy pridelené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevybavené aktivity pre dnešok
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kúpiť
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definujte stupeň pre prah 0%
 DocType: Sales Order,To Deliver,Dodať
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Správa Subdodávky
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čakajúci Množstvo
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nie je aktívny
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nie je aktívny
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslal do nasledujúcich čísel: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Skontrolujte nastavenie rozmery pre tlač
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Ocenenie Rate je povinné, ak zadaná počiatočným stavom zásob"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Ocenenie Rate je povinné, ak zadaná počiatočným stavom zásob"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,neuhradená Hodnoty
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Ujistěte se prodejní objednávky
 DocType: Project Task,Project Task,Úloha Project
 ,Lead Id,Id Obchodnej iniciatívy
 DocType: C-Form Invoice Detail,Grand Total,Celkem
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Verní zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by nemala byť menšia ako ktoré už boli schválené listy {1} pre obdobie
 DocType: Announcement,Posted By,Pridané
 DocType: Item,Delivered by Supplier (Drop Ship),Dodáva Dodávateľom (Drop Ship)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavte spoločnosť
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavte spoločnosť
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Predajná faktúry časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Vybrať Platobný účet, aby Bank Entry"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Vytvoriť Zamestnanecké záznamy pre správu listy, vyhlásenia o výdavkoch a miezd"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Vytvoriť Zamestnanecké záznamy pre správu listy, vyhlásenia o výdavkoch a miezd"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Pridať do Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukcie
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Súvislosť s Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manažér
 DocType: Payment Entry,Payment From / To,Platba od / do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,časové obdobie
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úverový limit je nižšia ako aktuálna dlžnej čiastky za zákazníka. Úverový limit musí byť aspoň {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úverový limit je nižšia ako aktuálna dlžnej čiastky za zákazníka. Úverový limit musí byť aspoň {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založené na"" a ""Zoskupené podľa"", nemôžu byť rovnaké"
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,Rozlišení Datum
 DocType: Student Batch Name,Batch Name,Batch Name
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Harmonogramu vytvorenia:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,zapísať
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ukáže na študenta bol prítomný v Student mesačnú návštevnosť Správa
@@ -722,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,študent Účasť
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,So spätným suroviny na základe
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Prosím, zadejte podrobnosti položky"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Interest,Interest,záujem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Predpredaj
 DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
@@ -740,7 +743,7 @@
 ,Absent Student Report,Absent Študent Report
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Ponuka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Spoločnosť {0} neexistuje
@@ -749,8 +752,6 @@
 DocType: Serial No,Warranty Expiry Date,Záruka Datum vypršení platnosti
 DocType: Material Request Item,Quantity and Warehouse,Množstvo a sklad
 DocType: Sales Invoice,Commission Rate (%),Výška provízie (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vyberte program
 DocType: Project,Estimated Cost,odhadované náklady
 DocType: Purchase Order,Link to material requests,Odkaz na materiálnych požiadaviek
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nie je skladová položka
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 DocType: Payment Entry,Received Amount (Company Currency),Prijaté Suma (Company mena)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
@@ -851,7 +852,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odeslat email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nemáte oprávnenie
 DocType: Company,Default Bank Account,Prednastavený Bankový účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
@@ -864,8 +865,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenájdený žiadny zamestnanec
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Skupina študentov je už aktualizovaná.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Skupina študentov je už aktualizovaná.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Skupina študentov je už aktualizovaná.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Skupina študentov je už aktualizovaná.
 DocType: SMS Center,All Customer Contact,Všetky Kontakty Zákazníka
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
 DocType: Warehouse,Tree Details,Tree Podrobnosti
@@ -876,8 +877,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimálna suma faktúry
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: náklady Center {2} nepatrí do spoločnosti {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Účet {2} nemôže byť skupina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v predchádzajúcom &#39;{typ_dokumentu}&#39; tabuľka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v predchádzajúcom &#39;{typ_dokumentu}&#39; tabuľka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žiadne úlohy
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 DocType: Asset,Opening Accumulated Depreciation,otvorenie Oprávky
@@ -893,7 +894,7 @@
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,rozvrh
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,rozvrh
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadajte vek odchodu do dôchodku v rokoch
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -901,7 +902,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Čistý zisk / strata
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -912,7 +913,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Objednávka na platobné
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Otváranie"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,otvorená robiť
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
@@ -928,7 +929,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkom Použiteľné Poplatky v doklade o kúpe tovaru, ktorý tabuľky musí byť rovnaká ako celkom daní a poplatkov"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkom Použiteľné Poplatky v doklade o kúpe tovaru, ktorý tabuľky musí byť rovnaká ako celkom daní a poplatkov"
 DocType: Sales Team,Incentives,Pobídky
 DocType: SMS Log,Requested Numbers,Požadované Čísla
 DocType: Production Planning Tool,Only Obtain Raw Materials,Získať iba suroviny
@@ -986,8 +987,7 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,komponenty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
@@ -1039,8 +1039,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Východisková banka / Peňažný účet budú automaticky aktualizované v plat položka denníku ak je zvolený tento režim.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervaly pre platové triedy zákonníka {0} prekrýva s stupeň intervaly pre ostatných tried. Prosím skontrolujte intervaly {0} a {1} a skúste to znova
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Company mena)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Riadok # {0}: Sadzba nesmie byť vyššia ako sadzba použitá v {1} {2}
@@ -1053,7 +1051,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
 DocType: Timesheet Detail,Bill,účet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Vedľa Odpisy Dátum sa zadáva ako uplynulom dni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Vedľa Odpisy Dátum sa zadáva ako uplynulom dni
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Biela
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riadok {0}: Množstvo nie je k dispozícii pre {4} v sklade {1} pri účtovaní čas zápisu ({2} {3})
@@ -1067,7 +1065,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
 DocType: Student Batch Name,Student Batch Name,Študent Batch Name
 DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
 DocType: Repayment Schedule,Balance Loan Amount,Bilancia Výška úveru
@@ -1087,10 +1085,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Zadajte {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nemôže byť záporné
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Sales Invoice Item,Rate With Margin,Sadzba s maržou
 DocType: Sales Invoice Item,Rate With Margin,Sadzba s maržou
@@ -1119,7 +1117,7 @@
 DocType: Lead,Organization Name,Názov organizácie
 DocType: Tax Rule,Shipping State,Prepravné State
 ,Projected Quantity as Source,Množstvo projekciou as Zdroj
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Zahŕňajú non-skladových položiek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodejní náklady
@@ -1127,7 +1125,7 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,PSČ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Predajné objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Tvorba prírastkov zásob
@@ -1171,7 +1169,7 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
@@ -1206,11 +1204,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Prosím, zadajte kód položky sa dostať číslo šarže"
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
 DocType: Employee Loan,Partially Disbursed,čiastočne Vyplatené
-DocType: Grading Structure,Grading System Name,Meno systém triedenia
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba nie je nakonfigurovaný. Prosím skontrolujte, či je účet bol nastavený na režim platieb alebo na POS Profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba nie je nakonfigurovaný. Prosím skontrolujte, či je účet bol nastavený na režim platieb alebo na POS Profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Rovnakú položku nemožno zadávať viackrát.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ďalšie účty môžu byť vyrobené v rámci skupiny, ale údaje je možné proti non-skupín"
@@ -1249,11 +1246,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Uveďte aspoň jeden atribút v tabuľke atribúty
 DocType: Announcement,All Students,všetci študenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} musí byť non-skladová položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} musí byť non-skladová položka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervaly
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Študent Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
@@ -1294,8 +1291,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Objednávky pomôžu pri plánovaní a sledovaní na vaše nákupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Objednávky pomôžu pri plánovaní a sledovaní na vaše nákupy
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emisie / prenosu množstvo {0} v hmotnej Request {1} \ nemôže byť väčšie než množstvo {2} pre položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Malý
@@ -1319,7 +1316,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vaše Produkty alebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
@@ -1337,7 +1334,7 @@
 DocType: Student Group Student,Group Roll Number,Číslo skupiny rollov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Súčet všetkých váh úloha by mal byť 1. Upravte váhy všetkých úloh projektu v súlade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1364,7 +1361,7 @@
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} položky v prebiehajúcej
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
-DocType: Grade Interval,Grade Code,grade Code
+DocType: Grading Scale Interval,Grade Code,grade Code
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
@@ -1381,7 +1378,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakujúce Až
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vyberte spoločnosť
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vyberte spoločnosť
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dátum dodávateľskej faktúry
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Musíte povolit Nákupní košík
@@ -1397,7 +1394,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Plán údržby {0} existuje v porovnaní s {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,učiaci študenta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Mena záverečného účtu, musí byť {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Súčet bodov za všetkých cieľov by malo byť 100. Je {0}
@@ -1446,13 +1444,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
 DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
 ,Purchase Invoice Trends,Trendy přijatách faktur
 DocType: Employee,Better Prospects,Lepší vyhlídky
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riadok # {0}: Dávka {1} má iba {2} qty. Vyberte inú dávku, ktorá má {3} k dispozícii, alebo rozdeľte riadok do viacerých riadkov a doručte / vydávajte z viacerých šarží"
 DocType: Vehicle,License Plate,Poznávacia značka
 DocType: Appraisal,Goals,Ciele
 DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
@@ -1471,7 +1470,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
@@ -1482,7 +1481,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázať P &amp; L zostatky neuzavretý fiškálny rok je
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktívny
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Urobiť Predajné objednávky, ktoré vám pomôžu plánovať svoju prácu a doručiť na čas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Urobiť Predajné objednávky, ktoré vám pomôžu plánovať svoju prácu a doručiť na čas"
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkom Dodatočné náklady
 DocType: Course Schedule,SH,SH
@@ -1493,7 +1492,7 @@
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Asset Movement,Stock Manager,Reklamný manažér
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Balení Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Balení Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavenie SMS brány
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
@@ -1519,7 +1518,7 @@
 DocType: Sales Invoice,Source,Zdroj
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show uzavretý
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset kategória je povinný pre položku investičného majetku
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset kategória je povinný pre položku investičného majetku
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Táto {0} je v rozpore s {1} o {2} {3}
 DocType: Student Attendance Tool,Students HTML,študenti HTML
@@ -1537,7 +1536,7 @@
 DocType: Student,Date of Leaving,Dátum Odchádzanie
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Vytvoriť vedie
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Vytvoriť vedie
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
@@ -1565,7 +1564,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Prihlášky
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Krabica
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,možné Dodávateľ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizácia
@@ -1599,7 +1598,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Predvolené BOM pre {0} nenašiel Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Študenti sú v centre systému, pridajte všetky svoje študentov"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Študenti sú v centre systému, pridajte všetky svoje študentov"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Riadok # {0}: dátum Svetlá {1} nemôže byť pred Cheque Dátum {2}
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Riadok {0}: čas od času aj na čas z {1} sa prekrýva s {2}
@@ -1611,20 +1610,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V deň, keď (y), na ktoré žiadate o povolenie sú prázdniny. Nemusíte požiadať o voľno."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslať e-mail Payment
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,novú úlohu
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Značka Citácia
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Značka Citácia
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostatné správy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Skúste plánovanie operácií pre X dní vopred.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Prosím nastaviť predvolený účet mzdy, splatnú v spoločnosti {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,hľadanie položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,hľadanie položky
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Čistá zmena v hotovosti
 DocType: Assessment Plan,Grading Scale,stupnica
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,už boli dokončené
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Platba Dopyt už existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
@@ -1662,7 +1661,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zbierať
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nemožno odstrániť fiškálny rok {0}. Fiškálny rok {0} je nastavený ako predvolený v globálnom nastavení
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1705,8 +1704,6 @@
 DocType: Student Sibling,Studying in Same Institute,Štúdium v Same ústave
 DocType: Territory,Territory Manager,Oblastní manažer
 DocType: Packed Item,To Warehouse (Optional),Warehouse (voliteľné)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 DocType: Payment Entry,Paid Amount (Company Currency),Zaplatená suma (Company meny)
 DocType: Purchase Invoice,Additional Discount,Ďalšie zľavy
 DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
@@ -1716,9 +1713,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobraziť Košík
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnosť je uvedená, \n uveďte prosím aj ""váhu MJ"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnosť je uvedená, \n uveďte prosím aj ""váhu MJ"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Vedľa Odpisy Dátum je povinné pre nové aktívum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Vedľa Odpisy Dátum je povinné pre nové aktívum
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina kurzov pre každú dávku
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina kurzov pre každú dávku
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single jednotka položky.
@@ -1735,9 +1732,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Je potrebné nákladového strediska pre &#39;zisku a straty &quot;účtu {2}. Prosím nastaviť predvolené nákladového strediska pre spoločnosť.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
@@ -1764,21 +1759,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nepodarilo sa nájsť kurz pre {0} až {1} pre kľúčové dátum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Žiadne
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hlavné
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varianta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hlavné
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,Zamestnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
 DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,ročné náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
@@ -1798,7 +1792,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ocenenie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
-DocType: Grading Structure,Grading Intervals,triedenie Intervaly
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prosím Vlož
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nemožno overbill k bodu {0} v rade {1} viac ako {2}. Aby bolo možné cez-fakturácie, je potrebné nastaviť pri nákupe Nastavenie"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Prosím nastaviť filter na základe výtlačku alebo v sklade
@@ -1811,16 +1804,17 @@
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riadok # {0}: zamietnutie Warehouse je povinná proti zamietnutej bodu {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Splátka
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Spravovať svoje objednávky
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Spravovať svoje objednávky
 DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
 DocType: Employee,Salutation,Oslovení
 DocType: Course,Course Abbreviation,skratka ihrisko
 DocType: Student Leave Application,Student Leave Application,Študent nechať aplikáciu
 DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zamestnancov {0} o pol dňa na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Celkom pracovná doba by nemala byť väčšia ako maximálna pracovnej doby {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Referencie
@@ -1830,7 +1824,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,new košík
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,new košík
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Vehicle,Wheels,kolesá
@@ -1862,10 +1856,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Zakáže vytváranie časových protokolov proti výrobnej zákazky. Transakcie nesmú byť sledované proti výrobnej zákazky
 DocType: Student,Student Mobile Number,Študent Číslo mobilného telefónu
 DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Číslo šarže je povinné
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Číslo šarže je povinné
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektov
@@ -1873,7 +1867,7 @@
 DocType: Budget,Fiscal Year,Fiskální rok
 DocType: Vehicle Log,Fuel Price,palivo Cena
 DocType: Budget,Budget,Rozpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nemožno priradiť proti {0}, pretože to nie je výnos alebo náklad účet"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 DocType: Student Admission,Application Form Route,prihláška Trasa
@@ -1905,7 +1899,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Množstvo {0} {1} odpočítať proti {2}
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Meno a ID zamestnanca
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Odvody a dane
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -1964,7 +1958,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ výdajov"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
 DocType: Asset,Depreciation Schedule,plán odpisy
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date by mala byť v rozmedzí od dátumu a do dnešného dňa
@@ -1981,13 +1975,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 ,Vehicle Expenses,Náklady pre autá
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
+DocType: Serial No,Invoice Details,Podrobnosti faktúry
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
 DocType: Employee Loan,Loan Amount,Výška pôžičky
@@ -2011,7 +2006,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 DocType: Loan Type,Loan Name,pôžička Name
@@ -2023,6 +2018,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
 DocType: Production Order,Skip Material Transfer,Preskočiť prenos materiálu
 DocType: Production Order,Skip Material Transfer,Preskočiť prenos materiálu
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nepodarilo sa nájsť kurz {0} až {1} pre kľúčový dátum {2}. Ručne vytvorte záznam o menovej karte
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,"Dátum, kedy váš finančný rok končí"
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je teraz predvolený Fiškálny rok. Prosím aktualizujte svoj prehliadač, aby sa prejavili zmeny."
@@ -2060,9 +2056,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiškálny rok ** predstavuje finančný rok. Všetky účtovné záznamy a ďalšie významné transakcie sú sledované pod ** Fiškálny rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Iniciatíva Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 DocType: Student Admission,Eligibility,spôsobilosť
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Vedie vám pomôžu podnikanie, pridajte všetky svoje kontakty a viac ako vaše vývody"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Vedie vám pomôžu podnikanie, pridajte všetky svoje kontakty a viac ako vaše vývody"
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
@@ -2103,7 +2099,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Vyberte společnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je povinná k položke {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je povinná k položke {1}
 DocType: Process Payroll,Fortnightly,dvojtýždňové
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
@@ -2119,7 +2115,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dieťa Položka by nemala byť produkt Bundle. Odstráňte položku `{0}` a uložiť
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Pridať Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Pridať Timesheets
 DocType: Vehicle Service,Service Item,servis Položka
 DocType: Bank Guarantee,Bank Guarantee,Banková záruka
 DocType: Bank Guarantee,Bank Guarantee,Banková záruka
@@ -2169,8 +2165,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny sa nebudú zobrazovať, pokiaľ Cenník nie je nastavený"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím krajinu, k tomuto Shipping pravidlá alebo skontrolovať Celosvetová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debetné K je vyžadované
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debetné K je vyžadované
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Ponuka Term
 DocType: Quality Inspection,Quality Manager,Manažér kvality
@@ -2204,14 +2200,14 @@
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Prosím, zadajte prevzatia dokumentu"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Prosím, zadajte prevzatia dokumentu"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
 DocType: Project,External,Externí
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Výrobné zákazky Vytvorené: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Výrobné zákazky Vytvorené: {0}
 DocType: Branch,Branch,Větev
 DocType: Guardian,Mobile Number,Telefónne číslo
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
@@ -2220,7 +2216,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
 DocType: Scheduling Tool,Student Batch,študent Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,urobiť Študent
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,urobiť Študent
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Boli ste pozvaní k spolupráci na projekte: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Nainštalovať teraz
@@ -2244,8 +2240,9 @@
 DocType: SMS Log,Sent To,Odoslaná
 DocType: Payment Request,Make Sales Invoice,Vytvoriť faktúru
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programy
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Nasledujúce Kontakt dátum nemôže byť v minulosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nasledujúce Kontakt dátum nemôže byť v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Vyberte položku šarže
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PInv-RET-
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
@@ -2259,7 +2256,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 0
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,kusovníky
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Obchody
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Obchody
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
@@ -2275,8 +2272,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Přenos materiálu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicou {0} {1} pre položku {4}. Robíte si iný {3} proti rovnakej {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vybrať zmena výšky účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vybrať zmena výšky účet
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2287,7 +2284,7 @@
 DocType: Budget Account,Budget Account,rozpočet účtu
 DocType: Quality Inspection,Verified By,Verified By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
-DocType: Grade Interval,Grade Description,grade Popis
+DocType: Grading Scale Interval,Grade Description,grade Popis
 DocType: Stock Entry,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
@@ -2325,7 +2322,7 @@
 DocType: Upload Attendance,Attendance To Date,Účast na data
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Čistá zmena objemu pohľadávok
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Vyrovnávací Off
 DocType: Offer Letter,Accepted,Přijato
@@ -2339,7 +2336,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,user Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
@@ -2353,7 +2350,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Názov inštitútu pre ktorý nastavujete tento systém.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Nasledujúce Výrobné zákazky boli vytvorené:
@@ -2376,6 +2373,7 @@
 DocType: Email Digest,How frequently?,Jak často?
 DocType: Purchase Receipt,Get Current Stock,Získať aktuálny stav
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Strom Bill materiálov
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 DocType: Student,Joining Date,spájanie Dátum
 ,Employees working on a holiday,Zamestnanci pracujúci na dovolenku
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,mark Present
@@ -2477,7 +2475,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Výprodej Datum není uvedeno
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Výroba
 DocType: Guardian,Occupation,povolania
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Sales Invoice,This Document,tento dokument
 DocType: Installation Note Item,Installed Qty,Instalované množství
@@ -2500,8 +2498,8 @@
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 DocType: Payment Entry,Payment Type,Typ platby
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
 DocType: Process Payroll,Select Employees,Vybrať Zamestnanci
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenčný dátum
@@ -2518,7 +2516,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} už vytvorili pre firmu {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Nahradit položky / kusovníky ve všech kusovníků
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Príjem a musí byť predložený
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Príjem a musí byť predložený
 DocType: Purchase Invoice Item,Received Qty,Přijaté Množství
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nezaplatené a nedoručené
@@ -2531,7 +2529,7 @@
 ,To Produce,K výrobě
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mzda
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,aby užívateľ
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,aby užívateľ
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Zadajte platnú e-mailovú adresu
@@ -2544,11 +2542,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Bezbariérový šablóna nesmie byť predvolenú šablónu
 DocType: Account,Income Account,Účet příjmů
 DocType: Payment Request,Amount in customer's currency,Čiastka v mene zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuálne Množstvo
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Predchádzajúce
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Študent Šarže pomôže sledovať dochádzku, hodnotenia a poplatky pre študentov"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Študent Šarže pomôže sledovať dochádzku, hodnotenia a poplatky pre študentov"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná suma
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal vstup na platy z {0} až {1}
@@ -2571,7 +2570,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Nastavenie Skladu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
@@ -2581,6 +2580,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"Pošle e-mail o tejto udalosti, aby zamestnanci so statusom &quot;otvorený&quot;"
 DocType: Task,Depends on Tasks,Závisí na Úlohy
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Prílohy je možné zobraziť bez povolenia nákupného košíka
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Názov nového nákladového strediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
@@ -2593,12 +2593,10 @@
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Č plat sklzu nájdený medzi {0} a {1}
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,študent Prijímacie
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je zakázaný
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je zakázaný
 DocType: Supplier,Billing Currency,Mena fakturácie
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Veľké
@@ -2615,7 +2613,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodná Odporúčané tovar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Všetky skupiny Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Celkom {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Celkom {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
@@ -2633,7 +2631,7 @@
 DocType: Price List,Price List Master,Ceník Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
 DocType: Price List,Applicable for Countries,Pre krajiny
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nechajte len aplikácie, ktoré majú status, schválené &#39;i, Zamietnuté&#39; môžu byť predložené"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Študent Názov skupiny je povinné v rade {0}
@@ -2726,7 +2724,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Vehicle Service,Engine Oil,Motorový olej
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Employee Loan,Loan Details,pôžička Podrobnosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Riadok {0}: Dokončené množstvo musí byť väčšia ako nula.
@@ -2791,7 +2789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Sklady s existujúcimi transakcie nemožno previesť na skupinu.
 DocType: Assessment Result Tool,Result HTML,výsledok HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vyprší
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Pridajte študentov
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Pridajte študentov
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2856,7 +2854,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limit skríženými
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademický termín s týmto &quot;akademický rok &#39;{0} a&quot; Meno Termín&#39; {1} už existuje. Upravte tieto položky a skúste to znova.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Pretože existujú nejaké transakcie voči položke {0} nemožno zmeniť hodnotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Pretože existujú nejaké transakcie voči položke {0} nemožno zmeniť hodnotu {1}
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
@@ -2900,7 +2898,7 @@
 DocType: Supplier,Last Day of the Next Month,Posledný deň nasledujúceho mesiaca
 DocType: Support Settings,Auto close Issue after 7 days,Auto zavrieť Issue po 7 dňoch
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolenka nemôže byť pridelené pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,študent Žiadateľ
 DocType: Asset Category Account,Accumulated Depreciation Account,účet oprávok
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
@@ -2928,8 +2926,8 @@
 DocType: Asset,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplatená suma nemôže byť vyšší ako celkový negatívny dlžnej čiastky {0}
@@ -2948,7 +2946,7 @@
 DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očakávaná hodnota Po celú dobu životnosti musí byť menšie ako Gross sumy nákupu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očakávaná hodnota Po celú dobu životnosti musí byť menšie ako Gross sumy nákupu
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturovaná částka
 DocType: Asset,Double Declining Balance,double degresívne
@@ -2969,19 +2967,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplatené čiastky nemôže byť väčšia ako Výška úveru {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Zákazková výroba nevytvorili
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Zákazková výroba nevytvorili
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
 DocType: Asset,Fully Depreciated,plne odpísaný
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účasť HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citácie sú návrhy, ponuky ste svojim zákazníkom odoslanej"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citácie sú návrhy, ponuky ste svojim zákazníkom odoslanej"
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Poradové číslo a Batch
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Súčet skóre hodnotiacich kritérií musí byť {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervované
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervované
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Hodnota nebo Množství
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minúta
@@ -3112,7 +3110,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,študent Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná rada ponúk
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Položka s rovnakým názvom už existuje ({0}), prosím, zmente názov skupiny položiek alebo premenujte položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,vyberte zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,vyberte zákazníka
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového strediska
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
@@ -3131,19 +3129,18 @@
 DocType: Vehicle,Insurance Details,poistenie Podrobnosti
 DocType: Account,Payable,Splatný
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Prosím, zadajte dobu splácania"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dlžníci ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dlžníci ({0})
 DocType: Pricing Rule,Margin,Marže
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Hrubý Zisk %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Suma nákupu je povinná
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Suma nákupu je povinná
 DocType: Lead,Address Desc,Popis adresy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je povinná
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Názov témy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
-DocType: Grading Structure,Grade Intervals,grade Intervaly
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vyberte podstatu svojho podnikania.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
@@ -3172,6 +3169,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Prosím nastaviť predvolený {0} vo firme {1}
 DocType: Cheque Print Template,Starting position from top edge,Východisková poloha od horného okraja
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Rovnaký dodávateľ bol zadaný viackrát
@@ -3225,7 +3223,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Změna pořadí Množství
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuálne pracovné príležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
-DocType: Journal Entry,Write Off,Odpísať
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpísať
 DocType: Timesheet Detail,Operation ID,Prevádzka ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
@@ -3236,8 +3234,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dodávateľ doručí zákazníkovi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) nie je na sklade
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Ďalšie Dátum musí byť väčšia ako Dátum zverejnenia
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dát a export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Prírastky zásob existujú proti skladu {0}, a preto nie je možné preradiť alebo upravovať"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Žiadni študenti Nájdené
@@ -3249,14 +3247,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vyberte prosím citácie
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vyberte prosím citácie
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vyberte prosím citácie
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vyberte prosím citácie
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založené na účasti tohto študenta
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Žiadni študenti v
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pridať ďalšie položky alebo otvorené plnej forme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
@@ -3303,9 +3302,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pred zmierenie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} musí byť dlhodobý majetok položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} musí byť dlhodobý majetok položka
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
@@ -3328,7 +3327,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
 DocType: Purchase Invoice Item,Rate,Sadzba
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Internovat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Meno adresy
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Meno adresy
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Základní
@@ -3353,7 +3352,7 @@
 DocType: Purchase Invoice,Print Language,tlač Language
 DocType: Salary Slip,Total Working Hours,Celkovej pracovnej doby
 DocType: Stock Entry,Including items for sub assemblies,Vrátane položiek pre montážnych podskupín
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Zadajte hodnota musí byť kladná
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Zadajte hodnota musí byť kladná
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Všetky územia
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Študent je už zapísané.
@@ -3373,17 +3372,15 @@
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítať na základe
 DocType: Delivery Note Item,From Warehouse,Zo skladu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
 DocType: Assessment Plan,Supervisor Name,Meno Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program na zápis do programu
 DocType: Program Enrollment Course,Program Enrollment Course,Program na zápis do programu
-DocType: Grading Structure,Grading Structure,triedenie Štruktúra
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Prepravné City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash flow z prevádzkových činností
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
@@ -3406,6 +3403,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Dátum začatia by mala byť pred uzávierky
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť cez Setup&gt; Numbering Series"
 DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
 DocType: Department,Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
@@ -3434,7 +3432,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Vytvoriť Zamestnanecké záznamov
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Vytvoriť Zamestnanecké záznamov
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Celkem Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,účtovná závierka
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hodina
@@ -3449,8 +3447,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Místo Prodeje
 DocType: Payment Entry,Received Amount,prijatej Suma
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti Ľudské zdroje&gt; Osobné nastavenie"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Vytvorte pre celkové množstvo, ignorujte množstvo už na objednávke"
 DocType: Account,Tax,Daň
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neoznačený
@@ -3463,7 +3459,7 @@
 DocType: Batch,Source Document Name,Názov zdrojového dokumentu
 DocType: Batch,Source Document Name,Názov zdrojového dokumentu
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,vytvoriť užívateľa
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,vytvoriť užívateľa
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
@@ -3475,8 +3471,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá zmena vo vlastnom imaní
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,príjem
 ,Sales Register,Sales Register
@@ -3487,16 +3483,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Zatiaľ žiadni zákazníci!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Prehľad o peňažných tokoch
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atribúty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Posledná Dátum objednávky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark dochádzky pre viac zamestnancov
@@ -3521,14 +3519,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Riadok {0} # účet musí byť typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Študentská karta
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typy činností pre Time Záznamy
 DocType: Tax Rule,Sales,Predaj
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
 DocType: Training Event,Exam,skúška
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturácia State
@@ -3561,7 +3559,7 @@
 DocType: Payment Entry,Account Paid From,Účet sú platení z prostriedkov
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,urobiť Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,urobiť Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tlač a papiernictva
 DocType: Stock Settings,Show Barcode Field,Show čiarového kódu Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Poslať Dodávateľ e-maily
@@ -3577,6 +3575,7 @@
 DocType: Offer Letter,Awaiting Response,Čaká odpoveď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Vyššie
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neplatný atribút {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Uveďte, či je neštandardný splatný účet"
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
@@ -3613,7 +3612,7 @@
 DocType: Program Enrollment Tool,Get Students From,Získať študentov z
 DocType: Hub Settings,Seller Country,Prodejce Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikovať položky na webových stránkach
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Skupina vaši študenti v dávkach
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Skupina vaši študenti v dávkach
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikace
@@ -3672,7 +3671,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Zkouška
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / dobropis
 DocType: Stock Settings,Auto insert Price List rate if missing,Automaticky vložiť cenníkovú cenu ak neexistuje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Celkem uhrazené částky
 DocType: Production Order Item,Transferred Qty,Přenesená Množství
@@ -3713,6 +3712,7 @@
 ,Sales Funnel,Prodej Nálevka
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skratka je povinná
 DocType: Project,Task Progress,pokrok úloha
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Vozík
 ,Qty to Transfer,Množství pro přenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
@@ -3746,7 +3746,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,vyberať poplatky
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 DocType: Item,Opening Stock,otvorenie Sklad
@@ -3765,7 +3765,7 @@
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapísať študenti
 DocType: Hub Settings,Name Token,Názov Tokenu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
@@ -3776,7 +3776,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} proti Predajnej Faktúre {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Název projektu
-DocType: Supplier,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
+DocType: Customer,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Production Order,Required Items,povinné predmety
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
@@ -3807,6 +3807,7 @@
 DocType: Item,Taxes,Daně
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Platená a nie je doručenie
 DocType: Project,Default Cost Center,Výchozí Center Náklady
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 DocType: Bank Guarantee,End Date,Datum ukončení
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,sklad Transakcia
 DocType: Budget,Budget Accounts,rozpočtové účty
@@ -3871,7 +3872,7 @@
 DocType: Customer,Sales Partner and Commission,Predaj Partner a Komisie
 DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sadzba (%) / rok
 ,Project Quantity,projekt Množstvo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} u všetkých položiek je nulová, môže byť by ste mali zmeniť, Distribuovať poplatkov na základe &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} u všetkých položiek je nulová, môže byť by ste mali zmeniť, Distribuovať poplatkov na základe &#39;"
 DocType: Opportunity,To Discuss,K projednání
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotiek {1} potrebná {2} pre dokončenie tejto transakcie.
 DocType: Loan Type,Rate of Interest (%) Yearly,Úroková sadzba (%) Ročné
@@ -3894,7 +3895,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riadok {0}: Mena BOM # {1} by sa mala rovnať vybranej mene {2}
 DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatok Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,fleet management
@@ -3911,7 +3912,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Sklad {0} neexistuje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ocenenie rýchlosť nebola nájdená pre výtlačku {0}, ktorý je na to účtovné položky pre požadované {1} {2}. Ak je položka vybavovať ako položka vzorky v {1}, prosím spomenúť, že v {1} tabuľky položky. V opačnom prípade vytvorte prichádzajúce legálne transakciu za položku alebo zmienka rýchlosťou ocenenie v zázname položky a skúste odovzdanie / zrušenie tejto položky"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiálov dodaných proti tomuto dodaciemu listu
 DocType: Project,Customer Details,Podrobnosti zákazníků
@@ -3928,7 +3929,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Predložené objednávky nemožno zmazať
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Řízení kvality
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} bol zakázaný
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} bol zakázaný
 DocType: Employee Loan,Repay Fixed Amount per Period,Splácať paušálna čiastka za obdobie
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Zadajte prosím množstvo pre Položku {0}
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
@@ -3955,7 +3956,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Študent ID e-mailu
 DocType: Employee,Notice (days),Oznámenie (dni)
 DocType: Tax Rule,Sales Tax Template,Daň z predaja Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Úprava skladových zásob
@@ -3989,6 +3990,7 @@
 DocType: Purchase Invoice,Debit Note Issued,vydanie dlhopisu
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} pohľadávku nemôže byť prevedená
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Táto položka je variantom {0} (šablóna).
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,nákup
 DocType: Announcement,Announcement,oznámenia
@@ -4004,7 +4006,7 @@
 DocType: Account,Receivable,Pohledávky
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vyberte položky do Výroba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Vyberte položky do Výroba
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Kmeňové dáta synchronizácia, môže to trvať nejaký čas"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Prodejce Popis
@@ -4017,7 +4019,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Salary Detail,Component,komponentov
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotiace kritériá Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otvorenie Oprávky musí byť menšia ako rovná {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvorenie Oprávky musí byť menšia ako rovná {0}
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
@@ -4052,7 +4054,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pripojiť
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Employee Loan,Repay from Salary,Splatiť z platu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Požiadavka na platbu proti {0} {1} na sumu {2}
@@ -4070,7 +4072,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Posúdenie Detail Výsledok
 DocType: Employee Education,Employee Education,Vzdelávanie zamestnancov
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicitné skupinu položiek uvedené v tabuľke na položku v skupine
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -4079,7 +4081,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Sklad {0} nie je viazané na žiadny účet, vytvorte / odkazujú na príslušnom účte (aktív) na sklade."
 DocType: Purchase Invoice,Recurring Id,Opakující se Id
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Zmazať trvalo?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Zmazať trvalo?
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neplatný {0}
@@ -4090,13 +4092,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Nastavte si škola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základňa Zmena Suma (Company mena)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Uložte dokument ako prvý.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Zmeniť skratku
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Poslední částka objednávky
+DocType: Task,Is Milestone,Je míľnikom
 DocType: Daily Work Summary,Email Sent To,E-mailom odoslaným
 DocType: Budget,Warn,Varovat
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Akékoľvek iné poznámky, pozoruhodné úsilie, ktoré by mali ísť v záznamoch."
@@ -4129,11 +4132,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní.
 DocType: Tax Rule,Purchase Tax Template,Spotrebná daň šablóny
 ,Project wise Stock Tracking,Sledování zboží dle projektu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaměstnanecké záznamy.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Objednať
@@ -4156,7 +4158,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávne vymazané
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
 DocType: Purchase Invoice Item,Price List Rate,Ceník Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Vytvoriť citácie zákazníkov
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Vytvoriť citácie zákazníkov
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Zobrazit ""Skladem"" nebo ""Není skladem"" na základě skladem k dispozici v tomto skladu."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Priemerná doba zhotovená dodávateľom dodať
@@ -4178,7 +4180,7 @@
 DocType: Asset,Disposal Date,Likvidácia Dátum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budú zaslané všetkým aktívnym zamestnancom spoločnosti v danú hodinu, ak nemajú dovolenku. Zhrnutie odpovedí budú zaslané do polnoci."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,tréning Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
@@ -4186,7 +4188,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Samozrejme je povinné v rade {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Pridať / Upraviť ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Pridať / Upraviť ceny
 DocType: Batch,Parent Batch,Rodičovská dávka
 DocType: Batch,Parent Batch,Rodičovská dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablóny tlače
@@ -4231,7 +4233,7 @@
 DocType: Item,Variant Based On,Variant založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši Dodávatelia
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 DocType: Request for Quotation Item,Supplier Part No,Žiadny dodávateľ Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemôže odpočítať, ak kategória je pre &quot;ocenenie&quot; alebo &quot;Vaulation a Total&quot;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Prijaté Od
@@ -4241,7 +4243,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Riadok {0}: doba hodnota musí byť väčšia ako nula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
@@ -4250,20 +4252,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Payment Reconciliation,From Invoice Date,Z faktúry Dátum
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturačná mena sa musí rovnať meny alebo účtu strana peňazí buď predvoleného comapany je
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturačná mena sa musí rovnať meny alebo účtu strana peňazí buď predvoleného comapany je
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,nechať inkasa
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Čím sa zaoberá?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do skladu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Všetky Študent Prijímacie
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: School House,House Name,Meno dom
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrický
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridajte zvyšok vašej organizácie ako používateľa. Môžete tiež pridať pozvať zákazníkov na portáli ich pridaním zo zoznamu kontaktov
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridajte zvyšok vašej organizácie ako používateľa. Môžete tiež pridať pozvať zákazníkov na portáli ich pridaním zo zoznamu kontaktov
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
@@ -4272,7 +4274,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Buying Settings,Naming Series,Číselné rady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Dátum poistenie štarte by mala byť menšia ako poistenie koncovým dátumom
@@ -4287,7 +4289,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Výplatnej páske zamestnanca {0} už vytvorili pre časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo najazdených kilometrov
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},"Obdobie od a obdobia, k dátam povinné pre opakované {0}"
@@ -4300,7 +4302,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
 DocType: Sales Invoice Timesheet,Billing Hours,billing Hodiny
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Predvolené BOM pre {0} nebol nájdený
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Poklepte na položky a pridajte ich sem
 DocType: Fees,Program Enrollment,Registrácia do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
@@ -4402,7 +4405,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
-DocType: Grade Interval,Grade Interval,trieda Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Svetlá Dátum aktualizované
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4411,6 +4413,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Stiahnuť PDF
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,"Tam, kde jsou uloženy předměty."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 DocType: Request for Quotation,Supplier Detail,dodávateľ Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Chyba vo vzorci alebo stave: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Fakturovaná čiastka
@@ -4456,7 +4459,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Nastavenie jednoduché webové stránky pre moju organizáciu
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
@@ -4515,7 +4518,7 @@
 ,Items To Be Requested,Položky se budou vyžadovat
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Informácie o spoločnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Vyberte alebo pridanie nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Vyberte alebo pridanie nového zákazníka
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Nákladové stredisko je nutné rezervovať výdavkov nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založené na účasti základu tohto zamestnanca
@@ -4528,13 +4531,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,suma nákupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Koniec roka nemôže byť pred uvedením do prevádzky roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Koniec roka nemôže byť pred uvedením do prevádzky roku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Zamestnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Balené množstvo se musí rovnať množstvu pre položku {0} v riadku {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množstvo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastaviť predvolené Holiday List pre zamestnancov {0} alebo {1} Company
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Směnky vznesené zákazníkům.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
@@ -4543,15 +4546,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Employee Loan Application,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Guardian,Guardian,poručník
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdelanie
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifikovaný
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Voliteľné. Nastaví východiskovej mene spoločnosti, ak nie je uvedené."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozícii Množstvo na Od Warehouse
@@ -4588,7 +4593,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marža %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
 DocType: Asset,Is Existing Asset,Je existujúcemu aktívu
 DocType: Salary Detail,Statistical Component,Štatistická zložka
 ,Monthly Salary Register,Měsíční plat Register
@@ -4643,7 +4648,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pripojiť Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,sklad Levels
 DocType: Customer,Commission Rate,Výška provízie
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Vytvoriť Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí byť jedným z príjem Pay a interný prevod
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytika
@@ -4656,6 +4661,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Order,Customer's Purchase Order Date,Zákazníka Objednávka Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Základný kapitál
+DocType: Shopping Cart Settings,Show Public Attachments,Zobraziť verejné prílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Platobná brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby presmerovať užívateľa na vybrané stránky.
@@ -4680,7 +4686,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Neukazovať žiadny symbol ako $ atď vedľa meny.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pól dňa)
 DocType: Supplier,Credit Days,Úvěrové dny
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Urobiť Študent Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Urobiť Študent Batch
 DocType: Leave Type,Is Carry Forward,Je převádět
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days
@@ -4699,8 +4705,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť cez Setup&gt; Numbering Series"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť cez Setup&gt; Numbering Series"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 68ee525..40125ef 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Serija Točka preteka Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Osnutek
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Prikaži Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Prikaži Variante
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Količina
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Skrb za zdravje
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zamuda pri plačilu (dnevi)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Poslovno leto {0} je potrebno
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglaševanje
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista družba je vpisana več kot enkrat
 DocType: Employee,Married,Poročen
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ni dovoljeno za {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ni dovoljeno za {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Pridobi artikle iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Izdelek {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,"Ni elementov, navedenih"
 DocType: Payment Reconciliation,Reconcile,Uskladitev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina z živili
 DocType: Quality Inspection Reading,Reading 1,Branje 1
 DocType: Process Payroll,Make Bank Entry,Naredite Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pokojninski skladi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Naslednja Amortizacija datum ne more biti pred Nakup Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Naslednja Amortizacija datum ne more biti pred Nakup Datum
 DocType: SMS Center,All Sales Person,Vse Sales oseba
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mesečni Distribution ** vam pomaga razširjati proračuna / Target po mesecih, če imate sezonske v vašem podjetju."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ni najdenih predmetov
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Ni najdenih predmetov
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plača Struktura Missing
 DocType: Lead,Person Name,Ime oseba
 DocType: Sales Invoice Item,Sales Invoice Item,Artikel na računu
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna šola&quot; ali &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Poročila o zalogi
 DocType: Warehouse,Warehouse Detail,Skladišče Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Izraz Končni datum ne more biti najpozneje do leta End Datum študijskem letu, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ali je osnovno sredstvo&quot; ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ali je osnovno sredstvo&quot; ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
 DocType: Vehicle Service,Brake Oil,Zavorna olja
 DocType: Tax Rule,Tax Type,Davčna Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
 DocType: BOM,Item Image (if not slideshow),Postavka Image (če ne slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Obstaja Stranka z istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Urne / 60) * Dejanska  čas operacije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Izberite BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Izberite BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Nabavna vrednost dobavljenega predmeta
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,"Praznik na {0} ni med Od datuma, do sedaj"
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,razred
 DocType: Sales Invoice Item,Delivered By Supplier,Delivered dobavitelj
 DocType: SMS Center,All Contact,Vse Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Proizvodnja naročite že ustvarili za vse postavke s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Proizvodnja naročite že ustvarili za vse postavke s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Letne plače
 DocType: Daily Work Summary,Daily Work Summary,Dnevni Delo Povzetek
 DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zamrznjeno
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zamrznjeno
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Izberite obstoječo družbo za ustvarjanje kontnem načrtu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Zaloga Stroški
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Izberite Target Skladišče
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Začetek
 DocType: Journal Entry Account,Credit in Company Currency,Kredit v podjetju valuti
 DocType: Delivery Note,Installation Status,Namestitev Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ali želite posodobiti prisotnost? <br> Sedanje: {0} \ <br> Odsoten: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dobava surovine za nakup
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,za POS računa je potreben vsaj en način plačila.
 DocType: Products Settings,Show Products as a List,Prikaži izdelke na seznamu
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Naj Amortizacija Začetek
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahteva Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Naj Zaposleni
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Naj Zaposleni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Izvedba
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Načrt za vzdrževanje obiskov.
 DocType: SMS Settings,Enter url parameter for message,Vnesite url parameter za sporočila
 DocType: POS Profile,Customer Groups,Skupine uporabnikov
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finančne izjave
 DocType: Guardian,Students,študenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravila za uporabo cene in popust.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenik mora biti primerno za nakup ali prodajo
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Seznam zaporedij za to transakcijo
 DocType: Company,Default Payroll Payable Account,Privzeto Plače plačljivo račun
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Posodobitev e-Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Posodobitev e-Group
 DocType: Sales Invoice,Is Opening Entry,Je vstopna odprtina
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Omemba če nestandardni terjatve račun, ki se uporablja"
 DocType: Course Schedule,Instructor Name,inštruktor Ime
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti Sales računa Postavka
 ,Production Orders in Progress,Proizvodna naročila v teku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto denarni tokovi pri financiranju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
 DocType: Lead,Address & Contact,Naslov in kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neuporabljene liste iz prejšnjih dodelitev
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Skupaj Costing Znesek (preko Čas lista)
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bančni vnosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Objavite v Hub
 DocType: Student Admission,Student Admission,študent Sprejem
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Postavka {0} je odpovedan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Zahteva za material
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 DocType: Item,Purchase Details,Nakup Podrobnosti
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Poročilo o dostavi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Poročilo o dostavi
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Stroški Prodano sredstvi
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Začetek Plačilo je bil spremenjen, ko je potegnil. Prosimo, še enkrat vleči."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
-DocType: Grade Interval,Min Score,min Ocena
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
 DocType: Student Applicant,Admitted,priznal
 DocType: Workstation,Rent Cost,Najem Stroški
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Vrednost naročila
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / denarni posli proti osebi ali za notranjo prerazporeditvijo
 DocType: Shipping Rule,Valid for Countries,Velja za države
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno &quot;Ne Kopiraj«"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno &quot;Ne Kopiraj«"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Skupaj naročite Upoštevani
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Prosimo, vpišite &quot;Ponovi na dan v mesecu&quot; vrednosti polja"
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Davčna stopnja
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} že dodeljenih za Employee {1} za obdobje {2} do {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Izberite Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,"Pretvarjanje, da non-Group"
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (lot) postavke.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Debetni Znesek
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Ustvarjanje skupin študentov
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Zahteva za ponudbo
 DocType: Salary Slip Timesheet,Working Hours,Delovni čas
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščno / trenutno zaporedno številko obstoječega zaporedja.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Ustvari novo stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Ustvari novo stranko
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Če je več Rules Cenik še naprej prevladovala, so pozvane, da nastavite Priority ročno za reševanje morebitnih sporov."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Ustvari naročilnice
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Ustvari naročilnice
 ,Purchase Register,Nakup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Veljavnih cenah
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday gospodar.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Od paketa No.
 DocType: Item Attribute,To Range,Da Domet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ne more spremeniti metode vrednotenja, kot so transakcije pred nekaj elementov, ki ga ne imeti svojo lastno metodo vrednotenja"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Skupaj listi dodeljena je obvezna
 DocType: Job Opening,Description of a Job Opening,Opis službo Otvoritev
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,V čakanju na aktivnosti za danes
@@ -533,7 +537,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
 DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
 DocType: Shipping Rule,Net Weight,Neto teža
 DocType: Employee,Emergency Phone,Zasilna Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Nakup
@@ -543,7 +547,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Prosimo, določite stopnjo za praga 0%"
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Postavka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
 DocType: Account,Profit and Loss,Dobiček in izguba
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje Podizvajalci
@@ -569,7 +573,7 @@
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 DocType: Production Plan Item,Pending Qty,Pending Kol
 DocType: Budget,Ignore,Ignoriraj
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ni aktiven
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ni aktiven
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslan na naslednjih številkah: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Preverite nastavitve za dimenzije za tiskanje
 DocType: Salary Slip,Salary Slip Timesheet,Plača Slip Timesheet
@@ -578,13 +582,13 @@
 DocType: Sales Invoice,Total Commission,Skupaj Komisija
 DocType: Pricing Rule,Sales Partner,Prodaja Partner
 DocType: Buying Settings,Purchase Receipt Required,Potrdilo o nakupu Obvezno
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Oceni Vrednotenje je obvezna, če je začel Odpiranje Stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Oceni Vrednotenje je obvezna, če je začel Odpiranje Stock"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,nakopičene Vrednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Naredite Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Naredite Sales Order
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,ID Ponudbe
 DocType: C-Form Invoice Detail,Grand Total,Skupna vsota
@@ -601,7 +605,7 @@
 DocType: Job Applicant,Resume Attachment,Nadaljuj Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke
 DocType: Leave Control Panel,Allocate,Dodeli
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Prodaja Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Prodaja Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Opomba: Skupna dodeljena listi {0} ne sme biti manjši od že odobrene listov {1} za obdobje
 DocType: Announcement,Posted By,Avtor
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavi dobavitelja (Drop Ship)
@@ -611,7 +615,7 @@
 DocType: Quotation,Quotation To,Ponudba za
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavite Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavite Company
@@ -623,7 +627,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenčna št &amp; Referenčni datum je potrebna za {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Izberite Plačilo računa, da bo Bank Entry"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Ustvarjanje zapisov zaposlencev za upravljanje listje, odhodkov terjatev in na izplačane plače"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Ustvarjanje zapisov zaposlencev za upravljanje listje, odhodkov terjatev in na izplačane plače"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj zbirke znanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Predlog Pisanje
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plačilo Začetek odštevanja
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Povezava z skrbnika2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Plačilo Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Časovno obdobje
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nova kreditna meja je nižja od trenutne neporavnani znesek za stranko. Kreditno linijo mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nova kreditna meja je nižja od trenutne neporavnani znesek za stranko. Kreditno linijo mora biti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
 DocType: SMS Settings,Receiver Parameter,Sprejemnik Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Na podlagi"" in ""Združi po"" ne more biti enaka"
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,Resolucija Datum
 DocType: Student Batch Name,Batch Name,serija Ime
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ustvaril:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,včlanite se
 DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,"Bo pokazal študenta, kot so v Študentski Mesečno poročilo navzočih"
@@ -720,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,študent Udeležba
 DocType: Sales Invoice Timesheet,Time Sheet,čas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush Surovine, ki temelji na"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Prosimo, vnesite podatke točko"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosimo, vnesite podatke točko"
 DocType: Interest,Interest,Obresti
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Drugi podatki
@@ -738,7 +741,7 @@
 ,Absent Student Report,Odsoten Student Report
 DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na:
 DocType: Offer Letter Term,Offer Letter Term,Pisna ponudba Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Element ima variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Postavka {0} ni bilo mogoče najti
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Podjetje {0} ne obstaja
@@ -747,8 +750,6 @@
 DocType: Serial No,Warranty Expiry Date,Garancija Datum preteka
 DocType: Material Request Item,Quantity and Warehouse,Količina in skladišča
 DocType: Sales Invoice,Commission Rate (%),Komisija Stopnja (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavite Poimenovanje serijsko {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavite Poimenovanje serijsko {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Izberite program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Izberite program
 DocType: Project,Estimated Cost,Ocenjeni strošek
@@ -767,7 +768,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ni zaloge artikla
 DocType: Mode of Payment Account,Default Account,Privzeti račun
 DocType: Payment Entry,Received Amount (Company Currency),Prejela znesek (družba Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosimo, izberite tedensko off dan"
 DocType: Production Order Operation,Planned End Time,Načrtovano Končni čas
 ,Sales Person Target Variance Item Group-Wise,Prodaja Oseba Target Varianca Postavka Group-Wise
@@ -831,7 +832,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Cenik ni izbrana
 DocType: Employee,Family Background,Družina Ozadje
 DocType: Request for Quotation Supplier,Send Email,Pošlji e-pošto
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ne Dovoljenje
 DocType: Company,Default Bank Account,Privzeti bančni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
@@ -844,8 +845,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Najdenih ni delavec
 DocType: Supplier Quotation,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Študent Skupina je že posodobljen.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Študent Skupina je že posodobljen.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Študent Skupina je že posodobljen.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Študent Skupina je že posodobljen.
 DocType: SMS Center,All Customer Contact,Vse Customer Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Naloži zaloge ravnovesje preko CSV.
 DocType: Warehouse,Tree Details,drevo Podrobnosti
@@ -856,8 +857,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna Znesek računa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Stroški Center {2} ne pripada družbi {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: računa {2} ne more biti skupina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Točka Row {idx} {DOCTYPE} {DOCNAME} ne obstaja v zgoraj &#39;{DOCTYPE} &quot;tabela
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Točka Row {idx} {DOCTYPE} {DOCNAME} ne obstaja v zgoraj &#39;{DOCTYPE} &quot;tabela
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ni opravil
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno Račun ustvarjen na primer 05, 28, itd"
 DocType: Asset,Opening Accumulated Depreciation,Odpiranje nabrano amortizacijo
@@ -873,7 +874,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Izberite Items
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Razpored za golf
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Razpored za golf
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: HR Settings,Enter retirement age in years,Vnesite upokojitveno starost v letih
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljna Skladišče
@@ -881,7 +882,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Vse Postavka Skupine
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Vse Postavka Skupine
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Čisti dobiček / izguba
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
@@ -892,7 +893,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Nakup naročila do plačila
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Predvidoma Kol
 DocType: Sales Invoice,Payment Due Date,Datum zapadlosti
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Odpiranje&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Odpri storiti
 DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo
@@ -908,7 +909,7 @@
 DocType: Item Reorder,Re-Order Qty,Ponovno naročila Kol
 DocType: Leave Block List Date,Leave Block List Date,Pustite Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena ali Popust
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Skupaj veljavnih cenah na Potrdilo o nakupu postavke tabele mora biti enaka kot Skupaj davkov in dajatev
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Skupaj veljavnih cenah na Potrdilo o nakupu postavke tabele mora biti enaka kot Skupaj davkov in dajatev
 DocType: Sales Team,Incentives,Spodbude
 DocType: SMS Log,Requested Numbers,Zahtevane številke
 DocType: Production Planning Tool,Only Obtain Raw Materials,Pridobite le surovine
@@ -966,8 +967,7 @@
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
 DocType: Quality Inspection Reading,Reading 6,Branje 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
@@ -1019,8 +1019,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Privzeti Bank / Cash račun bo samodejno posodobljen plač Journal Entry, ko je izbrana ta način."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Intervali za naziv zakonika {0} prekriva z razreda intervalih za druge razrede. Prosimo, preverite intervali {0} in {1} in poskusite znova"
 DocType: BOM,Raw Material Cost(Company Currency),Stroškov surovin (družba Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Vsi artikli so se že prenesli na to Proizvodno naročilo.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Vrstica # {0}: stopnja ne more biti večji od stopnje, ki se uporablja pri {1} {2}"
@@ -1032,7 +1030,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Spletna stran Element
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Naslednja Amortizacija Datum je vpisana kot preteklem dnevu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Naslednja Amortizacija Datum je vpisana kot preteklem dnevu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bela
 DocType: SMS Center,All Lead (Open),Vse ponudbe (Odprte)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Vrstica {0}: Kol ni na voljo za {4} v skladišču {1} na objavo čas začetka ({2} {3})
@@ -1047,7 +1045,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Sklep Tip mora biti eden od {0}
 DocType: Lead,Next Contact Date,Naslednja Stik Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Odpiranje Količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
 DocType: Student Batch Name,Student Batch Name,Student Serija Ime
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
 DocType: Repayment Schedule,Balance Loan Amount,Bilanca Znesek posojila
@@ -1067,10 +1065,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Navedite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
 DocType: Delivery Note,Delivery To,Dostava
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne more biti negativna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Skupno število amortizacije
 DocType: Sales Invoice Item,Rate With Margin,Oceni z mejo
 DocType: Sales Invoice Item,Rate With Margin,Oceni z mejo
@@ -1099,7 +1097,7 @@
 DocType: Lead,Organization Name,Organization Name
 DocType: Tax Rule,Shipping State,Dostava država
 ,Projected Quantity as Source,Predvidena količina kot vir
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo &quot;dobili predmetov iz nakupu prejemki&quot; gumb
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo &quot;dobili predmetov iz nakupu prejemki&quot; gumb
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Vključi non-parkom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodajna Stroški
@@ -1107,7 +1105,7 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Privzet stroškovni center prodaje
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poštna številka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Poštna številka
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Naročilo {0} je {1}
 DocType: Opportunity,Contact Info,Kontaktni podatki
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Izdelava Zaloga Entries
@@ -1150,7 +1148,7 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Pravilo za dostavo za košaro
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 DocType: Global Defaults,Global Defaults,Globalni Privzeto
@@ -1185,11 +1183,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vnesite Koda priti Serija Število
 DocType: Stock Settings,Default Item Group,Privzeto Element Group
 DocType: Employee Loan,Partially Disbursed,delno črpanju
-DocType: Grading Structure,Grading System Name,Ime Grading sistem
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavitelj baze podatkov.
 DocType: Account,Balance Sheet,Bilanca stanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plačila ni nastavljen. Prosimo, preverite, ali je bil račun nastavljen na načinu plačila ali na POS profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plačila ni nastavljen. Prosimo, preverite, ali je bil račun nastavljen na načinu plačila ali na POS profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Vaš prodajni oseba bo dobil opomin na ta dan, da se obrnete na stranko"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti element ni mogoče vnesti večkrat.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Nadaljnje računi se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
@@ -1228,11 +1225,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Delo končano
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Prosimo navedite vsaj en atribut v tabeli Atributi
 DocType: Announcement,All Students,Vse Študenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,"Točka {0} mora biti postavka, non-stock"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,"Točka {0} mora biti postavka, non-stock"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ogled Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Študent Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Ostali svet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
@@ -1273,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Naročilo {0} ni veljavno
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Naročilnice vam pomaga načrtovati in spremljati svoje nakupe
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Naročilnice vam pomaga načrtovati in spremljati svoje nakupe
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Skupna količina Vprašanje / Transfer {0} v dogovoru Material {1} \ ne sme biti večja od zahtevane količine {2} za postavko {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Majhno
@@ -1298,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Svoje izdelke ali storitve
 DocType: Mode of Payment,Mode of Payment,Način plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
@@ -1316,7 +1313,7 @@
 DocType: Student Group Student,Group Roll Number,Skupina Roll Število
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Vsota vseh uteži nalog bi moral biti 1. Prosimo, da ustrezno prilagodi uteži za vse naloge v projektu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalski Oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na &quot;Uporabi On &#39;polju, ki je lahko točka, točka Group ali Brand."
@@ -1343,7 +1340,7 @@
 DocType: Depreciation Schedule,Journal Entry,Vnos v dnevnik
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} izdelkov v teku
 DocType: Workstation,Workstation Name,Workstation Name
-DocType: Grade Interval,Grade Code,razred Code
+DocType: Grading Scale Interval,Grade Code,razred Code
 DocType: POS Item Group,POS Item Group,POS Element Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
@@ -1360,7 +1357,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Strojna oprema
 DocType: Sales Order,Recurring Upto,Ponavljajoči Upto
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Prosimo izberite Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Prosimo izberite Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Zapusti
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavitelj Datum računa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Morate omogočiti Košarica
@@ -1376,7 +1373,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Staranje Območje 3
 DocType: Maintenance Schedule Item,No of Visits,Število obiskov
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},obstaja Vzdrževanje Razpored {0} proti {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Vpisovanje študentov
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zaključni račun mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Seštevek točk za vseh ciljev bi morala biti 100. To je {0}
@@ -1425,13 +1423,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontni načrt
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Detail,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
 DocType: Pricing Rule,"Higher the number, higher the priority","Višja kot je številka, višja je prioriteta"
 ,Purchase Invoice Trends,Račun za nakup Trendi
 DocType: Employee,Better Prospects,Boljši obeti
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Vrstica # {0}: Serija {1} ima le {2} kol. Izberite drugo serijo, ki ima {3} kol na voljo ali razdeli vrstico v več vrstic, da poda / vprašanja iz različnih serij"
 DocType: Vehicle,License Plate,Registrska tablica
 DocType: Appraisal,Goals,Cilji
 DocType: Warranty Claim,Warranty / AMC Status,Garancija / AMC Status
@@ -1449,7 +1448,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Delavec ne more poročati zase.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Če računa je zamrznjeno, so vpisi dovoljeni omejenih uporabnikov."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil delovnega mesta, potrebna usposobljenost itd"
 DocType: Journal Entry Account,Account Balance,Stanje na računu
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Davčna pravilo za transakcije.
@@ -1460,7 +1459,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezaprt poslovno leto je P &amp; L bilanc
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktiven
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Naredite Prodajni nalogi, ki vam pomaga načrtovati svoje delo in poda na čas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Naredite Prodajni nalogi, ki vam pomaga načrtovati svoje delo in poda na čas"
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Skupaj Dodatni stroški
 DocType: Course Schedule,SH,SH
@@ -1471,7 +1470,7 @@
 DocType: Shipping Rule Condition,To Value,Do vrednosti
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakiranje listek
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Pakiranje listek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Urad za najem
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavitve Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo!
@@ -1497,7 +1496,7 @@
 DocType: Sales Invoice,Source,Vir
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zaprto
 DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ta {0} ni v nasprotju s {1} za {2} {3}
 DocType: Student Attendance Tool,Students HTML,študenti HTML
@@ -1515,7 +1514,7 @@
 DocType: Student,Date of Leaving,Datum Leaving
 DocType: Pricing Rule,For Price List,Za cenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Ustvari Interesenti
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Ustvari Interesenti
 DocType: Maintenance Schedule,Schedules,Urniki
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
@@ -1543,7 +1542,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Vpisi
 DocType: Sales Invoice Item,Brand Name,Blagovna znamka
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Škatla
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Možni Dobavitelj
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
@@ -1577,7 +1576,7 @@
 DocType: Quality Inspection Reading,Reading 4,Branje 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Privzeti BOM za {0} nismo našli za projekt {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Terjatve za račun družbe.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Študenti so v središču sistema, dodamo vse svoje učence"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Študenti so v središču sistema, dodamo vse svoje učence"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Datum Potrditev {1} ne more biti pred Ček Datum {2}
 DocType: Company,Default Holiday List,Privzeti seznam praznikov
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Vrstica {0}: V času in času {1} se prekrivajo z {2}
@@ -1589,20 +1588,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so prazniki. Vam ni treba zaprositi za dopust."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno pošlji plačila Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova naloga
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Naredite predračun
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Naredite predračun
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Druga poročila
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Prosimo, nastavite privzetega izplačane plače je treba plačati račun v družbi {0}"
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Iskanje Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Iskanje Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto sprememba v gotovini
 DocType: Assessment Plan,Grading Scale,Ocenjevalna lestvica
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,že končana
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Plačilni Nalog že obstaja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
@@ -1640,7 +1639,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zberite
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Ne, ne moreš brisati poslovnega leta {0}. Poslovno leto {0} je privzet v globalnih nastavitvah"
 DocType: Journal Entry,Entry Type,Začetek Type
 ,Customer Credit Balance,Stranka Credit Balance
@@ -1683,7 +1682,6 @@
 DocType: Student Sibling,Studying in Same Institute,Študij v istem inštitutu
 DocType: Territory,Territory Manager,Ozemlje Manager
 DocType: Packed Item,To Warehouse (Optional),Da Warehouse (po želji)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Oznaka&gt; Element Group&gt; Znamka
 DocType: Payment Entry,Paid Amount (Company Currency),Plačan znesek (družba Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
@@ -1693,9 +1691,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Poglej v košarico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketing Stroški
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Zahteva se uporablja za izdelavo tega staleža Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Naslednja Amortizacija Datum je obvezna za nove investicije
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Naslednja Amortizacija Datum je obvezna za nove investicije
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ločeno Group s sedežem tečaj za vsako serijo
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ločeno Group s sedežem tečaj za vsako serijo
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enotni enota točke.
@@ -1712,9 +1710,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: je Center Stroški potrebna za &quot;izkaz poslovnega izida&quot; računa {2}. Nastavite privzeto stroškovno Center za družbo.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nov kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Branje 2
@@ -1741,21 +1737,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Uskladitev JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice.
 DocType: Purchase Invoice Item,Batch No,Serija Ne
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},"Ni mogoče, da bi našli menjalni tečaj za {0} na {1} za ključni datum {2}"
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Skrbnika2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
 DocType: Employee Attendance Tool,Employees HTML,zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
 DocType: Employee,Leave Encashed?,Dopusta unovčijo?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno
 DocType: Email Digest,Annual Expenses,letni stroški
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodeljen znesek
@@ -1775,7 +1770,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,cenitve
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Pogoj za Shipping pravilu
-DocType: Grading Structure,Grading Intervals,razvrščanje intervali
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,vnesite
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ni mogoče overbill za postavko {0} v vrstici {1} več kot {2}. Če želite, da nad-obračun, prosim, da pri nakupu Nastavitve"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Prosim, nastavite filter, ki temelji na postavki ali skladišče"
@@ -1788,16 +1782,17 @@
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Vrstica # {0}: zavrnitev Skladišče je obvezno proti zavrnil postavki {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Plačilo
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Upravljajte naročila
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Upravljajte naročila
 DocType: Production Order Operation,Actual Time and Cost,Dejanski čas in stroški
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Zahteva za največ {0} se lahko izvede za postavko {1} proti Sales Order {2}
 DocType: Employee,Salutation,Pozdrav
 DocType: Course,Course Abbreviation,Kratica za tečaj
 DocType: Student Leave Application,Student Leave Application,Študent Zapusti Uporaba
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenih {0} v pol dneva na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Skupaj delovni čas ne sme biti večja od max delovnih ur {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle predmeti v času prodaje.
 DocType: Quotation Item,Actual Qty,Dejanska Količina
 DocType: Sales Invoice Item,References,Reference
@@ -1807,7 +1802,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravite in poskusite znova."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Sodelavec
 DocType: Asset Movement,Asset Movement,Gibanje sredstvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nova košarico
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Nova košarico
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
 DocType: Vehicle,Wheels,kolesa
@@ -1839,10 +1834,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Onemogoči oblikovanje časovnih dnevnikov proti proizvodnji naročil. Operacije se ne gosenicami proti Production reda
 DocType: Student,Student Mobile Number,Študent mobilno številko
 DocType: Item,Has Variants,Ima Variante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID je obvezen
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID je obvezen
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID je obvezen
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID je obvezen
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajoči Račun
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektov
@@ -1850,7 +1845,7 @@
 DocType: Budget,Fiscal Year,Poslovno leto
 DocType: Vehicle Log,Fuel Price,gorivo Cena
 DocType: Budget,Budget,Proračun
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun ne more biti dodeljena pred {0}, ker to ni prihodek ali odhodek račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Doseženi
 DocType: Student Admission,Application Form Route,Prijavnica pot
@@ -1881,7 +1876,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Znesek {0} {1} odšteti pred {2}
 DocType: Employee,Salary Information,Plača Informacije
 DocType: Sales Person,Name and Employee ID,Ime in zaposlenih ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
 DocType: Website Item Group,Website Item Group,Spletna stran Element Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Dajatve in davki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vnesite Referenčni datum
@@ -1939,7 +1934,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer Prihodki
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
 DocType: Asset,Depreciation Schedule,Amortizacija Razpored
 DocType: Bank Reconciliation Detail,Against Account,Proti račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Polovica Dan Datum mora biti med Od datuma in do danes
@@ -1956,13 +1951,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
 ,Quotation Trends,Trendi ponudb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
 DocType: Shipping Rule Condition,Shipping Amount,Znesek Dostave
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Dokler Znesek
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
 DocType: Purchase Order,Delivered,Dostavljeno
 ,Vehicle Expenses,Stroški vozil
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
+DocType: Serial No,Invoice Details,Podrobnosti na računu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
 DocType: Purchase Receipt,Vehicle Number,Število vozil
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, na katerega se bodo ponavljajoče račun stop"
 DocType: Employee Loan,Loan Amount,Znesek posojila
@@ -1986,7 +1982,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Skupina Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Šport
 DocType: Loan Type,Loan Name,posojilo Ime
@@ -1998,6 +1994,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Skladišče, kjer ste vzdrževanje zalog zavrnjenih predmetov"
 DocType: Production Order,Skip Material Transfer,Preskoči Material Transfer
 DocType: Production Order,Skip Material Transfer,Preskoči Material Transfer
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Mogoče najti menjalni tečaj za {0} in {1} za ključ datumu {2}. Prosimo ustvariti zapis Valuta Exchange ročno
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vaš proračunsko leto konča na
 DocType: POS Profile,Price List,Cenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je zdaj privzeta poslovno leto. Prosimo, osvežite brskalnik za spremembe začele veljati."
@@ -2035,9 +2032,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Postavka {0} je bil že vrnjen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalno leto ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so povezane  z izidi ** poslovnega leta **.
 DocType: Opportunity,Customer / Lead Address,Stranka / Naslov ponudbe
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 DocType: Student Admission,Eligibility,Upravičenost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Interesenti vam pomaga dobiti posel, dodamo vse svoje stike in več kot vaše vodi"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Interesenti vam pomaga dobiti posel, dodamo vse svoje stike in več kot vaše vodi"
 DocType: Production Order Operation,Actual Operation Time,Dejanska Operacija čas
 DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik)
 DocType: Purchase Taxes and Charges,Deduct,Odbitka
@@ -2078,7 +2075,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Izberite Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Pustite prazno, če velja za vse oddelke"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Process Payroll,Fortnightly,vsakih štirinajst dni
 DocType: Currency Exchange,From Currency,Iz valute
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
@@ -2094,7 +2091,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ne morete izbrati vrsto naboja kot &quot;On prejšnje vrstice Znesek&quot; ali &quot;Na prejšnje vrstice Total&quot; za prvi vrsti
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Otrok točka ne bi smela biti izdelka Bundle. Odstranite element &#39;{0}&#39; in shranite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bančništvo
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj časovnice
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj časovnice
 DocType: Vehicle Service,Service Item,Service Element
 DocType: Bank Guarantee,Bank Guarantee,Bančna garancija
 DocType: Bank Guarantee,Bank Guarantee,Bančna garancija
@@ -2144,8 +2141,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cene se ne bodo pokazale, če Cenik ni nastavljen"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Prosimo, navedite državo ta prevoz pravilu ali preverite Dostava po celem svetu"
 DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Bremenitev je potrebno
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Bremenitev je potrebno
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik
 DocType: Offer Letter Term,Offer Term,Ponudba Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -2179,14 +2176,14 @@
 DocType: Opportunity,Lost Reason,Lost Razlog
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Naslov
 DocType: Quality Inspection,Sample Size,Velikost vzorca
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vnesite Prejem dokumenta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Vsi predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vnesite Prejem dokumenta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Vsi predmeti so bili že obračunano
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven &quot;Od zadevi št &#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Project,External,Zunanji
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uporabniki in dovoljenja
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Naročila za proizvodnjo Ustvarjen: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Naročila za proizvodnjo Ustvarjen: {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Mobilna številka
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje in Branding
@@ -2195,7 +2192,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
 DocType: Scheduling Tool,Student Batch,študent serije
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaše stranke
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Naredite Študent
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Naredite Študent
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ti so bili povabljeni k sodelovanju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Prijavi se zdaj
@@ -2219,8 +2216,9 @@
 DocType: SMS Log,Sent To,Poslano
 DocType: Payment Request,Make Sales Invoice,Naredi račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programska oprema
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Naslednja Stik datum ne more biti v preteklosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Naslednja Stik datum ne more biti v preteklosti
 DocType: Company,For Reference Only.,Samo za referenco.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Izberite Serija št
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neveljavna {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Znesek
@@ -2234,7 +2232,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Primer št ne more biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži diaprojekcijo na vrhu strani
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Trgovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Trgovine
 DocType: Serial No,Delivery Time,Čas dostave
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Staranje, ki temelji na"
 DocType: Item,End of Life,End of Life
@@ -2250,8 +2248,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Prenos Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,"Ta dokument je nad mejo, ki jo {0} {1} za postavko {4}. Delaš drugo {3} zoper isto {2}?"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,znesek računa Izberite sprememba
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,znesek računa Izberite sprememba
 DocType: Purchase Invoice,Price List Currency,Cenik Valuta
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
 DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock
@@ -2262,7 +2260,7 @@
 DocType: Budget Account,Budget Account,proračun računa
 DocType: Quality Inspection,Verified By,Verified by
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne more spremeniti privzeto valuto družbe, saj so obstoječi posli. Transakcije se treba odpovedati, da spremenite privzeto valuto."
-DocType: Grade Interval,Grade Description,razred Opis
+DocType: Grading Scale Interval,Grade Description,razred Opis
 DocType: Stock Entry,Purchase Receipt No,Potrdilo o nakupu Ne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kapara
 DocType: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
@@ -2300,7 +2298,7 @@
 DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Plačilo računa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto sprememba terjatev do kupcev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenzacijske Off
 DocType: Offer Letter,Accepted,Sprejeto
@@ -2314,7 +2312,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Oznaka dostavnega pravila
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Uporabniški forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
 DocType: Employee,Previous Work Experience,Prejšnja Delovne izkušnje
@@ -2328,7 +2326,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Ime zavoda, za katerega vzpostavitev tega sistema."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Vknjižba zamrzniti do tega datuma, nihče ne more narediti / spremeniti vnos razen vlogi določeno spodaj."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stanje projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),"Preverite, da je to prepoveste frakcij. (za številkami)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,so bile oblikovane naslednje naročila za proizvodnjo:
@@ -2351,6 +2349,7 @@
 DocType: Email Digest,How frequently?,Kako pogosto?
 DocType: Purchase Receipt,Get Current Stock,Pridobite trenutne zaloge
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drevo Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Oznaka&gt; Element Group&gt; Znamka
 DocType: Student,Joining Date,Vstop Datum
 ,Employees working on a holiday,Zaposleni na počitnice
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
@@ -2432,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Potrditev Datum ni omenjena
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Proizvodnja
 DocType: Guardian,Occupation,poklic
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
 DocType: Sales Invoice,This Document,Ta dokument
 DocType: Installation Note Item,Installed Qty,Nameščen Kol
@@ -2455,8 +2454,8 @@
 DocType: Notification Control,Sales Order Message,Sales Order Sporočilo
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Privzeta nastavitev Vrednote, kot so podjetja, valuta, tekočem proračunskem letu, itd"
 DocType: Payment Entry,Payment Type,Način plačila
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
 DocType: Process Payroll,Select Employees,Izberite Zaposleni
 DocType: Opportunity,Potential Sales Deal,Potencialni Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referenčni datum
@@ -2473,7 +2472,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalno POS Profil {0} že ustvarili za družbo {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zamenjaj artikel / BOM v vseh BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Potrdilo dokument je treba predložiti
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Potrdilo dokument je treba predložiti
 DocType: Purchase Invoice Item,Received Qty,Prejela Kol
 DocType: Stock Entry Detail,Serial No / Batch,Zaporedna številka / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ne plača in ne Delivered
@@ -2486,7 +2485,7 @@
 ,To Produce,Za izdelavo
 apps/erpnext/erpnext/config/hr.py +93,Payroll,izplačane plače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Naredite uporabnika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Naredite uporabnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketu za dostavo (za tisk)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vnesite veljaven e-poštni naslov
@@ -2500,11 +2499,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Onemogočeno predloga ne sme biti kot privzeto
 DocType: Account,Income Account,Prihodki račun
 DocType: Payment Request,Amount in customer's currency,Znesek v valuti stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dostava
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Dostava
 DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Glejte &quot;Oceni materialov na osnovi&quot; v stanejo oddelku
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prejšnja
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Študentski Paketi vam pomaga slediti sejnin, ocene in pristojbine za študente"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Študentski Paketi vam pomaga slediti sejnin, ocene in pristojbine za študente"
 DocType: Payment Entry,Total Allocated Amount,Skupaj Dodeljena Znesek
 DocType: Item Reorder,Material Request Type,Material Zahteva Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural list Vstop za pla iz {0} in {1}
@@ -2527,7 +2527,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
@@ -2537,6 +2537,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Bomo poslali e-poštno sporočilo o dogodku na zaposlene s statusom &#39;Odpri&#39;
 DocType: Task,Depends on Tasks,Odvisno od Opravila
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Upravljanje drevesa skupine kupcev.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,"Priključki se lahko dokaže, ne da bi omogočili nakupovalni voziček"
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Stroški Center Ime
 DocType: Leave Control Panel,Leave Control Panel,Pustite Nadzorna plošča
@@ -2549,12 +2550,10 @@
 DocType: Sales Invoice,Debit To,Bremenitev
 DocType: Delivery Note,Required only for sample item.,Zahteva le za točko vzorca.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Št plačilni list dalo med {0} in {1}
 ,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Študentski Sprejemi
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je onemogočeno
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je onemogočeno
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2571,7 +2570,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Domača stran Izbrani izdelka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Vse skupine za ocenjevanje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo skladišče Ime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Skupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Skupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Ozemlje
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Navedite ni obiskov zahtevanih
 DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje
@@ -2589,7 +2588,7 @@
 DocType: Price List,Price List Master,Cenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Vse prodajne transakcije je lahko označena pred številnimi ** Prodajni Osebe **, tako da lahko nastavite in spremljanje ciljev."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
 DocType: Price List,Applicable for Countries,Velja za države
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; in &quot;Zavrnjeno&quot; se lahko predloži
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Študent Group Ime je obvezno v vrsti {0}
@@ -2670,7 +2669,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 DocType: Vehicle Service,Engine Oil,Motorno olje
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Naslov stranke
 DocType: Employee Loan,Loan Details,posojilo Podrobnosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Vrstica {0}: Zaključen Kol mora biti večji od nič.
@@ -2735,7 +2734,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Skladišča z obstoječim poslom ni mogoče pretvoriti v skupino.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Poteče
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj Študenti
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj Študenti
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Prosimo, izberite {0}"
 DocType: C-Form,C-Form No,C-forma
 DocType: BOM,Exploded_items,Exploded_items
@@ -2800,7 +2799,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit navzkrižnim
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tveganega kapitala
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Akademski izraz s tem &quot;študijskem letu &#39;{0} in&quot; Trajanje Ime&#39; {1} že obstaja. Prosimo, spremenite te vnose in poskusite znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kot že obstajajo transakcije proti zapisu {0}, ki jih ne more spremeniti vrednosti {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kot že obstajajo transakcije proti zapisu {0}, ki jih ne more spremeniti vrednosti {1}"
 DocType: UOM,Must be Whole Number,Mora biti celo število
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nove Listi Dodeljena (v dnevih)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijska št {0} ne obstaja
@@ -2844,7 +2843,7 @@
 DocType: Supplier,Last Day of the Next Month,Zadnji dan v naslednjem mesecu
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu Izdaja po 7 dneh
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dopusta ni mogoče dodeliti pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,študent Prijavitelj
 DocType: Asset Category Account,Accumulated Depreciation Account,Bilančni Amortizacija račun
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
@@ -2872,7 +2871,7 @@
 DocType: Asset,Item Code,Oznaka
 DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo
 DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Plačani znesek ne sme biti večja od celotnega negativnega neplačanega zneska {0}
@@ -2890,7 +2889,7 @@
 DocType: Production Planning Tool,Create Material Requests,Ustvarite Material Zahteve
 DocType: Employee Education,School/University,Šola / univerza
 DocType: Payment Request,Reference Details,Referenčna Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Pričakovana vrednost Po Življenjska doba sme biti manjša od bruto zneska nakupa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Pričakovana vrednost Po Življenjska doba sme biti manjša od bruto zneska nakupa
 DocType: Sales Invoice Item,Available Qty at Warehouse,Na voljo Količina na Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Zaračunavajo Znesek
 DocType: Asset,Double Declining Balance,Double Upadanje Balance
@@ -2911,19 +2910,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Plačanega zneska ne sme biti večja od zneska kredita {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Proizvodnja Sklep ni bil ustvarjen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Proizvodnja Sklep ni bil ustvarjen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti za 'Do datuma '
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},"status študenta, ne more spremeniti {0} je povezana z uporabo študentskega {1}"
 DocType: Asset,Fully Depreciated,celoti amortizirana
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markirana Udeležba HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citati so predlogi, ponudbe, ki ste jih poslali svojim strankam"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citati so predlogi, ponudbe, ki ste jih poslali svojim strankam"
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijska številka in serije
 DocType: Warranty Claim,From Company,Od družbe
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Vsota ocen ocenjevalnih meril mora biti {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Prosim, nastavite Število amortizacije Rezervirano"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Prosim, nastavite Število amortizacije Rezervirano"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vrednost ali Kol
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
@@ -3053,7 +3052,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Študentska skupina
 DocType: Shopping Cart Settings,Quotation Series,Zaporedje ponudb
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Izberite stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Izberite stranko
 DocType: C-Form,I,jaz
 DocType: Company,Asset Depreciation Cost Center,Asset Center Amortizacija Stroški
 DocType: Sales Order Item,Sales Order Date,Datum Naročila Kupca
@@ -3072,19 +3071,18 @@
 DocType: Vehicle,Insurance Details,zavarovanje Podrobnosti
 DocType: Account,Payable,Plačljivo
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vnesite roki odplačevanja
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dolžniki ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dolžniki ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nove stranke
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto dobiček %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Potrditev Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto znesek nakupa je obvezna
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto znesek nakupa je obvezna
 DocType: Lead,Address Desc,Naslov opis izdelka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je obvezen
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Ime temo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Mora biti izbran Atleast eden prodaji ali nakupu
-DocType: Grading Structure,Grade Intervals,grade intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Izberite naravo vašega podjetja.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kjer so proizvodni postopki.
 DocType: Asset Movement,Source Warehouse,Vir Skladišče
@@ -3113,6 +3111,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
 DocType: Territory,Territory Targets,Territory cilji
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},"Prosim, nastavite privzeto {0} v družbi {1}"
 DocType: Cheque Print Template,Starting position from top edge,Začetni položaj od zgornjega roba
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Enako dobavitelj je bila vpisana večkrat
@@ -3166,7 +3165,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Preureditev Kol
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Razpisana delovna
 DocType: Company,Stock Adjustment Account,Račun prilagoditev zaloge
-DocType: Journal Entry,Write Off,Odpisati
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpisati
 DocType: Timesheet Detail,Operation ID,Operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem uporabniku (login) ID. Če je nastavljeno, bo postala privzeta za vse oblike HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Od {1}
@@ -3177,8 +3176,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavitelj zagotavlja naročniku
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ni na zalogi
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Naslednji datum mora biti večja od Napotitev Datum
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Prikaži davek break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz in izvoz podatkov
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","vpisi zaloge obstajajo proti Warehouse {0}, zato ga ne more ponovno dodeliti ali jo spremeni"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Najdeno študenti
@@ -3190,14 +3189,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
 DocType: Program Enrollment,School House,šola House
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Izberite Citati
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Izberite Citati
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Naredite Maintenance obisk
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Izberite Citati
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Izberite Citati
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Naredite Maintenance obisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
 DocType: Company,Default Cash Account,Privzeti gotovinski račun
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ta temelji na prisotnosti tega Študent
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Ni Študenti
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodajte več predmetov ali odprto popolno obliko
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
@@ -3244,9 +3244,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pred uskladitvijo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Davki in dajatve na dodano vrednost (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
 DocType: Sales Order,Partly Billed,Delno zaračunavajo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Točka {0} mora biti osnovno sredstvo postavka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Točka {0} mora biti osnovno sredstvo postavka
 DocType: Item,Default BOM,Privzeto BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Skupaj Izjemna Amt
@@ -3269,7 +3269,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
 DocType: Purchase Invoice Item,Rate,Vrednost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,naslov Ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,naslov Ime
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Koda ocena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Osnovni
@@ -3294,7 +3294,7 @@
 DocType: Purchase Invoice,Print Language,Jezik tiskanja
 DocType: Salary Slip,Total Working Hours,Skupaj Delovni čas
 DocType: Stock Entry,Including items for sub assemblies,"Vključno s postavkami, za sklope"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Vnesite vrednost mora biti pozitivna
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Vnesite vrednost mora biti pozitivna
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Vse Territories
 DocType: Purchase Invoice,Items,Predmeti
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Študent je že vpisan.
@@ -3314,17 +3314,15 @@
 DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od in Do datumov zahtevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
 DocType: Assessment Plan,Supervisor Name,Ime nadzornik
 DocType: Program Enrollment Course,Program Enrollment Course,Program Vpis tečaj
 DocType: Program Enrollment Course,Program Enrollment Course,Program Vpis tečaj
-DocType: Grading Structure,Grading Structure,razvrščanje Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
 DocType: Tax Rule,Shipping City,Dostava Mesto
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ta postavka je varianta {0} (Template). Atributi bodo kopirali več iz predloge, če je nastavljen &quot;Ne Kopiraj«"
 DocType: Notification Control,Customize the Notification,Prilagodite Obvestilo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Denarni tok iz poslovanja
 DocType: Sales Invoice,Shipping Rule,Pravilo za dostavo
@@ -3347,6 +3345,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Pričetek mora biti pred Zapiranje Datum
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja vrsto za udeležbi preko Nastavitve&gt; oštevilčevanje Series
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v knjigo terjatev
 DocType: Department,Days for which Holidays are blocked for this department.,"Dni, za katere so Holidays blokirana za ta oddelek."
@@ -3375,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
 DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Ustvari zaposlencev zapisov
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Ustvari zaposlencev zapisov
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Skupaj Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,računovodski izkazi
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ura
@@ -3390,8 +3389,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Prodajno mesto
 DocType: Payment Entry,Received Amount,prejela znesek
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Ustvarjanje za polno količino, ignoriranje količino že po naročilu"
 DocType: Account,Tax,Davčna
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ne Označeno
@@ -3404,7 +3401,7 @@
 DocType: Batch,Source Document Name,Vir Ime dokumenta
 DocType: Batch,Source Document Name,Vir Ime dokumenta
 DocType: Job Opening,Job Title,Job Naslov
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Ustvari uporabnike
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Ustvari uporabnike
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Obiščite poročilo za vzdrževalna klic.
@@ -3415,8 +3412,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
 DocType: BOM,Website Description,Spletna stran Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto sprememba v kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,prejem
 ,Sales Register,Prodaja Register
@@ -3427,16 +3424,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
 DocType: Customer Group,Customer Group Name,Skupina Ime stranke
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ni še nobene stranke!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izkaz denarnih tokov
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu"
 DocType: GL Entry,Against Voucher Type,Proti bon Type
 DocType: Item,Attributes,Atributi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Vnesite račun za odpis
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnja Datum naročila
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Udeležba za več zaposlenih
@@ -3461,14 +3460,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Vrstica {0} # računa mora biti tipa &quot;osnovno sredstvo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kol
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija je obvezna
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija je obvezna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finančne storitve
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Vrste dejavnosti za Čas Dnevniki
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
 DocType: Training Event,Exam,Izpit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Država za zaračunavanje
@@ -3501,7 +3500,7 @@
 DocType: Payment Entry,Account Paid From,Račun se plača iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Oznaka
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Naredite Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Naredite Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tiskanje in Pisalne
 DocType: Stock Settings,Show Barcode Field,Prikaži Barcode Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Pošlji Dobavitelj e-pošte
@@ -3517,6 +3516,7 @@
 DocType: Offer Letter,Awaiting Response,Čakanje na odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Nad
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Omemba če nestandardni plača račun
 DocType: Salary Slip,Earning & Deduction,Zaslužek &amp; Odbitek
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
@@ -3553,7 +3553,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dobili študenti iz
 DocType: Hub Settings,Seller Country,Prodajalec Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite elementov na spletni strani
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Skupina učenci v serijah
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Skupina učenci v serijah
 DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Pogoji in Podrobnosti
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Tehnični podatki
@@ -3613,7 +3613,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Poskusno delo
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,komponente plače
 DocType: Program Enrollment Tool,New Academic Year,Novo študijsko leto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Nazaj / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Nazaj / dobropis
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Skupaj Plačan znesek
 DocType: Production Order Item,Transferred Qty,Prenese Kol
@@ -3654,6 +3654,7 @@
 ,Sales Funnel,Prodaja toka
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Kratica je obvezna
 DocType: Project,Task Progress,naloga Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Košarica
 ,Qty to Transfer,Količina Prenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponudbe za interesente ali stranke.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
@@ -3687,7 +3688,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,zbiranje pristojbine
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
 DocType: Lead,Add to calendar on this date,Dodaj v koledar na ta dan
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave.
 DocType: Item,Opening Stock,Začetna zaloga
@@ -3705,7 +3706,7 @@
 DocType: Customer,From Lead,Iz ponudbe
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Naročila sprosti za proizvodnjo.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Program Enrollment Tool,Enroll Students,včlanite Študenti
 DocType: Hub Settings,Name Token,Ime Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna Prodaja
@@ -3716,7 +3717,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} za račun {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Ime projekta
-DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
+DocType: Customer,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
 DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek
 DocType: Production Order,Required Items,Zahtevani Točke
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Razlika
@@ -3747,6 +3748,7 @@
 DocType: Item,Taxes,Davki
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Plačana in ni podal
 DocType: Project,Default Cost Center,Privzet Stroškovni Center
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavite Poimenovanje serijsko {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series
 DocType: Bank Guarantee,End Date,Končni datum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Zaloga Transakcije
 DocType: Budget,Budget Accounts,Proračun računi
@@ -3811,7 +3813,7 @@
 DocType: Customer,Sales Partner and Commission,Prodaja Partner in Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Obrestna mera (%) / leto
 ,Project Quantity,projekt Količina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli stroškov na osnovi&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli stroškov na osnovi&quot;"
 DocType: Opportunity,To Discuss,Razpravljati
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enote {1} potrebno {2} za dokončanje te transakcije.
 DocType: Loan Type,Rate of Interest (%) Yearly,Obrestna mera (%) Letna
@@ -3834,7 +3836,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsoten
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Vrstica {0}: Valuta BOM # {1} mora biti enaka izbrani valuti {2}
 DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet management
@@ -3851,7 +3853,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Skladišče {0} ne obstaja
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracija Za ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mesečni Distribucijski Odstotki
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopnja Vrednotenje nismo našli v postavki {0}, ki mora opraviti vknjižbe besede {1} {2}. Če je element transakcijah kot element vzorca v {1}, se omenja, da v {1} Element tabeli. V nasprotnem primeru, ustvarite dohodni transakcijo zaloge za postavko ali omembe stopnji vrednotenja v evidenco Element, nato poskusite submiting / preklic ta vnos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materialov podal proti tej dobavnici
 DocType: Project,Customer Details,Podrobnosti strank
@@ -3868,7 +3870,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Predložene naročila ni mogoče izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu je že ""bremenitev"", ni dovoljeno nastaviti ""Stanje mora biti"" kot ""kredit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Upravljanje kakovosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Točka {0} je bila onemogočena
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Točka {0} je bila onemogočena
 DocType: Employee Loan,Repay Fixed Amount per Period,Povrne fiksni znesek na obdobje
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vnesite količino za postavko {0}
 DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina
@@ -3895,7 +3897,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Študent Email ID
 DocType: Employee,Notice (days),Obvestilo (dni)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Izberite predmete, da shranite račun"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,"Izberite predmete, da shranite račun"
 DocType: Employee,Encashment Date,Vnovčevanje Datum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Prilagoditev zaloge
@@ -3929,6 +3931,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Opomin Izdano
 DocType: Production Order,Warehouses,Skladišča
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} sredstev ni mogoče prenesti
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ta element je različica {0} (predloga).
 DocType: Workstation,per hour,na uro
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 DocType: Announcement,Announcement,Obvestilo
@@ -3944,7 +3947,7 @@
 DocType: Account,Receivable,Terjatev
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Izberite artikel v Izdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Izberite artikel v Izdelava
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Prodajalec Opis
@@ -3957,7 +3960,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno
 DocType: Salary Detail,Component,Komponenta
 DocType: Assessment Criteria,Assessment Criteria Group,Skupina Merila ocenjevanja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Odpiranje nabrano amortizacijo sme biti manjša od enako {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Odpiranje nabrano amortizacijo sme biti manjša od enako {0}
 DocType: Warehouse,Warehouse Name,Skladišče Name
 DocType: Naming Series,Select Transaction,Izberite Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vnesite Odobritev vloge ali Potrditev uporabnika
@@ -3992,7 +3995,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na &quot;Set as Default&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pridruži se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Employee Loan,Repay from Salary,Poplačilo iz Plača
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Zahteva plačilo pred {0} {1} za znesek {2}
@@ -4010,7 +4013,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Ocena Rezultat Podrobnosti
 DocType: Employee Education,Employee Education,Izobraževanje delavec
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dvojnik postavka skupina je našla v tabeli točka skupine
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
 DocType: Salary Slip,Net Pay,Neto plača
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijska št {0} je že prejela
@@ -4019,7 +4022,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Skladišče {0} ni povezano z nobenim računom, ustvarite / povezati ustrezne račun (sredstev) za skladišče."
 DocType: Purchase Invoice,Recurring Id,Ponavljajoči Id
 DocType: Customer,Sales Team Details,Sales Team Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Izbriši trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Izbriši trajno?
 DocType: Expense Claim,Total Claimed Amount,Skupaj zahtevani znesek
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencialne možnosti za prodajo.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neveljavna {0}
@@ -4030,13 +4033,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup vaš šola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Osnovna Sprememba Znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Shranite dokument na prvem mestu.
 DocType: Account,Chargeable,Obračuna
 DocType: Company,Change Abbreviation,Spremeni kratico
 DocType: Expense Claim Detail,Expense Date,Expense Datum
 DocType: Item,Max Discount (%),Max Popust (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Zadnja naročite Znesek
+DocType: Task,Is Milestone,je Milestone
 DocType: Daily Work Summary,Email Sent To,E-pošta poslana
 DocType: Budget,Warn,Opozori
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah."
@@ -4069,11 +4073,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zamrzni zaloge starejše od` mora biti manjša od %d dni.
 DocType: Tax Rule,Purchase Tax Template,Nakup Davčna Template
 ,Project wise Stock Tracking,Projekt pametno Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Obstaja vzdrževanje Urnik {0} proti {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Dejanska Količina (pri viru / cilju)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidence zaposlenih.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
 DocType: HR Settings,Payroll Settings,Nastavitve plače
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Naročiti
@@ -4096,7 +4099,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čeki in depoziti nepravilno izbil
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš dodeliti samega sebe kot matični račun
 DocType: Purchase Invoice Item,Price List Rate,Cenik Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Ustvari ponudbe kupcev
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Ustvari ponudbe kupcev
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokaži &quot;Na zalogi&quot; ali &quot;Ni na zalogi&quot;, ki temelji na zalogi na voljo v tem skladišču."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Kosovnica (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Povprečen čas, ki ga dobavitelj dostaviti"
@@ -4118,7 +4121,7 @@
 DocType: Asset,Disposal Date,odstranjevanje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pošta bo poslana vsem aktivnih zaposlenih v družbi na določeni uri, če nimajo počitnic. Povzetek odgovorov bo poslano ob polnoči."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Predlogi za usposabljanje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
@@ -4126,7 +4129,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Seveda je obvezna v vrsti {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danes ne more biti pred od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Uredi Cene
 DocType: Batch,Parent Batch,nadrejena Serija
 DocType: Batch,Parent Batch,nadrejena Serija
 DocType: Cheque Print Template,Cheque Print Template,Ček Print Predloga
@@ -4171,7 +4174,7 @@
 DocType: Item,Variant Based On,"Varianta, ki temelji na"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaše Dobavitelji
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
 DocType: Request for Quotation Item,Supplier Part No,Šifra dela dobavitelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vaulation in Total&quot;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Prejela od
@@ -4181,7 +4184,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} za {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Vrstica {0}: Ure vrednost mora biti večja od nič.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
 DocType: Issue,Content Type,Vrsta vsebine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
@@ -4190,20 +4193,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite neusklajene vnose
 DocType: Payment Reconciliation,From Invoice Date,Od Datum računa
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,valuta za zaračunavanje mora biti enaka bodisi privzeti comapany v valuti ali stranka računa valuto
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,valuta za zaračunavanje mora biti enaka bodisi privzeti comapany v valuti ali stranka računa valuto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,pustite Vnovčevanje
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Kaj to naredi?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladišča
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Vse Študentski Sprejemi
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
 DocType: School House,House Name,Ime House
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Posodobite dodatnih stroškov za izračun iztovori stroške predmetov
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Električno
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte preostanek organizacije kot uporabnike. Dodate lahko tudi povabi stranke na vašem portalu jih dodate iz imenika
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte preostanek organizacije kot uporabnike. Dodate lahko tudi povabi stranke na vašem portalu jih dodate iz imenika
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID uporabnika ni nastavljena za Employee {0}
@@ -4212,7 +4215,7 @@
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od zadnjega naročila
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Buying Settings,Naming Series,Poimenovanje zaporedja
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum zavarovanje Začetek sme biti manjša od datuma zavarovanje End
@@ -4227,7 +4230,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Plača Slip delavca {0} že ustvarili za časa stanja {1}
 DocType: Vehicle Log,Odometer,števec kilometrov
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče {0}"
@@ -4240,7 +4243,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,zaračunavanje storitev ure
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Privzeti BOM za {0} ni bilo mogoče najti
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Dotaknite predmete, da jih dodate tukaj"
 DocType: Fees,Program Enrollment,Program Vpis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Prosim, nastavite {0}"
@@ -4341,7 +4345,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
 DocType: Issue,First Responded On,Najprej odgovorila
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah
-DocType: Grade Interval,Grade Interval,razred Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna Leto Start Date in fiskalno leto End Date so že določeni v proračunskem letu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Potrditev Datum posodobljeni
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Serija
@@ -4350,6 +4353,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Prenos PDF
 DocType: Production Order,Planned End Date,Načrtovan End Date
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Če so predmeti shranjeni.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 DocType: Request for Quotation,Supplier Detail,Dobavitelj Podrobnosti
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Napaka v formuli ali stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Obračunani znesek
@@ -4394,7 +4398,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Nastavitev preprosto spletno stran za svojo organizacijo
 DocType: Payment Reconciliation,Receivable / Payable Account,Terjatve / plačljivo račun
 DocType: Delivery Note Item,Against Sales Order Item,Proti Sales Order Postavka
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vnesite stroškovno mesto matično
@@ -4453,7 +4457,7 @@
 ,Items To Be Requested,"Predmeti, ki bodo zahtevana"
 DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Company,Company Info,Informacije o podjetju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Izberite ali dodati novo stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Izberite ali dodati novo stranko
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Stroškovno mesto je potrebno rezervirati odhodek zahtevek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ta temelji na prisotnosti tega zaposlenega
@@ -4466,13 +4470,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop uporabnike iz česar dopusta aplikacij na naslednjih dneh.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Znesek nakupa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Konec leta ne more biti pred začetkom leta
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Konec leta ne more biti pred začetkom leta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Zaslužki zaposlencev
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Production Order,Manufactured Qty,Izdelano Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Nastavite privzeto Hiša List za zaposlenega {0} ali podjetja {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne obstaja
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ne obstaja
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Računi zbrana strankam.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
@@ -4481,15 +4485,17 @@
 DocType: Quality Inspection Reading,Reading 3,Branje 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bon Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Employee Loan Application,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Cenitev {0} ustvarjena za Employee {1} v določenem časovnem obdobju
 DocType: Employee,Education,Izobraževanje
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje akcija Z
 DocType: Employee,Current Address Is,Trenutni Naslov je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,spremenjene
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Neobvezno. Nastavi privzeto valuto družbe, če ni določeno."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Vpisi računovodstvo lista.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
@@ -4526,7 +4532,7 @@
 DocType: Hub Settings,Hub Settings,Nastavitve Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Pri poslovanju
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
 DocType: Asset,Is Existing Asset,Je obstoječemu sredstvu
 DocType: Salary Detail,Statistical Component,Statistični Komponenta
 DocType: Salary Detail,Statistical Component,Statistični Komponenta
@@ -4582,7 +4588,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Priložite Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Zaloga Ravni
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Naredite Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacije blok dopustu oddelka.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Plačilo Tip mora biti eden od Prejemanje, plačati in notranji prenos"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4595,6 +4601,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Dovoli Proizvodnja na počitnicah
 DocType: Sales Order,Customer's Purchase Order Date,Stranke Naročilo Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Osnovni kapital
+DocType: Shopping Cart Settings,Show Public Attachments,Prikaži Javna Priključki
 DocType: Packing Slip,Package Weight Details,Paket Teža Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Plačilo Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po zaključku plačila preusmeri uporabnika na izbrano stran.
@@ -4619,7 +4626,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne kažejo vsak simbol, kot $ itd zraven valute."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Naj Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Naj Student Batch
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Pridobi artikle iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
@@ -4638,8 +4645,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek
 DocType: GL Entry,Is Opening,Je Odpiranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja vrsto za udeležbi preko Nastavitve&gt; oštevilčevanje Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja vrsto za udeležbi preko Nastavitve&gt; oštevilčevanje Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Račun {0} ne obstaja
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za spletne strani in drugih publikacij.
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 7d38d89..bb0a811 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Item Status skadimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Draft Bank
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Shfaq Variantet
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Shfaq Variantet
 DocType: Academic Term,Academic Term,Term akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Sasi
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kujdes shëndetësor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vonesa në pagesa (ditë)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,shpenzimeve të shërbimit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Viti Fiskal {0} është e nevojshme
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamat
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Njëjta kompani është futur më shumë se një herë
 DocType: Employee,Married,I martuar
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nuk lejohet për {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nuk lejohet për {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Të marrë sendet nga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi Setup punonjës Emërtimi Sistemit në Burimeve Njerëzore&gt; Cilësimet HR
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nuk ka artikuj të listuara
 DocType: Payment Reconciliation,Reconcile,Pajtojë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Ushqimore
 DocType: Quality Inspection Reading,Reading 1,Leximi 1
 DocType: Process Payroll,Make Bank Entry,Bëni Banka Hyrja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondet pensionale
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Zhvlerësimi Date tjetër nuk mund të jetë më parë data e blerjes
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Zhvlerësimi Date tjetër nuk mund të jetë më parë data e blerjes
 DocType: SMS Center,All Sales Person,Të gjitha Person Sales
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Shpërndarja mujore ** ju ndihmon të shpërndani Buxhetore / Target gjithë muaj nëse keni sezonalitetit në biznesin tuaj.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nuk sende gjetur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Nuk sende gjetur
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktura Paga Missing
 DocType: Lead,Person Name,Emri personi
 DocType: Sales Invoice Item,Sales Invoice Item,Item Shitjet Faturë
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",p.sh. &quot;Shkolla fillore&quot; ose &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Raportet
 DocType: Warehouse,Warehouse Detail,Magazina Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term End Date nuk mund të jetë më vonë se Data Year fund të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;A është e aseteve fikse&quot; nuk mund të jetë e pakontrolluar, pasi ekziston rekord Pasurive ndaj artikullit"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;A është e aseteve fikse&quot; nuk mund të jetë e pakontrolluar, pasi ekziston rekord Pasurive ndaj artikullit"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Lloji Tatimore
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Ju nuk jeni i autorizuar për të shtuar ose shënimet e para përditësim {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (nëse nuk Slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Ekziston një klient me të njëjtin emër
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ore Rate / 60) * aktuale Operacioni Koha
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Zgjidh BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Zgjidh BOM
 DocType: SMS Log,SMS Log,SMS Identifikohu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostoja e Artikujve dorëzohet
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Festa në {0} nuk është në mes Nga Data dhe To Date
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Gradë
 DocType: Sales Invoice Item,Delivered By Supplier,Dorëzuar nga furnizuesi
 DocType: SMS Center,All Contact,Të gjitha Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Rendit prodhimi krijuar tashmë për të gjitha sendet me bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Rendit prodhimi krijuar tashmë për të gjitha sendet me bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Paga vjetore
 DocType: Daily Work Summary,Daily Work Summary,Daily Përmbledhje Work
 DocType: Period Closing Voucher,Closing Fiscal Year,Mbyllja e Vitit Fiskal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} është e ngrirë
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} është e ngrirë
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Ju lutem, përzgjidhni kompanie ekzistuese për krijimin Skemën e Kontabilitetit"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Shpenzimet
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Zgjidhni Target Magazina
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra Hyrja
 DocType: Journal Entry Account,Credit in Company Currency,Kreditit në kompanisë Valuta
 DocType: Delivery Note,Installation Status,Instalimi Statusi
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",A doni për të rinovuar pjesëmarrjen? <br> Prezent: {0} \ <br> Mungon: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Furnizimit të lëndëve të para për Blerje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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ë.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,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: Products Settings,Show Products as a List,Shfaq Produkte si një Lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Shkarko template, plotësoni të dhënat e duhura dhe të bashkëngjitni e tanishëm. Të gjitha datat dhe punonjës kombinim në periudhën e zgjedhur do të vijë në template, me të dhënat ekzistuese frekuentimit"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Bëni Amortizimi Hyrja
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Kërkesë Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,bëni punonjës
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,bëni punonjës
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmetimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Ekzekutim
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detajet e operacioneve të kryera.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plani për vizita të mirëmbajtjes.
 DocType: SMS Settings,Enter url parameter for message,Shkruani parametër url per mesazhin
 DocType: POS Profile,Customer Groups,Grupet e konsumatorëve
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Pasqyrat financiare
 DocType: Guardian,Students,studentët
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Rregullat për aplikimin e çmimeve dhe zbritje.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista çmimi duhet të jetë i zbatueshëm për blerjen ose shitjen e
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Seria për këtë transaksion
 DocType: Company,Default Payroll Payable Account,Default Payroll Llogaria e pagueshme
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Është Hapja Hyrja
 DocType: Customer Group,Mention if non-standard receivable account applicable,Përmend në qoftë se jo-standarde llogari të arkëtueshme të zbatueshme
 DocType: Course Schedule,Instructor Name,instruktor Emri
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Kundër Item Shitjet Faturë
 ,Production Orders in Progress,Urdhërat e prodhimit në Progres
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Paraja neto nga Financimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
 DocType: Lead,Address & Contact,Adresa &amp; Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Shtoni gjethe të papërdorura nga alokimet e mëparshme
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Kostoja Shuma (via Koha Sheet)
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Banka Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Publikojë në Hub
 DocType: Student Admission,Student Admission,Pranimi Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Item {0} është anuluar
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 DocType: Item,Purchase Details,Detajet Blerje
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Njoftojë me email për krijimin e kërkesës automatike materiale
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Lloji Faturë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Ofrimit Shënim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Ofrimit Shënim
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostoja e asetit të shitur
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Pagesa Hyrja është ndryshuar, pasi që ju nxorrën atë. Ju lutemi të tërheqë atë përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
-DocType: Grade Interval,Min Score,Min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
 DocType: Student Applicant,Admitted,pranuar
 DocType: Workstation,Rent Cost,Qira Kosto
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Vlera Order
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash transaksionet kundër partisë apo për transferimin e brendshëm
 DocType: Shipping Rule,Valid for Countries,I vlefshëm për vendet
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ky artikull është një Template dhe nuk mund të përdoret në transaksionet. Atribute pika do të kopjohet gjatë në variantet nëse nuk është vendosur &quot;Jo Copy &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ky artikull është një Template dhe nuk mund të përdoret në transaksionet. Atribute pika do të kopjohet gjatë në variantet nëse nuk është vendosur &quot;Jo Copy &#39;
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Rendit Gjithsej konsideruar
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ju lutemi shkruani &#39;Përsëriteni në Ditën e Muajit &quot;në terren vlerë
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} në {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Zgjidh Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert për të jo-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (shumë) e një artikulli.
 DocType: C-Form Invoice Detail,Invoice Date,Data e faturës
 DocType: GL Entry,Debit Amount,Shuma Debi
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Krijo Grupet Student
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Kërkesa për kuotim
 DocType: Salary Slip Timesheet,Working Hours,Orari i punës
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Krijo një klient i ri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Krijo një klient i ri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nëse Rregullat shumta Çmimeve të vazhdojë të mbizotërojë, përdoruesit janë të kërkohet për të vendosur përparësi dorë për të zgjidhur konfliktin."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Krijo urdhëron Blerje
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Krijo urdhëron Blerje
 ,Purchase Register,Blerje Regjistrohu
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Akuzat e aplikueshme
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mjeshtër pushime.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Nga Paketa nr
 DocType: Item Attribute,To Range,Në rang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Të letrave me vlerë dhe depozita
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nuk mund të ndryshojë metodën e vlerësimit, pasi ka transaksione kundër disa artikuj që nuk kanë se është metodë e vlerësimit"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Gjithsej lë alokuara është i detyrueshëm
 DocType: Job Opening,Description of a Job Opening,Përshkrimi i një Hapja Job
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivitetet në pritje për sot
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
 DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,blej
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ju lutemi të përcaktuar klasën për Prag 0%
 DocType: Sales Order,To Deliver,Për të ofruar
 DocType: Purchase Invoice Item,Item,Artikull
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Menaxhimi Nënkontraktimi
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 DocType: Production Plan Item,Pending Qty,Në pritje Qty
 DocType: Budget,Ignore,Injoroj
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nuk është aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nuk është aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS dërguar në numrat e mëposhtëm: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Dimensionet kontrolloni Setup për printim
 DocType: Salary Slip,Salary Slip Timesheet,Paga Slip pasqyrë e mungesave
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Komisioni i përgjithshëm
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Pranimi Blerje kërkuar
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vlerësimi Vlerësoni është i detyrueshëm në qoftë Hapja Stock hyrë
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Vlerësimi Vlerësoni është i detyrueshëm në qoftë Hapja Stock hyrë
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Vlerat e akumuluara
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Bëni Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Bëni Sales Order
 DocType: Project Task,Project Task,Projekti Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumatorët të përsëritur
 DocType: Leave Control Panel,Allocate,Alokimi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Shitjet Kthehu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Shënim: gjethet total alokuara {0} nuk duhet të jetë më pak se gjethet e miratuara tashmë {1} për periudhën
 DocType: Announcement,Posted By,postuar Nga
 DocType: Item,Delivered by Supplier (Drop Ship),Dorëzuar nga Furnizuesi (Drop Ship)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ju lutemi të vendosur Kompaninë
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ju lutemi të vendosur Kompaninë
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Fatura pasqyrë e mungesave
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenca Nuk &amp; Referenca Data është e nevojshme për {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Zgjidhni Pagesa Llogaria për të bërë Banka Hyrja
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Krijo dhënat e punonjësve për të menaxhuar gjethe, pretendimet e shpenzimeve dhe pagave"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Krijo dhënat e punonjësve për të menaxhuar gjethe, pretendimet e shpenzimeve dhe pagave"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Shtoje te Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Propozimi Shkrimi
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagesa Zbritja Hyrja
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Raporti me Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menaxher
 DocType: Payment Entry,Payment From / To,Pagesa nga /
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Data Gama
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Kufiri i ri i kredisë është më pak se shuma aktuale të papaguar për konsumatorin. kufiri i kreditit duhet të jetë atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Kufiri i ri i kredisë është më pak se shuma aktuale të papaguar për konsumatorin. kufiri i kreditit duhet të jetë atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
 DocType: SMS Settings,Receiver Parameter,Marresit Parametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Bazuar Në &#39;dhe&#39; Grupit nga &#39;nuk mund të jetë e njëjtë
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,Rezoluta Data
 DocType: Student Batch Name,Batch Name,Batch Emri
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Pasqyrë e mungesave krijuar:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,regjistroj
 DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Do të tregojë nxënësin si të pranishme në Student Raporti mujor Pjesëmarrja
@@ -720,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,Pjesëmarrja Student
 DocType: Sales Invoice Timesheet,Time Sheet,Koha Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush të lëndëve të para në bazë të
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ju lutem shkruani të dhënat pika
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ju lutem shkruani të dhënat pika
 DocType: Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales para
 DocType: Purchase Receipt,Other Details,Detaje të tjera
@@ -738,7 +741,7 @@
 ,Absent Student Report,Mungon Raporti Student
 DocType: Email Digest,Next email will be sent on:,Email ardhshëm do të dërgohet në:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Letër Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item ka variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nuk u gjet
 DocType: Bin,Stock Value,Stock Vlera
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Kompania {0} nuk ekziston
@@ -747,8 +750,6 @@
 DocType: Serial No,Warranty Expiry Date,Garanci Data e skadimit
 DocType: Material Request Item,Quantity and Warehouse,Sasia dhe Magazina
 DocType: Sales Invoice,Commission Rate (%),Vlerësoni komision (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Ju lutem, përzgjidhni Program"
 DocType: Project,Estimated Cost,Kostoja e vlerësuar
 DocType: Purchase Order,Link to material requests,Link të kërkesave materiale
@@ -766,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nuk është një gjendje Item
 DocType: Mode of Payment Account,Default Account,Gabim Llogaria
 DocType: Payment Entry,Received Amount (Company Currency),Shuma e marrë (Company Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Ju lutem, përzgjidhni ditë javore jashtë"
 DocType: Production Order Operation,Planned End Time,Planifikuar Fundi Koha
 ,Sales Person Target Variance Item Group-Wise,Sales Person i synuar Varianca Item Grupi i urti
@@ -830,7 +831,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Lista e Çmimeve nuk zgjidhet
 DocType: Employee,Family Background,Historiku i familjes
 DocType: Request for Quotation Supplier,Send Email,Dërgo Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nuk ka leje
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
@@ -843,7 +844,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Asnjë punonjës gjetur
 DocType: Supplier Quotation,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupi Student është përditësuar tashmë.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupi Student është përditësuar tashmë.
 DocType: SMS Center,All Customer Contact,Të gjitha Customer Kontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Ngarko ekuilibër aksioneve nëpërmjet CSV.
 DocType: Warehouse,Tree Details,Tree Details
@@ -854,8 +855,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Shuma minimale Faturë
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Qendra Kosto {2} nuk i përkasin kompanisë {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Llogaria {2} nuk mund të jetë një grup
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {} {DOCTYPE docname} nuk ekziston në më sipër &#39;{DOCTYPE}&#39; tabelë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {} {DOCTYPE docname} nuk ekziston në më sipër &#39;{DOCTYPE}&#39; tabelë
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nuk ka detyrat
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin fatura auto do të gjenerohet p.sh. 05, 28 etj"
 DocType: Asset,Opening Accumulated Depreciation,Hapja amortizimi i akumuluar
@@ -871,7 +872,7 @@
 DocType: Bin,Moving Average Rate,Moving norma mesatare
 DocType: Production Planning Tool,Select Items,Zgjidhni Items
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Orari i kursit
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Orari i kursit
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: HR Settings,Enter retirement age in years,Shkruani moshën e pensionit në vitet
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Magazina
@@ -879,7 +880,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Të gjitha Item Grupet
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Të gjitha Item Grupet
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Fitimi neto / Humbja
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
@@ -890,7 +891,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Blerje Rendit për Pagesa
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Hapja&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Hapur për të bërë
 DocType: Notification Control,Delivery Note Message,Ofrimit Shënim Mesazh
@@ -906,7 +907,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Rendit Qty
 DocType: Leave Block List Date,Leave Block List Date,Dërgo Block Lista Data
 DocType: Pricing Rule,Price or Discount,Çmimi ose Discount
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Akuzat totale të zbatueshme në Blerje tryezë Receipt artikujt duhet të jetë i njëjtë si Total taksat dhe tarifat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Akuzat totale të zbatueshme në Blerje tryezë Receipt artikujt duhet të jetë i njëjtë si Total taksat dhe tarifat
 DocType: Sales Team,Incentives,Nxitjet
 DocType: SMS Log,Requested Numbers,Numrat kërkuara
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vetëm Merrni lëndëve të para
@@ -964,8 +965,7 @@
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Fee Structure,Components,komponentet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
@@ -1017,8 +1017,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimik
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Llogaria bankare / Cash do të rifreskohet automatikisht në Paga Journal hyrjes kur ky modalitet zgjidhet.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervalet për Kodi klasës {0} përputhet me intervale të klasës për klasat e tjera. Ju lutem kontrolloni intervale {0} dhe {1} dhe provoni përsëri
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Kosto (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: norma nuk mund të jetë më e madhe se norma e përdorur në {1} {2}
@@ -1031,7 +1029,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
 DocType: Timesheet Detail,Bill,Fature
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Zhvlerësimi Date tjetër është futur si datë të fundit
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Zhvlerësimi Date tjetër është futur si datë të fundit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,E bardhë
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty nuk është në dispozicion për {4} në depo {1} të postimi kohën e hyrjes ({2} {3})
@@ -1046,7 +1044,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Rendit Lloji duhet të jetë një nga {0}
 DocType: Lead,Next Contact Date,Tjetër Kontakt Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Hapja Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
 DocType: Student Batch Name,Student Batch Name,Student Batch Emri
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
 DocType: Repayment Schedule,Balance Loan Amount,Bilanci Shuma e Kredisë
@@ -1066,10 +1064,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Ju lutem specifikoni një {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
 DocType: Delivery Note,Delivery To,Ofrimit të
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Planning Tool,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nuk mund të jetë negative
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Zbritje
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Zbritje
 DocType: Asset,Total Number of Depreciations,Numri i përgjithshëm i nënçmime
 DocType: Sales Invoice Item,Rate With Margin,Shkalla me diferencë
 DocType: Sales Invoice Item,Rate With Margin,Shkalla me diferencë
@@ -1098,7 +1096,7 @@
 DocType: Lead,Organization Name,Emri i Organizatës
 DocType: Tax Rule,Shipping State,Shteti Shipping
 ,Projected Quantity as Source,Sasia e parashikuar si Burimi
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Item duhet të shtohen duke përdorur &#39;të marrë sendet nga blerjen Pranimet&#39; button
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Item duhet të shtohen duke përdorur &#39;të marrë sendet nga blerjen Pranimet&#39; button
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Përfshijnë zëra jo-aksioneve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Shitjet Shpenzimet
@@ -1106,7 +1104,7 @@
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kodi Postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Kodi Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} është {1}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Marrja e aksioneve Entries
@@ -1150,7 +1148,7 @@
 DocType: Sales Partner,Distributor,Shpërndarës
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shporta Transporti Rregulla
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 DocType: Global Defaults,Global Defaults,Defaults Global
@@ -1185,11 +1183,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Ju lutemi shkruani kodin Item për të marrë Numri i Serisë
 DocType: Stock Settings,Default Item Group,Gabim Item Grupi
 DocType: Employee Loan,Partially Disbursed,lëvrohet pjesërisht
-DocType: Grading Structure,Grading System Name,Emri Nota Sistemit
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Bazës së të dhënave Furnizuesi.
 DocType: Account,Balance Sheet,Bilanci i gjendjes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode pagesa nuk është i konfiguruar. Ju lutem kontrolloni, nëse llogaria është vendosur në Mode të pagesave ose në POS Profilin."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode pagesa nuk është i konfiguruar. Ju lutem kontrolloni, nëse llogaria është vendosur në Mode të pagesave ose në POS Profilin."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Personi i shitjes juaj do të merrni një kujtesë në këtë datë të kontaktoni klientin
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Same artikull nuk mund të futen shumë herë.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Llogaritë e mëtejshme mund të bëhen në bazë të grupeve, por hyra mund të bëhet kundër jo-grupeve"
@@ -1228,11 +1225,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Punën e bërë
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ju lutem specifikoni të paktën një atribut në tabelë Atributet
 DocType: Announcement,All Students,Të gjitha Studentët
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} artikull duhet të jetë një element jo-aksioneve
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} artikull duhet të jetë një element jo-aksioneve
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Shiko Ledger
 DocType: Grading Scale,Intervals,intervalet
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Pjesa tjetër e botës
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
@@ -1273,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Faturat e papaguara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,urdhrat e blerjes t&#39;ju ndihmuar të planit dhe të ndjekin deri në blerjet tuaja
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,urdhrat e blerjes t&#39;ju ndihmuar të planit dhe të ndjekin deri në blerjet tuaja
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",totale sasia Çështja / Transfer {0} në materiale Kërkesë {1} \ nuk mund të jetë më e madhe se sasia e kërkuar {2} për pikën {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,I vogël
@@ -1298,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Produktet ose shërbimet tuaja
 DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
@@ -1316,7 +1313,7 @@
 DocType: Student Group Student,Group Roll Number,Grupi Roll Number
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total i të gjitha peshave duhet të jetë detyrë 1. Ju lutemi të rregulluar peshat e të gjitha detyrave të Projektit në përputhje me rrethanat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Pajisje kapitale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të &quot;Apliko në &#39;fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
@@ -1343,7 +1340,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} artikuj në progres
 DocType: Workstation,Workstation Name,Workstation Emri
-DocType: Grade Interval,Grade Code,Kodi Grade
+DocType: Grading Scale Interval,Grade Code,Kodi Grade
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
@@ -1360,7 +1357,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,përsëritur upto
 DocType: Attendance,HR Manager,Menaxher HR
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Ju lutem zgjidhni një Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Ju lutem zgjidhni një Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilegj Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizuesi Data e faturës
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Ju duhet të mundësojnë Shporta
@@ -1376,7 +1373,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Ushqim
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gama plakjen 3
 DocType: Maintenance Schedule Item,No of Visits,Nr i vizitave
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark FREKUENTIMI
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark FREKUENTIMI
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Mirëmbajtja Shtojca {0} ekziston kundër {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,studenti regjistrimit
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Monedhën e llogarisë Mbyllja duhet të jetë {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Shuma e pikëve për të gjitha qëllimet duhet të jetë 100. Kjo është {0}
@@ -1425,13 +1423,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Lista e Llogarive
 DocType: Material Request,Terms and Conditions Content,Termat dhe Kushtet Përmbajtja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
 DocType: Employee,Owned,Pronësi
 DocType: Salary Detail,Depends on Leave Without Pay,Varet në pushim pa pagesë
 DocType: Pricing Rule,"Higher the number, higher the priority","Më i lartë numri, më i lartë prioriteti"
 ,Purchase Invoice Trends,Blerje Trendet Faturë
 DocType: Employee,Better Prospects,Perspektivë më të mirë
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rresht # {0}: The batch {1} ka vetëm {2} Qty. Ju lutem zgjidhni një tjetër grumbull cila ka {3} Qty në dispozicion ose ndarë rresht në rreshta të shumta, për të ofruar / çështje nga tufa të shumta"
 DocType: Vehicle,License Plate,Targë
 DocType: Appraisal,Goals,Qëllimet
 DocType: Warranty Claim,Warranty / AMC Status,Garanci / AMC Statusi
@@ -1449,7 +1448,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Në qoftë se llogaria është e ngrirë, shënimet janë të lejuar për përdoruesit të kufizuara."
 DocType: Email Digest,Bank Balance,Bilanci bankë
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profili i punës, kualifikimet e nevojshme etj"
 DocType: Journal Entry Account,Account Balance,Bilanci i llogarisë
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Rregulla taksë për transaksionet.
@@ -1460,7 +1459,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Trego P &amp; L bilancet pambyllur vitit fiskal
 DocType: Shipping Rule,Shipping Account,Llogaria anijeve
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Llogaria {2} është joaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Bëni Sales urdhëron për të ndihmuar ju planifikoni punën tuaj dhe të japë në kohë
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Bëni Sales urdhëron për të ndihmuar ju planifikoni punën tuaj dhe të japë në kohë
 DocType: Quality Inspection,Readings,Lexime
 DocType: Stock Entry,Total Additional Costs,Gjithsej kosto shtesë
 DocType: Course Schedule,SH,SH
@@ -1471,7 +1470,7 @@
 DocType: Shipping Rule Condition,To Value,Të vlerës
 DocType: Asset Movement,Stock Manager,Stock Menaxher
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depo Burimi është i detyrueshëm për rresht {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Shqip Paketimi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Shqip Paketimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Zyra Qira
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS settings portë
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import dështoi!
@@ -1497,7 +1496,7 @@
 DocType: Sales Invoice,Source,Burim
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Shfaq të mbyllura
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategoria është i detyrueshëm për artikull Aseteve Fikse
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategoria është i detyrueshëm për artikull Aseteve Fikse
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Kjo {0} konfliktet me {1} për {2} {3}
 DocType: Student Attendance Tool,Students HTML,studentët HTML
@@ -1515,7 +1514,7 @@
 DocType: Student,Date of Leaving,Datën e largimit
 DocType: Pricing Rule,For Price List,Për listën e çmimeve
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Ekzekutiv Kërko
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Krijo kryeson
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Krijo kryeson
 DocType: Maintenance Schedule,Schedules,Oraret
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
@@ -1543,7 +1542,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Regjistrimet
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Detajet Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,depo Default është e nevojshme për pika të zgjedhura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,depo Default është e nevojshme për pika të zgjedhura
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kuti
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mundur Furnizuesi
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizata
@@ -1577,7 +1576,7 @@
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM Default për {0} nuk u gjet për Projektin {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studentët janë në zemër të sistemit, shtoni të gjithë studentët tuaj"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studentët janë në zemër të sistemit, shtoni të gjithë studentët tuaj"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: date Pastrimi {1} nuk mund të jetë para datës çek {2}
 DocType: Company,Default Holiday List,Default Festa Lista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Nga kohë dhe për kohën e {1} është mbivendosje me {2}
@@ -1589,20 +1588,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dita (s) në të cilin ju po aplikoni për leje janë festa. Ju nuk duhet të aplikoni për leje.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ridergo Pagesa Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Detyra e re
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Bëni Kuotim
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Bëni Kuotim
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Raportet tjera
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Ju lutemi të vendosur Default Payroll Llogaria e pagueshme në Kompaninë {0}
 DocType: SMS Center,Receiver List,Marresit Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Kërko Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Kërko Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Shuma konsumuar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Ndryshimi neto në para të gatshme
 DocType: Assessment Plan,Grading Scale,Scale Nota
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,përfunduar tashmë
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Kërkesa pagesa tashmë ekziston {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
@@ -1640,7 +1639,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,mbledh
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ju nuk mund të fshini Viti Fiskal {0}. Viti Fiskal {0} është vendosur si default në Settings Global
 DocType: Journal Entry,Entry Type,Hyrja Lloji
 ,Customer Credit Balance,Bilanci Customer Credit
@@ -1683,8 +1682,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studimi në njëjtën Institutin
 DocType: Territory,Territory Manager,Territori Menaxher
 DocType: Packed Item,To Warehouse (Optional),Për Magazina (Fakultativ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
 DocType: Payment Entry,Paid Amount (Company Currency),Paid Shuma (Kompania Valuta)
 DocType: Purchase Invoice,Additional Discount,Discount shtesë
 DocType: Selling Settings,Selling Settings,Shitja Settings
@@ -1694,9 +1691,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Shiko në Shportë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Kërkesa material përdoret për të bërë këtë Stock Hyrja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Zhvlerësimi Data Next është i detyrueshëm për pasuri të re
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Zhvlerësimi Data Next është i detyrueshëm për pasuri të re
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Sigurisht veçantë bazuar Grupi për çdo Batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Sigurisht veçantë bazuar Grupi për çdo Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Njësi e vetme e një artikulli.
@@ -1713,9 +1710,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Qendra Kosto është e nevojshme për &quot;Fitimi dhe Humbja &#39;llogarisë {2}. Ju lutemi të ngritur një qendër me kosto të paracaktuar për kompaninë.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Një grup të konsumatorëve ekziston me të njëjtin emër, ju lutem të ndryshojë emrin Customer ose riemërtoni grup të konsumatorëve"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Një grup të konsumatorëve ekziston me të njëjtin emër, ju lutem të ndryshojë emrin Customer ose riemërtoni grup të konsumatorëve"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Kontakti i ri
 DocType: Territory,Parent Territory,Territori prind
 DocType: Quality Inspection Reading,Reading 2,Leximi 2
@@ -1742,21 +1737,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pajtimi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Shumë kolona. Eksportit raportin dhe të shtypura duke përdorur një aplikim spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch Asnjë
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Në pamundësi për të gjetur kursin e këmbimit për {0} në {1} për datën kyçe {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Lejo Sales shumta urdhra kundër Rendit Blerje një konsumatorit
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Kryesor
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Kryesor
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
 DocType: Employee Attendance Tool,Employees HTML,punonjësit HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
 DocType: Employee,Leave Encashed?,Dërgo arkëtuar?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Nga fushë është e detyrueshme
 DocType: Email Digest,Annual Expenses,Shpenzimet vjetore
 DocType: Item,Variants,Variantet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Shuma e ndarë
@@ -1775,7 +1769,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vlerësime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serial Asnjë hyrë për Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Një kusht për Sundimin Shipping
-DocType: Grading Structure,Grading Intervals,Intervalet e notimit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ju lutemi shkruani
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","nuk mund overbill për artikullit {0} në rradhë {1} më shumë se {2}. Për të lejuar mbi-faturimit, ju lutemi të vendosur në Blerja Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Ju lutemi të vendosur filtër në bazë të artikullit ose Magazina
@@ -1788,16 +1781,17 @@
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejected Magazina është e detyrueshme kundër Item refuzuar {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pagesa
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Menaxho urdhërat tuaj
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Menaxho urdhërat tuaj
 DocType: Production Order Operation,Actual Time and Cost,Koha aktuale dhe kostos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Kërkesa material i maksimumi {0} mund të jetë bërë për Item {1} kundër Sales Rendit {2}
 DocType: Employee,Salutation,Përshëndetje
 DocType: Course,Course Abbreviation,Shkurtesa Course
 DocType: Student Leave Application,Student Leave Application,Student Leave Aplikimi
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},I punësuar {0} në gjysmë ditë në {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Orët totale të punës nuk duhet të jetë më e madhe se sa orë pune max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Në
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Artikuj Bundle në kohën e shitjes.
 DocType: Quotation Item,Actual Qty,Aktuale Qty
 DocType: Sales Invoice Item,References,Referencat
@@ -1807,7 +1801,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ju keni hyrë artikuj kopjuar. Ju lutemi të ndrequr dhe provoni përsëri.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Koleg
 DocType: Asset Movement,Asset Movement,Lëvizja e aseteve
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Shporta e re
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Shporta e re
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} nuk është një Item serialized
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
 DocType: Vehicle,Wheels,rrota
@@ -1839,10 +1833,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Pamundëson krijimin e kohës shkrimet kundër urdhërat e prodhimit. Operacionet nuk do të gjurmuar kundër Rendit Production
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ka Variantet
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Grumbull ID është i detyrueshëm
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Grumbull ID është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Grumbull ID është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Grumbull ID është i detyrueshëm
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
 DocType: Purchase Invoice,Recurring Invoice,Fatura përsëritur
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menaxhimi i Projekteve
@@ -1850,7 +1844,7 @@
 DocType: Budget,Fiscal Year,Viti Fiskal
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Buxhet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Buxheti nuk mund të caktohet {0} kundër, pasi kjo nuk është një llogari të ardhura ose shpenzime"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arritur
 DocType: Student Admission,Application Form Route,Formular Aplikimi Route
@@ -1881,7 +1875,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Shuma {0} {1} zbritur kundër {2}
 DocType: Employee,Salary Information,Informacione paga
 DocType: Sales Person,Name and Employee ID,Emri dhe punonjës ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
 DocType: Website Item Group,Website Item Group,Faqja kryesore Item Grupi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Detyrat dhe Taksat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ju lutem shkruani datën Reference
@@ -1940,7 +1934,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Përsëriteni ardhurat Klientit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) duhet të ketë rol &#39;aprovuesi kurriz&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Palë
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
 DocType: Asset,Depreciation Schedule,Zhvlerësimi Orari
 DocType: Bank Reconciliation Detail,Against Account,Kundër Llogaria
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Data Day duhet të jetë midis Nga Data dhe deri më sot
@@ -1957,13 +1951,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
 DocType: Purchase Order,Delivered,Dorëzuar
 ,Vehicle Expenses,Shpenzimet automjeteve
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
+DocType: Serial No,Invoice Details,detajet e faturës
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
 DocType: Purchase Receipt,Vehicle Number,Numri i Automjeteve
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Data në të cilën përsëritura fatura do të ndalet
 DocType: Employee Loan,Loan Amount,Shuma e kredisë
@@ -1987,7 +1982,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grup për jo-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportiv
 DocType: Loan Type,Loan Name,kredi Emri
@@ -1998,6 +1993,7 @@
 ,Customer Acquisition and Loyalty,Customer Blerja dhe Besnik
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazina ku ju jeni mbajtjen e aksioneve të artikujve refuzuar
 DocType: Production Order,Skip Material Transfer,Kalo Material Transferimi
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Në pamundësi për të gjetur kursin e këmbimit për {0} në {1} për datën kyçe {2}. Ju lutem të krijuar një rekord Currency Exchange dorë
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vitin e juaj financiare përfundon në
 DocType: POS Profile,Price List,Tarifë
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} është tani default Viti Fiskal. Ju lutemi të rifreskoni shfletuesin tuaj për ndryshim të hyjnë në fuqi.
@@ -2035,9 +2031,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Item {0} tashmë është kthyer
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Viti Fiskal ** përfaqëson një viti financiar. Të gjitha shënimet e kontabilitetit dhe transaksionet tjera të mëdha janë gjurmuar kundër Vitit Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Customer / Adresa Lead
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 DocType: Student Admission,Eligibility,pranueshmëri
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Çon ju ndihmojë të merrni të biznesit, shtoni të gjitha kontaktet tuaja dhe më shumë si çon tuaj"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Çon ju ndihmojë të merrni të biznesit, shtoni të gjitha kontaktet tuaja dhe më shumë si çon tuaj"
 DocType: Production Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
@@ -2078,7 +2074,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Zgjidh kompanisë ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lini bosh nëse konsiderohet për të gjitha departamentet
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Llojet e punësimit (, kontratë të përhershme, etj intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Process Payroll,Fortnightly,dyjavor
 DocType: Currency Exchange,From Currency,Nga Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
@@ -2094,7 +2090,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nuk mund të zgjidhni llojin e ngarkuar si &quot;Për Shuma Previous Row &#39;ose&#39; Në Previous Row Total&quot; për rreshtin e parë
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item nuk duhet të jetë një Bundle Product. Ju lutemi të heq arikullin &#39;{0}&#39; dhe për të shpëtuar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankar
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Shto timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Shto timesheets
 DocType: Vehicle Service,Service Item,Shërbimi Item
 DocType: Bank Guarantee,Bank Guarantee,garanci bankare
 DocType: Bank Guarantee,Bank Guarantee,garanci bankare
@@ -2144,8 +2140,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Çmimet nuk do të shfaqet në qoftë Lista Çmimi nuk është vendosur
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ju lutem specifikoni një vend për këtë Rregull Shipping ose kontrolloni anijeve në botë
 DocType: Stock Entry,Total Incoming Value,Vlera Totale hyrëse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debi Për të është e nevojshme
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debi Për të është e nevojshme
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Blerje Lista e Çmimeve
 DocType: Offer Letter Term,Offer Term,Term Oferta
 DocType: Quality Inspection,Quality Manager,Menaxheri Cilësia
@@ -2179,14 +2175,14 @@
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Adresa e re
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ju lutemi shkruani Dokumenti Marrjes
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ju lutemi shkruani Dokumenti Marrjes
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ju lutem specifikoni një të vlefshme &#39;nga rasti Jo&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
 DocType: Project,External,I jashtëm
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Përdoruesit dhe Lejet
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Urdhërat e prodhimit Krijuar: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Urdhërat e prodhimit Krijuar: {0}
 DocType: Branch,Branch,Degë
 DocType: Guardian,Mobile Number,Numri Mobile
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printime dhe quajtur
@@ -2195,7 +2191,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Konsumatorët tuaj
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,bëni Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,bëni Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ju keni qenë të ftuar për të bashkëpunuar në këtë projekt: {0}
 DocType: Leave Block List Date,Block Date,Data bllok
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Apliko tani
@@ -2219,8 +2215,9 @@
 DocType: SMS Log,Sent To,Dërguar në
 DocType: Payment Request,Make Sales Invoice,Bëni Sales Faturë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programe
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next Kontakt Data nuk mund të jetë në të kaluarën
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Kontakt Data nuk mund të jetë në të kaluarën
 DocType: Company,For Reference Only.,Vetëm për referencë.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Zgjidh Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Shuma
@@ -2234,7 +2231,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Rast No. nuk mund të jetë 0
 DocType: Item,Show a slideshow at the top of the page,Tregojnë një Slideshow në krye të faqes
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Dyqane
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Dyqane
 DocType: Serial No,Delivery Time,Koha e dorëzimit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Plakjen Bazuar Në
 DocType: Item,End of Life,Fundi i jetës
@@ -2250,8 +2247,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material Transferimi
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifikoni operacionet, koston operative dhe të japë një operacion i veçantë nuk ka për operacionet tuaja."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ky dokument është mbi kufirin nga {0} {1} për pika {4}. A jeni duke bërë një tjetër {3} kundër të njëjtit {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Llogaria Shuma Zgjidh ndryshim
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Llogaria Shuma Zgjidh ndryshim
 DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
 DocType: Stock Settings,Allow Negative Stock,Lejo Negativ Stock
@@ -2262,7 +2259,7 @@
 DocType: Budget Account,Budget Account,Llogaria buxheti
 DocType: Quality Inspection,Verified By,Verifikuar nga
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nuk mund të ndryshojë monedhën parazgjedhje kompanisë, sepse ka transaksione ekzistuese. Transaksionet duhet të anulohet për të ndryshuar monedhën default."
-DocType: Grade Interval,Grade Description,Grade Përshkrimi
+DocType: Grading Scale Interval,Grade Description,Grade Përshkrimi
 DocType: Stock Entry,Purchase Receipt No,Pranimi Blerje Asnjë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparosje
 DocType: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
@@ -2300,7 +2297,7 @@
 DocType: Upload Attendance,Attendance To Date,Pjesëmarrja në datën
 DocType: Warranty Claim,Raised By,Ngritur nga
 DocType: Payment Gateway Account,Payment Account,Llogaria e pagesës
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Ndryshimi neto në llogarive të arkëtueshme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensues Off
 DocType: Offer Letter,Accepted,Pranuar
@@ -2314,7 +2311,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Rregulla Transporti Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forumi User
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
 DocType: Employee,Previous Work Experience,Përvoja e mëparshme e punës
@@ -2328,7 +2325,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Emri i institutit për të cilat ju jeni të vendosur deri këtë sistem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Rregjistrimi kontabël ngrirë deri në këtë datë, askush nuk mund të bëjë / modifikoj hyrjen përveç rolit të specifikuar më poshtë."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Ju lutemi ruani dokumentin para se të gjeneruar orar të mirëmbajtjes
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ju lutemi ruani dokumentin para se të gjeneruar orar të mirëmbajtjes
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statusi i Projektit
 DocType: UOM,Check this to disallow fractions. (for Nos),Kontrolloni këtë për të moslejuar fraksionet. (Për Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,janë krijuar Urdhërat e mëposhtme prodhimit:
@@ -2351,6 +2348,7 @@
 DocType: Email Digest,How frequently?,Sa shpesh?
 DocType: Purchase Receipt,Get Current Stock,Get Stock aktual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Pema e Bill e materialeve
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
 DocType: Student,Joining Date,Bashkimi me Date
 ,Employees working on a holiday,Punonjës që punojnë në një festë
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark pranishëm
@@ -2432,7 +2430,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Pastrimi Data nuk përmendet
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Prodhim
 DocType: Guardian,Occupation,profesion
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
 DocType: Sales Invoice,This Document,Ky dokument
 DocType: Installation Note Item,Installed Qty,Instaluar Qty
@@ -2455,8 +2453,8 @@
 DocType: Notification Control,Sales Order Message,Sales Rendit Mesazh
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Vlerat Default si Company, Valuta, vitin aktual fiskal, etj"
 DocType: Payment Entry,Payment Type,Lloji Pagesa
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
 DocType: Process Payroll,Select Employees,Zgjidhni Punonjësit
 DocType: Opportunity,Potential Sales Deal,Shitjet e mundshme marrëveshjen
 DocType: Payment Entry,Cheque/Reference Date,Çek / Reference Data
@@ -2473,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profilin {0} krijuar tashmë për kompaninë {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Replace Item / bom në të gjitha BOM-in
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Dokumenti Pranimi duhet të dorëzohet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Dokumenti Pranimi duhet të dorëzohet
 DocType: Purchase Invoice Item,Received Qty,Marrë Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nuk është paguar dhe nuk dorëzohet
@@ -2486,7 +2484,7 @@
 ,To Produce,Për të prodhuar
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Për rresht {0} në {1}. Të përfshijnë {2} në shkallën Item, {3} duhet të përfshihen edhe rreshtave"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,bëni përdoruesin
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,bëni përdoruesin
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikimi i paketës për shpërndarjen (për shtyp)
 DocType: Bin,Reserved Quantity,Sasia e rezervuara
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ju lutemi shkruani adresën vlefshme email
@@ -2500,11 +2498,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,template me aftësi të kufizuara nuk duhet të jetë template parazgjedhur
 DocType: Account,Income Account,Llogaria ardhurat
 DocType: Payment Request,Amount in customer's currency,Shuma në monedhë të klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Ofrimit të
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Ofrimit të
 DocType: Stock Reconciliation Item,Current Qty,Qty tanishme
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Shih &quot;Shkalla e materialeve në bazë të&quot; në nenin kushton
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Mallrat e studentëve të ju ndihmojë të gjetur frekuentimit, vlerësimet dhe tarifat për studentët"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Mallrat e studentëve të ju ndihmojë të gjetur frekuentimit, vlerësimet dhe tarifat për studentët"
 DocType: Payment Entry,Total Allocated Amount,Shuma totale e alokuar
 DocType: Item Reorder,Material Request Type,Material Type Kërkesë
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Gazeta hyrjes pagave nga {0} në {1}
@@ -2527,7 +2526,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
@@ -2537,6 +2536,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Do të dërgoni një email në lidhje me ngjarjen për të punësuarit me statusin e &#39;hapur&#39;
 DocType: Task,Depends on Tasks,Varet Detyrat
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage grup të konsumatorëve Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Attachments mund të tregohet pa mundësuar karrocat
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Qendra Kosto New Emri
 DocType: Leave Control Panel,Leave Control Panel,Lini Control Panel
@@ -2549,12 +2549,10 @@
 DocType: Sales Invoice,Debit To,Debi Për
 DocType: Delivery Note,Required only for sample item.,Kërkohet vetëm për pika të mostrës.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty aktual Pas Transaksionit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nuk ka paga shqip gjetur mes {0} dhe {1}
 ,Pending SO Items For Purchase Request,Në pritje SO artikuj për Kërkesë Blerje
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Pranimet e studentëve
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
 DocType: Supplier,Billing Currency,Faturimi Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Shumë i madh
@@ -2571,7 +2569,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Të gjitha grupet e vlerësimit
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Magazina Emri
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territor
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
 DocType: Stock Settings,Default Valuation Method,Gabim Vlerësimi Metoda
@@ -2589,7 +2587,7 @@
 DocType: Price List,Price List Master,Lista e Çmimeve Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Gjitha Shitjet Transaksionet mund të tagged kundër shumta ** Personat Sales ** në mënyrë që ju mund të vendosni dhe monitoruar objektivat.
 ,S.O. No.,SO Nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
 DocType: Price List,Applicable for Countries,Të zbatueshme për vendet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; dhe &#39;refuzuar&#39; mund të dorëzohet
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Group Emri është i detyrueshëm në rresht {0}
@@ -2670,7 +2668,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 DocType: Vehicle Service,Engine Oil,Vaj makine
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
 DocType: Employee Loan,Loan Details,kredi Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Kompletuar Qty duhet të jetë më e madhe se zero.
@@ -2735,7 +2733,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Depot me transaksion ekzistues nuk mund të konvertohet në grup.
 DocType: Assessment Result Tool,Result HTML,Rezultati HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Skadon ne
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Shto Studentët
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Shto Studentët
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Ju lutem, përzgjidhni {0}"
 DocType: C-Form,C-Form No,C-Forma Nuk ka
 DocType: BOM,Exploded_items,Exploded_items
@@ -2800,7 +2798,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Kaloi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Një term akademike me këtë &#39;vitin akademik&#39; {0} dhe &#39;Term Emri&#39; {1} ekziston. Ju lutemi të modifikojë këto të hyra dhe të provoni përsëri.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Si ka transaksione ekzistuese kundër artikull {0}, ju nuk mund të ndryshojë vlerën e {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Si ka transaksione ekzistuese kundër artikull {0}, ju nuk mund të ndryshojë vlerën e {1}"
 DocType: UOM,Must be Whole Number,Duhet të jetë numër i plotë
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lë të reja alokuara (në ditë)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial Asnjë {0} nuk ekziston
@@ -2844,7 +2842,7 @@
 DocType: Supplier,Last Day of the Next Month,Dita e fundit e muajit të ardhshëm
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue ngushtë pas 7 ditësh
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lënë nuk mund të ndahen përpara {0}, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Aplikuesi
 DocType: Asset Category Account,Accumulated Depreciation Account,Llogaria akumuluar Zhvlerësimi
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2872,8 +2870,8 @@
 DocType: Asset,Item Code,Kodi i artikullit
 DocType: Production Planning Tool,Create Production Orders,Krijo urdhërat e prodhimit
 DocType: Serial No,Warranty / AMC Details,Garanci / AMC Detajet
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
 DocType: Lead,Market Segment,Segmenti i Tregut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Shuma e paguar nuk mund të jetë më e madhe se shuma totale negative papaguar {0}
@@ -2891,7 +2889,7 @@
 DocType: Production Planning Tool,Create Material Requests,Krijo Kërkesat materiale
 DocType: Employee Education,School/University,Shkolla / Universiteti
 DocType: Payment Request,Reference Details,Referenca Detajet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Vlera e pritshme Pas së dobishme duhet të jetë më pak se bruto Blerje Shuma
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Vlera e pritshme Pas së dobishme duhet të jetë më pak se bruto Blerje Shuma
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty në dispozicion në magazinë
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Shuma e faturuar
 DocType: Asset,Double Declining Balance,Dyfishtë rënie Balance
@@ -2912,19 +2910,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Shuma e disbursuar nuk mund të jetë më e madhe se: Kredia {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Rendit prodhimit jo krijuar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Rendit prodhimit jo krijuar
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Nga Data &quot;duhet të jetë pas&quot; deri më sot &quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
 DocType: Asset,Fully Depreciated,amortizuar plotësisht
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Pjesëmarrja e shënuar HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citate janë propozimet, ofertat keni dërguar për klientët tuaj"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citate janë propozimet, ofertat keni dërguar për klientët tuaj"
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Pa serial dhe Batch
 DocType: Warranty Claim,From Company,Nga kompanisë
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Shuma e pikëve të kritereve të vlerësimit të nevojave të jetë {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Ju lutemi të vendosur Numri i nënçmime rezervuar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ju lutemi të vendosur Numri i nënçmime rezervuar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vlera ose Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutë
@@ -3055,7 +3053,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupi Student
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Ju lutemi zgjidhni klientit
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Ju lutemi zgjidhni klientit
 DocType: C-Form,I,unë
 DocType: Company,Asset Depreciation Cost Center,Asset Center Zhvlerësimi Kostoja
 DocType: Sales Order Item,Sales Order Date,Sales Order Data
@@ -3074,19 +3072,18 @@
 DocType: Vehicle,Insurance Details,Details Insurance
 DocType: Account,Payable,Për t&#39;u paguar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ju lutemi shkruani Periudhat Ripagimi
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitorët ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitorët ({0})
 DocType: Pricing Rule,Margin,diferencë
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Klientët e Rinj
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto% Fitimi
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Pastrimi Data
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Shuma Blerje është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Shuma Blerje është i detyrueshëm
 DocType: Lead,Address Desc,Adresuar Përshkrimi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partia është e detyrueshme
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Emri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast një nga shitjen apo blerjen duhet të zgjidhen
-DocType: Grading Structure,Grade Intervals,Intervalet klasës
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Zgjidhni natyrën e biznesit tuaj.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Ku operacionet prodhuese janë kryer.
 DocType: Asset Movement,Source Warehouse,Burimi Magazina
@@ -3115,6 +3112,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Ju lutemi të vendosur parazgjedhur {0} në Kompaninë {1}
 DocType: Cheque Print Template,Starting position from top edge,pozicion nga buzë të lartë duke filluar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Same furnizuesi është lidhur shumë herë
@@ -3168,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Hapje e tanishme e punës
 DocType: Company,Stock Adjustment Account,Llogaria aksioneve Rregullimit
-DocType: Journal Entry,Write Off,Shkruani Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Shkruani Off
 DocType: Timesheet Detail,Operation ID,Operacioni ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Përdoruesi i Sistemit (login) ID. Nëse vendosur, ajo do të bëhet e parazgjedhur për të gjitha format e burimeve njerëzore."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Nga {1}
@@ -3179,8 +3177,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizuesi jep Klientit
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Item / {0}) është nga të aksioneve
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Data e ardhshme duhet të jetë më i madh se mbi postimet Data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Trego taksave break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importi dhe Eksporti i të dhënave
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entries Stock ekzistojnë kundër Magazina {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë atë"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nuk studentët Found
@@ -3192,13 +3190,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Nga AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Ju lutem, përzgjidhni Citate"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Ju lutem, përzgjidhni Citate"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
 DocType: Company,Default Cash Account,Gabim Llogaria Cash
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Kjo është e bazuar në pjesëmarrjen e këtij Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Nuk ka Studentët në
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Shto artikuj më shumë apo formë të hapur të plotë
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Ju lutemi shkruani &#39;datës së pritshme dorëzimit&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
@@ -3244,9 +3243,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Para se të pajtimit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Për {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taksat dhe Tarifat Shtuar (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
 DocType: Sales Order,Partly Billed,Faturuar Pjesërisht
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} duhet të jetë një artikull Fixed Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} duhet të jetë një artikull Fixed Asset
 DocType: Item,Default BOM,Gabim bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Ju lutem ri-lloj emri i kompanisë për të konfirmuar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Outstanding Amt Total
@@ -3268,7 +3267,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Lista e Çmimeve Exchange Rate
 DocType: Purchase Invoice Item,Rate,Normë
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Mjek praktikant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresa Emri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,adresa Emri
 DocType: Stock Entry,From BOM,Nga bom
 DocType: Assessment Code,Assessment Code,Kodi i vlerësimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Themelor
@@ -3293,7 +3292,7 @@
 DocType: Purchase Invoice,Print Language,Print Gjuha
 DocType: Salary Slip,Total Working Hours,Gjithsej Orari i punës
 DocType: Stock Entry,Including items for sub assemblies,Duke përfshirë edhe artikuj për nën kuvendet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Të gjitha Territoret
 DocType: Purchase Invoice,Items,Artikuj
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studenti është regjistruar tashmë.
@@ -3312,16 +3311,14 @@
 DocType: Issue,Opening Time,Koha e hapjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Nga dhe në datat e kërkuara
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
 DocType: Assessment Plan,Supervisor Name,Emri Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program Regjistrimi Kursi
-DocType: Grading Structure,Grading Structure,Struktura Nota
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
 DocType: Tax Rule,Shipping City,Shipping Qyteti
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ky artikull është një variant i {0} (Stampa). Atributet do të kopjohet gjatë nga template nëse &#39;Jo Copy &quot;është vendosur
 DocType: Notification Control,Customize the Notification,Customize Njoftimin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash Flow nga operacionet
 DocType: Sales Invoice,Shipping Rule,Rregulla anijeve
@@ -3344,6 +3341,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Hapja Data duhet të jetë para datës së mbylljes
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi Setup numëron seri për Pjesëmarrja nëpërmjet Setup&gt; Numbering Series
 DocType: Leave Control Panel,Carry Forward,Bart
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në Ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Ditë për të cilat Festat janë bllokuar për këtë departament.
@@ -3371,7 +3369,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gjithsej (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Item Nr Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Krijo Records punonjësve
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Krijo Records punonjësve
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,I pranishëm Total
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Deklaratat e kontabilitetit
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Orë
@@ -3386,7 +3384,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ri pas zëvendësimit
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Pika e Shitjes
 DocType: Payment Entry,Received Amount,Shuma e marrë
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi Setup punonjës Emërtimi Sistemit në Burimeve Njerëzore&gt; Cilësimet HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Krijo për sasinë e plotë, duke injoruar sasi tashmë në mënyrë"
 DocType: Account,Tax,Tatim
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,i pashënuar
@@ -3397,7 +3394,7 @@
 DocType: C-Form,Invoices,Faturat
 DocType: Batch,Source Document Name,Dokumenti Burimi Emri
 DocType: Job Opening,Job Title,Titulli Job
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Krijo Përdoruesit
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Krijo Përdoruesit
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitoni raport për thirrjen e mirëmbajtjes.
@@ -3408,8 +3405,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
 DocType: BOM,Website Description,Website Përshkrim
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Ndryshimi neto në ekuitetit
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Faturë
 ,Sales Register,Shitjet Regjistrohu
@@ -3420,16 +3417,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nuk ka asgjë për të redaktuar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nuk ka Konsumatorët akoma!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pasqyra Cash Flow
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Liçensë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ju lutem, përzgjidhni Mbaj përpara në qoftë se ju të dëshironi që të përfshijë bilancit vitit të kaluar fiskal lë të këtij viti fiskal"
 DocType: GL Entry,Against Voucher Type,Kundër Voucher Type
 DocType: Item,Attributes,Atributet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Rendit fundit Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Pjesëmarrja për të punësuarit të shumta
@@ -3454,14 +3453,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Llogaria duhet të jenë të tipit &quot;Asset fikse &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Nga Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Rregullat për të llogaritur shumën e anijeve për një shitje
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seria është i detyrueshëm
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seria është i detyrueshëm
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Shërbimet Financiare
 DocType: Student Sibling,Student ID,ID Student
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Llojet e aktiviteteve për Koha Shkrime
 DocType: Tax Rule,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
 DocType: Training Event,Exam,Provimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Shteti Faturimi
@@ -3494,7 +3493,7 @@
 DocType: Payment Entry,Account Paid From,Llogaria e paguar nga
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,bëni Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,bëni Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print dhe Stationery
 DocType: Stock Settings,Show Barcode Field,Trego Barcode Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Dërgo email furnizuesi
@@ -3509,6 +3508,7 @@
 DocType: Offer Letter,Awaiting Response,Në pritje të përgjigjes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Sipër
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Përmend në qoftë se llogaria jo-standarde pagueshme
 DocType: Salary Slip,Earning & Deduction,Fituar dhe Zbritje
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
@@ -3543,7 +3543,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get Studentët nga
 DocType: Hub Settings,Seller Country,Shitës Vendi
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikojnë artikuj në faqen
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupi nxënësit tuaj në tufa
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupi nxënësit tuaj në tufa
 DocType: Authorization Rule,Authorization Rule,Rregulla Autorizimi
 DocType: Sales Invoice,Terms and Conditions Details,Termat dhe Kushtet Detajet
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikimet
@@ -3602,7 +3602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Provë
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponentet e pagave
 DocType: Program Enrollment Tool,New Academic Year,New Year akademik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Kthimi / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Kthimi / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Gjithsej shuma e paguar
 DocType: Production Order Item,Transferred Qty,Transferuar Qty
@@ -3643,6 +3643,7 @@
 ,Sales Funnel,Gyp Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Shkurtim është i detyrueshëm
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Qerre
 ,Qty to Transfer,Qty të transferojë
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Kuotat për kryeson apo klientët.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roli i lejuar për të redaktuar aksioneve të ngrirë
@@ -3675,7 +3676,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Sasi ({0}) nuk mund të jetë një pjesë në rradhë {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Mblidhni Taksat
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
 DocType: Lead,Add to calendar on this date,Shtoni në kalendarin në këtë datë
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Rregullat për të shtuar shpenzimet e transportit detar.
 DocType: Item,Opening Stock,hapja Stock
@@ -3693,7 +3694,7 @@
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Urdhërat lëshuar për prodhim.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Program Enrollment Tool,Enroll Students,regjistrohen Studentët
 DocType: Hub Settings,Name Token,Emri Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Shitja Standard
@@ -3704,7 +3705,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Emri i Projektit
-DocType: Supplier,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
+DocType: Customer,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
 DocType: Journal Entry Account,If Income or Expense,Nëse të ardhura ose shpenzime
 DocType: Production Order,Required Items,Items kërkuara
 DocType: Stock Ledger Entry,Stock Value Difference,Vlera e aksioneve Diferenca
@@ -3734,6 +3735,7 @@
 DocType: Item,Taxes,Tatimet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Paguar dhe nuk dorëzohet
 DocType: Project,Default Cost Center,Qendra Kosto e albumit
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
 DocType: Bank Guarantee,End Date,End Date
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transaksionet e aksioneve
 DocType: Budget,Budget Accounts,Llogaritë e buxhetit
@@ -3798,7 +3800,7 @@
 DocType: Customer,Sales Partner and Commission,Sales Partner dhe Komisioni
 DocType: Employee Loan,Rate of Interest (%) / Year,Norma e interesit (%) / Viti
 ,Project Quantity,Sasia Project
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} për të gjitha sendet është zero, mund të jetë që ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar On &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} për të gjitha sendet është zero, mund të jetë që ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar On &#39;"
 DocType: Opportunity,To Discuss,Për të diskutuar
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} njësitë e {1} nevojshme në {2} për të përfunduar këtë transaksion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Norma e interesit (%) vjetore
@@ -3821,7 +3823,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Mungon
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Valuta e BOM # {1} duhet të jetë e barabartë me monedhën e zgjedhur {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Komponenti Fee
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Menaxhimi Fleet
@@ -3838,7 +3840,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazina {0} nuk ekziston
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regjistrohu Për Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Përqindjet mujore Shpërndarjes
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Shkalla e vlerësimit nuk u gjet për pika {0}, e cila është e nevojshme për të bërë shënimet e kontabilitetit për {1} {2}. Nëse artikulli është transacting si një artikull mostër në {1}, ju lutemi të përmendim se në {1} tryezë artikull. Përndryshe, ju lutem të krijuar një transaksion hyrje aksioneve për artikull ose përmend normën e vlerësimit në të dhënat artikull, dhe pastaj të përpiqet dërgimi / anulimit këtë term"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% E materialeve dorëzuar kundër këtij notën shpërndarëse
 DocType: Project,Customer Details,Detajet e klientit
@@ -3855,7 +3857,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,urdhërat e dorëzuara nuk mund të fshihet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Menaxhimit të Cilësisë
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} artikull ka qenë me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} artikull ka qenë me aftësi të kufizuara
 DocType: Employee Loan,Repay Fixed Amount per Period,Paguaj shuma fikse për një periudhë
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
 DocType: Employee External Work History,Employee External Work History,Punonjës historia e jashtme
@@ -3881,7 +3883,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Njoftim (ditë)
 DocType: Tax Rule,Sales Tax Template,Template Sales Tax
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
 DocType: Employee,Encashment Date,Arkëtim Data
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Stock Rregullimit
@@ -3914,6 +3916,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Hedhur në qarkullim
 DocType: Production Order,Warehouses,Depot
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktiv nuk mund të transferohet
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ky Artikull është një variant i {0} (Shabllon).
 DocType: Workstation,per hour,në orë
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,blerje
 DocType: Announcement,Announcement,njoftim
@@ -3929,7 +3932,7 @@
 DocType: Account,Receivable,Arkëtueshme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roli që i lejohet të paraqesë transaksionet që tejkalojnë limitet e kreditit përcaktuara.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Zgjidhni Items të Prodhimi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Zgjidhni Items të Prodhimi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master dhënat syncing, ajo mund të marrë disa kohë"
 DocType: Item,Material Issue,Materiali Issue
 DocType: Hub Settings,Seller Description,Shitës Përshkrim
@@ -3942,7 +3945,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Urdhërohet
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteret e vlerësimit Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Hapja amortizimi i akumuluar duhet të jetë më pak se e barabartë me {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Hapja amortizimi i akumuluar duhet të jetë më pak se e barabartë me {0}
 DocType: Warehouse,Warehouse Name,Magazina Emri
 DocType: Naming Series,Select Transaction,Përzgjedhjen e transaksioneve
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ju lutemi shkruani Miratimi Roli ose Miratimi përdoruesin
@@ -3976,7 +3979,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Për të vendosur këtë vit fiskal si default, klikoni mbi &#39;Bëje si Default&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,bashkohem
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Employee Loan,Repay from Salary,Paguajë nga paga
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Kerkuar pagesën kundër {0} {1} për sasi {2}
@@ -3994,7 +3997,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Vlerësimi Rezultati Detail
 DocType: Employee Education,Employee Education,Arsimimi punonjës
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Grupi Duplicate artikull gjenden në tabelën e grupit artikull
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Llogari
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Asnjë {0} tashmë është marrë
@@ -4003,7 +4006,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magazina {0} nuk është e lidhur me ndonjë llogari, ju lutem të krijuar / lidhin përkatëse llogarinë (aktiv) për depo."
 DocType: Purchase Invoice,Recurring Id,Përsëritur Id
 DocType: Customer,Sales Team Details,Detajet shitjet e ekipit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Fshini përgjithmonë?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Fshini përgjithmonë?
 DocType: Expense Claim,Total Claimed Amount,Shuma totale Pohoi
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mundësi potenciale për të shitur.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4014,13 +4017,14 @@
 DocType: Warehouse,PIN,GJILPËRË
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup shkolla juaj në ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Ndryshimi Shuma (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Ruaj dokumentin e parë.
 DocType: Account,Chargeable,I dënueshëm
 DocType: Company,Change Abbreviation,Ndryshimi Shkurtesa
 DocType: Expense Claim Detail,Expense Date,Shpenzim Data
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Shuma Rendit Fundit
+DocType: Task,Is Milestone,A Milestone
 DocType: Daily Work Summary,Email Sent To,Email Sent To
 DocType: Budget,Warn,Paralajmëroj
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Çdo vërejtje të tjera, përpjekje të përmendet se duhet të shkoni në të dhënat."
@@ -4053,11 +4057,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Ngrij Stoqet me te vjetra se` duhet të jetë më e vogël se% d ditë.
 DocType: Tax Rule,Purchase Tax Template,Blerje Template Tatimore
 ,Project wise Stock Tracking,Projekti Ndjekja mençur Stock
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Mirëmbajtja Orari {0} ekziston kundër {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Sasia aktuale (në burim / objektiv)
 DocType: Item Customer Detail,Ref Code,Kodi ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Të dhënat punonjës.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
 DocType: HR Settings,Payroll Settings,Listën e pagave Cilësimet
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Përputhje për Faturat jo-lidhura dhe pagesat.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Vendi Renditja
@@ -4080,7 +4083,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Çeqet dhe Depozitat pastruar gabimisht
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
 DocType: Purchase Invoice Item,Price List Rate,Lista e Çmimeve Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Krijo kuotat konsumatorëve
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Krijo kuotat konsumatorëve
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Trego &quot;Në magazinë&quot; ose &quot;Jo në magazinë&quot; në bazë të aksioneve në dispozicion në këtë depo.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill e materialeve (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Koha mesatare e marra nga furnizuesi për të ofruar
@@ -4102,7 +4105,7 @@
 DocType: Asset,Disposal Date,Shkatërrimi Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email do të dërgohet të gjithë të punësuarve aktive e shoqërisë në orë të caktuar, në qoftë se ata nuk kanë pushim. Përmbledhje e përgjigjeve do të dërgohet në mesnatë."
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback Training
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
@@ -4110,7 +4113,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursi është i detyrueshëm në rresht {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Deri më sot nuk mund të jetë e para nga data e
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Add / Edit Çmimet
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Cheque Print Template,Cheque Print Template,Çek Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafiku i Qendrave te Kostos
@@ -4154,7 +4157,7 @@
 DocType: Item,Variant Based On,Variant i bazuar në
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Furnizuesit tuaj
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
 DocType: Request for Quotation Item,Supplier Part No,Furnizuesi Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimin&#39; ose &#39;Vaulation dhe Total &quot;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Marrë nga
@@ -4164,7 +4167,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Nga {0} për {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Hours Vlera duhet të jetë më e madhe se zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
 DocType: Issue,Content Type,Përmbajtja Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
@@ -4173,20 +4176,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,Nga Faturë Data
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,monedhë faturimit duhet të jetë e barabartë me monedhën ose llogarinë pala e secilës parazgjedhur comapany e monedhës
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,monedhë faturimit duhet të jetë e barabartë me monedhën ose llogarinë pala e secilës parazgjedhur comapany e monedhës
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lini arkëtim
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Çfarë do të bëni?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Për Magazina
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Të gjitha Pranimet e studentëve
 ,Average Commission Rate,Mesatare Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
 DocType: School House,House Name,Emri House
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Update shpenzimet shtesë për të llogaritur koston ul të artikujve
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Shto pjesën tjetër të organizatës suaj si përdoruesit e juaj. Ju gjithashtu mund të shtoni ftojë konsumatorët për portalin tuaj duke shtuar ato nga Kontaktet
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Shto pjesën tjetër të organizatës suaj si përdoruesit e juaj. Ju gjithashtu mund të shtoni ftojë konsumatorët për portalin tuaj duke shtuar ato nga Kontaktet
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Përdoruesi ID nuk është caktuar për punonjësit {0}
@@ -4195,7 +4198,7 @@
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ditët Që Rendit Fundit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Fillimi duhet të jetë më pak se data Insurance Fund
@@ -4210,7 +4213,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Paga Slip nga punonjësi {0} krijuar tashmë për fletë kohë {1}
 DocType: Vehicle Log,Odometer,rrugëmatës
 DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Periudha nga dhe periudha në datat e detyrueshme për të përsëritura {0}
@@ -4223,7 +4226,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,faturimit Hours
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM Default për {0} nuk u gjet
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Prekni për të shtuar artikuj tyre këtu
 DocType: Fees,Program Enrollment,program Regjistrimi
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ju lutemi të vendosur {0}
@@ -4324,7 +4328,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
 DocType: Issue,First Responded On,Së pari u përgjigj më
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kryqi Listimi i artikullit në grupe të shumta
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Viti Fiskal Data e Fillimit dhe Viti Fiskal Fundi Data e janë vendosur tashmë në vitin fiskal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Pastrimi Date updated
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
@@ -4333,6 +4336,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Shkarko PDF
 DocType: Production Order,Planned End Date,Planifikuar Data e Përfundimit
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Ku sendet janë ruajtur.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 DocType: Request for Quotation,Supplier Detail,furnizuesi Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Error ne formulen ose gjendje: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Shuma e faturuar
@@ -4377,7 +4381,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup një website të thjeshtë për organizatën time
 DocType: Payment Reconciliation,Receivable / Payable Account,Arkëtueshme / pagueshme Llogaria
 DocType: Delivery Note Item,Against Sales Order Item,Kundër Sales Rendit Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ju lutemi shkruani qendra kosto prind
@@ -4436,7 +4440,7 @@
 ,Items To Be Requested,Items të kërkohet
 DocType: Purchase Order,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Zgjidhni ose shtoni klient të ri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Zgjidhni ose shtoni klient të ri
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Qendra Kosto është e nevojshme për të librit një kërkesë shpenzimeve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Kjo është e bazuar në pjesëmarrjen e këtij punonjësi
@@ -4449,13 +4453,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop përdoruesit nga bërja Dërgo Aplikacione në ditët në vijim.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Shuma Blerje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Fundi Viti nuk mund të jetë para se të fillojë Vitit
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Fundi Viti nuk mund të jetë para se të fillojë Vitit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Përfitimet e Punonjësve
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Production Order,Manufactured Qty,Prodhuar Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Ju lutemi të vendosur një default Holiday Lista për punonjësit {0} ose Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nuk ekziston
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nuk ekziston
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
@@ -4464,15 +4468,17 @@
 DocType: Quality Inspection Reading,Reading 3,Leximi 3
 ,Hub,Qendër
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Employee Loan Application,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
 DocType: Guardian,Guardian,kujdestar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vlerësimi {0} krijuar për punonjësit {1} në datën e caktuar varg
 DocType: Employee,Education,Arsim
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Emërtimi Fushata By
 DocType: Employee,Current Address Is,Adresa e tanishme është
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifikuar
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Fakultative. Vë monedhë default kompanisë, nëse nuk është specifikuar."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
@@ -4509,7 +4515,7 @@
 DocType: Hub Settings,Hub Settings,Hub Cilësimet
 DocType: Project,Gross Margin %,Marzhi bruto%
 DocType: BOM,With Operations,Me Operacioneve
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
 DocType: Asset,Is Existing Asset,Është Asetin ekzistuese
 DocType: Salary Detail,Statistical Component,Komponenti statistikore
 DocType: Salary Detail,Statistical Component,Komponenti statistikore
@@ -4565,7 +4571,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Bashkangjit Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Nivelet e aksioneve
 DocType: Customer,Commission Rate,Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Bëni Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Pagesa Lloji duhet të jetë një nga Merre, të paguajë dhe Transfer të Brendshme"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitikë
@@ -4578,6 +4584,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Lejo Prodhimi në pushime
 DocType: Sales Order,Customer's Purchase Order Date,Konsumatorit Rendit Blerje Data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Trego Attachments publike
 DocType: Packing Slip,Package Weight Details,Paketa Peshë Detajet
 DocType: Payment Gateway Account,Payment Gateway Account,Pagesa Llogaria Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pas përfundimit të pagesës përcjellëse përdorues në faqen e zgjedhur.
@@ -4602,7 +4609,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,A nuk tregojnë ndonjë simbol si $ etj ardhshëm të valutave.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Bëni Serisë Student
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Bëni Serisë Student
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Të marrë sendet nga bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ditësh
@@ -4621,7 +4628,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Shuma e sanksionuar
 DocType: GL Entry,Is Opening,Është Hapja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi Setup numëron seri për Pjesëmarrja nëpërmjet Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Llogaria {0} nuk ekziston
 DocType: Account,Cash,Para
 DocType: Employee,Short biography for website and other publications.,Biografia e shkurtër për faqen e internetit dhe botime të tjera.
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index ae36e46..25492c6 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Батцх артикла истека статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банка Нацрт
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Схов Варијанте
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Схов Варијанте
 DocType: Academic Term,Academic Term,akademski Рок
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материјал
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Количина
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,здравство
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Кашњење у плаћању (Дани)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,сервис Трошкови
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} је потребно
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,оглашавање
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Иста компанија је ушла у више наврата
 DocType: Employee,Married,Ожењен
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Није дозвољено за {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Није дозвољено за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Гет ставке из
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Но итемс листед
 DocType: Payment Reconciliation,Reconcile,помирити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 DocType: Process Payroll,Make Bank Entry,Маке Банк Ентри
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следећа Амортизација Датум не може бити пре купуваве
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следећа Амортизација Датум не може бити пре купуваве
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Месечни Дистрибуција ** помаже да дистрибуирате буџет / Таргет преко месеци ако имате сезонски у свом послу.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Није пронађено ставки
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Није пронађено ставки
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Плата Структура Недостаје
 DocType: Lead,Person Name,Особа Име
 DocType: Sales Invoice Item,Sales Invoice Item,Продаја Рачун шифра
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",нпр &quot;Основна школа&quot; или &quot;Универзитет&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,stock Извештаји
 DocType: Warehouse,Warehouse Detail,Магацин Детаљ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Рок Датум завршетка не може бити касније од годину завршити Датум школске године у којој је термин везан (академска година {}). Молимо исправите датуме и покушајте поново.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Да ли је основних средстава&quot; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Да ли је основних средстава&quot; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
 DocType: Vehicle Service,Brake Oil,кочница уље
 DocType: Tax Rule,Tax Type,Пореска Тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Артикал слика (ако не слидесхов)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существуетклиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Избор БОМ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Избор БОМ
 DocType: SMS Log,SMS Log,СМС Пријава
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Трошкови уручене пошиљке
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Празник на {0} није између Од датума и до сада
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,разред
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производња заказа већ створена за све ставке са БОМ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Производња заказа већ створена за све ставке са БОМ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годишња плата
 DocType: Daily Work Summary,Daily Work Summary,Дневни Рад Преглед
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} је замрзнут
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} је замрзнут
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Молимо одаберите постојећу компанију за израду контни
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Акции Расходы
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Селецт Таргет Варехоусе
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Цонтра Ступање
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валути Компанија
 DocType: Delivery Note,Installation Status,Инсталација статус
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Да ли желите да ажурирате присуство? <br> Пресент: {0} \ <br> Одсутни: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 DocType: Request for Quotation,RFQ-,РФК-
 DocType: Item,Supply Raw Materials for Purchase,Набавка сировина за куповину
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Најмање један начин плаћања је потребно за ПОС рачуна.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Најмање један начин плаћања је потребно за ПОС рачуна.
 DocType: Products Settings,Show Products as a List,Схов Производи као Лист
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преузмите шаблон, попуните одговарајуће податке и приложите измењену датотеку.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Маке Трошкови Ентри
 DocType: Appraisal Template Goal,KRA,Гром
 DocType: Lead,Request Type,Захтев Тип
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Маке Емплоиее
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Маке Емплоиее
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,радиодифузија
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,извршење
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детаљи о пословању спроведена.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План одржавања посете.
 DocType: SMS Settings,Enter url parameter for message,Унесите УРЛ параметар за поруке
 DocType: POS Profile,Customer Groups,Цустомер Групе
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Финансијски извештаји
 DocType: Guardian,Students,Студенти
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила применения цен и скидки .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
 DocType: Company,Default Payroll Payable Account,Уобичајено Плате плаћају рачун
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Упдате-маил Група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Упдате-маил Група
 DocType: Sales Invoice,Is Opening Entry,Отвара Ентри
 DocType: Customer Group,Mention if non-standard receivable account applicable,Спомените ако нестандардни потраживања рачуна примењује
 DocType: Course Schedule,Instructor Name,инструктор Име
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Против продаје Фактура тачком
 ,Production Orders in Progress,Производни Поруџбине у напретку
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето готовина из финансирања
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Укупно Обрачун трошкова Износ (преко Тиме Схеет)
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банк unosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,Објављивање у Хуб
 DocType: Student Admission,Student Admission,студент Улаз
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Пункт {0} отменяется
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
 DocType: Journal Entry,Multi Currency,Тема Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Обавештење о пријему пошиљке
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Обавештење о пријему пошиљке
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Набавна вредност продате Ассет
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
-DocType: Grade Interval,Min Score,мин Резултат
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Student Applicant,Admitted,Признао
 DocType: Workstation,Rent Cost,Издавање Трошкови
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,вредност поруџбине
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банка / Новчане трансакције против странке или за интерни трансфер
 DocType: Shipping Rule,Valid for Countries,Важи за земље
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ово је тачка шаблона и не може се користити у трансакцијама. Атрибути јединица ће бити копирани у варијанти осим 'Нема Копирање' постављено
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ово је тачка шаблона и не може се користити у трансакцијама. Атрибути јединица ће бити копирани у варијанти осим 'Нема Копирање' постављено
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Укупно Ордер Сматра
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите ' Repeat на день месяца ' значения поля"
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,Пореска стопа
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} већ издвојила за запосленог {1} за период {2} {3} у
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Избор артикла
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Групно (много) од стране јединице.
 DocType: C-Form Invoice Detail,Invoice Date,Фактуре
 DocType: GL Entry,Debit Amount,Износ задужења
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створити студентских група
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,Захтев за понуду
 DocType: Salary Slip Timesheet,Working Hours,Радно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промена стартовања / струја број редни постојеће серије.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Креирајте нови клијента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Креирајте нови клијента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако више Цене Правила наставити да превлада, корисници су упитани да подесите приоритет ручно да реши конфликт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Створити куповини Ордерс
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Створити куповини Ордерс
 ,Purchase Register,Куповина Регистрација
 DocType: Course Scheduling Tool,Rechedule,Рецхедуле
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобална подешавања за свим производним процесима.
 DocType: Accounts Settings,Accounts Frozen Upto,Рачуни Фрозен Упто
 DocType: SMS Log,Sent On,Послата
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха .
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Од Пакет број
 DocType: Item Attribute,To Range,У распону
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не могу променити метод процене, јер постоје трансакције против неких ставки које га нема сопствену метод вредновања"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Укупно лишће издвојена обавезна
 DocType: Job Opening,Description of a Job Opening,Опис посао Отварање
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Пендинг активности за данас
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,купити
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Молимо Вас да дефинише оцену за праг 0%
 DocType: Sales Order,To Deliver,Да Испоручи
 DocType: Purchase Invoice Item,Item,ставка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управљање Подуговарање
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 DocType: Production Plan Item,Pending Qty,Кол чекању
 DocType: Budget,Ignore,Игнорисати
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} није активан
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} није активан
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},СМС порука на следеће бројеве телефона: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,цхецк сетуп димензије за штампање
 DocType: Salary Slip,Salary Slip Timesheet,Плата Слип Тимесхеет
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Укупно Комисија
 DocType: Pricing Rule,Sales Partner,Продаја Партнер
 DocType: Buying Settings,Purchase Receipt Required,Куповина Потврда Обавезно
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Процена курс је обавезна ако Отварање Сток ушла
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Процена курс је обавезна ако Отварање Сток ушла
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Нема резултата у фактури табели записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,акумулиране вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Маке Продаја Наручите
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Маке Продаја Наручите
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,ресуме Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
 DocType: Leave Control Panel,Allocate,Доделити
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Продаја Ретурн
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Напомена: Укупно издвојена лишће {0} не сме бити мањи од већ одобрених лишћа {1} за период
 DocType: Announcement,Posted By,Поставио
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Додељена сума не може бити негативан
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Подесите Цомпани
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Подесите Цомпани
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продаја Фактура Тимесхеет
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Избор Плаћање рачуна да банке Ентри
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Створити запослених евиденције за управљање лишће, трошковима тврдње и плате"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Створити запослених евиденције за управљање лишће, трошковима тврдње и плате"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додај у бази знања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Писање предлога
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаћање Ступање дедукције
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Однос са Гуардиан2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,менаџер
 DocType: Payment Entry,Payment From / To,Плаћање Фром /
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Датум опсег
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нови кредитни лимит је мање од тренутног преосталог износа за купца. Кредитни лимит мора да садржи најмање {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нови кредитни лимит је мање од тренутног преосталог износа за купца. Кредитни лимит мора да садржи најмање {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Исто аукција је ушао више пута.
 DocType: SMS Settings,Receiver Parameter,Пријемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основу"" и ""Групиши по"" не могу бити идентични"
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,Резолуција Датум
 DocType: Student Batch Name,Batch Name,батцх Име
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Тимесхеет цреатед:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,уписати
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ће показати ученика као присутна у Студентском Месечно Аттенданце Репорт
@@ -720,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,студент Присуство
 DocType: Sales Invoice Timesheet,Time Sheet,Распоред
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Бацкфлусх сировине на основу
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Пожалуйста, введите детали деталя"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Пре продаје
 DocType: Purchase Receipt,Other Details,Остали детаљи
@@ -738,7 +741,7 @@
 ,Absent Student Report,Абсент Студентски Извештај
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда Леттер Терм
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Фирма {0} не постоји
@@ -747,8 +750,6 @@
 DocType: Serial No,Warranty Expiry Date,Гаранција Датум истека
 DocType: Material Request Item,Quantity and Warehouse,Количина и Магацин
 DocType: Sales Invoice,Commission Rate (%),Комисија Стопа (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање Сериес за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање Сериес за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Молимо одаберите програм
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Молимо одаберите програм
 DocType: Project,Estimated Cost,Процењени трошкови
@@ -767,7 +768,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не является акционерным Пункт
 DocType: Mode of Payment Account,Default Account,Уобичајено Рачун
 DocType: Payment Entry,Received Amount (Company Currency),Примљени износ (Фирма валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планирано време завршетка
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
@@ -850,7 +851,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Request for Quotation Supplier,Send Email,Сенд Емаил
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Без дозвола
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
@@ -863,8 +864,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не работник не найдено
 DocType: Supplier Quotation,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студент Група је већ ажуриран.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студент Група је већ ажуриран.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студент Група је већ ажуриран.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студент Група је већ ажуриран.
 DocType: SMS Center,All Customer Contact,Све Кориснички Контакт
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Уплоад равнотежу берзе преко ЦСВ.
 DocType: Warehouse,Tree Details,трее Детаљи
@@ -875,8 +876,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимални износ фактуре
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Цена центар {2} не припада компанији {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: налог {2} не може бити група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Итем Ред {идк}: {ДОЦТИПЕ} {ДОЦНАМЕ} не постоји у горе &#39;{ДОЦТИПЕ}&#39; сто
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Итем Ред {идк}: {ДОЦТИПЕ} {ДОЦНАМЕ} не постоји у горе &#39;{ДОЦТИПЕ}&#39; сто
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Но задаци
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Дан у месецу на којем друмски фактура ће бити генерисан нпр 05, 28 итд"
 DocType: Asset,Opening Accumulated Depreciation,Отварање акумулирана амортизација
@@ -892,7 +893,7 @@
 DocType: Bin,Moving Average Rate,Мовинг Авераге рате
 DocType: Production Planning Tool,Select Items,Изаберите ставке
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Распоред курс
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Распоред курс
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: HR Settings,Enter retirement age in years,Унесите старосну границу за пензионисање у годинама
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Циљна Магацин
@@ -900,7 +901,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
 DocType: Stock Entry,STE-,аортна
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Все Группы товаров
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Все Группы товаров
 DocType: Process Payroll,Activity Log,Активност Пријава
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Нето добит / губитак
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
@@ -911,7 +912,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Налог за куповину на исплату
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Отварање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Опен То До
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
@@ -927,7 +928,7 @@
 DocType: Item Reorder,Re-Order Qty,Поново поручивање
 DocType: Leave Block List Date,Leave Block List Date,Оставите Датум листу блокираних
 DocType: Pricing Rule,Price or Discount,Цена или Скидка
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Укупно Важећи Оптужбе у куповини потврда за ставке табели мора бити исти као и укупних пореза и накнада
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Укупно Важећи Оптужбе у куповини потврда за ставке табели мора бити исти као и укупних пореза и накнада
 DocType: Sales Team,Incentives,Подстицаји
 DocType: SMS Log,Requested Numbers,Тражени Бројеви
 DocType: Production Planning Tool,Only Obtain Raw Materials,Само Добијање Сировине
@@ -985,8 +986,7 @@
 DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
@@ -1038,8 +1038,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,хемијски
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Дефаулт Банка / Готовина налог ће аутоматски бити ажуриран у плате књижење када је изабран овај режим.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Интервали за оцену Код {0} преклапа са интервалима разреда за остале разреде. Молимо вас да проверите интервали {0} и {1} и покушајте поново
 DocType: BOM,Raw Material Cost(Company Currency),Сировина трошкова (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ред # {0}: курс не може бити већа од стопе која се користи у {1} {2}
@@ -1052,7 +1050,7 @@
 DocType: BOM Website Item,BOM Website Item,БОМ Сајт артикла
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
 DocType: Timesheet Detail,Bill,рачун
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Бео
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина није доступан за {4} у складишту {1} на објављивање време ступања ({2} {3})
@@ -1067,7 +1065,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Наручи Тип мора бити један од {0}
 DocType: Lead,Next Contact Date,Следеће Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отварање Кол
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
 DocType: Student Batch Name,Student Batch Name,Студент Серија Име
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
 DocType: Repayment Schedule,Balance Loan Amount,Биланс Износ кредита
@@ -1087,10 +1085,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Наведите {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може бити негативан
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Укупан број Амортизација
 DocType: Sales Invoice Item,Rate With Margin,Стопа Са маргина
 DocType: Sales Invoice Item,Rate With Margin,Стопа Са маргина
@@ -1119,7 +1117,7 @@
 DocType: Lead,Organization Name,Име организације
 DocType: Tax Rule,Shipping State,Достава Држава
 ,Projected Quantity as Source,Пројектована Количина као извор
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
 DocType: Employee,A-,А-
 DocType: Production Planning Tool,Include non-stock items,Укључују не-залихама
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Коммерческие расходы
@@ -1127,7 +1125,7 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Поштански број
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Поштански број
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Салес Ордер {0} је {1}
 DocType: Opportunity,Contact Info,Контакт Инфо
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Макинг Стоцк записи
@@ -1171,7 +1169,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
 ,Ordered Items To Be Billed,Ж артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Од Опсег мора да буде мањи од у распону
 DocType: Global Defaults,Global Defaults,Глобални Дефаултс
@@ -1206,11 +1204,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Молимо Вас да унесете Код товара да се број серије
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
 DocType: Employee Loan,Partially Disbursed,Делимично Додељено
-DocType: Grading Structure,Grading System Name,Градинг систем Име
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдевач базе података.
 DocType: Account,Balance Sheet,баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим плаћања није подешен. Молимо вас да проверите, да ли налог је постављен на начину плаћања или на ПОС профил."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим плаћања није подешен. Молимо вас да проверите, да ли налог је постављен на начину плаћања или на ПОС профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ваша особа продаја ће добити подсетник на овај датум да се контактира купца
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Исто ставка не може се уписати више пута.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
@@ -1249,11 +1246,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Наведите бар један атрибут у табели Атрибутима
 DocType: Announcement,All Students,Сви студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Погледај Леџер
 DocType: Grading Scale,Intervals,интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Студент Мобилни број
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
@@ -1294,8 +1291,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Наруџбенице помоћи да планирате и праћење куповина
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Наруџбенице помоћи да планирате и праћење куповина
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Мали
@@ -1319,7 +1316,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Синц мастер података
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
 DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,БОМ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
@@ -1336,7 +1333,7 @@
 DocType: Student Group Student,Group Roll Number,"Група Ролл, број"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Збир свих радних тегова треба да буде 1. Подесите тежине свих задатака пројекта у складу са тим
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
@@ -1363,7 +1360,7 @@
 DocType: Depreciation Schedule,Journal Entry,Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ставки у току
 DocType: Workstation,Workstation Name,Воркстатион Име
-DocType: Grade Interval,Grade Code,граде код
+DocType: Grading Scale Interval,Grade Code,граде код
 DocType: POS Item Group,POS Item Group,ПОС Тачка Група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Емаил Дигест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
@@ -1380,7 +1377,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,аппаратные средства
 DocType: Sales Order,Recurring Upto,понављајући Упто
 DocType: Attendance,HR Manager,ХР Менаџер
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Изаберите Цомпани
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Изаберите Цомпани
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Потребно је да омогућите Корпа
@@ -1396,7 +1393,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старење Опсег 3
 DocType: Maintenance Schedule Item,No of Visits,Број посета
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,марк Похађани
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,марк Похађани
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Распоред одржавања {0} постоји од {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Уписивање student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута затварања рачуна мора да буде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир бодова за све циљеве би требало да буде 100. То је {0}
@@ -1445,13 +1443,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Контни
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи оставити без Паи
 DocType: Pricing Rule,"Higher the number, higher the priority","Виши број, већи приоритет"
 ,Purchase Invoice Trends,Фактури Трендови
 DocType: Employee,Better Prospects,Бољи изгледи
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Шаржа {1} има само {2} Кти. Молимо одаберите другу групу која има {3} Кти Аваилабле или поделити ред у више редова, да испоручи / проблема из више серија"
 DocType: Vehicle,License Plate,Регистарске таблице
 DocType: Appraisal,Goals,Циљеви
 DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ статус
@@ -1470,7 +1469,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Запослени не може пријавити за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Аконалог је замрзнут , уноси могу да ограничене корисницима ."
 DocType: Email Digest,Bank Balance,Стање на рачуну
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы , квалификация , необходимые т.д."
 DocType: Journal Entry Account,Account Balance,Рачун Биланс
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Пореска Правило за трансакције.
@@ -1481,7 +1480,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Схов П &amp; Л стања унцлосед фискалну годину
 DocType: Shipping Rule,Shipping Account,Достава рачуна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: налог {2} је неактиван
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Маке Салес Ордерс ће вам помоћи да планирате свој рад и доставити на време
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Маке Салес Ордерс ће вам помоћи да планирате свој рад и доставити на време
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Укупно Додатни трошкови
 DocType: Course Schedule,SH,СХ
@@ -1492,7 +1491,7 @@
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Asset Movement,Stock Manager,Сток директор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Паковање Слип
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Паковање Слип
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
@@ -1518,7 +1517,7 @@
 DocType: Sales Invoice,Source,Извор
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,схов затворено
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Средство Категорија је обавезна за фиксне тачке средстава
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Средство Категорија је обавезна за фиксне тачке средстава
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Нема резултата у табели плаћања записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ова {0} је у супротности са {1} за {2} {3}
 DocType: Student Attendance Tool,Students HTML,Студенти ХТМЛ-
@@ -1536,7 +1535,7 @@
 DocType: Student,Date of Leaving,Датум Леавинг
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,створити Леадс
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,створити Леадс
 DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
@@ -1564,7 +1563,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Упис
 DocType: Sales Invoice Item,Brand Name,Бранд Наме
 DocType: Purchase Receipt,Transporter Details,Транспортер Детаљи
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,коробка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,могуће добављача
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организација
@@ -1598,7 +1597,7 @@
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Стандардно БОМ за {0} није пронађен за пројекат {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Захтеви за рачун предузећа.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студенти су у срцу система, додати све студенте"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студенти су у срцу система, додати све студенте"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ред # {0}: Датум Одобрење {1} не може бити пре Чек Дате {2}
 DocType: Company,Default Holiday List,Уобичајено Холидаи Лист
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од времена и доба {1} преклапа са {2}
@@ -1610,20 +1609,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Поново плаћања Емаил
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Нови задатак
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Направи понуду
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Направи понуду
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Остали извештаји
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Покушајте планирање операција за Кс дана унапред.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Молимо поставите Дефаулт Паиролл Паиабле рачун у компанији {0}
 DocType: SMS Center,Receiver List,Пријемник Листа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Тражи артикла
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Тражи артикла
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Цонсумед Износ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нето промена на пари
 DocType: Assessment Plan,Grading Scale,скала оцењивања
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,већ завршено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Плаћање Захтјев већ постоји {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
@@ -1661,7 +1660,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,прикупити
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Кретање средство запис {0} је направљена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Кретање средство запис {0} је направљена
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете брисати Фискална година {0}. Фискална {0} Година је постављен као подразумевани у глобалним поставкама
 DocType: Journal Entry,Entry Type,Ступање Тип
 ,Customer Credit Balance,Кориснички кредитни биланс
@@ -1704,8 +1703,6 @@
 DocType: Student Sibling,Studying in Same Institute,Студирање у истом институту
 DocType: Territory,Territory Manager,Територија Менаџер
 DocType: Packed Item,To Warehouse (Optional),До складишта (опционо)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 DocType: Payment Entry,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
@@ -1715,9 +1712,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Погледај у корпу
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Захтев се користи да би овај унос Стоцк
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следећа Амортизација Датум је обавезан за инвестицију
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следећа Амортизација Датум је обавезан за инвестицију
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Одвојени базирана Група наравно за сваку серију
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Једна јединица једне тачке.
 DocType: Fee Category,Fee Category,naknada Категорија
@@ -1733,8 +1730,7 @@
 DocType: Course Assessment Criteria,Weightage,Веигхтаге
 DocType: Packing Slip,PS-,ПС-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Трошкови Центар је потребно за &quot;добит и губитак&quot; налога {2}. Молимо Вас да оснује центар трошкова подразумевани за компаније.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Кориснички&gt; Кориснички Група&gt; Територија
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нови контакт
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
@@ -1761,21 +1757,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Помирење ЈСОН
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 DocType: Purchase Invoice Item,Batch No,Групно Нема
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Није могуће пронаћи курс за {0} до {1} за кључне дана {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволите више продајних налога против нарудзбенице купац је
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Гуардиан2 Мобилни број
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,основной
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Варијанта
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,основной
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
 DocType: Employee Attendance Tool,Employees HTML,zaposleni ХТМЛ
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
 DocType: Employee,Leave Encashed?,Оставите Енцасхед?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Прилика Од пољу је обавезна
 DocType: Email Digest,Annual Expenses,Годишњи трошкови
 DocType: Item,Variants,Варијанте
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
@@ -1795,7 +1790,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,аппраисалс
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за владавину Схиппинг
-DocType: Grading Structure,Grading Intervals,норматив Интервали
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Унесите
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не могу да овербилл за тачком {0} у реду {1} више од {2}. Да би се омогућило над-наплате, молимо вас да поставите у Буиинг Сеттингс"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Молимо поставите филтер на основу тачке или Варехоусе
@@ -1808,16 +1802,17 @@
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Одбијен Складиште је обавезна против одбијен тачком {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Плаћање
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Организујте своје налоге
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Организујте своје налоге
 DocType: Production Order Operation,Actual Time and Cost,Тренутно време и трошак
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Поздрав
 DocType: Course,Course Abbreviation,Наравно држава
 DocType: Student Leave Application,Student Leave Application,Студент одсуство примене
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Запослени {0} на пола дана на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Укупно радно време не би требало да буде већи од мак радних сати {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Бундле ставке у време продаје.
 DocType: Quotation Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
@@ -1827,7 +1822,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Унели дупликате . Молимо исправи и покушајте поново .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,помоћник
 DocType: Asset Movement,Asset Movement,средство покрет
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Нова корпа
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Нова корпа
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
 DocType: Vehicle,Wheels,Точкови
@@ -1859,10 +1854,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Онемогућава стварање временских трупаца против производних налога. Операције неће бити праћени против Продуцтион Ордер
 DocType: Student,Student Mobile Number,Студент Број мобилног телефона
 DocType: Item,Has Variants,Хас Варијанте
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Батцх ИД је обавезна
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Батцх ИД је обавезна
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Батцх ИД је обавезна
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Батцх ИД је обавезна
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
 DocType: Purchase Invoice,Recurring Invoice,Понављајући Рачун
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управљање пројектима
@@ -1870,7 +1865,7 @@
 DocType: Budget,Fiscal Year,Фискална година
 DocType: Vehicle Log,Fuel Price,Гориво Цена
 DocType: Budget,Budget,Буџет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџет не може се одредити према {0}, јер то није прихода или расхода рачун"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнута
 DocType: Student Admission,Application Form Route,Образац за пријаву Рута
@@ -1901,7 +1896,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Износ {0} {1} одузима од {2}
 DocType: Employee,Salary Information,Плата Информација
 DocType: Sales Person,Name and Employee ID,Име и број запослених
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -1960,7 +1955,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Поновите Кориснички Приход
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,пара
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
 DocType: Asset,Depreciation Schedule,Амортизација Распоред
 DocType: Bank Reconciliation Detail,Against Account,Против налога
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Пола Дан Датум треба да буде између Од датума и до данас
@@ -1977,13 +1972,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Испоручено
 ,Vehicle Expenses,Трошкови возила
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
+DocType: Serial No,Invoice Details,Детаљи рачуна
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
 DocType: Employee Loan,Loan Amount,Износ позајмице
@@ -2007,7 +2003,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Аббр не може бити празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група не-Гроуп
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,спортски
 DocType: Loan Type,Loan Name,kredit Име
@@ -2019,6 +2015,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Магацин где се одржава залихе одбачених предмета
 DocType: Production Order,Skip Material Transfer,Скип Материал Трансфер
 DocType: Production Order,Skip Material Transfer,Скип Материал Трансфер
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Није могуће пронаћи курс за {0} до {1} за кључне дана {2}. Направите валута Екцханге рекорд ручно
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Ваша финансијска година се завршава
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
@@ -2056,9 +2053,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискална година** представља Финансијску годину. Све рачуноводствене уносе и остале главне трансакције се прате наспрам **Фискалне фодине**.
 DocType: Opportunity,Customer / Lead Address,Кориснички / Олово Адреса
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 DocType: Student Admission,Eligibility,квалификованост
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Леадс вам помоћи да посао, додати све своје контакте и још као своје трагове"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Леадс вам помоћи да посао, додати све своје контакте и још као своје трагове"
 DocType: Production Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
@@ -2099,7 +2096,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изаберите фирму ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Process Payroll,Fortnightly,четрнаестодневни
 DocType: Currency Exchange,From Currency,Од валутног
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
@@ -2115,7 +2112,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда , как «О предыдущего ряда Сумма » или « О предыдущего ряда Всего 'для первой строки"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Дете артикла не би требало да буде Бундле производа. Молимо Вас да уклоните ставку `{0} &#39;и сачувати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,банкарство
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Додај тимесхеетс
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Додај тимесхеетс
 DocType: Vehicle Service,Service Item,сервис артикла
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
@@ -2165,8 +2162,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цене неће бити приказан ако Ценовник није подешен
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Наведите земљу за ову Схиппинг правило или проверите ворлдвиде схиппинг
 DocType: Stock Entry,Total Incoming Value,Укупна вредност Долазни
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебитна Да је потребно
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебитна Да је потребно
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Куповина Ценовник
 DocType: Offer Letter Term,Offer Term,Понуда Рок
 DocType: Quality Inspection,Quality Manager,Руководилац квалитета
@@ -2200,14 +2197,14 @@
 DocType: Opportunity,Lost Reason,Лост Разлог
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Величина узорка
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Молимо унесите документ о пријему
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Молимо унесите документ о пријему
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Све ставке су већ фактурисано
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Наведите тачну &#39;Од Предмет бр&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 DocType: Project,External,Спољни
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволе
 DocType: Vehicle Log,VLOG.,ВЛОГ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производни Поруџбине Креирано: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Производни Поруџбине Креирано: {0}
 DocType: Branch,Branch,Филијала
 DocType: Guardian,Mobile Number,Број мобилног телефона
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг
@@ -2216,7 +2213,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серијски број {0} није пронађен
 DocType: Scheduling Tool,Student Batch,студент партије
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваши Купци
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Маке Студент
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Маке Студент
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Позвани сте да сарађују на пројекту: {0}
 DocType: Leave Block List Date,Block Date,Блоцк Дате
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Пријавите се
@@ -2240,8 +2237,9 @@
 DocType: SMS Log,Sent To,Послат
 DocType: Payment Request,Make Sales Invoice,Маке Салес фактура
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Програми
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следећа контакт Датум не могу бити у прошлости
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следећа контакт Датум не могу бити у прошлости
 DocType: Company,For Reference Only.,За справки.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Избор серијски бр
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неважећи {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,ПИНВ-РЕТ-
 DocType: Sales Invoice Advance,Advance Amount,Унапред Износ
@@ -2255,7 +2253,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Предмет бр не може бити 0
 DocType: Item,Show a slideshow at the top of the page,Приказивање слајдова на врху странице
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,БОМ
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазины
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазины
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
 DocType: Item,End of Life,Крај живота
@@ -2271,8 +2269,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Пренос материјала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овај документ је преко границе од {0} {1} за ставку {4}. Правиш други {3} против исте {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Молимо поставите понављају након снимања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Избор промена износ рачуна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Молимо поставите понављају након снимања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Избор промена износ рачуна
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
@@ -2283,7 +2281,7 @@
 DocType: Budget Account,Budget Account,буџета рачуна
 DocType: Quality Inspection,Verified By,Верифиед би
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании , потому что есть существующие операции . Сделки должны быть отменены , чтобы поменять валюту ."
-DocType: Grade Interval,Grade Description,граде Опис
+DocType: Grading Scale Interval,Grade Description,граде Опис
 DocType: Stock Entry,Purchase Receipt No,Куповина Пријем Нема
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,задаток
 DocType: Process Payroll,Create Salary Slip,Направи Слип платама
@@ -2321,7 +2319,7 @@
 DocType: Upload Attendance,Attendance To Date,Присуство Дате
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Gateway Account,Payment Account,Плаћање рачуна
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Наведите компанија наставити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Наведите компанија наставити
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Нето Промена Потраживања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсационные Выкл
 DocType: Offer Letter,Accepted,Примљен
@@ -2334,7 +2332,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Корисник форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
 DocType: Employee,Previous Work Experience,Претходно радно искуство
@@ -2348,7 +2346,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Име института за коју се постављање овог система.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Рачуноводствени унос замрзнуте до овог датума, нико не може / изменити унос осим улоге доле наведеном."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Сачувајте документ пре генерисања план одржавања
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Сачувајте документ пре генерисања план одржавања
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус пројекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Проверите то тако да одбаци фракција. (За НОС)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Следећи производних налога су створени:
@@ -2371,6 +2369,7 @@
 DocType: Email Digest,How frequently?,Колико често?
 DocType: Purchase Receipt,Get Current Stock,Гет тренутним залихама
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дрво Билл оф Материалс
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 DocType: Student,Joining Date,Датум приступања
 ,Employees working on a holiday,Запослени који раде на одмор
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марко Садашња
@@ -2472,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,производња
 DocType: Guardian,Occupation,занимање
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
 DocType: Sales Invoice,This Document,Овај документ
 DocType: Installation Note Item,Installed Qty,Инсталирани Кол
@@ -2495,8 +2494,8 @@
 DocType: Notification Control,Sales Order Message,Продаја Наручите порука
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию , как Болгарии, Валюта , текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Плаћање Тип
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
 DocType: Process Payroll,Select Employees,Изаберите Запослени
 DocType: Opportunity,Potential Sales Deal,Потенцијални Продаја Деал
 DocType: Payment Entry,Cheque/Reference Date,Чек / Референтни датум
@@ -2513,7 +2512,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобална ПОС Профил {0} Већ је направљена за компанију {1}
 DocType: Purchase Order,Ref SQ,Реф СК
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Замените Итем / бом у свим БОМс
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Потврда мора бити достављен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Потврда мора бити достављен
 DocType: Purchase Invoice Item,Received Qty,Примљени Кол
 DocType: Stock Entry Detail,Serial No / Batch,Серијски бр / Серије
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не Паид и није испоручена
@@ -2526,7 +2525,7 @@
 ,To Produce,за производњу
 apps/erpnext/erpnext/config/hr.py +93,Payroll,платни списак
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Маке корисника
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Маке корисника
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација пакета за испоруку (за штампу)
 DocType: Bin,Reserved Quantity,Резервисани Количина
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Унесите исправну е-маил адресу
@@ -2540,11 +2539,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Онемогућен шаблон не мора да буде подразумевани шаблон
 DocType: Account,Income Account,Приходи рачуна
 DocType: Payment Request,Amount in customer's currency,Износ у валути купца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Испорука
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте &quot;стопа материјала на бази&quot; у Цостинг одељак
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,прев
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студент Пакети помоћи да пратите посећеност, процене и накнаде за студенте"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студент Пакети помоћи да пратите посећеност, процене и накнаде за студенте"
 DocType: Payment Entry,Total Allocated Amount,Укупно издвајају
 DocType: Item Reorder,Material Request Type,Материјал Врста Захтева
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Аццурал Јоурнал Ентри за плате од {0} до {1}
@@ -2567,7 +2567,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Стаза води од индустрије Типе .
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
@@ -2577,6 +2577,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ће послати е-маил о догађају запосленима са статусом &quot;Отворени&quot;
 DocType: Task,Depends on Tasks,Зависи од Задаци
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управление групповой клиентов дерево .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Прилози могу бити приказана без омогућавање колица
 DocType: Supplier Quotation,SQTN-,СКТН-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Нови Трошкови Центар Име
 DocType: Leave Control Panel,Leave Control Panel,Оставите Цонтрол Панел
@@ -2589,12 +2590,10 @@
 DocType: Sales Invoice,Debit To,Дебитна Да
 DocType: Delivery Note,Required only for sample item.,Потребно само за узорак ставку.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Нема плата клизање налази између {0} и {1}
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Студент Пријемни
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} је онемогућен
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} је онемогућен
 DocType: Supplier,Billing Currency,Обрачун Валута
 DocType: Sales Invoice,SINV-RET-,СИНВ-РЕТ-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Екстра велики
@@ -2611,7 +2610,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Страница Представљамо производа
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Све процене Групе
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нови Магацин Име
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Укупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Укупно {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територија
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
@@ -2629,7 +2628,7 @@
 DocType: Price List,Price List Master,Ценовник Мастер
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
 ,S.O. No.,С.О. Не.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Важи за земље
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Остави само Апликације које имају статус &quot;Одобрено&quot; и &quot;Одбијен&quot; могу се доставити
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Студент Име групе је обавезно у реду {0}
@@ -2722,7 +2721,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 DocType: Vehicle Service,Engine Oil,Моторно уље
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 DocType: Employee Loan,Loan Details,kredit Детаљи
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршен количина мора бити већа од нуле.
@@ -2787,7 +2786,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Складишта са постојећим трансакцији не може бити конвертована у групу.
 DocType: Assessment Result Tool,Result HTML,rezultat ХТМЛ-
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Истиче
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Додај Студенти
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Додај Студенти
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
@@ -2852,7 +2851,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,лимит Цроссед
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вентуре Цапитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Академски назив са овим &#39;школској&#39; {0} и &#39;Рок име&#39; {1} већ постоји. Молимо Вас да измените ове ставке и покушајте поново.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Као што постоје постоје трансакције против ставку {0}, не може да промени вредност {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Као што постоје постоје трансакције против ставку {0}, не може да промени вредност {1}"
 DocType: UOM,Must be Whole Number,Мора да буде цео број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нове Лишће Издвојена (у данима)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серийный номер {0} не существует
@@ -2896,7 +2895,7 @@
 DocType: Supplier,Last Day of the Next Month,Последњи дан наредног мјесеца
 DocType: Support Settings,Auto close Issue after 7 days,Ауто затварање издање након 7 дана
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите не може се доделити пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студент Подносилац
 DocType: Asset Category Account,Accumulated Depreciation Account,Исправка вриједности рачуна
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
@@ -2924,8 +2923,8 @@
 DocType: Asset,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детаљи
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
 DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
@@ -2944,7 +2943,7 @@
 DocType: Production Planning Tool,Create Material Requests,Креирате захтеве Материјал
 DocType: Employee Education,School/University,Школа / Универзитет
 DocType: Payment Request,Reference Details,Референтна Детаљи
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Очекује Вредност Након користан живот мора бити мања од бруто набавне Износ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очекује Вредност Након користан живот мора бити мања од бруто набавне Износ
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступно Кол у складишту
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Изграђена Износ
 DocType: Asset,Double Declining Balance,Доубле дегресивне
@@ -2965,19 +2964,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Исплаћено износ не може бити већи од кредита Износ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производња Поруџбина није направљена
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Производња Поруџбина није направљена
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
 DocType: Asset,Fully Depreciated,потпуно отписаних
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Приметан Присуство ХТМЛ
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Цитати су предлози, понуде које сте послали да својим клијентима"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Цитати су предлози, понуде које сте послали да својим клијентима"
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серијски број и партије
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Збир Сцорес мерила за оцењивање треба да буде {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Вредност или Кол
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,минут
@@ -3107,7 +3106,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,студент Група
 DocType: Shopping Cart Settings,Quotation Series,Цитат Серија
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Молимо одаберите клијента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Молимо одаберите клијента
 DocType: C-Form,I,ја
 DocType: Company,Asset Depreciation Cost Center,Средство Амортизација Трошкови центар
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
@@ -3126,19 +3125,18 @@
 DocType: Vehicle,Insurance Details,осигурање Детаљи
 DocType: Account,Payable,к оплате
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Молимо Вас да унесете отплате Периоди
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Дужници ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Дужници ({0})
 DocType: Pricing Rule,Margin,Маржа
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нове Купци
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Бруто добит%
 DocType: Appraisal Goal,Weightage (%),Веигхтаге (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Чишћење Датум
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Бруто Куповина Износ је обавезан
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Бруто Куповина Износ је обавезан
 DocType: Lead,Address Desc,Адреса Десц
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Парти је обавезно
 DocType: Journal Entry,JV-,ЈВ-
 DocType: Topic,Topic Name,Назив теме
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Барем један од продајете или купујете морају бити изабрани
-DocType: Grading Structure,Grade Intervals,Граде Интервали
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изаберите природу вашег посла.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Где се обавља производњу операције.
 DocType: Asset Movement,Source Warehouse,Извор Магацин
@@ -3167,6 +3165,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
 DocType: Territory,Territory Targets,Територија Мете
 DocType: Delivery Note,Transporter Info,Транспортер Инфо
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Кориснички&gt; Кориснички Група&gt; Територија
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Молимо поставите подразумевани {0} у компанији {1}
 DocType: Cheque Print Template,Starting position from top edge,Почетне позиције од горње ивице
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Исти добављач је ушао више пута
@@ -3220,7 +3219,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Реордер ком
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Цуррент Јоб Опенингс
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
-DocType: Journal Entry,Write Off,Отписати
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписати
 DocType: Timesheet Detail,Operation ID,Операција ИД
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Систем Корисник (пријављивање) ИД. Ако се постави, она ће постати стандардна за све ХР облицима."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Од {1}
@@ -3231,8 +3230,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Добављач доставља клијенту
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Облик / тачка / {0}) није у складишту
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Следећа Датум мора бити већи од датума када је послата
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Покажи пореза распада
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Подаци Увоз и извоз
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Сток уноса постоје против Варехоусе {0}, стога не можете поново доделити или модификовати"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ниједан студент Фоунд
@@ -3244,14 +3243,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
 DocType: Program Enrollment,School House,Школа Кућа
 DocType: Serial No,Out of AMC,Од АМЦ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Молимо одаберите Куотатионс
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Молимо одаберите Куотатионс
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Маке одржавање Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Молимо одаберите Куотатионс
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Молимо одаберите Куотатионс
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Маке одржавање Посетите
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
 DocType: Company,Default Cash Account,Уобичајено готовински рачун
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ово је засновано на похађања овог Студент
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Но Ученици у
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додали још ставки или Опен пуној форми
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
@@ -3298,9 +3298,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Пре помирења
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Порези и накнаде додавања (Друштво валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Итем {0} мора бити основних средстава итем
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Итем {0} мора бити основних средстава итем
 DocType: Item,Default BOM,Уобичајено БОМ
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Укупно Изванредна Амт
@@ -3323,7 +3323,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
 DocType: Purchase Invoice Item,Rate,Стопа
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,стажиста
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адреса Име
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Адреса Име
 DocType: Stock Entry,From BOM,Од БОМ
 DocType: Assessment Code,Assessment Code,Процена код
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,основной
@@ -3348,7 +3348,7 @@
 DocType: Purchase Invoice,Print Language,принт Језик
 DocType: Salary Slip,Total Working Hours,Укупно Радно време
 DocType: Stock Entry,Including items for sub assemblies,Укључујући ставке за под скупштине
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Унесите вредност мора бити позитивна
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Унесите вредност мора бити позитивна
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Все территории
 DocType: Purchase Invoice,Items,Артикли
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент је већ уписано.
@@ -3368,17 +3368,15 @@
 DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты , необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
 DocType: Assessment Plan,Supervisor Name,Супервизор Име
 DocType: Program Enrollment Course,Program Enrollment Course,Програм Упис предмета
 DocType: Program Enrollment Course,Program Enrollment Course,Програм Упис предмета
-DocType: Grading Structure,Grading Structure,градинг Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
 DocType: Tax Rule,Shipping City,Достава Град
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ово артикла је варијанта {0} (Темплате). Атрибути ће бити копирани са шаблона осим 'Нема Копирање' постављено
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Новчани ток из пословања
 DocType: Sales Invoice,Shipping Rule,Достава Правило
@@ -3401,6 +3399,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Молимо Вас да изаберете датум постања први
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Датум отварања треба да буде пре затварања Дате
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање бројева серије за похађање преко Сетуп&gt; нумерисање серија
 DocType: Leave Control Panel,Carry Forward,Пренети
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
 DocType: Department,Days for which Holidays are blocked for this department.,Дани за које Празници су блокирани овом одељењу.
@@ -3429,7 +3428,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Укупно (Амт)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 DocType: Quality Inspection,Item Serial No,Ставка Сериал но
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Створити запослених Рецордс
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Створити запослених Рецордс
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Укупно Поклон
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,рачуноводствених исказа
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,час
@@ -3444,8 +3443,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Нови БОМ након замене
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Поинт оф Сале
 DocType: Payment Entry,Received Amount,примљени износ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Створити за пуну количину, игноришући количину већ би"
 DocType: Account,Tax,Порез
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,необележен
@@ -3458,7 +3455,7 @@
 DocType: Batch,Source Document Name,Извор Име документа
 DocType: Batch,Source Document Name,Извор Име документа
 DocType: Job Opening,Job Title,Звање
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,створити корисника
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,створити корисника
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетите извештаја за одржавање разговора.
@@ -3470,8 +3467,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Вебсајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промена у капиталу
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Признаница
 ,Sales Register,Продаја Регистрација
@@ -3482,16 +3479,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Не постоји ништа да измените .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Преглед за овај месец и чекају активности
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Но Купци иет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај о токовима готовине
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Молимо изаберите пренети ако такође желите да укључите претходну фискалну годину је биланс оставља на ову фискалну годину
 DocType: GL Entry,Against Voucher Type,Против Вауцер Типе
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последњи Низ Датум
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
 DocType: Student,Guardian Details,гуардиан Детаљи
 DocType: C-Form,C-Form,Ц-Форм
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присуство за више радника
@@ -3516,14 +3515,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # Рачун мора бити типа &#39;основним средствима&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Кол
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансијске услуге
 DocType: Student Sibling,Student ID,студентска
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Врсте активности за време Логс
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
 DocType: Training Event,Exam,испит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Кр
 DocType: Tax Rule,Billing State,Тецх Стате
@@ -3556,7 +3555,7 @@
 DocType: Payment Entry,Account Paid From,Рачун Паид Од
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сировина Шифра
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Маке Леад
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Маке Леад
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Принт и Папирна
 DocType: Stock Settings,Show Barcode Field,Схов Баркод Поље
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Пошаљи Супплиер Емаилс
@@ -3572,6 +3571,7 @@
 DocType: Offer Letter,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Горе
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Поменули да нестандардни плаћа рачун
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
@@ -3608,7 +3608,7 @@
 DocType: Program Enrollment Tool,Get Students From,Гет студенти из
 DocType: Hub Settings,Seller Country,Продавац Земља
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Објављивање ставке на сајту
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група ваши ученици у серијама
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група ваши ученици у серијама
 DocType: Authorization Rule,Authorization Rule,Овлашћење Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови Детаљи
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,технические условия
@@ -3668,7 +3668,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,пробни рад
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата компоненте
 DocType: Program Enrollment Tool,New Academic Year,Нова школска година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Повратак / одобрењу кредита
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Повратак / одобрењу кредита
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Укупно Плаћени износ
 DocType: Production Order Item,Transferred Qty,Пренето Кти
@@ -3709,6 +3709,7 @@
 ,Sales Funnel,Продаја Левак
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Држава је обавезна
 DocType: Project,Task Progress,zadatak Напредак
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Колица
 ,Qty to Transfer,Количина за трансфер
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
@@ -3742,7 +3743,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,таксе
 DocType: Attendance,ATT-,АТТ-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
 DocType: Lead,Add to calendar on this date,Додај у календар овог датума
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
 DocType: Item,Opening Stock,otvaranje Сток
@@ -3761,7 +3762,7 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поруџбине пуштен за производњу.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Program Enrollment Tool,Enroll Students,упис студената
 DocType: Hub Settings,Name Token,Име токен
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продаја
@@ -3772,7 +3773,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
 DocType: Sales Invoice,SINV-,СИНВ-
 DocType: Request for Quotation Item,Project Name,Назив пројекта
-DocType: Supplier,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
+DocType: Customer,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
 DocType: Journal Entry Account,If Income or Expense,Ако прихода или расхода
 DocType: Production Order,Required Items,тражених ставки
 DocType: Stock Ledger Entry,Stock Value Difference,Вредност акције Разлика
@@ -3803,6 +3804,7 @@
 DocType: Item,Taxes,Порези
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Паид и није испоручена
 DocType: Project,Default Cost Center,Уобичајено Трошкови Центар
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање Сериес за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 DocType: Bank Guarantee,End Date,Датум завршетка
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,stock Трансакције
 DocType: Budget,Budget Accounts,рачуна буџета
@@ -3867,7 +3869,7 @@
 DocType: Customer,Sales Partner and Commission,Продаја партнера и Комисија
 DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стопа (%) / Иеар
 ,Project Quantity,projekat Количина
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може бити требало би да промените &#39;Распоредите пријава по&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може бити требало би да промените &#39;Распоредите пријава по&#39;"
 DocType: Opportunity,To Discuss,Да Дисцусс
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} јединице {1} потребна {2} довршите ову трансакцију.
 DocType: Loan Type,Rate of Interest (%) Yearly,Каматна стопа (%) Годишња
@@ -3890,7 +3892,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,марк Одсутан
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута у БОМ # {1} треба да буде једнака изабране валуте {2}
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,naknada Компонента
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управљање возним парком
@@ -3907,7 +3909,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Магацин {0} не постоји
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистер За ЕРПНект Хуб
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Дистрибуција Проценти
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Изабрана опција не може имати Батцх
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Изабрана опција не може имати Батцх
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Процена стопа није пронађен за тачком {0}, која је потребна да уради рачуноводствене ставке за {1} {2}. Ако је ставка трансакцијама као ставка узорка у {1}, молимо вас да поменете да је у {1} табели тачка. У супротном, молимо вас да створи долазни стоцк трансакцију за стопу процене тачка или поменути у записнику јединице, а затим покушајте достављање / отказивања тхис ентри"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% испоручених материјала на основу ове Отпремнице
 DocType: Project,Customer Details,Кориснички Детаљи
@@ -3924,7 +3926,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Достављени налози се не могу избрисати
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Управљање квалитетом
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Итем {0} је онемогућен
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Итем {0} је онемогућен
 DocType: Employee Loan,Repay Fixed Amount per Period,Отплатити фиксан износ по периоду
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
@@ -3950,7 +3952,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Студент-маил ИД
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Изабрали ставке да спасе фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Изабрали ставке да спасе фактуру
 DocType: Employee,Encashment Date,Датум Енцасхмент
 DocType: Training Event,Internet,Интернет
 DocType: Account,Stock Adjustment,Фото со Регулировка
@@ -3983,6 +3985,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Задужењу Издато
 DocType: Production Order,Warehouses,Складишта
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} имовина не може се пренети
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ова ставка је варијанта {0} (Темплате).
 DocType: Workstation,per hour,на сат
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Куповина
 DocType: Announcement,Announcement,објава
@@ -3998,7 +4001,7 @@
 DocType: Account,Receivable,Дебиторская задолженность
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улога која је дозвољено да поднесе трансакције које превазилазе кредитне лимите.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Изабери ставке у Производња
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Изабери ставке у Производња
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
 DocType: Item,Material Issue,Материјал Издање
 DocType: Hub Settings,Seller Description,Продавац Опис
@@ -4011,7 +4014,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ж
 DocType: Salary Detail,Component,Саставни део
 DocType: Assessment Criteria,Assessment Criteria Group,Критеријуми за процену Група
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Отварање акумулирана амортизација мора бити мањи од једнак {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Отварање акумулирана амортизација мора бити мањи од једнак {0}
 DocType: Warehouse,Warehouse Name,Магацин Име
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
@@ -4046,7 +4049,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да бисте подесили ову фискалну годину , као подразумевајуће , кликните на "" Сет ас Дефаулт '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Придружити
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Employee Loan,Repay from Salary,Отплатити од плате
 DocType: Leave Application,LAP/,ЛАП /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Тражећи исплату од {0} {1} за износ {2}
@@ -4064,7 +4067,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Процена резултата Детаљ
 DocType: Employee Education,Employee Education,Запослени Образовање
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Дупликат ставка група наћи у табели тачка групе
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
 DocType: Salary Slip,Net Pay,Нето плата
 DocType: Account,Account,рачун
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серийный номер {0} уже получил
@@ -4073,7 +4076,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Магацин {0} није повезан на било који рачун, креирајте / Линк одговарајући (актива) налог за складиште."
 DocType: Purchase Invoice,Recurring Id,Понављајући Ид
 DocType: Customer,Sales Team Details,Продајни тим Детаљи
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Обриши трајно?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Обриши трајно?
 DocType: Expense Claim,Total Claimed Amount,Укупан износ полаже
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијалне могућности за продају.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неважећи {0}
@@ -4084,13 +4087,14 @@
 DocType: Warehouse,PIN,ПИН-
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Подесите школа у ЕРПНект
 DocType: Sales Invoice,Base Change Amount (Company Currency),База Промена Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Први Сачувајте документ.
 DocType: Account,Chargeable,Наплатив
 DocType: Company,Change Abbreviation,Промена скраћеница
 DocType: Expense Claim Detail,Expense Date,Расходи Датум
 DocType: Item,Max Discount (%),Максимална Попуст (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последњи Наручи Количина
+DocType: Task,Is Milestone,Да ли је МОТО
 DocType: Daily Work Summary,Email Sent To,Емаил Сент То
 DocType: Budget,Warn,Упозорити
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији."
@@ -4123,11 +4127,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
 DocType: Tax Rule,Purchase Tax Template,Порез на промет Темплате
 ,Project wise Stock Tracking,Пројекат мудар Праћење залиха
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Стварни Кол (на извору / циљне)
 DocType: Item Customer Detail,Ref Code,Реф Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Запослених евиденција.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
 DocType: HR Settings,Payroll Settings,Платне Подешавања
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Матцх нису повезане фактурама и уплатама.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Извршите поруџбину
@@ -4150,7 +4153,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекови и депозити погрешно ситуацију
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
 DocType: Purchase Invoice Item,Price List Rate,Ценовник Оцени
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Створити цитате купаца
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Створити цитате купаца
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Схов &quot;У складишту&quot; или &quot;Није у складишту&quot; заснован на лагеру на располагању у овом складишту.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Саставнице (БОМ)
 DocType: Item,Average time taken by the supplier to deliver,Просечно време које је добављач за испоруку
@@ -4172,7 +4175,7 @@
 DocType: Asset,Disposal Date,odlaganje Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Емаилс ће бити послат свим активних радника компаније у датом сат времена, ако немају одмора. Сажетак одговора ће бити послат у поноћ."
 DocType: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Контакт
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
@@ -4180,7 +4183,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Наравно обавезна је у реду {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До данас не може бити раније од датума
 DocType: Supplier Quotation Item,Prevdoc DocType,Превдоц ДОЦТИПЕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Додај / измени Прицес
 DocType: Batch,Parent Batch,родитељ Серија
 DocType: Batch,Parent Batch,родитељ Серија
 DocType: Cheque Print Template,Cheque Print Template,Чек Штампа Шаблон
@@ -4225,7 +4228,7 @@
 DocType: Item,Variant Based On,Варијанту засновану на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ваши Добављачи
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
 DocType: Request for Quotation Item,Supplier Part No,Добављач Део Бр
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не могу одбити када категорија је за &quot;процену вредности&quot; или &quot;Ваулатион и Тотал &#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Primio od
@@ -4235,7 +4238,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Од {0} {1} за
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Ред {0}: Сати вредност мора бити већа од нуле.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
 DocType: Issue,Content Type,Тип садржаја
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
@@ -4244,20 +4247,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
 DocType: Payment Reconciliation,From Invoice Date,Од Датум рачуна
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставите уновчења
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Шта он ради ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Да Варехоусе
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Све Студент Пријемни
 ,Average Commission Rate,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: School House,House Name,хоусе Име
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Упдате додатне трошкове да израчуна слетео трошак ставке
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,электрический
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Додајте остатак свог организације као своје кориснике. Такође можете да додате позвати купце да вашем порталу тако да их додају из контаката
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Додајте остатак свог организације као своје кориснике. Такође можете да додате позвати купце да вашем порталу тако да их додају из контаката
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
@@ -4266,7 +4269,7 @@
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Подсетник за рођендан за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дана Од Последња Наручи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Осигурање Датум почетка треба да буде мања од осигурања Енд дате
@@ -4281,7 +4284,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
 DocType: Vehicle Log,Odometer,мерач за пређени пут
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
@@ -4294,7 +4297,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,обрачун сат
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Уобичајено БОМ за {0} није пронађен
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Додирните ставке да их додати
 DocType: Fees,Program Enrollment,програм Упис
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
@@ -4395,7 +4399,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
 DocType: Issue,First Responded On,Прво одговорила
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Оглас крст од предмета на више група
-DocType: Grade Interval,Grade Interval,граде интервал
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Цлеаранце Датум ажуриран
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,подела Серија
@@ -4404,6 +4407,7 @@
 DocType: Request for Quotation Supplier,Download PDF,довнлоад ПДФ
 DocType: Production Order,Planned End Date,Планирани Датум Крај
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Где ставке су ускладиштене.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
 DocType: Request for Quotation,Supplier Detail,добављач Детаљ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Грешка у формули или стања: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Фактурисани износ
@@ -4448,7 +4452,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Подешавање једноставан сајт за своју организацију
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
@@ -4507,7 +4511,7 @@
 ,Items To Be Requested,Артикли бити затражено
 DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Company,Company Info,Подаци фирме
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Изабрати или додати новог купца
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Изабрати или додати новог купца
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Трошка је обавезан да резервишете трошковима захтев
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ово је засновано на похађања овог запосленог
@@ -4520,13 +4524,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп кориснике од доношења Леаве апликација на наредним данима.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Куповина Количина
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Добављач Понуда {0} је направљена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,До краја године не може бити пре почетка године
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,До краја године не може бити пре почетка године
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Примања запослених
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постоји
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не постоји
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Рачуни подигао купцима.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
@@ -4535,15 +4539,17 @@
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Средиште
 DocType: GL Entry,Voucher Type,Тип ваучера
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ценовник није пронађен или онемогућен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Employee Loan Application,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
 DocType: Guardian,Guardian,старатељ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,образовање
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,дел
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Тренутна Адреса Је
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модификовани
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
@@ -4580,7 +4586,7 @@
 DocType: Hub Settings,Hub Settings,Хуб Подешавања
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Са операције
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
 DocType: Asset,Is Existing Asset,Да ли је постојеће имовине
 DocType: Salary Detail,Statistical Component,Статистички Компонента
 DocType: Salary Detail,Statistical Component,Статистички Компонента
@@ -4636,7 +4642,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикрепите логотип
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,stock Нивои
 DocType: Customer,Commission Rate,Комисија Оцени
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Маке Вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок оставите апликације по одељењу.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип уплата мора бити један од Примите, Паи и интерни трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,аналитика
@@ -4649,6 +4655,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволите производња на празницима
 DocType: Sales Order,Customer's Purchase Order Date,Наруџбенице купца Датум
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал Сток
+DocType: Shopping Cart Settings,Show Public Attachments,Схов Публиц Прилози
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детаљи
 DocType: Payment Gateway Account,Payment Gateway Account,Паимент Гатеваи налог
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Након завршетка уплате преусмерава корисника на одабране стране.
@@ -4673,7 +4680,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показују као симбол $ итд поред валутама.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Маке Студент Батцх
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Маке Студент Батцх
 DocType: Leave Type,Is Carry Forward,Је напред Царри
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Се ставке из БОМ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Олово Дани Тиме
@@ -4692,8 +4699,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање бројева серије за похађање преко Сетуп&gt; нумерисање серија
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање бројева серије за похађање преко Сетуп&gt; нумерисање серија
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Счет {0} не существует
 DocType: Account,Cash,Готовина
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за сајт и других публикација.
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index e89fef9..b65ecda 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch Punkt Utgångs Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankväxel
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Visar varianter
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Visar varianter
 DocType: Academic Term,Academic Term,Akademisk termin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kvantitet
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sjukvård
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Försenad betalning (dagar)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjänsten Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Räkenskapsårets {0} krävs
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklam
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samma Företaget anges mer än en gång
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ej tillåtet för {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ej tillåtet för {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Få objekt från
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställd Namn System i Mänskliga Resurser&gt; HR Inställningar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkten {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Inga föremål listade
 DocType: Payment Reconciliation,Reconcile,Avstämma
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Matvaror
 DocType: Quality Inspection Reading,Reading 1,Avläsning 1
 DocType: Process Payroll,Make Bank Entry,Skapa Bank inlägg
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonder
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Nästa avskrivning Datum kan inte vara före Inköpsdatum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nästa avskrivning Datum kan inte vara före Inköpsdatum
 DocType: SMS Center,All Sales Person,Alla försäljningspersonal
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Månatlig Distribution ** hjälper du distribuerar budgeten / Mål över månader om du har säsongs i din verksamhet.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Inte artiklar hittade
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Inte artiklar hittade
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Lönestruktur saknas
 DocType: Lead,Person Name,Namn
 DocType: Sales Invoice Item,Sales Invoice Item,Fakturan Punkt
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",t.ex. &quot;Primary School&quot; eller &quot;universitet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lagerrapporter
 DocType: Warehouse,Warehouse Detail,Lagerdetalj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Slutdatum kan inte vara senare än slutet av året Datum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Är Fast Asset&quot; kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Är Fast Asset&quot; kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
 DocType: Vehicle Service,Brake Oil,bromsolja
 DocType: Tax Rule,Tax Type,Skatte Typ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har inte behörighet att lägga till eller uppdatera poster före {0}
 DocType: BOM,Item Image (if not slideshow),Produktbild (om inte bildspel)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En kund finns med samma namn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timmar / 60) * Faktisk produktionstid
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Välj BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Välj BOM
 DocType: SMS Log,SMS Log,SMS-logg
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad levererat gods
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Semester på {0} är inte mellan Från datum och Till datum
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Kvalitet
 DocType: Sales Invoice Item,Delivered By Supplier,Levereras av Supplier
 DocType: SMS Center,All Contact,Alla Kontakter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produktionsorder redan skapats för alla objekt med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Produktionsorder redan skapats för alla objekt med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Årslön
 DocType: Daily Work Summary,Daily Work Summary,Dagliga Work Sammandrag
 DocType: Period Closing Voucher,Closing Fiscal Year,Stänger Räkenskapsårets
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} är fryst
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} är fryst
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Välj befintligt företag för att skapa konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Kostnader
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Välj Target Warehouse
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Konteringsanteckning
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i bolaget Valuta
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vill du uppdatera närvaro? <br> Föreliggande: {0} \ <br> Frånvarande: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Leverera råvaror för köp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Minst ett läge av betalning krävs för POS faktura.
 DocType: Products Settings,Show Products as a List,Visa produkter som en lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Hämta mallen, fyll lämpliga uppgifter och bifoga den modifierade filen. Alla datum och anställdas kombinationer i den valda perioden kommer i mallen, med befintliga närvaroutdrag"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Göra Av- Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ av förfrågan
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,göra Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,göra Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Sändning
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Exekvering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljer om de åtgärder som genomförs.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planer för underhållsbesök.
 DocType: SMS Settings,Enter url parameter for message,Ange url parameter för meddelande
 DocType: POS Profile,Customer Groups,kundgrupper
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Bokslut
 DocType: Guardian,Students,studenter
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regler för tillämpning av prissättning och rabatt.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prislista måste gälla för att köpa eller sälja
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serie Lista för denna transaktion
 DocType: Company,Default Payroll Payable Account,Standard Lön Betal konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Uppdatera E-postgrupp
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Uppdatera E-postgrupp
 DocType: Sales Invoice,Is Opening Entry,Är öppen anteckning
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nämn om icke-standard mottagningskonto tillämpat
 DocType: Course Schedule,Instructor Name,instruktör Namn
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot fakturaprodukt
 ,Production Orders in Progress,Aktiva Produktionsordrar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettokassaflöde från finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Localstorage är full, inte spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Localstorage är full, inte spara"
 DocType: Lead,Address & Contact,Adress och kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lägg oanvända blad från tidigare tilldelningar
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totalt Costing Belopp (via Tidrapportering)
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankAnteckningar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Publicera i Hub
 DocType: Student Admission,Student Admission,Student Antagning
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Punkt {0} avbryts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 DocType: Item,Purchase Details,Inköpsdetaljer
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Meddela via e-post om skapandet av automatisk Material Begäran
 DocType: Journal Entry,Multi Currency,Flera valutor
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Typ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Följesedel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Följesedel
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostnader för sålda Asset
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Betalningsposten har ändrats efter att du hämtade den. Vänligen hämta igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
 DocType: Student Applicant,Admitted,medgav
 DocType: Workstation,Rent Cost,Hyr Kostnad
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ordervärde
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash transaktioner mot partiet eller för intern överföring
 DocType: Shipping Rule,Valid for Countries,Gäller för länder
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Denna punkt är en mall och kan inte användas i transaktioner. Punkt attribut kommer att kopieras över till varianterna inte &quot;Nej Kopiera&quot; ställs in
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Denna punkt är en mall och kan inte användas i transaktioner. Punkt attribut kommer att kopieras över till varianterna inte &quot;Nej Kopiera&quot; ställs in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Den totala order Anses
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ange &quot;Upprepa på Dag i månaden&quot; fältvärde
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} som redan tilldelats för anställd {1} för perioden {2} till {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Välj Punkt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konvertera till icke-gruppen
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (parti) i en punkt.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadatum
 DocType: GL Entry,Debit Amount,Debit Belopp
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Skapa studentgrupper
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Offertförfrågan
 DocType: Salary Slip Timesheet,Working Hours,Arbetstimmar
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ändra start / aktuella sekvensnumret av en befintlig serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Skapa en ny kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Skapa en ny kund
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Om flera prissättningsregler fortsätta att gälla, kan användarna uppmanas att ställa Prioritet manuellt för att lösa konflikten."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Skapa inköpsorder
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Skapa inköpsorder
 ,Purchase Register,Inköpsregistret
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Tillämpliga avgifter
@@ -484,7 +487,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Semester topp.
@@ -506,6 +509,7 @@
 DocType: Packing Slip,From Package No.,Från Paket No.
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Värdepapper och inlåning
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan inte ändra värderingsmetoden, eftersom det finns transaktioner mot vissa poster som inte har egen värderingsmetod"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blad tilldelats är obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivning av ett jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,I avvaktan på aktiviteter för dag
@@ -533,7 +537,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
 DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
 DocType: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Köpa
@@ -543,7 +547,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ange grad för tröskelvärdet 0%
 DocType: Sales Order,To Deliver,Att Leverera
 DocType: Purchase Invoice Item,Item,Objekt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
 DocType: Journal Entry,Difference (Dr - Cr),Skillnad (Dr - Cr)
 DocType: Account,Profit and Loss,Resultaträkning
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Hantera Underleverantörer
@@ -569,7 +573,7 @@
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 DocType: Production Plan Item,Pending Qty,Väntar Antal
 DocType: Budget,Ignore,Ignorera
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} är inte aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} är inte aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS skickas till följande nummer: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,kryss Setup dimensioner för utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lön Slip Tidrapport
@@ -578,13 +582,13 @@
 DocType: Sales Invoice,Total Commission,Totalt kommissionen
 DocType: Pricing Rule,Sales Partner,Försäljnings Partner
 DocType: Buying Settings,Purchase Receipt Required,Inköpskvitto Krävs
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Värderings Rate är obligatoriskt om ingående lager in
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Värderings Rate är obligatoriskt om ingående lager in
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Inga träffar i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Välj Företag och parti typ först
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ackumulerade värden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Skapa kundorder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Skapa kundorder
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
@@ -601,7 +605,7 @@
 DocType: Job Applicant,Resume Attachment,CV Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Återkommande kunder
 DocType: Leave Control Panel,Allocate,Fördela
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Obs: Totala antalet allokerade blad {0} inte bör vara mindre än vad som redan har godkänts blad {1} för perioden
 DocType: Announcement,Posted By,Postat av
 DocType: Item,Delivered by Supplier (Drop Ship),Levereras av leverantören (Drop Ship)
@@ -611,7 +615,7 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vänligen ställ in företaget
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
@@ -622,7 +626,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fakturan Tidrapport
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Välj Betalkonto att Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Skapa anställda register för att hantera löv, räkningar och löner"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Skapa anställda register för att hantera löv, räkningar och löner"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Lägg till kunskapsbasen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Förslagsskrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betalning Entry Avdrag
@@ -664,8 +668,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relation med Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Chef
 DocType: Payment Entry,Payment From / To,Betalning från / till
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datumintervall
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nya kreditgränsen är mindre än nuvarande utestående beloppet för kunden. Kreditgräns måste vara minst {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nya kreditgränsen är mindre än nuvarande utestående beloppet för kunden. Kreditgräns måste vara minst {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
 DocType: SMS Settings,Receiver Parameter,Mottagare Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Baserad på"" och ""Gruppera efter"" kan inte vara samma"
@@ -675,7 +678,7 @@
 DocType: Issue,Resolution Date,Åtgärds Datum
 DocType: Student Batch Name,Batch Name,batch Namn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tidrapport skapat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Skriva in
 DocType: Selling Settings,Customer Naming By,Kundnamn på
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Visar eleven som närvarande i Student Monthly Närvaro Rapport
@@ -719,7 +722,7 @@
 DocType: Student Attendance,Student Attendance,Student Närvaro
 DocType: Sales Invoice Timesheet,Time Sheet,Tidrapportering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Återrapportering Råvaror Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ange produktdetaljer
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ange produktdetaljer
 DocType: Interest,Interest,Intressera
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Övriga detaljer
@@ -737,7 +740,7 @@
 ,Absent Student Report,Frånvarorapport Student
 DocType: Email Digest,Next email will be sent on:,Nästa e-post kommer att skickas på:
 DocType: Offer Letter Term,Offer Letter Term,Erbjudande Brev Villkor
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Produkten har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Produkt  {0} hittades inte
 DocType: Bin,Stock Value,Stock Värde
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,existerar inte företag {0}
@@ -746,8 +749,6 @@
 DocType: Serial No,Warranty Expiry Date,Garanti Förfallodatum
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet och Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionsandel (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Var god välj Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Var god välj Program
 DocType: Project,Estimated Cost,Beräknad kostnad
@@ -766,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} är inte en lagervara
 DocType: Mode of Payment Account,Default Account,Standard konto
 DocType: Payment Entry,Received Amount (Company Currency),Erhållet belopp (Company valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Välj helgdagar
 DocType: Production Order Operation,Planned End Time,Planerat Sluttid
 ,Sales Person Target Variance Item Group-Wise,Försäljningen Person Mål Varians Post Group-Wise
@@ -830,7 +831,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Request for Quotation Supplier,Send Email,Skicka Epost
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Inget Tillstånd
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
@@ -843,7 +844,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen anställd hittades
 DocType: Supplier Quotation,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen är redan uppdaterad.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen är redan uppdaterad.
 DocType: SMS Center,All Customer Contact,Alla Kundkontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Ladda lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Detaljerad information
@@ -854,8 +855,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimifakturabelopp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostnadsställe {2} inte tillhör bolaget {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: konto {2} inte kan vara en grupp
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {doknamn} existerar inte i ovanstående &quot;{doctype} tabellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {doknamn} existerar inte i ovanstående &quot;{doctype} tabellen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Inga uppgifter
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dagen i den månad som auto faktura kommer att genereras t.ex. 05, 28 etc"
 DocType: Asset,Opening Accumulated Depreciation,Ingående ackumulerade avskrivningar
@@ -871,7 +872,7 @@
 DocType: Bin,Moving Average Rate,Rörligt medelvärdes hastighet
 DocType: Production Planning Tool,Select Items,Välj objekt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursschema
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursschema
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: HR Settings,Enter retirement age in years,Ange pensionsåldern i år
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Lager
@@ -879,7 +880,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,Import Närvaro
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alla artikelgrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alla artikelgrupper
 DocType: Process Payroll,Activity Log,Aktivitets Logg
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto Vinst / Förlust
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
@@ -890,7 +891,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Inköpsorder till betalning
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Öppna&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Öppna för att göra
 DocType: Notification Control,Delivery Note Message,Följesedel Meddelande
@@ -906,7 +907,7 @@
 DocType: Item Reorder,Re-Order Qty,Återuppta Antal
 DocType: Leave Block List Date,Leave Block List Date,Lämna Blockeringslista Datum
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt tillämpliga avgifter i inköpskvittot Items tabellen måste vara densamma som den totala skatter och avgifter
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt tillämpliga avgifter i inköpskvittot Items tabellen måste vara densamma som den totala skatter och avgifter
 DocType: Sales Team,Incentives,Sporen
 DocType: SMS Log,Requested Numbers,Begärda nummer
 DocType: Production Planning Tool,Only Obtain Raw Materials,Endast Skaffa Råvaror
@@ -964,8 +965,7 @@
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Fee Structure,Components,Komponenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
@@ -1017,8 +1017,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betalning mot Försäljning / inköpsorder bör alltid märkas i förskott
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Standard Bank / Cash konto kommer att uppdateras automatiskt i Lön Journal Entry när detta läge är valt.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallen för Grade kod {0} lappar med betyget intervallen för andra kvaliteter. Vänligen kontrollera intervall {0} och {1} och försök igen
 DocType: BOM,Raw Material Cost(Company Currency),Råvarukostnaden (Företaget valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Priset kan inte vara större än den som används i {1} {2}
@@ -1031,7 +1029,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Post
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
 DocType: Timesheet Detail,Bill,Räkningen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Nästa Avskrivningar Datum anges som tidigare datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Nästa Avskrivningar Datum anges som tidigare datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Vit
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antal inte tillgängligt för {4} i lager {1} vid utstationering tidpunkt för angivelsen ({2} {3})
@@ -1046,7 +1044,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Beställd Typ måste vara en av {0}
 DocType: Lead,Next Contact Date,Nästa Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Öppning Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ange konto för förändring Belopp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ange konto för förändring Belopp
 DocType: Student Batch Name,Student Batch Name,Elev batchnamn
 DocType: Holiday List,Holiday List Name,Semester Listnamn
 DocType: Repayment Schedule,Balance Loan Amount,Balans Lånebelopp
@@ -1066,10 +1064,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Specificera en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
 DocType: Delivery Note,Delivery To,Leverans till
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Planning Tool,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan inte vara negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt Antal Avskrivningar
 DocType: Sales Invoice Item,Rate With Margin,Betygsätt med marginal
 DocType: Sales Invoice Item,Rate With Margin,Betygsätt med marginal
@@ -1098,7 +1096,7 @@
 DocType: Lead,Organization Name,Organisationsnamn
 DocType: Tax Rule,Shipping State,Frakt State
 ,Projected Quantity as Source,Projicerade Kvantitet som källa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Produkt måste tillsättas med hjälp av ""få produkter  från kvitton"" -knappen"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Produkt måste tillsättas med hjälp av ""få produkter  från kvitton"" -knappen"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Inkludera icke-lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Försäljnings Kostnader
@@ -1106,7 +1104,7 @@
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postnummer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Kundorder {0} är {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Göra Stock Inlägg
@@ -1150,7 +1148,7 @@
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
 ,Ordered Items To Be Billed,Beställda varor att faktureras
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 DocType: Global Defaults,Global Defaults,Globala standardinställningar
@@ -1185,11 +1183,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Ange Post kod för att få Batch nummer
 DocType: Stock Settings,Default Item Group,Standard Varugrupp
 DocType: Employee Loan,Partially Disbursed,delvis Utbetalt
-DocType: Grading Structure,Grading System Name,Betygsskala Namn
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverantörsdatabas.
 DocType: Account,Balance Sheet,Balansräkning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalning läget är inte konfigurerad. Kontrollera, om kontot har satts på läge av betalningar eller på POS profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalning läget är inte konfigurerad. Kontrollera, om kontot har satts på läge av betalningar eller på POS profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din säljare kommer att få en påminnelse om detta datum att kontakta kunden
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samma post kan inte anges flera gånger.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligare konton kan göras inom ramen för grupper, men poster kan göras mot icke-grupper"
@@ -1228,11 +1225,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Arbete Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ange minst ett attribut i tabellen attribut
 DocType: Announcement,All Students,Alla studenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Objektet {0} måste vara en icke-lagervara
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Objektet {0} måste vara en icke-lagervara
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Se journal
 DocType: Grading Scale,Intervals,intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resten av världen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
@@ -1273,8 +1270,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Hämta utestående fakturor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Kundorder {0} är inte giltig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Inköpsorder hjälpa dig att planera och följa upp dina inköp
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Inköpsorder hjälpa dig att planera och följa upp dina inköp
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totala emissions / Transfer mängd {0} i Material Begäran {1} \ inte kan vara större än efterfrågat antal {2} till punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Liten
@@ -1298,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync basdata
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Dina produkter eller tjänster
 DocType: Mode of Payment,Mode of Payment,Betalningssätt
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
@@ -1315,7 +1312,7 @@
 DocType: Student Group Student,Group Roll Number,Grupprullnummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summan av alla uppgift vikter bör vara 1. Justera vikter av alla projektuppgifter i enlighet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapital Utrustning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
@@ -1342,7 +1339,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journalanteckning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} objekt pågår
 DocType: Workstation,Workstation Name,Arbetsstation Namn
-DocType: Grade Interval,Grade Code,grade kod
+DocType: Grading Scale Interval,Grade Code,grade kod
 DocType: POS Item Group,POS Item Group,POS Artikelgrupp
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
@@ -1359,7 +1356,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hårdvara
 DocType: Sales Order,Recurring Upto,Återkommande kommande~~POS=HEADCOMP Upp
 DocType: Attendance,HR Manager,HR-chef
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Välj ett företag
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Välj ett företag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Enskild ledighet
 DocType: Purchase Invoice,Supplier Invoice Date,Leverantörsfakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Du måste aktivera Varukorgen
@@ -1375,7 +1372,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Åldringsräckvidd 3
 DocType: Maintenance Schedule Item,No of Visits,Antal besök
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Närvaro
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Närvaro
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Underhållschema {0} existerar mot {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Inlärning elev
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta avslutnings Hänsyn måste vara {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summan av poäng för alla mål bör vara 100. Det är {0}
@@ -1424,13 +1422,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Detail,Depends on Leave Without Pay,Beror på avgång utan lön
 DocType: Pricing Rule,"Higher the number, higher the priority","Högre nummer, högre prioritet"
 ,Purchase Invoice Trends,Inköpsfaktura Trender
 DocType: Employee,Better Prospects,Bättre prospekt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Rad # {0}: Batch {1} har endast {2} qty. Var god välj en annan sats som har {3} antal tillgängliga eller dela raden i flera rader för att leverera / utgå från flera satser
 DocType: Vehicle,License Plate,Registreringsskylt
 DocType: Appraisal,Goals,Mål
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
@@ -1448,7 +1447,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Om kontot är fruset, är poster endast tillgängligt för begränsade användare."
 DocType: Email Digest,Bank Balance,BANKTILLGODOHAVANDE
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikationer som krävs osv"
 DocType: Journal Entry Account,Account Balance,Balanskonto
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Skatte Regel för transaktioner.
@@ -1459,7 +1458,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Visa ej avslutad skatteårets P &amp; L balanser
 DocType: Shipping Rule,Shipping Account,Frakt konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} är inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Gör kundorder för att hjälpa dig att planera ditt arbete och leverera i tid
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Gör kundorder för att hjälpa dig att planera ditt arbete och leverera i tid
 DocType: Quality Inspection,Readings,Avläsningar
 DocType: Stock Entry,Total Additional Costs,Totalt Merkostnader
 DocType: Course Schedule,SH,SH
@@ -1470,7 +1469,7 @@
 DocType: Shipping Rule Condition,To Value,Att Värdera
 DocType: Asset Movement,Stock Manager,Lagrets direktör
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Källa lager är obligatoriskt för rad {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Följesedel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Följesedel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kontorshyra
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS-gateway-inställningar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import misslyckades!
@@ -1496,7 +1495,7 @@
 DocType: Sales Invoice,Source,Källa
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show stängd
 DocType: Leave Type,Is Leave Without Pay,Är ledighet utan lön
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategori är obligatorisk för fast tillgångsposten
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategori är obligatorisk för fast tillgångsposten
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Inga träffar i betalningstabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Detta {0} konflikter med {1} för {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenter HTML
@@ -1514,7 +1513,7 @@
 DocType: Student,Date of Leaving,Datum för att lämna
 DocType: Pricing Rule,For Price List,För prislista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Skapa Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Skapa Leads
 DocType: Maintenance Schedule,Schedules,Scheman
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
@@ -1542,7 +1541,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Inskrivningar
 DocType: Sales Invoice Item,Brand Name,Varumärke
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standardlager krävs för vald post
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Standardlager krävs för vald post
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Låda
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,möjlig Leverantör
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisationen
@@ -1576,7 +1575,7 @@
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standard BOM för {0} hittades inte för Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Anspråk på företagets bekostnad.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Eleverna i hjärtat i systemet, lägga till alla dina elever"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Eleverna i hjärtat i systemet, lägga till alla dina elever"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rad # {0}: Clearance datum {1} kan inte vara före check Datum {2}
 DocType: Company,Default Holiday List,Standard kalender
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Från tid och att tiden på {1} överlappar med {2}
@@ -1588,20 +1587,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (s) som du ansöker om ledighet är helgdagar. Du behöver inte ansöka om tjänstledighet.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Skicka om Betalning E
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Ny uppgift
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Skapa offert
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Skapa offert
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andra rapporter
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Försök att planera verksamheten för X dagar i förväg.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Ställ Default Lön betalas konto i bolaget {0}
 DocType: SMS Center,Receiver List,Mottagare Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Sök Produkt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Sök Produkt
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Förbrukad mängd
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoförändring i Cash
 DocType: Assessment Plan,Grading Scale,Betygsskala
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,redan avslutat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betalning förfrågan finns redan {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
@@ -1639,7 +1638,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Samla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan inte ta bort Räkenskapsårets {0}. Räkenskapsårets {0} är satt som standard i Globala inställningar
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Kund tillgodohavande
@@ -1682,7 +1681,6 @@
 DocType: Student Sibling,Studying in Same Institute,Studera i samma institut
 DocType: Territory,Territory Manager,Territorium manager
 DocType: Packed Item,To Warehouse (Optional),Till Warehouse (tillval)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 DocType: Payment Entry,Paid Amount (Company Currency),Betald Belopp (Company valuta)
 DocType: Purchase Invoice,Additional Discount,Ytterligare rabatt
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
@@ -1692,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Visa i varukorgen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Begäran används för att göra detta Lagerinlägg
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Nästa Avskrivningar Datum är obligatoriskt för ny tillgång
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Nästa Avskrivningar Datum är obligatoriskt för ny tillgång
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbaserad grupp för varje grupp
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbaserad grupp för varje grupp
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enda enhet av ett objekt.
@@ -1711,9 +1709,7 @@
 DocType: Course Assessment Criteria,Weightage,Vikt
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kostnadsställe krävs för &quot;Resultaträkning&quot; konto {2}. Ställ upp en standardkostnadsställe för bolaget.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En Kundgrupp finns med samma namn, vänligen ändra Kundens namn eller döp om Kundgruppen"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En Kundgrupp finns med samma namn, vänligen ändra Kundens namn eller döp om Kundgruppen"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Ny kontakt
 DocType: Territory,Parent Territory,Överordnat område
 DocType: Quality Inspection Reading,Reading 2,Avläsning 2
@@ -1740,21 +1736,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Avstämning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alltför många kolumner. Exportera rapporten och skriva ut det med hjälp av ett kalkylprogram.
 DocType: Purchase Invoice Item,Batch No,Batch nr
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Det går inte att hitta växelkursen för {0} till {1} för nyckeldatum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillåt flera kundorder mot Kundens beställning
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Huvud
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Huvud
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Anställda HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
 DocType: Employee,Leave Encashed?,Lämna inlösen?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Möjlighet Från fältet är obligatoriskt
 DocType: Email Digest,Annual Expenses,årliga kostnader
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Avsatt mängd
@@ -1774,7 +1769,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,bedömningar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicera Löpnummer upp till punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En förutsättning för en frakt Regel
-DocType: Grading Structure,Grading Intervals,klassificerings Intervaller
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Stig på
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Det går inte att overbill för Punkt {0} i rad {1} mer än {2}. För att möjliggöra överfakturering, ställ in köpa Inställningar"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Ställ filter baserat på punkt eller Warehouse
@@ -1787,16 +1781,17 @@
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rad # {0}: Avslag Warehouse är obligatoriskt mot förkastade Punkt {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betalning
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Hantera order
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Hantera order
 DocType: Production Order Operation,Actual Time and Cost,Faktisk tid och kostnad
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Begäran om maximalt {0} kan göras till punkt {1} mot kundorder {2}
 DocType: Employee,Salutation,Salutation
 DocType: Course,Course Abbreviation,Naturligtvis Förkortning
 DocType: Student Leave Application,Student Leave Application,Student Lämna Application
 DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Anställd {0} på Halvdag på {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Totalt arbetstid bör inte vara större än max arbetstid {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundlade poster vid tidpunkten för försäljning.
 DocType: Quotation Item,Actual Qty,Faktiska Antal
 DocType: Sales Invoice Item,References,Referenser
@@ -1806,7 +1801,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har angett dubbletter. Vänligen rätta och försök igen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Rörelse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ny vagn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,ny vagn
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Produktt {0} är inte en serialiserad Produkt
 DocType: SMS Center,Create Receiver List,Skapa Mottagare Lista
 DocType: Vehicle,Wheels,hjul
@@ -1838,10 +1833,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Inaktiverar skapandet av tids stockar mot produktionsorder. Verksamheten får inte spåras mot produktionsorder
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID är obligatoriskt
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID är obligatoriskt
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
 DocType: Purchase Invoice,Recurring Invoice,Återkommande Faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Hantera projekt
@@ -1849,7 +1844,7 @@
 DocType: Budget,Fiscal Year,Räkenskapsår
 DocType: Vehicle Log,Fuel Price,bränsle~~POS=TRUNC Pris
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan inte tilldelas mot {0}, eftersom det inte är en intäkt eller kostnad konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Uppnått
 DocType: Student Admission,Application Form Route,Ansökningsblankett Route
@@ -1880,7 +1875,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Belopp {0} {1} avräknas mot {2}
 DocType: Employee,Salary Information,Lön Information
 DocType: Sales Person,Name and Employee ID,Namn och Anställnings ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
 DocType: Website Item Group,Website Item Group,Webbplats Produkt Grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Tullar och skatter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ange Referensdatum
@@ -1938,7 +1933,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Upprepa kund Intäkter
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) måste ha rollen ""Utgiftsgodkännare"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Välj BOM och Antal för produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Välj BOM och Antal för produktion
 DocType: Asset,Depreciation Schedule,avskrivningsplanen
 DocType: Bank Reconciliation Detail,Against Account,Mot Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halv Dag Datum bör vara mellan Från datum och hittills
@@ -1955,13 +1950,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
 DocType: Purchase Order,Delivered,Levereras
 ,Vehicle Expenses,fordons Kostnader
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
+DocType: Serial No,Invoice Details,Faktura detaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
 DocType: Purchase Receipt,Vehicle Number,Fordonsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Den dag då återkommande faktura kommer att stoppa
 DocType: Employee Loan,Loan Amount,Lånebelopp
@@ -1985,7 +1981,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Förkortning kan inte vara tomt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupp till icke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,Loan Namn
@@ -1997,6 +1993,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Lager där du hanterar lager av avvisade föremål
 DocType: Production Order,Skip Material Transfer,Hoppa över materialöverföring
 DocType: Production Order,Skip Material Transfer,Hoppa över materialöverföring
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Det gick inte att hitta växelkursen för {0} till {1} för nyckeldatum {2}. Var god skapa en valutautbyteslista manuellt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Din räkenskapsår slutar
 DocType: POS Profile,Price List,Prislista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} är nu standard räkenskapsår. Vänligen uppdatera din webbläsare för att ändringen ska träda i kraft.
@@ -2034,9 +2031,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Punkt {0} redan har returnerat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Räkenskapsårets ** representerar budgetåret. Alla bokföringsposter och andra större transaktioner spåras mot ** räkenskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kund / Huvudadress
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 DocType: Student Admission,Eligibility,Behörighet
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads hjälpa dig att få verksamheten, lägga till alla dina kontakter och mer som dina leder"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads hjälpa dig att få verksamheten, lägga till alla dina kontakter och mer som dina leder"
 DocType: Production Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
@@ -2077,7 +2074,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Välj Företaget ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lämna tomt om det anses vara för alla avdelningar
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer av anställning (permanent, kontrakts, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Process Payroll,Fortnightly,Var fjortonde dag
 DocType: Currency Exchange,From Currency,Från Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
@@ -2093,7 +2090,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Det går inte att välja avgiftstyp som ""På föregående v Belopp"" eller ""På föregående v Total"" för första raden"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Objekt bör inte vara en produkt Bundle. Ta bort objektet `{0}` och spara
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bank
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Lägg tidrapporter
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Lägg tidrapporter
 DocType: Vehicle Service,Service Item,sERVICE
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
@@ -2143,8 +2140,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Priserna kommer inte att visas om prislista inte är inställd
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ange ett land för frakt regel eller kontrollera Världsomspännande sändnings
 DocType: Stock Entry,Total Incoming Value,Totalt Inkommande Värde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debitering krävs
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debitering krävs
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Inköps Prislista
 DocType: Offer Letter Term,Offer Term,Erbjudandet Villkor
 DocType: Quality Inspection,Quality Manager,Kvalitetsansvarig
@@ -2178,14 +2175,14 @@
 DocType: Opportunity,Lost Reason,Förlorad Anledning
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adress
 DocType: Quality Inspection,Sample Size,Provstorlek
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ange Kvitto Dokument
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alla objekt har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ange Kvitto Dokument
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Alla objekt har redan fakturerats
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ange ett giltigt Från ärende nr &quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Användare och behörigheter
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produktionsorder Skapad: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Produktionsorder Skapad: {0}
 DocType: Branch,Branch,Bransch
 DocType: Guardian,Mobile Number,Mobilnummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tryckning och Branding
@@ -2194,7 +2191,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Löpnummer {0} hittades inte
 DocType: Scheduling Tool,Student Batch,elev Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dina kunder
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,gör Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,gör Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du har blivit inbjuden att samarbeta i projektet: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Ansök nu
@@ -2218,8 +2215,9 @@
 DocType: SMS Log,Sent To,Skickat Till
 DocType: Payment Request,Make Sales Invoice,Skapa fakturan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Mjukvara
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next Kontakt Datum kan inte vara i det förflutna
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Kontakt Datum kan inte vara i det förflutna
 DocType: Company,For Reference Only.,För referens.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Välj batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ogiltigt {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-retro
 DocType: Sales Invoice Advance,Advance Amount,Förskottsmängd
@@ -2233,7 +2231,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ärendenr kan inte vara 0
 DocType: Item,Show a slideshow at the top of the page,Visa ett bildspel på toppen av sidan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,stycklistor
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Butiker
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Butiker
 DocType: Serial No,Delivery Time,Leveranstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Åldring Baserad på
 DocType: Item,End of Life,Uttjänta
@@ -2249,8 +2247,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfermaterial
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Ange verksamhet, driftskostnad och ger en unik drift nej till din verksamhet."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Detta dokument är över gränsen med {0} {1} för posten {4}. Är du göra en annan {3} mot samma {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ställ återkommande efter att ha sparat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Välj förändringsbelopp konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Ställ återkommande efter att ha sparat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Välj förändringsbelopp konto
 DocType: Purchase Invoice,Price List Currency,Prislista Valuta
 DocType: Naming Series,User must always select,Användaren måste alltid välja
 DocType: Stock Settings,Allow Negative Stock,Tillåt Negativ lager
@@ -2261,7 +2259,7 @@
 DocType: Budget Account,Budget Account,budget-konto
 DocType: Quality Inspection,Verified By,Verifierad Av
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Det går inte att ändra bolagets standardvaluta, eftersom det redan finns transaktioner. Transaktioner måste avbokas att ändra valuta."
-DocType: Grade Interval,Grade Description,grade Beskrivning
+DocType: Grading Scale Interval,Grade Description,grade Beskrivning
 DocType: Stock Entry,Purchase Receipt No,Inköpskvitto Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Handpenning
 DocType: Process Payroll,Create Salary Slip,Skapa lönebeskedet
@@ -2299,7 +2297,7 @@
 DocType: Upload Attendance,Attendance To Date,Närvaro Till Datum
 DocType: Warranty Claim,Raised By,Höjt av
 DocType: Payment Gateway Account,Payment Account,Betalningskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ange vilket bolag för att fortsätta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Ange vilket bolag för att fortsätta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettoförändring av kundfordringar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensations Av
 DocType: Offer Letter,Accepted,Godkända
@@ -2313,7 +2311,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Frakt Regel Etikett
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Användarforum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
 DocType: Employee,Previous Work Experience,Tidigare Arbetslivserfarenhet
@@ -2327,7 +2325,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Namnet på institutet som du installerar systemet.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frysta fram till detta datum, ingen kan göra / ändra posten förutom ange roll nedan."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vänligen spara dokumentet innan du skapar underhållsschema
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vänligen spara dokumentet innan du skapar underhållsschema
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markera att tillåta bråkdelar. (För NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Följande produktionsorder skapades:
@@ -2350,6 +2348,7 @@
 DocType: Email Digest,How frequently?,Hur ofta?
 DocType: Purchase Receipt,Get Current Stock,Få Nuvarande lager
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 DocType: Student,Joining Date,Inträdesdatum
 ,Employees working on a holiday,Anställda som arbetar på en semester
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Närvarande
@@ -2431,7 +2430,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produktion
 DocType: Guardian,Occupation,Ockupation
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totalt (Antal)
 DocType: Sales Invoice,This Document,Det här dokumentet
 DocType: Installation Note Item,Installed Qty,Installerat antal
@@ -2454,8 +2453,8 @@
 DocType: Notification Control,Sales Order Message,Kundorder Meddelande
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ange standardvärden som bolaget, Valuta, varande räkenskapsår, etc."
 DocType: Payment Entry,Payment Type,Betalning Typ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
 DocType: Process Payroll,Select Employees,Välj Anställda
 DocType: Opportunity,Potential Sales Deal,Potentiella säljmöjligheter
 DocType: Payment Entry,Cheque/Reference Date,Check / Referens Datum
@@ -2472,7 +2471,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profil {0} redan skapats för företag {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Byt Punkt / BOM i alla stycklistor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvitto dokument måste lämnas in
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvitto dokument måste lämnas in
 DocType: Purchase Invoice Item,Received Qty,Mottagna Antal
 DocType: Stock Entry Detail,Serial No / Batch,Löpnummer / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Inte betalda och inte levereras
@@ -2485,7 +2484,7 @@
 ,To Produce,Att Producera
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Löner
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,gör Användare
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,gör Användare
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifiering av paketet för leverans (för utskrift)
 DocType: Bin,Reserved Quantity,Reserverad Kvantitet
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ange giltig e-postadress
@@ -2499,11 +2498,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Funktionshindrade mall får inte vara standardmall
 DocType: Account,Income Account,Inkomst konto
 DocType: Payment Request,Amount in customer's currency,Belopp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Leverans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Leverans
 DocType: Stock Reconciliation Item,Current Qty,Aktuellt Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate of Materials Based On&quot; i kalkyl avsnitt
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Föregående
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student partier hjälpa dig att spåra närvaro, bedömningar och avgifter för studenter"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student partier hjälpa dig att spåra närvaro, bedömningar och avgifter för studenter"
 DocType: Payment Entry,Total Allocated Amount,Sammanlagda anslaget
 DocType: Item Reorder,Material Request Type,Typ av Materialbegäran
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry för löner från {0} till {1}
@@ -2526,7 +2526,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spår leder med Industry Type.
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
@@ -2536,6 +2536,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Kommer att skicka ett e-postmeddelande om händelsen till anställda med status &quot;Open&quot;
 DocType: Task,Depends on Tasks,Beror på Uppgifter
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Hantera Kundgruppsträd.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Bilagor kan visas utan att aktivera kundvagnen
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nytt kostnadsställe Namn
 DocType: Leave Control Panel,Leave Control Panel,Lämna Kontrollpanelen
@@ -2548,12 +2549,10 @@
 DocType: Sales Invoice,Debit To,Debitering
 DocType: Delivery Note,Required only for sample item.,Krävs endast för provobjekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiska Antal Efter transaktion
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lön slip hittades mellan {0} och {1}
 ,Pending SO Items For Purchase Request,I avvaktan på SO Artiklar till inköpsanmodan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Antagning
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} är inaktiverad
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} är inaktiverad
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-retro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Stor
@@ -2570,7 +2569,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Hemsida Aktuell produkt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alla bedömningsgrupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Ny Lager Namn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totalt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ange antal besökare (krävs)
 DocType: Stock Settings,Default Valuation Method,Standardvärderingsmetod
@@ -2588,7 +2587,7 @@
 DocType: Price List,Price List Master,Huvudprislista
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alla försäljningstransaktioner kan märkas mot flera ** säljare ** så att du kan ställa in och övervaka mål.
 ,S.O. No.,SÅ Nej
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
 DocType: Price List,Applicable for Countries,Gäller Länder
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Endast Lämna applikationer med status &#39;Godkänd&#39; och &#39;Avvisad&#39; kan lämnas in
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student gruppnamn är obligatorisk i rad {0}
@@ -2669,7 +2668,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Kontering för lager
 DocType: Vehicle Service,Engine Oil,Motorolja
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
 DocType: Employee Loan,Loan Details,Loan Detaljer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,V {0}: Genomförd Antal måste vara större än noll.
@@ -2734,7 +2733,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Lager med befintlig transaktion kan inte konverteras till gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut den
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Lägg till elever
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Lägg till elever
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Välj {0}
 DocType: C-Form,C-Form No,C-form Nr
 DocType: BOM,Exploded_items,Vidgade_artiklar
@@ -2799,7 +2798,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,gräns Korsade
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tilldelningskapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,En termin med detta &quot;Academic Year &#39;{0} och&quot; Term Name &quot;{1} finns redan. Ändra dessa poster och försök igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Eftersom det finns transaktioner mot produkten {0} så kan du inte ändra värdet av {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Eftersom det finns transaktioner mot produkten {0} så kan du inte ändra värdet av {1}
 DocType: UOM,Must be Whole Number,Måste vara heltal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nya Ledigheter Tilldelade (i dagar)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serienummer {0} inte existerar
@@ -2843,7 +2842,7 @@
 DocType: Supplier,Last Day of the Next Month,Sista dagen i nästa månad
 DocType: Support Settings,Auto close Issue after 7 days,Stäng automatiskt Problem efter 7 dagar
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan fördelas före {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Sökande
 DocType: Asset Category Account,Accumulated Depreciation Account,Ackumulerade avskrivningar konto
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
@@ -2871,8 +2870,8 @@
 DocType: Asset,Item Code,Produktkod
 DocType: Production Planning Tool,Create Production Orders,Skapa produktionsorder
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
 DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Utbetalda beloppet kan inte vara större än den totala negativa utestående beloppet {0}
@@ -2891,7 +2890,7 @@
 DocType: Production Planning Tool,Create Material Requests,Skapa Materialförfrågan
 DocType: Employee Education,School/University,Skola / Universitet
 DocType: Payment Request,Reference Details,Referens Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Förväntat värde eller återanvändas måste vara mindre än Gross köpesumman
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Förväntat värde eller återanvändas måste vara mindre än Gross köpesumman
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tillgång Antal vid Lager
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturerat antal
 DocType: Asset,Double Declining Balance,Dubbel degressiv
@@ -2912,19 +2911,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Betalats Beloppet får inte vara större än Loan Mängd {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produktionsorder inte skapat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Produktionsorder inte skapat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Från datum&quot; måste vara efter &quot;Till datum&quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
 DocType: Asset,Fully Depreciated,helt avskriven
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markerad Närvaro HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citat är förslag, bud som du har skickat till dina kunder"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citat är förslag, bud som du har skickat till dina kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Löpnummer och Batch
 DocType: Warranty Claim,From Company,Från Företag
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summan av Mängder av bedömningskriterier måste vara {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Ställ in Antal Avskrivningar bokat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ställ in Antal Avskrivningar bokat
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Värde eller Antal
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
@@ -3055,7 +3054,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student-gruppen
 DocType: Shopping Cart Settings,Quotation Series,Offert Serie
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Välj kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Välj kund
 DocType: C-Form,I,jag
 DocType: Company,Asset Depreciation Cost Center,Avskrivning kostnadsställe
 DocType: Sales Order Item,Sales Order Date,Kundorder Datum
@@ -3074,19 +3073,18 @@
 DocType: Vehicle,Insurance Details,Insurance Information
 DocType: Account,Payable,Betalning sker
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ange återbetalningstider
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Gäldenär ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Gäldenär ({0})
 DocType: Pricing Rule,Margin,Marginal
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nya kunder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruttovinst%
 DocType: Appraisal Goal,Weightage (%),Vikt (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttoköpesumma är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttoköpesumma är obligatorisk
 DocType: Lead,Address Desc,Adress fallande
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party är obligatoriskt
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ämnet Namn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Minst en av de sålda eller köpta måste väljas
-DocType: Grading Structure,Grade Intervals,grade Intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Välj typ av ditt företag.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Där tillverkningsprocesser genomförs.
 DocType: Asset Movement,Source Warehouse,Källa Lager
@@ -3115,6 +3113,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
 DocType: Territory,Territory Targets,Territorium Mål
 DocType: Delivery Note,Transporter Info,Transporter info
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Ställ in default {0} i bolaget {1}
 DocType: Cheque Print Template,Starting position from top edge,Utgångsläge från övre kanten
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Samma leverantör har angetts flera gånger
@@ -3168,7 +3167,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Ombeställningskvantitet
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Nuvarande jobb Öppningar
 DocType: Company,Stock Adjustment Account,Lager Justering Konto
-DocType: Journal Entry,Write Off,Avskrivning
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Avskrivning
 DocType: Timesheet Detail,Operation ID,Drift-ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systemanvändare (inloggning) ID. Om inställt, kommer det att bli standard för alla HR former."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Från {1}
@@ -3179,8 +3178,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverantören levererar till kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Föremål / {0}) är slut
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Nästa datum måste vara större än Publiceringsdatum
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Visa skatte uppbrott
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import och export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Aktieposter existerar mot Warehouse {0}, alltså du kan inte åter tilldela eller ändra det"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Inga studenter Funnet
@@ -3192,14 +3191,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Slut på AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Var god välj Citat
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Var god välj Citat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Skapa Servicebesök
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Var god välj Citat
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Var god välj Citat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Skapa Servicebesök
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
 DocType: Company,Default Cash Account,Standard Konto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Detta grundar sig på närvaron av denna Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Inga studenter i
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lägga till fler objekt eller öppna fullständiga formen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
@@ -3245,9 +3245,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Innan avstämning
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Till {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter och avgifter Added (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
 DocType: Sales Order,Partly Billed,Delvis Faktuerard
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Punkt {0} måste vara en fast tillgångspost
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Punkt {0} måste vara en fast tillgångspost
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Vänligen ange företagsnamn igen för att bekräfta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totalt Utestående Amt
@@ -3270,7 +3270,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Prislista Växelkurs
 DocType: Purchase Invoice Item,Rate,Betygsätt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adressnamn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adressnamn
 DocType: Stock Entry,From BOM,Från BOM
 DocType: Assessment Code,Assessment Code,bedömning kod
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grundläggande
@@ -3295,7 +3295,7 @@
 DocType: Purchase Invoice,Print Language,print Språk
 DocType: Salary Slip,Total Working Hours,Totala arbetstiden
 DocType: Stock Entry,Including items for sub assemblies,Inklusive poster för underheter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Ange värde måste vara positiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Ange värde måste vara positiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alla territorierna
 DocType: Purchase Invoice,Items,Produkter
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student är redan inskriven.
@@ -3315,16 +3315,14 @@
 DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Från och Till datum krävs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
 DocType: Assessment Plan,Supervisor Name,Supervisor Namn
 DocType: Program Enrollment Course,Program Enrollment Course,Program Inskrivningskurs
-DocType: Grading Structure,Grading Structure,betygs struktur
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
 DocType: Tax Rule,Shipping City,Shipping stad
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denna punkt är en variant av {0} (Template). Attribut kopieras över från mallen om &quot;No Copy &#39;är inställd
 DocType: Notification Control,Customize the Notification,Anpassa Anmälan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Kassaflöde från rörelsen
 DocType: Sales Invoice,Shipping Rule,Frakt Regel
@@ -3347,6 +3345,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Välj Publiceringsdatum först
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Öppningsdatum ska vara innan Slutdatum
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Setup&gt; Numbers Series
 DocType: Leave Control Panel,Carry Forward,Skicka Vidare
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadsställe med befintliga transaktioner kan inte omvandlas till liggaren
 DocType: Department,Days for which Holidays are blocked for this department.,Dagar då helgdagar är blockerade för denna avdelning.
@@ -3375,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totalt (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
 DocType: Quality Inspection,Item Serial No,Produkt Löpnummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Skapa anställda Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Skapa anställda Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Totalt Närvarande
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,räkenskaper
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Timme
@@ -3390,8 +3389,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Den nya BOM efter byte
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Butiksförsäljning
 DocType: Payment Entry,Received Amount,erhållet belopp
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställd Namn System i Mänskliga Resurser&gt; HR Inställningar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställd Namn System i Mänskliga Resurser&gt; HR Inställningar
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Skapa för hela kvantiteten, ignorera mängd redan på beställning"
 DocType: Account,Tax,Skatt
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,MÄRKLÖS
@@ -3404,7 +3401,7 @@
 DocType: Batch,Source Document Name,Källdokumentnamn
 DocType: Batch,Source Document Name,Källdokumentnamn
 DocType: Job Opening,Job Title,Jobbtitel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Skapa användare
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Skapa användare
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besöksrapport för service samtal.
@@ -3416,8 +3413,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: BOM,Website Description,Webbplats Beskrivning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoförändringen i eget kapital
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Mottagande
 ,Sales Register,Försäljningsregistret
@@ -3428,16 +3425,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det finns inget att redigera.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Inga kunder än!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kassaflödesanalys
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
 DocType: GL Entry,Against Voucher Type,Mot Kupongtyp
 DocType: Item,Attributes,Attributer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Ange avskrivningskonto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sista beställningsdatum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Närvaro för flera anställda
@@ -3462,14 +3461,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # Hänsyn måste vara av typen &quot;Fast Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antal
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler för att beräkna fraktbeloppet för en försäljning
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien är obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serien är obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansiella Tjänster
 DocType: Student Sibling,Student ID,Student-ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Olika typer av aktiviteter för Time Loggar
 DocType: Tax Rule,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
 DocType: Leave Allocation,Unused leaves,Oanvända blad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Faktureringsstaten
@@ -3502,7 +3501,7 @@
 DocType: Payment Entry,Account Paid From,Konto betalas från
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råvaru Artikelkod
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,gör Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,gör Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print och brevpapper
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Skicka e-post Leverantörs
@@ -3518,6 +3517,7 @@
 DocType: Offer Letter,Awaiting Response,Väntar på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ovan
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Nämn om inte-standard betalnings konto
 DocType: Salary Slip,Earning & Deduction,Vinst &amp; Avdrag
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
@@ -3554,7 +3554,7 @@
 DocType: Program Enrollment Tool,Get Students From,Få studenter från
 DocType: Hub Settings,Seller Country,Säljare Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicera artiklar på webbplatsen
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupp dina elever i omgångar
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupp dina elever i omgångar
 DocType: Authorization Rule,Authorization Rule,Auktoriseringsregel
 DocType: Sales Invoice,Terms and Conditions Details,Villkor Detaljer
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikationer
@@ -3614,7 +3614,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Skyddstillsyn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lönedelar
 DocType: Program Enrollment Tool,New Academic Year,Nytt läsår
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retur / kreditnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Retur / kreditnota
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Sammanlagda belopp som betalats
 DocType: Production Order Item,Transferred Qty,Överfört Antal
@@ -3655,6 +3655,7 @@
 ,Sales Funnel,Försäljning tratt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Förkortning är obligatorisk
 DocType: Project,Task Progress,Task framsteg
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kundvagn
 ,Qty to Transfer,Antal Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offerter till prospekt eller kunder
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roll tillåtet att redigera fryst lager
@@ -3688,7 +3689,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ta ut avgifter
 DocType: Attendance,ATT-,attrak-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
 DocType: Lead,Add to calendar on this date,Lägg till i kalender på denna dag
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regler för att lägga fraktkostnader.
 DocType: Item,Opening Stock,ingående lager
@@ -3706,7 +3707,7 @@
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order släppts för produktion.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Program Enrollment Tool,Enroll Students,registrera studenter
 DocType: Hub Settings,Name Token,Namn token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardförsäljnings
@@ -3717,7 +3718,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} mot faktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektnamn
-DocType: Supplier,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
+DocType: Customer,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
 DocType: Journal Entry Account,If Income or Expense,Om intäkter eller kostnader
 DocType: Production Order,Required Items,nödvändiga objekt
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Värde Skillnad
@@ -3748,6 +3749,7 @@
 DocType: Item,Taxes,Skatter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Betald och inte levererats
 DocType: Project,Default Cost Center,Standardkostnadsställe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Inställningar&gt; Inställningar&gt; Naming Series
 DocType: Bank Guarantee,End Date,Slutdatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,aktietransaktioner
 DocType: Budget,Budget Accounts,budget-konton
@@ -3812,7 +3814,7 @@
 DocType: Customer,Sales Partner and Commission,Försäljningen Partner och kommissionen
 DocType: Employee Loan,Rate of Interest (%) / Year,Hastighet av intresse (%) / år
 ,Project Quantity,projekt Kvantitet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Totalt {0} för alla objekt är noll kan vara du bör ändra &#39;Fördela avgifter bygger på&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Totalt {0} för alla objekt är noll kan vara du bör ändra &#39;Fördela avgifter bygger på&#39;
 DocType: Opportunity,To Discuss,Att Diskutera
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} behövs i {2} för att slutföra denna transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Hastighet av intresse (%) Årlig
@@ -3835,7 +3837,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Frånvarande
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: Valuta för BOM # {1} bör vara lika med den valda valutan {2}
 DocType: Journal Entry Account,Exchange Rate,Växelkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
 DocType: Homepage,Tag Line,Tag Linje
 DocType: Fee Component,Fee Component,avgift Komponent
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
@@ -3852,7 +3854,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Lager {0} existerar inte
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrera För ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månadsdistributions Procentsatser
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Värdering hastighet hittades inte för föremål {0}, vilket krävs för att göra bokföringsposter för {1} {2}. Om objektet är transaktions som prov objekt i {1}, nämn det i {1} Punkt tabellen. Annars kan du skapa ett inkommande lagertransaktion för objektet eller omnämnande värderingstakten i post och försök sedan inlämning / avbryta denna post"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av material som levereras mot detta följesedel
 DocType: Project,Customer Details,Kunduppgifter
@@ -3869,7 +3871,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Inlämnade order kan inte tas bort
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kvalitetshantering
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Punkt {0} har inaktiverats
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} har inaktiverats
 DocType: Employee Loan,Repay Fixed Amount per Period,Återbetala fast belopp per period
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
 DocType: Employee External Work History,Employee External Work History,Anställd Extern Arbetserfarenhet
@@ -3896,7 +3898,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student E ID
 DocType: Employee,Notice (days),Observera (dagar)
 DocType: Tax Rule,Sales Tax Template,Moms Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Välj objekt för att spara fakturan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Välj objekt för att spara fakturan
 DocType: Employee,Encashment Date,Inlösnings Datum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Lager för justering
@@ -3929,6 +3931,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debetnota utfärdad
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tillgång kan inte överföras
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Denna artikel är en variant av {0} (mall).
 DocType: Workstation,per hour,per timme
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Köp av
 DocType: Announcement,Announcement,Meddelande
@@ -3944,7 +3947,7 @@
 DocType: Account,Receivable,Fordran
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roll som får godkänna transaktioner som överstiger kreditgränser.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Välj produkter i Tillverkning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Välj produkter i Tillverkning
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
 DocType: Item,Material Issue,Materialproblem
 DocType: Hub Settings,Seller Description,Säljare Beskrivning
@@ -3957,7 +3960,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Beställde
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Bedömningskriteriegrupp
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Ingående ackumulerade avskrivningar måste vara mindre än lika med {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Ingående ackumulerade avskrivningar måste vara mindre än lika med {0}
 DocType: Warehouse,Warehouse Name,Lager Namn
 DocType: Naming Series,Select Transaction,Välj transaktion
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ange Godkännande roll eller godkänna Användare
@@ -3991,7 +3994,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","För att ställa denna verksamhetsåret som standard, klicka på &quot;Ange som standard&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Ansluta sig
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Employee Loan,Repay from Salary,Repay från Lön
 DocType: Leave Application,LAP/,KNÄ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Begärande betalning mot {0} {1} för mängden {2}
@@ -4009,7 +4012,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Detaljer Bedömningsresultat
 DocType: Employee Education,Employee Education,Anställd Utbildning
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dubblett grupp finns i posten grupptabellen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
 DocType: Salary Slip,Net Pay,Nettolön
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} redan har mottagits
@@ -4018,7 +4021,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Lager {0} är inte kopplat till något konto, vänligen skapa / koppla motsvarande (Asset) står för lagret."
 DocType: Purchase Invoice,Recurring Id,Återkommande Id
 DocType: Customer,Sales Team Details,Försäljnings Team Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Ta bort permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Ta bort permanent?
 DocType: Expense Claim,Total Claimed Amount,Totalt yrkade beloppet
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentiella möjligheter för att sälja.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ogiltigt {0}
@@ -4029,13 +4032,14 @@
 DocType: Warehouse,PIN,STIFT
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup din skola i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Basförändring Belopp (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spara dokumentet först.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Ändra Förkortning
 DocType: Expense Claim Detail,Expense Date,Utgiftsdatum
 DocType: Item,Max Discount (%),Max rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Sista beställningsmängd
+DocType: Task,Is Milestone,Är Milestone
 DocType: Daily Work Summary,Email Sent To,Email skickat till
 DocType: Budget,Warn,Varna
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alla andra anmärkningar, anmärkningsvärt ansträngning som ska gå i registren."
@@ -4068,11 +4072,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager äldre än` bör vara mindre än% d dagar.
 DocType: Tax Rule,Purchase Tax Template,Köp Tax Mall
 ,Project wise Stock Tracking,Projektvis lager Spårning
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Underhållsschema {0} finns mot {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiska Antal (vid källa/mål)
 DocType: Item Customer Detail,Ref Code,Referenskod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Personaldokument.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
 DocType: HR Settings,Payroll Settings,Sociala Inställningar
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Matcha ej bundna fakturor och betalningar.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Beställa
@@ -4095,7 +4098,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checkar och Insättningar rensas felaktigt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
 DocType: Purchase Invoice Item,Price List Rate,Prislista värde
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Skapa kund citat
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Skapa kund citat
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Visa &quot;i lager&quot; eller &quot;Inte i lager&quot; som bygger på lager tillgängliga i detta lager.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Genomsnittlig tid det tar för leverantören att leverera
@@ -4117,7 +4120,7 @@
 DocType: Asset,Disposal Date,bortskaffande Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post kommer att skickas till alla aktiva anställda i bolaget vid en given timme, om de inte har semester. Sammanfattning av svaren kommer att sändas vid midnatt."
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,utbildning Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
@@ -4125,7 +4128,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursen är obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hittills inte kan vara före startdatum
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Lägg till / redigera priser
 DocType: Batch,Parent Batch,Föräldragrupp
 DocType: Cheque Print Template,Cheque Print Template,Check utskriftsmall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kontoplan på Kostnadsställen
@@ -4169,7 +4172,7 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Dina Leverantörer
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
 DocType: Request for Quotation Item,Supplier Part No,Leverantör varunummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Det går inte att dra när kategori är för &quot;Värdering&quot; eller &quot;Vaulation och Total&quot;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Mottagen från
@@ -4179,7 +4182,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Från {0} för {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,V {0}: Timmar Värdet måste vara större än noll.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
 DocType: Issue,Content Type,Typ av innehåll
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
@@ -4188,20 +4191,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
 DocType: Payment Reconciliation,From Invoice Date,Från fakturadatum
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturerings valutan måste vara lika med antingen standard comapany valuta eller partikontovaluta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturerings valutan måste vara lika med antingen standard comapany valuta eller partikontovaluta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lämna inlösen
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Vad gör den?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Till Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alla Student Antagning
 ,Average Commission Rate,Genomsnittligt commisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
 DocType: School House,House Name,Hus-namn
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Uppdatera merkostnader för att beräkna landade kostnaden för objekt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrisk
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lägg till resten av din organisation som dina användare. Du kan också bjuda in Kunder till din portal genom att lägga till dem från Kontakter
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lägg till resten av din organisation som dina användare. Du kan också bjuda in Kunder till din portal genom att lägga till dem från Kontakter
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Användar-ID inte satt för anställd {0}
@@ -4210,7 +4213,7 @@
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Påminnelse födelsedag för {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar sedan senast Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum bör vara mindre än försäkring Slutdatum
@@ -4225,7 +4228,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Lönebesked av personal {0} redan skapats för tidrapporten {1}
 DocType: Vehicle Log,Odometer,Vägmätare
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM inte innehåller någon lagervara
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Period Från och period datum obligatoriska för återkommande {0}
@@ -4238,7 +4241,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings Timmar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standard BOM för {0} hittades inte
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tryck på objekt för att lägga till dem här
 DocType: Fees,Program Enrollment,programmet Inskrivning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ställ in {0}
@@ -4339,7 +4343,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
 DocType: Issue,First Responded On,Först svarade den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kors Notering av punkt i flera grupper
-DocType: Grade Interval,Grade Interval,grade Intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Räkenskapsårets Startdatum och Räkenskapsårets Slutdatum är redan inställd under räkenskapsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Datum uppdateras
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4348,6 +4351,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Hämta PDF
 DocType: Production Order,Planned End Date,Planerat Slutdatum
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Där artiklar lagras.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 DocType: Request for Quotation,Supplier Detail,leverantör Detalj
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Fel i formel eller ett tillstånd: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Fakturerade belopp
@@ -4393,7 +4397,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup en enkel hemsida för min organisation
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordran / Betal konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot Försäljningvara
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ange huvud kostnadsställe
@@ -4453,7 +4457,7 @@
 ,Items To Be Requested,Produkter att begäras
 DocType: Purchase Order,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Company,Company Info,Företagsinfo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Välj eller lägga till en ny kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Välj eller lägga till en ny kund
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostnadsställe krävs för att boka en räkningen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Tillämpning av medel (tillgångar)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Detta är baserat på närvaron av detta till anställda
@@ -4466,13 +4470,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppa användare från att göra Lämna program på följande dagarna.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Köpesumma
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverantör Offert {0} skapades
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End år kan inte vara före startåret
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,End år kan inte vara före startåret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Ersättningar till anställda
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Tillverkas Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vänligen ange ett standardkalender för anställd {0} eller Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existerar inte
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} existerar inte
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fakturor till kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
@@ -4481,15 +4485,17 @@
 DocType: Quality Inspection Reading,Reading 3,Avläsning 3
 ,Hub,Nav
 DocType: GL Entry,Voucher Type,Rabatt Typ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prislista hittades inte eller avaktiverad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Employee Loan Application,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
 DocType: Guardian,Guardian,väktare
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Bedömning {0} skapades för anställd {1} på visst datumintervall
 DocType: Employee,Education,Utbildning
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanj namnges av
 DocType: Employee,Current Address Is,Nuvarande adress är
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ändrad
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Tillval. Ställer företagets standardvaluta, om inte annat anges."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Redovisning journalanteckningar.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
@@ -4526,7 +4532,7 @@
 DocType: Hub Settings,Hub Settings,Nav Inställningar
 DocType: Project,Gross Margin %,Bruttomarginal%
 DocType: BOM,With Operations,Med verksamhet
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Är befintlig tillgång
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 DocType: Salary Detail,Statistical Component,Statistisk komponent
@@ -4582,7 +4588,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Fäst Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lager~~POS=TRUNC
 DocType: Customer,Commission Rate,Provisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Gör Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Betalning Type måste vara en av mottagning Betala och intern överföring
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4595,6 +4601,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillåt Produktion på helgdagar
 DocType: Sales Order,Customer's Purchase Order Date,Kundens inköpsorder Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapital Lager
+DocType: Shopping Cart Settings,Show Public Attachments,Visa offentliga bilagor
 DocType: Packing Slip,Package Weight Details,Paket Vikt Detaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betalning Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betalning avslutad omdirigera användare till valda sidan.
@@ -4619,7 +4626,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Visa inte någon symbol som $ etc bredvid valutor.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Göra Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Göra Student Batch
 DocType: Leave Type,Is Carry Forward,Är Överförd
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Hämta artiklar från BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledtid dagar
@@ -4638,8 +4645,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktionerade Belopp
 DocType: GL Entry,Is Opening,Är Öppning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Setup&gt; Numbers Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Setup&gt; Numbers Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Kontot {0} existerar inte
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi för webbplatsen och andra publikationer.
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index eab4ea9..d4d4a89 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -58,7 +58,7 @@
 ,Batch Item Expiry Status,தொகுதி பொருள் காலாவதியாகும் நிலை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,வங்கி உண்டியல்
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,காட்டு மாறிகள்
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,காட்டு மாறிகள்
 DocType: Academic Term,Academic Term,கல்வி கால
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,பொருள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,அளவு
@@ -74,6 +74,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,உடல்நலம்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,சேவை செலவு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,நிதியாண்டு {0} தேவையான
@@ -117,19 +118,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,விளம்பரம்
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,அதே நிறுவனம் ஒன்றுக்கு மேற்பட்ட முறை உள்ளிட்ட
 DocType: Employee,Married,திருமணம்
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},அனுமதி இல்லை {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},அனுமதி இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,இருந்து பொருட்களை பெற
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள சிஸ்டம் பெயரிடுதல்&gt; மனிதவள அமைப்புகள்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},தயாரிப்பு {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,உருப்படிகள் எதுவும் பட்டியலிடப்படவில்லை
 DocType: Payment Reconciliation,Reconcile,சமரசம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,மளிகை
 DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
 DocType: Process Payroll,Make Bank Entry,வங்கி நுழைவு செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,அடுத்து தேய்மானம் தேதி கொள்முதல் தேதி முன்பாக இருக்கக் கூடாது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,அடுத்து தேய்மானம் தேதி கொள்முதல் தேதி முன்பாக இருக்கக் கூடாது
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** மாதாந்திர விநியோகம் ** நீங்கள் உங்கள் வணிக பருவகால இருந்தால் நீங்கள் மாதங்கள் முழுவதும் பட்ஜெட் / இலக்கு விநியோகிக்க உதவுகிறது.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,பொருட்களை காணவில்லை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,பொருட்களை காணவில்லை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
 DocType: Lead,Person Name,நபர் பெயர்
 DocType: Sales Invoice Item,Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள்
@@ -138,16 +141,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",எ.கா. &quot;முதன்மை பள்ளி&quot; அல்லது &quot;பல்கலைக்கழகம்&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,பங்கு அறிக்கைகள்
 DocType: Warehouse,Warehouse Detail,சேமிப்பு கிடங்கு விரிவாக
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,கால முடிவு தேதி பின்னர் கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு முடிவு தேதி விட முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;நிலையான சொத்து உள்ளது&quot; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;நிலையான சொத்து உள்ளது&quot; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
 DocType: Vehicle Service,Brake Oil,பிரேக் ஆயில்
 DocType: Tax Rule,Tax Type,வரி வகை
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
 DocType: BOM,Item Image (if not slideshow),பொருள் படம் (இல்லையென்றால் ஸ்லைடுஷோ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,"ஒரு வாடிக்கையாளர் , அதே பெயரில்"
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM தேர்வு
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOM தேர்வு
 DocType: SMS Log,SMS Log,எஸ்எம்எஸ் புகுபதிகை
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,வழங்கப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} விடுமுறை வரம்பு தேதி தேதி இடையே அல்ல
@@ -192,11 +195,11 @@
 DocType: Training Result Employee,Grade,தரம்
 DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,உற்பத்தி ஆணை ஏற்கனவே BOM அனைத்து பொருட்கள் உருவாக்கப்பட்ட
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,உற்பத்தி ஆணை ஏற்கனவே BOM அனைத்து பொருட்கள் உருவாக்கப்பட்ட
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ஆண்டு சம்பளம்
 DocType: Daily Work Summary,Daily Work Summary,தினசரி வேலை சுருக்கம்
 DocType: Period Closing Voucher,Closing Fiscal Year,நிதியாண்டு மூடுவதற்கு
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} உறைந்து
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} உறைந்து
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,கணக்கு வரைபடம் உருவாக்க இருக்கும் நிறுவனத்தை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,பங்கு செலவுகள்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
@@ -205,12 +208,12 @@
 DocType: Journal Entry,Contra Entry,கான்ட்ரா நுழைவு
 DocType: Journal Entry Account,Credit in Company Currency,நிறுவனத்தின் நாணய கடன்
 DocType: Delivery Note,Installation Status,நிறுவல் நிலைமை
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",நீங்கள் வருகை புதுப்பிக்க விரும்புகிறீர்களா? <br> தற்போதைய: {0} \ <br> இருக்காது: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ஏற்கப்பட்டது + நிராகரிக்கப்பட்டது அளவு பொருள் பெறப்பட்டது அளவு சமமாக இருக்க வேண்டும் {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,வழங்கல் மூலப்பொருட்கள் வாங்க
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,கட்டணம் குறைந்தது ஒரு முறை பிஓஎஸ் விலைப்பட்டியல் தேவைப்படுகிறது.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,கட்டணம் குறைந்தது ஒரு முறை பிஓஎஸ் விலைப்பட்டியல் தேவைப்படுகிறது.
 DocType: Products Settings,Show Products as a List,நிகழ்ச்சி பொருட்கள் ஒரு பட்டியல்
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", டெம்ப்ளேட் பதிவிறக்கம் பொருத்தமான தரவு நிரப்ப செய்தது கோப்பு இணைக்கவும்.
@@ -225,7 +228,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,தேய்மானம் நுழைவு செய்ய
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,கோரிக்கை வகை
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,பணியாளர் செய்ய
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,பணியாளர் செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,நிர்வாகத்தினருக்கு
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,குலையை மூடுதல் மேற்கொள்ளப்படும்.
@@ -241,6 +244,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,பராமரிப்பு வருகைகள் திட்டம்.
 DocType: SMS Settings,Enter url parameter for message,செய்தி இணைய அளவுரு உள்ளிடவும்
 DocType: POS Profile,Customer Groups,வாடிக்கையாளர் குழுக்கள்
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,நிதி அறிக்கைகள்
 DocType: Guardian,Students,மாணவர்கள்
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,விலை மற்றும் தள்ளுபடி விண்ணப்பம் செய்வதற்கான விதிமுறைகள் .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,விலை பட்டியல் கொள்முதல் அல்லது விற்பனை பொருந்தும் வேண்டும்
@@ -266,7 +270,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
 DocType: Naming Series,Series List for this Transaction,இந்த பரிவர்த்தனை தொடர் பட்டியல்
 DocType: Company,Default Payroll Payable Account,இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,புதுப்பிக்கப்பட்டது மின்னஞ்சல் குழு
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,புதுப்பிக்கப்பட்டது மின்னஞ்சல் குழு
 DocType: Sales Invoice,Is Opening Entry,நுழைவு திறக்கிறது
 DocType: Customer Group,Mention if non-standard receivable account applicable,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு பொருந்தினால்
 DocType: Course Schedule,Instructor Name,பயிற்றுவிப்பாளர் பெயர்
@@ -278,7 +282,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள் எதிராக
 ,Production Orders in Progress,முன்னேற்றம் உற்பத்தி ஆணைகள்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,கடன் இருந்து நிகர பண
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
 DocType: Lead,Address & Contact,முகவரி மற்றும் தொடர்பு கொள்ள
 DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
@@ -304,7 +308,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),மொத்த செலவுவகை தொகை (நேரம் தாள் வழியாக)
 DocType: Item Website Specification,Item Website Specification,பொருள் வலைத்தளம் குறிப்புகள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,வங்கி பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
@@ -323,7 +327,7 @@
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 DocType: Student Admission,Student Admission,மாணவர் சேர்க்கை
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,பொருள் {0} ரத்து
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
@@ -377,12 +381,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,டெலிவரி குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,டெலிவரி குறிப்பு
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,விற்கப்பட்டது சொத்து செலவு
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
-DocType: Grade Interval,Min Score,min மதிப்பெண்
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Student Applicant,Admitted,ஒப்பு
 DocType: Workstation,Rent Cost,வாடகை செலவு
@@ -395,7 +398,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ஆணை மதிப்பு
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,வங்கி / பண கட்சிக்கு எதிராக அல்லது உள் பரிமாற்ற பரிவர்த்தனைகள்
 DocType: Shipping Rule,Valid for Countries,நாடுகள் செல்லுபடியாகும்
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,இந்த உருப்படி ஒரு டெம்ப்ளேட் உள்ளது பரிமாற்றங்களை பயன்படுத்த முடியாது. 'இல்லை நகல் அமைக்க வரை பொருள் பண்புகளை மாறிகள் மீது நகல்
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,இந்த உருப்படி ஒரு டெம்ப்ளேட் உள்ளது பரிமாற்றங்களை பயன்படுத்த முடியாது. 'இல்லை நகல் அமைக்க வரை பொருள் பண்புகளை மாறிகள் மீது நகல்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,அது கருதப்பட்டு மொத்த ஆணை
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,துறையில் மதிப்பு ' மாதம் நாளில் பூசை ' உள்ளிடவும்
@@ -405,13 +408,13 @@
 DocType: Item Tax,Tax Rate,வரி விகிதம்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ஏற்கனவே பணியாளர் ஒதுக்கப்பட்ட {1} காலம் {2} க்கான {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,உருப்படி தேர்வுசெய்க
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,அல்லாத குழு மாற்றுக
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ஒரு பொருள் ஒரு தொகுதி (நிறைய).
 DocType: C-Form Invoice Detail,Invoice Date,விலைப்பட்டியல் தேதி
 DocType: GL Entry,Debit Amount,பற்று தொகை
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,மாணவர் குழுக்கள் உருவாக்க
@@ -442,9 +445,9 @@
 DocType: Request for Quotation,Request for Quotation,விலைப்பட்டியலுக்கான கோரிக்கை
 DocType: Salary Slip Timesheet,Working Hours,வேலை நேரங்கள்
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ஏற்கனவே தொடரில் தற்போதைய / தொடக்க வரிசை எண் மாற்ற.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","பல விலை விதிகள் நிலவும் தொடர்ந்து இருந்தால், பயனர்கள் முரண்பாட்டை தீர்க்க கைமுறையாக முன்னுரிமை அமைக்க கேட்கப்பட்டது."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,கொள்முதல் ஆணைகள் உருவாக்க
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,கொள்முதல் ஆணைகள் உருவாக்க
 ,Purchase Register,பதிவு வாங்குவதற்கு
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,பிரயோகிக்கப்படும் கட்டணங்கள்
@@ -488,7 +491,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,அனைத்து உற்பத்தி செயல்முறைகள் உலக அமைப்புகள்.
 DocType: Accounts Settings,Accounts Frozen Upto,உறைந்த வரை கணக்குகள்
 DocType: SMS Log,Sent On,அன்று அனுப்பப்பட்டது
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,விடுமுறை மாஸ்டர் .
@@ -510,6 +513,7 @@
 DocType: Packing Slip,From Package No.,தொகுப்பு எண் இருந்து
 DocType: Item Attribute,To Range,வரையறைக்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,பத்திரங்கள் மற்றும் வைப்பு
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","அது இல்லை இது சில பொருட்களை எதிராக பரிமாற்றங்கள் உள்ளன, மதிப்பீடு முறை மாற்ற முடியாது சொந்த மதிப்பீட்டு முறை தான்"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ஒதுக்கப்பட்ட மொத்த இலைகள் கட்டாயமாகும்
 DocType: Job Opening,Description of a Job Opening,ஒரு வேலை ஆரம்பிப்பு விளக்கம்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,இன்று நிலுவையில் நடவடிக்கைகள்
@@ -537,7 +541,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
 DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ஒப்பனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,வாங்க
@@ -547,7 +551,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ஆரம்பம் 0% அளவீட்டைக் வரையறுக்க கொள்ளவும்
 DocType: Sales Order,To Deliver,வழங்க
 DocType: Purchase Invoice Item,Item,பொருள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
 DocType: Journal Entry,Difference (Dr - Cr),வேறுபாடு ( டாக்டர் - CR)
 DocType: Account,Profit and Loss,இலாப நட்ட
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
@@ -573,7 +577,7 @@
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 DocType: Production Plan Item,Pending Qty,நிலுவையில் அளவு
 DocType: Budget,Ignore,புறக்கணி
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} செயலில் இல்லை
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} செயலில் இல்லை
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},எஸ்எம்எஸ் எண்களில் அனுப்பப்பட்டது: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,அச்சிடும் அமைப்பு காசோலை பரிமாணங்களை
 DocType: Salary Slip,Salary Slip Timesheet,சம்பளம் ஸ்லிப் டைம் ஷீட்
@@ -582,13 +586,13 @@
 DocType: Sales Invoice,Total Commission,மொத்த ஆணையம்
 DocType: Pricing Rule,Sales Partner,விற்பனை வரன்வாழ்க்கை துணை
 DocType: Buying Settings,Purchase Receipt Required,கொள்முதல் ரசீது தேவை
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ஆரம்ப இருப்பு உள்ளிட்ட மதிப்பீட்டு மதிப்பீடு அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ஆரம்ப இருப்பு உள்ளிட்ட மதிப்பீட்டு மதிப்பீடு அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,திரட்டப்பட்ட கலாச்சாரம்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,விற்பனை ஆணை செய்ய
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,விற்பனை ஆணை செய்ய
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
@@ -605,7 +609,7 @@
 DocType: Job Applicant,Resume Attachment,துவைக்கும் இயந்திரம் இணைப்பு
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,மீண்டும் வாடிக்கையாளர்கள்
 DocType: Leave Control Panel,Allocate,நிர்ணயி
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,விற்பனை Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,குறிப்பு: மொத்த ஒதுக்கீடு இலைகள் {0} ஏற்கனவே ஒப்புதல் இலைகள் குறைவாக இருக்க கூடாது {1} காலம்
 DocType: Announcement,Posted By,பதிவிட்டவர்
 DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
@@ -615,7 +619,7 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),திறப்பு (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,நிறுவனத்தின் அமைக்கவும்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,நிறுவனத்தின் அமைக்கவும்
@@ -627,7 +631,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,விற்பனை விலைப்பட்டியல் டைம் ஷீட்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,வங்கி நுழைவு செய்ய கொடுப்பனவு கணக்கு தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","இலைகள், இழப்பில் கூற்றுக்கள் மற்றும் சம்பள நிர்வகிக்க பணியாளர் பதிவுகளை உருவாக்க"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","இலைகள், இழப்பில் கூற்றுக்கள் மற்றும் சம்பள நிர்வகிக்க பணியாளர் பதிவுகளை உருவாக்க"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,அறிவு தளம் சேர்க்க
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,மானசாவுடன்
 DocType: Payment Entry Deduction,Payment Entry Deduction,கொடுப்பனவு நுழைவு விலக்கு
@@ -669,8 +673,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 அரசுடன் உறவு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,மேலாளர்
 DocType: Payment Entry,Payment From / To,/ இருந்து பணம்
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,தேதி வரம்பு
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},புதிய கடன் வரம்பை வாடிக்கையாளர் தற்போதைய கடன் தொகையை விட குறைவாக உள்ளது. கடன் வரம்பு குறைந்தது இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},புதிய கடன் வரம்பை வாடிக்கையாளர் தற்போதைய கடன் தொகையை விட குறைவாக உள்ளது. கடன் வரம்பு குறைந்தது இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
 DocType: SMS Settings,Receiver Parameter,ரிசீவர் அளவுரு
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
@@ -680,7 +683,7 @@
 DocType: Issue,Resolution Date,தீர்மானம் தேதி
 DocType: Student Batch Name,Batch Name,தொகுதி பெயர்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,பதிவுசெய்யவும்
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,மாணவர் மாதாந்திர வருகை அறிக்கையில் போன்ற தற்போதைய மாணவர் காண்பிக்கும்
@@ -724,7 +727,7 @@
 DocType: Student Attendance,Student Attendance,மாணவர் வருகை
 DocType: Sales Invoice Timesheet,Time Sheet,நேரம் தாள்
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush மூலப்பொருட்கள் அடித்தளமாகக்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,உருப்படியை விவரங்கள் உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,உருப்படியை விவரங்கள் உள்ளிடவும்
 DocType: Interest,Interest,ஆர்வம்
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,முன் விற்பனை
 DocType: Purchase Receipt,Other Details,மற்ற விவரங்கள்
@@ -742,7 +745,7 @@
 ,Absent Student Report,இல்லாத மாணவர் அறிக்கை
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Offer Letter Term,Offer Letter Term,கடிதம் கால சலுகை
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,நிறுவனத்தின் {0} இல்லை
@@ -751,7 +754,6 @@
 DocType: Serial No,Warranty Expiry Date,உத்தரவாதத்தை காலாவதியாகும் தேதி
 DocType: Material Request Item,Quantity and Warehouse,அளவு மற்றும் சேமிப்பு கிடங்கு
 DocType: Sales Invoice,Commission Rate (%),கமிஷன் விகிதம் (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடுதல் தொடருக்கான தொடர் பெயரிடுதல் அமைக்கவும்
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
 DocType: Project,Estimated Cost,விலை மதிப்பீடு
@@ -770,7 +772,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ஒரு பங்கு பொருள் அல்ல
 DocType: Mode of Payment Account,Default Account,முன்னிருப்பு கணக்கு
 DocType: Payment Entry,Received Amount (Company Currency),பெறப்பட்ட தொகை (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,வாராந்திர ஆஃப் நாள் தேர்வு செய்க
 DocType: Production Order Operation,Planned End Time,திட்டமிட்ட நேரம்
 ,Sales Person Target Variance Item Group-Wise,விற்பனை நபர் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
@@ -853,7 +855,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Request for Quotation Supplier,Send Email,மின்னஞ்சல் அனுப்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,அனுமதி இல்லை
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
@@ -866,7 +868,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ஊழியர்   இல்லை
 DocType: Supplier Quotation,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,மாணவர் குழு ஏற்கனவே புதுப்பிக்கப்பட்டது.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,மாணவர் குழு ஏற்கனவே புதுப்பிக்கப்பட்டது.
 DocType: SMS Center,All Customer Contact,அனைத்து வாடிக்கையாளர் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv வழியாக பங்கு சமநிலை பதிவேற்றலாம்.
 DocType: Warehouse,Tree Details,மரம் விபரங்கள்
@@ -877,8 +879,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,குறைந்தபட்ச விலைப்பட்டியல் அளவு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: செலவு மையம் {2} நிறுவனத்தின் சொந்தம் இல்லை {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: கணக்கு {2} ஒரு குழுவாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,பொருள் வரிசையில் {அச்சுக்கோப்புகளை வாசிக்க}: {டாக்டைப்பானது} {docName} மேலே இல்லை '{டாக்டைப்பானது}' அட்டவணை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,பொருள் வரிசையில் {அச்சுக்கோப்புகளை வாசிக்க}: {டாக்டைப்பானது} {docName} மேலே இல்லை '{டாக்டைப்பானது}' அட்டவணை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,பணிகள் எதுவும் இல்லை
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","கார் விலைப்பட்டியல் 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 DocType: Asset,Opening Accumulated Depreciation,குவிக்கப்பட்ட தேய்மானம் திறந்து
@@ -894,7 +896,7 @@
 DocType: Bin,Moving Average Rate,சராசரி விகிதம் நகரும்
 DocType: Production Planning Tool,Select Items,தேர்ந்தெடு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,பாடநெறி அட்டவணை
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,பாடநெறி அட்டவணை
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
 DocType: HR Settings,Enter retirement age in years,ஆண்டுகளில் ஓய்வு பெறும் வயதை உள்ளிடவும்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,இலக்கு கிடங்கு
@@ -902,7 +904,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,இறக்குமதி வருகை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,அனைத்து பொருள் குழுக்கள்
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,அனைத்து பொருள் குழுக்கள்
 DocType: Process Payroll,Activity Log,நடவடிக்கை பதிவு
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,நிகர லாபம் / இழப்பு
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
@@ -913,7 +915,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;திறந்து&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,செய்ய திறந்த
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
@@ -929,7 +931,7 @@
 DocType: Item Reorder,Re-Order Qty,மீண்டும் ஒழுங்கு அளவு
 DocType: Leave Block List Date,Leave Block List Date,பிளாக் பட்டியல் தேதி விட்டு
 DocType: Pricing Rule,Price or Discount,விலை அல்லது தள்ளுபடி
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,கொள்முதல் ரசீது பொருட்கள் அட்டவணையில் மொத்த பொருந்தும் கட்டணங்கள் மொத்த வரி மற்றும் கட்டணங்கள் அதே இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,கொள்முதல் ரசீது பொருட்கள் அட்டவணையில் மொத்த பொருந்தும் கட்டணங்கள் மொத்த வரி மற்றும் கட்டணங்கள் அதே இருக்க வேண்டும்
 DocType: Sales Team,Incentives,செயல் தூண்டுதல்
 DocType: SMS Log,Requested Numbers,கோரப்பட்ட எண்கள்
 DocType: Production Planning Tool,Only Obtain Raw Materials,ஒரே மூலப்பொருட்கள் பெறுதல்
@@ -988,8 +990,7 @@
 DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Fee Structure,Components,கூறுகள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
@@ -1041,8 +1042,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,இரசாயன
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கப்பட்ட போது இயல்புநிலை வங்கி / பண கணக்கு தானாக சம்பளம் ஜர்னல் நுழைவு புதுப்பிக்கப்படும்.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",தர குறியீடு இடைவெளியை {0} மற்ற தரங்களாக தர இடைவெளியில் மேலெழுகிறது. இடைவெளியில் சரிபார்க்கவும் {0} மற்றும் {1} மீண்டும் முயற்சி
 DocType: BOM,Raw Material Cost(Company Currency),மூலப்பொருட்களின் விலை (நிறுவனத்தின் நாணய)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ரோ # {0}: விகிதம் பயன்படுத்தப்படும் விகிதத்தை விட அதிகமாக இருக்க முடியாது {1} {2}
@@ -1055,7 +1054,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM இணையத்தளம் பொருள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
 DocType: Timesheet Detail,Bill,ரசீது
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,வெள்ளை
 DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ரோ {0}: அளவு கிடைக்கவில்லை {4} கிடங்கில் {1} நுழைவு நேரம் வெளியிடும் ({2} {3})
@@ -1070,7 +1069,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ஒழுங்கு வகை ஒன்றாக இருக்க வேண்டும் {0}
 DocType: Lead,Next Contact Date,அடுத்த தொடர்பு தேதி
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,திறந்து அளவு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
 DocType: Student Batch Name,Student Batch Name,மாணவர் தொகுதி பெயர்
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
 DocType: Repayment Schedule,Balance Loan Amount,இருப்பு கடன் தொகை
@@ -1090,10 +1089,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},தயவு செய்து குறிப்பிட ஒரு {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,தள்ளுபடி
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,தள்ளுபடி
 DocType: Asset,Total Number of Depreciations,Depreciations எண்ணிக்கை
 DocType: Sales Invoice Item,Rate With Margin,மார்ஜின் உடன் விகிதம்
 DocType: Sales Invoice Item,Rate With Margin,மார்ஜின் உடன் விகிதம்
@@ -1122,7 +1121,7 @@
 DocType: Lead,Organization Name,நிறுவன பெயர்
 DocType: Tax Rule,Shipping State,கப்பல் மாநிலம்
 ,Projected Quantity as Source,மூல திட்டமிடப்பட்ட அளவு
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
 DocType: Employee,A-,ஏ
 DocType: Production Planning Tool,Include non-stock items,பங்கற்ற பொருட்களை சேர்க்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,விற்பனை செலவு
@@ -1130,7 +1129,7 @@
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ஜிப் குறியீடு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,ஜிப் குறியீடு
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
@@ -1174,7 +1173,7 @@
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
 ,Ordered Items To Be Billed,கணக்கில் வேண்டும் உத்தரவிட்டது உருப்படிகள்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ரேஞ்ச் குறைவாக இருக்க வேண்டும் இருந்து விட வரையறைக்கு
 DocType: Global Defaults,Global Defaults,உலக இயல்புநிலைகளுக்கு
@@ -1209,11 +1208,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,தொகுதி எண் பெற கொள்ளவும் பொருள் குறியீடு நுழைய
 DocType: Stock Settings,Default Item Group,இயல்புநிலை பொருள் குழு
 DocType: Employee Loan,Partially Disbursed,பகுதியளவு செலவிட்டு
-DocType: Grading Structure,Grading System Name,தர அமைப்பு பெயர்
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,வழங்குபவர் தரவுத்தள.
 DocType: Account,Balance Sheet,இருப்பு தாள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","பணம் செலுத்தும் முறை உள்ளமைக்கப்படவில்லை. கணக்கு கொடுப்பனவு முறை அல்லது பிஓஎஸ் பதிவு செய்தது பற்றி அமைக்க என்பதையும், சரிபார்க்கவும்."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","பணம் செலுத்தும் முறை உள்ளமைக்கப்படவில்லை. கணக்கு கொடுப்பனவு முறை அல்லது பிஓஎஸ் பதிவு செய்தது பற்றி அமைக்க என்பதையும், சரிபார்க்கவும்."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,உங்கள் விற்பனை நபர் வாடிக்கையாளர் தொடர்பு கொள்ள இந்த தேதியில் ஒரு நினைவூட்டல் வரும்
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,அதே பொருளைப் பலமுறை உள்ளிட முடியாது.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","மேலும் கணக்குகளை குழுக்கள் கீழ் செய்யப்பட்ட, ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்"
@@ -1252,11 +1250,11 @@
 DocType: Maintenance Visit Purpose,Work Done,வேலை
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,காரணிகள் அட்டவணை குறைந்தது ஒரு கற்பிதம் குறிப்பிட தயவு செய்து
 DocType: Announcement,All Students,அனைத்து மாணவர்கள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,பொருள் {0} ஒரு பங்கற்ற பொருளாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,பொருள் {0} ஒரு பங்கற்ற பொருளாக இருக்க வேண்டும்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,காட்சி லெட்ஜர்
 DocType: Grading Scale,Intervals,இடைவெளிகள்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,முந்தைய
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,மாணவர் மொபைல் எண்
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
@@ -1297,8 +1295,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,கொள்முதல் ஆணைகள் நீ திட்டமிட உதவும் உங்கள் கொள்முதல் சரி வர
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,கொள்முதல் ஆணைகள் நீ திட்டமிட உதவும் உங்கள் கொள்முதல் சரி வர
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,சிறிய
@@ -1322,7 +1320,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
 DocType: Student Applicant,AP,ஆந்திர
 DocType: Purchase Invoice Item,BOM,பொருட்களின் அளவுக்கான ரசீது(BOM)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
@@ -1340,7 +1338,7 @@
 DocType: Student Group Student,Group Roll Number,குழு ரோல் எண்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,அனைத்து பணி எடைகள் மொத்த இருக்க வேண்டும் 1. அதன்படி அனைத்து திட்ட பணிகளை எடைகள் சரிசெய்யவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,விநியோக  குறிப்பு {0} சமர்ப்பிக்கவில்லை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,விநியோக  குறிப்பு {0} சமர்ப்பிக்கவில்லை
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,மூலதன கருவிகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
@@ -1367,7 +1365,7 @@
 DocType: Depreciation Schedule,Journal Entry,பத்திரிகை நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} முன்னேற்றம் பொருட்களை
 DocType: Workstation,Workstation Name,பணிநிலைய பெயர்
-DocType: Grade Interval,Grade Code,தர குறியீடு
+DocType: Grading Scale Interval,Grade Code,தர குறியீடு
 DocType: POS Item Group,POS Item Group,பிஓஎஸ் பொருள் குழு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,மின்னஞ்சல் தொகுப்பு:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
@@ -1384,7 +1382,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,வன்பொருள்
 DocType: Sales Order,Recurring Upto,தொடர் வரை
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,தனிச்சலுகை விடுப்பு
 DocType: Purchase Invoice,Supplier Invoice Date,வழங்குபவர் விலைப்பட்டியல் தேதி
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,வண்டியில் செயல்படுத்த வேண்டும்
@@ -1401,7 +1399,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,உணவு
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,வயதான ரேஞ்ச் 3
 DocType: Maintenance Schedule Item,No of Visits,வருகைகள் எண்ணிக்கை
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,மார்க் Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,மார்க் Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},பராமரிப்பு அட்டவணை {0} எதிராக உள்ளது {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,பதிவுசெய்யும் மாணவர்
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},கணக்கை மூடுவதற்கான நாணயம் இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},அனைத்து இலக்குகளை புள்ளிகள் தொகை இது 100 இருக்க வேண்டும் {0}
@@ -1450,13 +1449,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,கணக்கு விளக்கப்படம்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Detail,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
 DocType: Pricing Rule,"Higher the number, higher the priority","உயர் எண், அதிக முன்னுரிமை"
 ,Purchase Invoice Trends,விலைப்பட்டியல் போக்குகள் வாங்குவதற்கு
 DocType: Employee,Better Prospects,நல்ல வாய்ப்புகள்
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ரோ # {0}: தொகுதி {1} மட்டுமே {2} கொத்தமல்லி உள்ளது. கிடைக்க கொண்ட {3} கொத்தமல்லி மற்றொரு தொகுதி தேர்ந்தெடுக்கவும் அல்லது / பல தொகுப்புகளும் இருந்து பிரச்சினை வழங்க, பல வரிசைகள் ஒரு வரிசையில் பிரிக்கவும்"
 DocType: Vehicle,License Plate,உரிமம் தகடு
 DocType: Appraisal,Goals,இலக்குகளை
 DocType: Warranty Claim,Warranty / AMC Status,உத்தரவாதத்தை / AMC நிலைமை
@@ -1475,7 +1475,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,பணியாளர் தன்னை தெரிவிக்க முடியாது.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","கணக்கு முடக்கப்படும் என்றால், உள்ளீடுகளை தடை செய்த அனுமதிக்கப்படுகிறது ."
 DocType: Email Digest,Bank Balance,வங்கி மீதி
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","வேலை சுயவிவரத்தை, தகுதிகள் தேவை முதலியன"
 DocType: Journal Entry Account,Account Balance,கணக்கு இருப்பு
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
@@ -1486,7 +1486,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,மூடப்படாத நிதி ஆண்டில் பி &amp; எல் நிலுவைகளை காட்டு
 DocType: Shipping Rule,Shipping Account,கப்பல் கணக்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: கணக்கு {2} செயலற்று உள்ளது
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,விற்பனை ஆணைகள் நீங்கள் உங்கள் வேலை திட்டமிட உதவும் மற்றும் சரியான நேரத்தில் வழங்க செய்ய
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,விற்பனை ஆணைகள் நீங்கள் உங்கள் வேலை திட்டமிட உதவும் மற்றும் சரியான நேரத்தில் வழங்க செய்ய
 DocType: Quality Inspection,Readings,அளவீடுகளும்
 DocType: Stock Entry,Total Additional Costs,மொத்த கூடுதல் செலவுகள்
 DocType: Course Schedule,SH,எஸ்.எச்
@@ -1497,7 +1497,7 @@
 DocType: Shipping Rule Condition,To Value,மதிப்பு
 DocType: Asset Movement,Stock Manager,பங்கு மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ஸ்லிப் பொதி
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,ஸ்லிப் பொதி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,அமைப்பு எஸ்எம்எஸ் வாயில் அமைப்புகள்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,இறக்குமதி தோல்வி!
@@ -1523,7 +1523,7 @@
 DocType: Sales Invoice,Source,மூல
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,மூடப்பட்டது காட்டு
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,சொத்து வகை நிலையான சொத்து உருப்படியை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,சொத்து வகை நிலையான சொத்து உருப்படியை அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},இந்த {0} கொண்டு மோதல்கள் {1} க்கான {2} {3}
 DocType: Student Attendance Tool,Students HTML,"மாணவர்கள், HTML"
@@ -1541,7 +1541,7 @@
 DocType: Student,Date of Leaving,விட்டு தேதி
 DocType: Pricing Rule,For Price List,விலை பட்டியல்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,லீட்ஸ் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,லீட்ஸ் உருவாக்கவும்
 DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
 DocType: Purchase Invoice Item,Net Amount,நிகர விலை
 DocType: Purchase Order Item Supplied,BOM Detail No,"BOM 
@@ -1570,7 +1570,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,திட்டம் சேர்வதில்
 DocType: Sales Invoice Item,Brand Name,குறியீட்டு பெயர்
 DocType: Purchase Receipt,Transporter Details,இடமாற்றி விபரங்கள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,பெட்டி
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,சாத்தியமான சப்ளையர்
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,அமைப்பு
@@ -1604,7 +1604,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} திட்ட காணப்படவில்லை இல்லை இயல்புநிலை BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","மாணவர்கள் அமைப்பின் மையத்தில் உள்ள உள்ளன, உங்கள் மாணவர்கள் சேர்க்க"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","மாணவர்கள் அமைப்பின் மையத்தில் உள்ள உள்ளன, உங்கள் மாணவர்கள் சேர்க்க"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ரோ # {0}: இசைவு தேதி {1} காசோலை தேதி முன் இருக்க முடியாது {2}
 DocType: Company,Default Holiday List,விடுமுறை பட்டியல் இயல்புநிலை
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ரோ {0}: நேரம் மற்றும் நேரம் {1} கொண்டு மேலெழும் {2}
@@ -1616,20 +1616,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,கொடுப்பனவு மின்னஞ்சலை மீண்டும் அனுப்புக
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,புதிய பணி
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,மேற்கோள் செய்ய
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,மேற்கோள் செய்ய
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,பிற அறிக்கைகள்
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},நிறுவனத்தின் இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு அமைக்கவும் {0}
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,தேடல் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,தேடல் பொருள்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,உட்கொள்ளுகிறது தொகை
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,பண நிகர மாற்றம்
 DocType: Assessment Plan,Grading Scale,தரம் பிரித்தல் ஸ்கேல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ஏற்கனவே நிறைவு
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},பணம் கோரிக்கை ஏற்கனவே உள்ளது {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
@@ -1667,7 +1667,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,சேகரிக்க
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,நீங்கள் நீக்க முடியாது நிதியாண்டு {0}. நிதியாண்டு {0} உலகளாவிய அமைப்புகள் முன்னிருப்பாக அமைக்க உள்ளது
 DocType: Journal Entry,Entry Type,நுழைவு வகை
 ,Customer Credit Balance,வாடிக்கையாளர் கடன் இருப்பு
@@ -1709,8 +1709,6 @@
 DocType: Student Sibling,Studying in Same Institute,அதே நிறுவனம் படிக்கும்
 DocType: Territory,Territory Manager,மண்டலம் மேலாளர்
 DocType: Packed Item,To Warehouse (Optional),கிடங்கில் (கட்டாயமில்லை)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Payment Entry,Paid Amount (Company Currency),செலுத்தப்பட்ட தொகை எவ்வளவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
@@ -1720,9 +1718,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,வண்டியில் காண்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,இந்த பங்கு நுழைவு செய்ய பயன்படுத்தப்படும் பொருள் கோரிக்கை
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,அடுத்த தேய்மானம் தேதி புதிய சொத்து அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,அடுத்த தேய்மானம் தேதி புதிய சொத்து அத்தியாவசியமானதாகும்
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ஒவ்வொரு தொகுதி தனி நிச்சயமாக பொறுத்தே குழு
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ஒவ்வொரு தொகுதி தனி நிச்சயமாக பொறுத்தே குழு
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ஒரு பொருள் ஒரே யூனிட்.
@@ -1739,9 +1737,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: செலவு மையம் &#39;இலாப நட்ட கணக்கு தேவை {2}. நிறுவனத்தின் ஒரு இயல்பான செலவு மையம் அமைக்க கொள்ளவும்.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,புதிய தொடர்பு
 DocType: Territory,Parent Territory,பெற்றோர் மண்டலம்
 DocType: Quality Inspection Reading,Reading 2,2 படித்தல்
@@ -1768,21 +1764,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,சமரசம் JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 DocType: Purchase Invoice Item,Batch No,தொகுதி இல்லை
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ஈடாக விகிதம் கண்டுபிடிக்க முடியவில்லை {0} {1} முக்கிய தேதி {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ஒரு வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக பல விற்பனை ஆணைகள் அனுமதி
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 கைப்பேசி
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,முதன்மை
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,மாற்று
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,முதன்மை
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,மாற்று
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
 DocType: Employee Attendance Tool,Employees HTML,"ஊழியர், HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
 DocType: Employee,Leave Encashed?,காசாக்கப்பட்டால் விட்டு?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Email Digest,Annual Expenses,வருடாந்த செலவுகள்
 DocType: Item,Variants,மாறிகள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,கொள்முதல் ஆணை செய்ய
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,கொள்முதல் ஆணை செய்ய
 DocType: SMS Center,Send To,அனுப்பு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
@@ -1801,7 +1796,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,மதிப்பீடுகளில்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ஒரு கப்பல் ஆட்சிக்கு ஒரு நிலையில்
-DocType: Grading Structure,Grading Intervals,தரம் பிரித்தல் இடைவெளிகள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,தயவுசெய்து உள்ளீடவும்
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","வரிசையில் பொருள் {0} க்கான overbill முடியாது {1} விட {2}. அமைப்புகள் வாங்குவதில் அதிகமாக பில்லிங் அனுமதிக்க, அமைக்கவும்"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,பொருள் அல்லது கிடங்கில் அடிப்படையில் வடிகட்டி அமைக்கவும்
@@ -1814,16 +1808,17 @@
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,கொடுப்பனவு
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,உங்கள் ஆர்டர்களை நிர்வகிக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,உங்கள் ஆர்டர்களை நிர்வகிக்கவும்
 DocType: Production Order Operation,Actual Time and Cost,உண்மையான நேரம் மற்றும் செலவு
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},அதிகபட்ச பொருள் கோரிக்கை {0} உருப்படி {1} எதிராகவிற்பனை ஆணை {2}
 DocType: Employee,Salutation,வணக்கம் தெரிவித்தல்
 DocType: Course,Course Abbreviation,பாடநெறி சுருக்கமான
 DocType: Student Leave Application,Student Leave Application,மாணவர் விடுப்பு விண்ணப்பம்
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},பணியாளர் {0} அன்று அரை நாளில் {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},மொத்த வேலை மணி நேரம் அதிகபட்சம் வேலை நேரம் விட அதிகமாக இருக்க கூடாது {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,மீது
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,விற்பனை நேரத்தில் பொருட்களை மூட்டை.
 DocType: Quotation Item,Actual Qty,உண்மையான அளவு
 DocType: Sales Invoice Item,References,குறிப்புகள்
@@ -1833,7 +1828,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,நீங்கள் போலி பொருட்களை நுழைந்தது. சரிசெய்து மீண்டும் முயற்சிக்கவும்.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,இணை
 DocType: Asset Movement,Asset Movement,சொத்து இயக்கம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,புதிய வண்டி
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,புதிய வண்டி
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,பொருள் {0} ஒரு தொடர் பொருள் அல்ல
 DocType: SMS Center,Create Receiver List,பெறுநர் பட்டியல் உருவாக்க
 DocType: Vehicle,Wheels,வீல்ஸ்
@@ -1865,10 +1860,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,உற்பத்தி ஆணைகள் எதிராக நேரத்தில் பதிவுகள் உருவாக்கம் முடக்குகிறது. ஆபரேஷன்ஸ் உற்பத்தி ஒழுங்குக்கு எதிரான கண்காணிக்கப்படும்
 DocType: Student,Student Mobile Number,மாணவர் மொபைல் எண்
 DocType: Item,Has Variants,வகைகள் உண்டு
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
 DocType: Sales Person,Parent Sales Person,பெற்றோர் விற்பனை நபர்
 DocType: Purchase Invoice,Recurring Invoice,மீண்டும் விலைப்பட்டியல்
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,திட்டங்கள் நிர்வாக
@@ -1876,7 +1871,7 @@
 DocType: Budget,Fiscal Year,நிதியாண்டு
 DocType: Vehicle Log,Fuel Price,எரிபொருள் விலை
 DocType: Budget,Budget,வரவு செலவு திட்டம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",அது ஒரு வருமான அல்லது செலவு கணக்கு அல்ல என பட்ஜெட் எதிராக {0} ஒதுக்கப்படும் முடியாது
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,அடைய
 DocType: Student Admission,Application Form Route,விண்ணப்ப படிவம் வழி
@@ -1908,7 +1903,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},அளவு {0} {1} எதிராக கழிக்கப்படும் {2}
 DocType: Employee,Salary Information,சம்பளம் தகவல்
 DocType: Sales Person,Name and Employee ID,பெயர் மற்றும் பணியாளர் ஐடி
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
 DocType: Website Item Group,Website Item Group,இணைய தகவல்கள் குழு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,கடமைகள் மற்றும் வரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
@@ -1966,7 +1961,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,மீண்டும் வாடிக்கையாளர் வருவாய்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1})பங்கு 'செலவு ஒப்புதல்' வேண்டும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,இணை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
 DocType: Asset,Depreciation Schedule,தேய்மானம் அட்டவணை
 DocType: Bank Reconciliation Detail,Against Account,கணக்கு எதிராக
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,அரை நாள் தேதி வரம்பு தேதி தேதி இடையே இருக்க வேண்டும்
@@ -1984,13 +1979,14 @@
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"பொருள் குழு குறிப்பிடப்படவில்லை
 உருப்படியை {0} ல் உருப்படியை மாஸ்டர்"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
 DocType: Purchase Order,Delivered,வழங்கினார்
 ,Vehicle Expenses,வாகன செலவுகள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
+DocType: Serial No,Invoice Details,விவரப்பட்டியல் விவரங்கள்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
 DocType: Employee Loan,Loan Amount,கடன்தொகை
@@ -2014,7 +2010,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,அல்லாத குழு குழு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,விளையாட்டு
 DocType: Loan Type,Loan Name,கடன் பெயர்
@@ -2026,6 +2022,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,நீங்கள் நிராகரித்து பொருட்களை பங்கு வைத்து எங்கே கிடங்கு
 DocType: Production Order,Skip Material Transfer,பொருள் பரிமாற்ற செல்க
 DocType: Production Order,Skip Material Transfer,பொருள் பரிமாற்ற செல்க
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ஈடாக விகிதம் கண்டுபிடிக்க முடியவில்லை {0} {1} முக்கிய தேதி {2}. கைமுறையாக ஒரு செலாவணி பதிவை உருவாக்க கொள்ளவும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,உங்கள் நிதி ஆண்டில் முடிவடைகிறது
 DocType: POS Profile,Price List,விலை பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} இப்போது இயல்புநிலை நிதியாண்டு ஆகிறது . விளைவு எடுக்க மாற்றம் உங்களது உலாவி புதுப்பிக்கவும் .
@@ -2063,9 +2060,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** நிதியாண்டு ** ஒரு நிதி ஆண்டு பிரதிபலிக்கிறது. அனைத்து உள்ளீடுகளை மற்றும் பிற முக்கிய பரிமாற்றங்கள் ** ** நிதியாண்டு எதிரான கண்காணிக்கப்படும்.
 DocType: Opportunity,Customer / Lead Address,வாடிக்கையாளர் / முன்னணி முகவரி
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
 DocType: Student Admission,Eligibility,தகுதி
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",தடங்கள் நீங்கள் வணிக உங்கள் தடங்கள் போன்ற உங்கள் தொடர்புகள் மற்றும் மேலும் சேர்க்க உதவ
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",தடங்கள் நீங்கள் வணிக உங்கள் தடங்கள் போன்ற உங்கள் தொடர்புகள் மற்றும் மேலும் சேர்க்க உதவ
 DocType: Production Order Operation,Actual Operation Time,உண்மையான நடவடிக்கையை நேரம்
 DocType: Authorization Rule,Applicable To (User),பொருந்தும் (பயனர்)
 DocType: Purchase Taxes and Charges,Deduct,கழித்து
@@ -2106,7 +2103,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Process Payroll,Fortnightly,இரண்டு வாரங்களுக்கு ஒரு முறை
 DocType: Currency Exchange,From Currency,நாணய இருந்து
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
@@ -2122,7 +2119,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,முதல் வரிசையில் ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசையில் தொகை 'அல்லது குற்றச்சாட்டுக்கள் வகை தேர்ந்தெடுக்க முடியாது
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,குழந்தை பொருள் ஒரு தயாரிப்பு மூட்டை இருக்க கூடாது. உருப்படியை நீக்க: {0}: மற்றும் காப்பாற்றுங்கள்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,வங்கி
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets சேர்
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets சேர்
 DocType: Vehicle Service,Service Item,சேவை பொருள்
 DocType: Bank Guarantee,Bank Guarantee,வங்கி உத்தரவாதம்
 DocType: Bank Guarantee,Bank Guarantee,வங்கி உத்தரவாதம்
@@ -2172,8 +2169,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,விலை பட்டியல் அமைக்கப்படவில்லை எனில் காண்பிக்கப்படும் விலைகளில் முடியாது
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,இந்த கப்பல் விதி ஒரு நாடு குறிப்பிட அல்லது உலகம் முழுவதும் கப்பல் சரிபார்க்கவும்
 DocType: Stock Entry,Total Incoming Value,மொத்த உள்வரும் மதிப்பு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,பற்று தேவைப்படுகிறது
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,பற்று தேவைப்படுகிறது
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,கொள்முதல் விலை பட்டியல்
 DocType: Offer Letter Term,Offer Term,சலுகை  கால
 DocType: Quality Inspection,Quality Manager,தர மேலாளர்
@@ -2207,14 +2204,14 @@
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,புதிய முகவரி
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,தயவு செய்து ரசீது ஆவண நுழைய
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,தயவு செய்து ரசீது ஆவண நுழைய
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;வழக்கு எண் வரம்பு&#39; சரியான குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
 DocType: Project,External,வெளி
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,பயனர்கள் மற்றும் அனுமதிகள்
 DocType: Vehicle Log,VLOG.,பதிவின்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},உற்பத்தி ஆணைகள் உருவாக்கப்பட்டது: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},உற்பத்தி ஆணைகள் உருவாக்கப்பட்டது: {0}
 DocType: Branch,Branch,கிளை
 DocType: Guardian,Mobile Number,மொபைல் எண்
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,அச்சிடுதல் மற்றும் பிராண்டிங்
@@ -2223,7 +2220,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,இல்லை தொ.இல. {0}
 DocType: Scheduling Tool,Student Batch,மாணவர் தொகுதி
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,உங்கள் வாடிக்கையாளர்கள்
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,மாணவர் செய்ய
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,மாணவர் செய்ய
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},நீங்கள் திட்டம் இணைந்து அழைக்கப்பட்டுள்ளனர்: {0}
 DocType: Leave Block List Date,Block Date,தேதி தடை
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,இப்பொழுது விண்ணப்பியுங்கள்
@@ -2248,8 +2245,9 @@
 DocType: SMS Log,Sent To,அனுப்பப்படும்
 DocType: Payment Request,Make Sales Invoice,விற்பனை விலைப்பட்டியல் செய்ய
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,மென்பொருள்கள்
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,அடுத்த தொடர்பு தேதி கடந்த காலத்தில் இருக்க முடியாது
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,அடுத்த தொடர்பு தேதி கடந்த காலத்தில் இருக்க முடியாது
 DocType: Company,For Reference Only.,குறிப்பு மட்டும்.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,தொகுதி தேர்வு இல்லை
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},தவறான {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,முன்கூட்டியே தொகை
@@ -2263,7 +2261,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,வழக்கு எண் 0 இருக்க முடியாது
 DocType: Item,Show a slideshow at the top of the page,பக்கம் மேலே ஒரு ஸ்லைடு ஷோ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ஸ்டோர்கள்
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ஸ்டோர்கள்
 DocType: Serial No,Delivery Time,விநியோக நேரம்
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,அடிப்படையில் மூப்படைதலுக்கான
 DocType: Item,End of Life,வாழ்க்கை முடிவுக்கு
@@ -2279,8 +2277,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,மாற்றம் பொருள்
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,இந்த ஆவணம் மூலம் எல்லை மீறிவிட்டது {0} {1} உருப்படியை {4}. நீங்கள் கவனிக்கிறீர்களா மற்றொரு {3} அதே எதிராக {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
@@ -2291,7 +2289,7 @@
 DocType: Budget Account,Budget Account,பட்ஜெட் கணக்கு
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ஏற்கனவே நடவடிக்கைகள் உள்ளன, ஏனெனில் , நிறுவனத்தின் இயல்புநிலை நாணய மாற்ற முடியாது. நடவடிக்கைகள் இயல்புநிலை நாணய மாற்ற இரத்து செய்யப்பட வேண்டும்."
-DocType: Grade Interval,Grade Description,தரம் விளக்கம்
+DocType: Grading Scale Interval,Grade Description,தரம் விளக்கம்
 DocType: Stock Entry,Purchase Receipt No,இல்லை சீட்டு வாங்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,அக்கறையுடனான பணத்தை
 DocType: Process Payroll,Create Salary Slip,சம்பளம் சீட்டு  உருவாக்க
@@ -2329,7 +2327,7 @@
 DocType: Upload Attendance,Attendance To Date,தேதி வருகை
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Gateway Account,Payment Account,கொடுப்பனவு கணக்கு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,கணக்குகள் நிகர மாற்றம்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Offer Letter,Accepted,ஏற்கப்பட்டது
@@ -2343,7 +2341,7 @@
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,பயனர் கருத்துக்களம்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
 DocType: Employee,Previous Work Experience,முந்தைய பணி அனுபவம்
@@ -2357,7 +2355,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,சபையின் பெயரால் இது நீங்கள் இந்த அமைப்பை அமைக்க வேண்டும்.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","இந்த தேதி வரை உறைநிலையில் பைனான்ஸ் நுழைவு, யாரும் / கீழே குறிப்பிட்ட பங்கை தவிர நுழைவு மாற்ற முடியும்."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"பராமரிப்பு அட்டவணை உருவாக்கும் முன் ஆவணத்தை சேமிக்க , தயவு செய்து"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"பராமரிப்பு அட்டவணை உருவாக்கும் முன் ஆவணத்தை சேமிக்க , தயவு செய்து"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,திட்டம் நிலை
 DocType: UOM,Check this to disallow fractions. (for Nos),அனுமதிப்பதில்லை உராய்வுகள் இந்த சரிபார்க்கவும். (இலக்கங்கள் ஐந்து)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,பின்வரும் உற்பத்தித் தேவைகளை உருவாக்கப்பட்ட:
@@ -2380,6 +2378,7 @@
 DocType: Email Digest,How frequently?,எப்படி அடிக்கடி?
 DocType: Purchase Receipt,Get Current Stock,தற்போதைய பங்கு கிடைக்கும்
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,பொருட்களின் பில் ட்ரீ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Student,Joining Date,சேர்ந்த தேதி
 ,Employees working on a holiday,ஒரு விடுமுறை வேலை ஊழியர்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,மார்க் தற்போதைய
@@ -2481,7 +2480,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,உற்பத்தி
 DocType: Guardian,Occupation,தொழில்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),மொத்தம் (அளவு)
 DocType: Sales Invoice,This Document,இந்த ஆவண
 DocType: Installation Note Item,Installed Qty,நிறுவப்பட்ட அளவு
@@ -2504,8 +2503,8 @@
 DocType: Notification Control,Sales Order Message,விற்பனை ஆர்டர் செய்தி
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","முதலியன கம்பெனி, நாணய , நடப்பு நிதியாண்டில் , போன்ற அமை கலாச்சாரம்"
 DocType: Payment Entry,Payment Type,கொடுப்பனவு வகை
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
 DocType: Process Payroll,Select Employees,தேர்வு ஊழியர்
 DocType: Opportunity,Potential Sales Deal,சாத்தியமான விற்பனை ஒப்பந்தம்
 DocType: Payment Entry,Cheque/Reference Date,காசோலை / பரிந்துரை தேதி
@@ -2522,7 +2521,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ஏற்கனவே நிறுவனம் உருவாக்கப்பட்டது GLOBAL பிஓஎஸ் சுயவிவரம் {0} {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,அனைத்து BOM கள் உள்ள பொருள் / BOM பதிலாக
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ரசீது ஆவணம் சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ரசீது ஆவணம் சமர்ப்பிக்க வேண்டும்
 DocType: Purchase Invoice Item,Received Qty,பெற்றார் அளவு
 DocType: Stock Entry Detail,Serial No / Batch,சீரியல் இல்லை / தொகுப்பு
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,அவர்களுக்கு ஊதியம் இல்லை மற்றும் பெறாதபோது
@@ -2535,7 +2534,7 @@
 ,To Produce,தயாரிப்பாளர்கள்
 apps/erpnext/erpnext/config/hr.py +93,Payroll,சம்பளப்பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","வரிசையில் {0} உள்ள {1}. பொருள் விகிதம் {2} சேர்க்க, வரிசைகள் {3} சேர்த்துக்கொள்ள வேண்டும்"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,பயனர் செய்ய
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,பயனர் செய்ய
 DocType: Packing Slip,Identification of the package for the delivery (for print),பிரசவத்திற்கு தொகுப்பின் அடையாள (அச்சுக்கு)
 DocType: Bin,Reserved Quantity,ஒதுக்கப்பட்ட அளவு
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,சரியான மின்னஞ்சல் முகவரியை உள்ளிடவும்
@@ -2548,11 +2547,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,முடக்கப்பட்டது டெம்ப்ளேட் இயல்புநிலை டெம்ப்ளேட் இருக்க கூடாது
 DocType: Account,Income Account,வருமான கணக்கு
 DocType: Payment Request,Amount in customer's currency,வாடிக்கையாளர் நாட்டின் நாணய தொகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,விநியோகம்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,விநியோகம்
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",பகுதி செயற் கைக்கோள் நிலாவிலிருந்து உள்ள &quot;அடிப்படையில் பொருட்களின் விகிதம்&quot; பார்க்க
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,முன்
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","மாணவர் தொகுப்புகளும் நீங்கள் வருகை, மாணவர்களுக்கு மதிப்பீடுகளை மற்றும் கட்டணங்கள் கண்காணிக்க உதவும்"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","மாணவர் தொகுப்புகளும் நீங்கள் வருகை, மாணவர்களுக்கு மதிப்பீடுகளை மற்றும் கட்டணங்கள் கண்காணிக்க உதவும்"
 DocType: Payment Entry,Total Allocated Amount,மொத்த ஒதுக்கப்பட்ட தொகை
 DocType: Item Reorder,Material Request Type,பொருள் கோரிக்கை வகை
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} இலிருந்து சம்பளம் க்கான Accural ஜர்னல் நுழைவு {1}
@@ -2575,7 +2575,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ட்ராக் தொழில் வகை செல்கிறது.
 DocType: Item Supplier,Item Supplier,பொருள் சப்ளையர்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
@@ -2585,6 +2585,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',நிலையை கொண்டு ஊழியர்களுக்கு நிகழ்வை பற்றி ஒரு மின்னஞ்சல் அனுப்ப வேண்டும் &#39;திறந்த&#39;
 DocType: Task,Depends on Tasks,பணிகளைப் பொறுத்தது
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,வாடிக்கையாளர் குழு மரம் நிர்வகி .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,இணைப்புகள் ஷாப்பிங் வண்டி இயக்காமல் காட்ட முடியும்
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,புதிய செலவு மையம் பெயர்
 DocType: Leave Control Panel,Leave Control Panel,கண்ட்ரோல் பேனல் விட்டு
@@ -2597,12 +2598,10 @@
 DocType: Sales Invoice,Debit To,செய்ய பற்று
 DocType: Delivery Note,Required only for sample item.,ஒரே மாதிரி உருப்படியை தேவைப்படுகிறது.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,பரிவர்த்தனை பிறகு உண்மையான அளவு
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},சம்பளம் சீட்டு இல்லை ஆகியவற்றுக்கிடையில் காணப்படுகிறது {0} மற்றும் {1}
 ,Pending SO Items For Purchase Request,கொள்முதல் கோரிக்கை நிலுவையில் எனவே விடயங்கள்
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,மாணவர் சேர்க்கை
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
 DocType: Supplier,Billing Currency,பில்லிங் நாணய
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,மிகப் பெரியது
@@ -2619,7 +2618,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,முகப்பு இடம்பெற்றிருந்தது தயாரிப்பு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,அனைத்து மதிப்பீடு குழுக்கள்
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,புதிய கிடங்கு பெயர்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),மொத்த {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),மொத்த {0} ({1})
 DocType: C-Form Invoice Detail,Territory,மண்டலம்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
@@ -2637,7 +2636,7 @@
 DocType: Price List,Price List Master,விலை பட்டியல் மாஸ்டர்
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,நீங்கள் அமைக்க மற்றும் இலக்குகள் கண்காணிக்க முடியும் என்று அனைத்து விற்பனை நடவடிக்கைகள் பல ** விற்பனை நபர்கள் ** எதிரான குறித்துள்ளார்.
 ,S.O. No.,S.O. இல்லை
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
 DocType: Price List,Applicable for Countries,நாடுகள் பொருந்தும்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ஒரே நிலையை கொண்ட பயன்பாடுகள் &#39;நிராகரிக்கப்பட்டது&#39; &#39;அனுமதிபெற்ற&#39; மற்றும் விடவும் சமர்ப்பிக்க முடியும்
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},மாணவர் குழு பெயர் வரிசையில் கட்டாய {0}
@@ -2730,7 +2729,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 DocType: Vehicle Service,Engine Oil,இயந்திர எண்ணெய்
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
 DocType: Employee Loan,Loan Details,கடன் விவரங்கள்
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ரோ {0}: பூர்த்தி அளவு சுழியை விட பெரியதாக இருக்க வேண்டும்.
@@ -2794,7 +2793,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் குழு மாற்றப்பட முடியாது.
 DocType: Assessment Result Tool,Result HTML,விளைவாக HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,அன்று காலாவதியாகிறது
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,மாணவர்கள் சேர்
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,மாணவர்கள் சேர்
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},தேர்வு செய்க {0}
 DocType: C-Form,C-Form No,சி படிவம் எண்
 DocType: BOM,Exploded_items,Exploded_items
@@ -2859,7 +2858,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,எல்லை குறுக்கு கோடிட்ட
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,துணிகர முதலீடு
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"இந்த &#39;கல்வி ஆண்டு&#39; கொண்ட ஒரு கல்விசார் கால {0} மற்றும் &#39;கால பெயர்&#39; {1} ஏற்கனவே உள்ளது. இந்த உள்ளீடுகளை மாற்ற, மீண்டும் முயற்சிக்கவும்."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","உருப்படியை {0} எதிராக இருக்கும் பரிமாற்றங்கள் உள்ளன, நீங்கள் மதிப்பு மாற்ற முடியாது {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","உருப்படியை {0} எதிராக இருக்கும் பரிமாற்றங்கள் உள்ளன, நீங்கள் மதிப்பு மாற்ற முடியாது {1}"
 DocType: UOM,Must be Whole Number,முழு எண் இருக்க வேண்டும்
 DocType: Leave Control Panel,New Leaves Allocated (In Days),புதிய விடுப்பு (நாட்களில்) ஒதுக்கப்பட்ட
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,தொடர் இல {0} இல்லை
@@ -2903,7 +2902,7 @@
 DocType: Supplier,Last Day of the Next Month,அடுத்த மாதத்தின் கடைசி நாளில்
 DocType: Support Settings,Auto close Issue after 7 days,7 நாட்களுக்குப் பிறகு ஆட்டோ நெருங்கிய வெளியீடு
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","முன் ஒதுக்கீடு செய்யப்படும் {0}, விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு பதிவில் இருந்து வருகிறது {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,மாணவர் விண்ணப்பதாரர்
 DocType: Asset Category Account,Accumulated Depreciation Account,திரண்ட தேய்மானம் கணக்கு
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
@@ -2931,8 +2930,8 @@
 DocType: Asset,Item Code,பொருள்  குறியீடு
 DocType: Production Planning Tool,Create Production Orders,உற்பத்தி ஆணைகள் உருவாக்க
 DocType: Serial No,Warranty / AMC Details,உத்தரவாதத்தை / AMC விவரம்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
@@ -2951,7 +2950,7 @@
 DocType: Production Planning Tool,Create Material Requests,பொருள் கோரிக்கைகள் உருவாக்க
 DocType: Employee Education,School/University,பள்ளி / பல்கலைக்கழகம்
 DocType: Payment Request,Reference Details,குறிப்பு விவரம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்த்த மதிப்பு மொத்த கொள்முதல் தொகையை விடக் குறைவாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்த்த மதிப்பு மொத்த கொள்முதல் தொகையை விடக் குறைவாக இருக்க வேண்டும்
 DocType: Sales Invoice Item,Available Qty at Warehouse,சேமிப்பு கிடங்கு கிடைக்கும் அளவு
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,பில் செய்த தொகை
 DocType: Asset,Double Declining Balance,இரட்டை குறைவு சமநிலை
@@ -2972,19 +2971,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},செலவிட்டு தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது கொள்ளலாம் {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,உற்பத்தி ஆர்டர் உருவாக்கப்பட்டது இல்லை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,உற்பத்தி ஆர்டர் உருவாக்கப்பட்டது இல்லை
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
 DocType: Asset,Fully Depreciated,முழுமையாக தணியாக
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,"அடையாளமிட்ட வருகை, HTML"
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",மேற்கோள்கள் முன்மொழிவுகள் நீங்கள் உங்கள் வாடிக்கையாளர்களுக்கு அனுப்பியுள்ளோம் ஏலம் உள்ளன
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",மேற்கோள்கள் முன்மொழிவுகள் நீங்கள் உங்கள் வாடிக்கையாளர்களுக்கு அனுப்பியுள்ளோம் ஏலம் உள்ளன
 DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,தொ.எ. மற்றும் தொகுதி
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,மதிப்பீடு அடிப்படியின் மதிப்பெண்கள் கூட்டுத்தொகை {0} இருக்க வேண்டும்.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations எண்ணிக்கை பதிவுசெய்தீர்கள் அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations எண்ணிக்கை பதிவுசெய்தீர்கள் அமைக்கவும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,மதிப்பு அல்லது அளவு
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,நிமிஷம்
@@ -3115,7 +3114,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,மாணவர் குழு
 DocType: Shopping Cart Settings,Quotation Series,மேற்கோள் தொடர்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
 DocType: C-Form,I,நான்
 DocType: Company,Asset Depreciation Cost Center,சொத்து தேய்மானம் செலவு மையம்
 DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
@@ -3134,19 +3133,18 @@
 DocType: Vehicle,Insurance Details,காப்புறுதி விபரங்கள்
 DocType: Account,Payable,செலுத்த வேண்டிய
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,தயவு செய்து திரும்பச் செலுத்துதல் பீரியட்ஸ் நுழைய
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
 DocType: Pricing Rule,Margin,விளிம்பு
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,புதிய வாடிக்கையாளர்கள்
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,மொத்த லாபம்%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,அனுமதி தேதி
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,மொத்த கொள்முதல் அளவு அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,மொத்த கொள்முதல் அளவு அத்தியாவசியமானதாகும்
 DocType: Lead,Address Desc,இறங்குமுக முகவரி
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,கட்சி அத்தியாவசியமானதாகும்
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,தலைப்பு பெயர்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,விற்பனை அல்லது வாங்கும் குறைந்தபட்சம் ஒரு தேர்வு வேண்டும்
-DocType: Grading Structure,Grade Intervals,தரம் இடைவெளிகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,உங்கள் வணிக தன்மை தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,உற்பத்தி இயக்கங்களை எங்கே கொண்டுவரப்படுகின்றன.
 DocType: Asset Movement,Source Warehouse,மூல கிடங்கு
@@ -3175,6 +3173,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,மாதாந்திர விநியோகம் சதவீதம்
 DocType: Territory,Territory Targets,மண்டலம் இலக்குகள்
 DocType: Delivery Note,Transporter Info,போக்குவரத்து தகவல்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},இயல்புநிலை {0} நிறுவனத்தின் அமைக்கவும் {1}
 DocType: Cheque Print Template,Starting position from top edge,தொடங்கி மேல் விளிம்பில் இருந்து நிலையை
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,அதே சப்ளையர் பல முறை உள்ளிட்ட வருகிறது
@@ -3228,7 +3227,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,தற்போதைய வேலை வாய்ப்புகள்
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
-DocType: Journal Entry,Write Off,இனிய எழுதவும்
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,இனிய எழுதவும்
 DocType: Timesheet Detail,Operation ID,ஆபரேஷன் ஐடி
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","கணினி பயனர் (உள்நுழைய) ஐடி. அமைத்தால், அது அனைத்து அலுவலக வடிவங்கள் முன்னிருப்பு போம்."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} இருந்து: {1}
@@ -3239,8 +3238,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,சப்ளையர் வாடிக்கையாளர் வழங்குகிறது
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# படிவம் / பொருள் / {0}) பங்கு வெளியே
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,அடுத்த நாள் பதிவுசெய்ய தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,தரவு இறக்குமதி மற்றும் ஏற்றுமதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","பங்கு உள்ளீடுகளை, கிடங்கு {0} எதிராக உள்ளன எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது அதை மாற்ற முடியாது"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,மாணவர்கள் காணப்படவில்லை.
@@ -3252,14 +3251,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
 DocType: Program Enrollment,School House,பள்ளி ஹவுஸ்
 DocType: Serial No,Out of AMC,AMC வெளியே
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
 DocType: Company,Default Cash Account,இயல்புநிலை பண கணக்கு
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,இந்த மாணவர் வருகை அடிப்படையாக கொண்டது
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,எந்த மாணவர்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,மேலும் பொருட்களை அல்லது திறந்த முழு வடிவம் சேர்க்க
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
@@ -3306,9 +3306,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,சமரசம் முன்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},எப்படி {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி வரிசையில் {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி வரிசையில் {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
 DocType: Sales Order,Partly Billed,இதற்கு கட்டணம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,பொருள் {0} ஒரு நிலையான சொத்தின் பொருள் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,பொருள் {0} ஒரு நிலையான சொத்தின் பொருள் இருக்க வேண்டும்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
@@ -3331,7 +3331,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
 DocType: Purchase Invoice Item,Rate,விலை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,நடமாட்டத்தை கட்டுபடுத்து
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,முகவரி பெயர்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,முகவரி பெயர்
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
 DocType: Assessment Code,Assessment Code,மதிப்பீடு குறியீடு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,அடிப்படையான
@@ -3356,7 +3356,7 @@
 DocType: Purchase Invoice,Print Language,அச்சு மொழி
 DocType: Salary Slip,Total Working Hours,மொத்த வேலை நேரங்கள்
 DocType: Stock Entry,Including items for sub assemblies,துணை தொகுதிகளுக்கான உருப்படிகள் உட்பட
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,அனைத்து பிரதேசங்களையும்
 DocType: Purchase Invoice,Items,பொருட்கள்
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,மாணவர் ஏற்கனவே பதிவு செய்யப்பட்டது.
@@ -3376,17 +3376,15 @@
 DocType: Issue,Opening Time,நேரம் திறந்து
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,தேவையான தேதிகள் மற்றும் இதயம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
 DocType: Assessment Plan,Supervisor Name,மேற்பார்வையாளர் பெயர்
 DocType: Program Enrollment Course,Program Enrollment Course,திட்டம் பதிவு கோர்ஸ்
 DocType: Program Enrollment Course,Program Enrollment Course,திட்டம் பதிவு கோர்ஸ்
-DocType: Grading Structure,Grading Structure,தரம் பிரித்தல் அமைப்பு
 DocType: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
 DocType: Tax Rule,Shipping City,கப்பல் நகரம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாறுபாடு உள்ளது. 'இல்லை நகல் அமைக்க வரை காரணிகள் டெம்ப்ளேட் இருந்து நகல்
 DocType: Notification Control,Customize the Notification,அறிவிப்பு தனிப்பயனாக்கு
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,செயல்பாடுகள் இருந்து பண பரிமாற்ற
 DocType: Sales Invoice,Shipping Rule,கப்பல் விதி
@@ -3409,6 +3407,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},"இயல்புநிலை BOM, பொருள் உள்ளது {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடரின் எண்ணிக்கையில்&gt; எண் தொடர்
 DocType: Leave Control Panel,Carry Forward,முன்னெடுத்து செல்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் லெட்ஜரிடம் மாற்ற முடியாது
 DocType: Department,Days for which Holidays are blocked for this department.,இது விடுமுறை நாட்கள் இந்த துறை தடுக்கப்பட்டது.
@@ -3437,7 +3436,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),மொத்தம் (விவரங்கள்)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 DocType: Quality Inspection,Item Serial No,பொருள் தொடர் எண்
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,பணியாளர் ரெக்கார்ட்ஸ் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,பணியாளர் ரெக்கார்ட்ஸ் உருவாக்கவும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,மொத்த தற்போதைய
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,கணக்கு அறிக்கைகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,மணி
@@ -3452,8 +3451,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,மாற்று பின்னர் புதிய BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,விற்பனை செய்யுமிடம்
 DocType: Payment Entry,Received Amount,பெறப்பட்ட தொகை
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள சிஸ்டம் பெயரிடுதல்&gt; மனிதவள அமைப்புகள்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள சிஸ்டம் பெயரிடுதல்&gt; மனிதவள அமைப்புகள்
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",", முழு அளவு உருவாக்க பொருட்டு ஏற்கனவே அளவு புறக்கணித்து"
 DocType: Account,Tax,வரி
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,குறிக்கப்பட்டுள்ளது இல்லை
@@ -3466,7 +3463,7 @@
 DocType: Batch,Source Document Name,மூல ஆவண பெயர்
 DocType: Batch,Source Document Name,மூல ஆவண பெயர்
 DocType: Job Opening,Job Title,வேலை தலைப்பு
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,பயனர்கள் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,பயனர்கள் உருவாக்கவும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,கிராம
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,பராமரிப்பு அழைப்பு அறிக்கையை பார்க்க.
@@ -3478,8 +3475,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: BOM,Website Description,இணையதளத்தில் விளக்கம்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ரசீது
 ,Sales Register,விற்பனை பதிவு
@@ -3490,16 +3487,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,திருத்த எதுவும் இல்லை .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,இதுவரை இல்லை வாடிக்கையாளர்கள்!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,பணப்பாய்வு அறிக்கை
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,உரிமம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,நீங்கள் முந்தைய நிதி ஆண்டின் இருப்புநிலை இந்த நிதி ஆண்டு விட்டு சேர்க்க விரும்பினால் முன் எடுத்து கொள்ளவும்
 DocType: GL Entry,Against Voucher Type,வவுச்சர் வகை எதிராக
 DocType: Item,Attributes,கற்பிதங்கள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
 DocType: Student,Guardian Details,பாதுகாவலர்  விபரங்கள்
 DocType: C-Form,C-Form,சி படிவம்
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,பல ஊழியர்கள் மார்க் வருகை
@@ -3524,14 +3523,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ரோ {0} # கணக்கு வகை இருக்க வேண்டும் &#39;நிலையான சொத்து&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,அளவு அவுட்
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ஒரு விற்பனை கப்பல் அளவு கணக்கிட விதிகள்
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,தொடர் கட்டாயமாகும்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,தொடர் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,நிதி சேவைகள்
 DocType: Student Sibling,Student ID,மாணவர் அடையாளம்
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,நேரம் பதிவேடுகளுக்கு நடவடிக்கைகள் வகைகள்
 DocType: Tax Rule,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
 DocType: Training Event,Exam,தேர்வு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
@@ -3565,7 +3564,7 @@
 DocType: Payment Entry,Account Paid From,கணக்கு இருந்து பணம்
 DocType: Purchase Order Item Supplied,Raw Material Item Code,மூலப்பொருட்களின் பொருள் குறியீடு
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,முன்னணி செய்ய
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,முன்னணி செய்ய
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,அச்சு மற்றும் ஸ்டேஷனரி
 DocType: Stock Settings,Show Barcode Field,காட்டு பார்கோடு களம்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
@@ -3581,6 +3580,7 @@
 DocType: Offer Letter,Awaiting Response,பதிலை எதிர்பார்த்திருப்பதாகவும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,மேலே
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
+DocType: Supplier,Mention if non-standard payable account,குறிப்பிட தரமற்ற செலுத்தப்பட கணக்கு என்றால்
 DocType: Salary Slip,Earning & Deduction,சம்பாதிக்கும் & விலக்கு
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
@@ -3617,7 +3617,7 @@
 DocType: Program Enrollment Tool,Get Students From,இருந்து மாணவர்கள் பெற
 DocType: Hub Settings,Seller Country,விற்பனையாளர் நாடு
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,இணையத்தளம் வெளியிடு
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,தொகுப்புகளும் குழு உங்கள் மாணவர்கள்
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,தொகுப்புகளும் குழு உங்கள் மாணவர்கள்
 DocType: Authorization Rule,Authorization Rule,அங்கீகார விதி
 DocType: Sales Invoice,Terms and Conditions Details,நிபந்தனைகள் விவரம்
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,விருப்பம்
@@ -3677,7 +3677,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,சோதனை காலம்
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,சம்பளம் கூறுகள்
 DocType: Program Enrollment Tool,New Academic Year,புதிய கல்வி ஆண்டு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,திரும்ப / கடன் குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,திரும்ப / கடன் குறிப்பு
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,மொத்த கட்டண தொகை
 DocType: Production Order Item,Transferred Qty,அளவு மாற்றம்
@@ -3718,6 +3718,7 @@
 ,Sales Funnel,விற்பனை நீக்க
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,சுருக்கம் கட்டாயமாகும்
 DocType: Project,Task Progress,டாஸ்க் முன்னேற்றம்
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,வண்டியில்
 ,Qty to Transfer,இடமாற்றம் அளவு
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
@@ -3750,7 +3751,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},அளவு ({0}) வரிசையில் ஒரு பகுதியை இருக்க முடியாது {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,கட்டணம் சேகரிக்க
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
 DocType: Lead,Add to calendar on this date,இந்த தேதி நாள்காட்டியில் சேர்க்கவும்
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
 DocType: Item,Opening Stock,ஆரம்ப இருப்பு
@@ -3769,7 +3770,7 @@
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ஆணைகள் உற்பத்தி வெளியிடப்பட்டது.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Program Enrollment Tool,Enroll Students,மாணவர்கள் பதிவுசெய்யவும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
@@ -3780,7 +3781,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல்க்கு எதிரான {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,திட்டம் பெயர்
-DocType: Supplier,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
+DocType: Customer,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
 DocType: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
 DocType: Production Order,Required Items,தேவையான பொருட்கள்
 DocType: Stock Ledger Entry,Stock Value Difference,பங்கு மதிப்பு வேறுபாடு
@@ -3810,6 +3811,7 @@
 DocType: Item,Taxes,வரி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,ஊதியம் மற்றும் பெறாதபோது
 DocType: Project,Default Cost Center,இயல்புநிலை விலை மையம்
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடுதல் தொடருக்கான தொடர் பெயரிடுதல் அமைக்கவும்
 DocType: Bank Guarantee,End Date,இறுதி நாள்
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,பங்கு பரிவர்த்தனைகள்
 DocType: Budget,Budget Accounts,பட்ஜெட் கணக்குகள்
@@ -3874,7 +3876,7 @@
 DocType: Customer,Sales Partner and Commission,விற்பனை பார்ட்னர் மற்றும் கமிஷன்
 DocType: Employee Loan,Rate of Interest (%) / Year,வட்டி (%) / ஆண்டின் விகிதம்
 ,Project Quantity,திட்ட அளவு
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","மொத்த {0} எல்லா கோப்புகளையும் பூஜ்யம், நீங்கள் &#39;அடிப்படையாகக் கொண்டு விநியோகிக்கவும் கட்டணங்கள்&#39; மாற்ற வேண்டும் இருக்கலாம்"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","மொத்த {0} எல்லா கோப்புகளையும் பூஜ்யம், நீங்கள் &#39;அடிப்படையாகக் கொண்டு விநியோகிக்கவும் கட்டணங்கள்&#39; மாற்ற வேண்டும் இருக்கலாம்"
 DocType: Opportunity,To Discuss,ஆலோசிக்க வேண்டும்
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} அலகுகள் {1} {2} இந்த பரிவர்த்தனையை நிறைவு செய்ய தேவை.
 DocType: Loan Type,Rate of Interest (%) Yearly,வட்டி விகிதம் (%) வருடாந்திரம்
@@ -3897,7 +3899,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,குறி இல்லாமல்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ரோ {0}: டெலி # கரன்சி {1} தேர்வு நாணய சமமாக இருக்க வேண்டும் {2}
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 DocType: Homepage,Tag Line,டேக் லைன்
 DocType: Fee Component,Fee Component,கட்டண பகுதியிலேயே
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,கடற்படை  மேலாண்மை
@@ -3914,7 +3916,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,கிடங்கு {0} இல்லை
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext மையம் பதிவு
 DocType: Monthly Distribution,Monthly Distribution Percentages,மாதாந்திர விநியோகம் சதவீதங்கள்
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","மதிப்பீடு விகிதம் பொருள் {0} கணக்கு உள்ளீடுகளை செய்ய நேர்ந்தால் எந்த காணப்படவில்லை {1} {2}. உருப்படி ஒரு மாதிரி உருப்படியாக transacting என்றால் {1}, {1} பொருள் அட்டவணையில் என்று குறிப்பிடவும். இல்லையெனில், பொருள் பதிவில் உருப்படியை அல்லது குறிப்பிடவும் மதிப்பீட்டு விகிதம் ஒரு உள்வரும் பங்கு பரிவர்த்தனை உருவாக்க செய்யவும், பின் இந்த நுழைவு ரத்து / அள்ளிப்பதற்கு முயற்சி"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,இந்த டெலிவரி குறிப்பு எதிராக அளிக்கப்பட்ட பொருட்களை%
 DocType: Project,Customer Details,வாடிக்கையாளர் விவரம்
@@ -3931,7 +3933,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,சமர்ப்பிக்கப்பட்ட ஆர்டர்களைப் நீக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,தர மேலாண்மை
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Employee Loan,Repay Fixed Amount per Period,காலம் ஒன்றுக்கு நிலையான தொகை திருப்பி
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
 DocType: Employee External Work History,Employee External Work History,பணியாளர் வெளி வேலை வரலாறு
@@ -3959,7 +3961,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,மாணவர் மின்னஞ்சல் ஐடி
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
 DocType: Tax Rule,Sales Tax Template,விற்பனை வரி டெம்ப்ளேட்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
 DocType: Employee,Encashment Date,பணமாக்கல் தேதி
 DocType: Training Event,Internet,இணைய
 DocType: Account,Stock Adjustment,பங்கு சீரமைப்பு
@@ -3993,6 +3995,7 @@
 DocType: Purchase Invoice,Debit Note Issued,டெபிட் குறிப்பை வெளியிட்டு
 DocType: Production Order,Warehouses,கிடங்குகள்
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} சொத்து இடமாற்றம் செய்ய முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாற்று உள்ளது.
 DocType: Workstation,per hour,ஒரு மணி நேரத்திற்கு
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,வாங்கும்
 DocType: Announcement,Announcement,அறிவிப்பு
@@ -4008,7 +4011,7 @@
 DocType: Account,Receivable,பெறத்தக்க
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ரோ # {0}: கொள்முதல் ஆணை ஏற்கனவே உள்ளது என சப்ளையர் மாற்ற அனுமதி
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,அமைக்க கடன் எல்லை மீறிய நடவடிக்கைகளை சமர்ப்பிக்க அனுமதி என்று பாத்திரம்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
 DocType: Item,Material Issue,பொருள் வழங்கல்
 DocType: Hub Settings,Seller Description,விற்பனையாளர் விளக்கம்
@@ -4021,7 +4024,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ஆணையிட்டார்
 DocType: Salary Detail,Component,கூறு
 DocType: Assessment Criteria,Assessment Criteria Group,மதிப்பீடு செய்க மதீப்பீட்டு குழு
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},குவிக்கப்பட்ட தேய்மானம் திறந்து சமமாக விட குறைவாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},குவிக்கப்பட்ட தேய்மானம் திறந்து சமமாக விட குறைவாக இருக்க வேண்டும் {0}
 DocType: Warehouse,Warehouse Name,சேமிப்பு கிடங்கு பெயர்
 DocType: Naming Series,Select Transaction,பரிவர்த்தனை தேர்வு
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,பங்கு அங்கீகரிக்கிறது அல்லது பயனர் அனுமதி உள்ளிடவும்
@@ -4056,7 +4059,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","இயல்புநிலை என இந்த நிதியாண்டில் அமைக்க, ' இயல்புநிலை அமை ' கிளிக்"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,சேர
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Employee Loan,Repay from Salary,சம்பளம் இருந்து திருப்பி
 DocType: Leave Application,LAP/,மடியில் /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},எதிராக கட்டணம் கோருகிறது {0} {1} அளவு {2}
@@ -4074,7 +4077,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,மதிப்பீடு முடிவு விவரம்
 DocType: Employee Education,Employee Education,பணியாளர் கல்வி
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,உருப்படியை குழு அட்டவணையில் பிரதி உருப்படியை குழு
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
 DocType: Salary Slip,Net Pay,நிகர சம்பளம்
 DocType: Account,Account,கணக்கு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,தொடர் இல {0} ஏற்கனவே பெற்றுள்ளது
@@ -4083,7 +4086,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","கிடங்கு {0} எந்த கணக்கில் இணைக்கப்பட்ட இல்லை, / கிடங்கு இணைக்க தொடர்புடைய (சொத்து) கணக்கை உருவாக்க தயவு செய்து."
 DocType: Purchase Invoice,Recurring Id,மீண்டும் அடையாளம்
 DocType: Customer,Sales Team Details,விற்பனை குழு விவரம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,நிரந்தரமாக நீக்கு?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,நிரந்தரமாக நீக்கு?
 DocType: Expense Claim,Total Claimed Amount,மொத்த கோரப்பட்ட தொகை
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,விற்பனை திறன் வாய்ப்புகள்.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},தவறான {0}
@@ -4094,13 +4097,14 @@
 DocType: Warehouse,PIN,PIN ஐ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext உங்கள் பள்ளி அமைப்பு
 DocType: Sales Invoice,Base Change Amount (Company Currency),மாற்றம் அடிப்படை தொகை (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
 DocType: Account,Chargeable,குற்றம் சாட்டப்பட தக்க
 DocType: Company,Change Abbreviation,மாற்றம் சுருக்கமான
 DocType: Expense Claim Detail,Expense Date,செலவு தேதி
 DocType: Item,Max Discount (%),அதிகபட்சம்  தள்ளுபடி (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,கடைசி ஆர்டர் தொகை
+DocType: Task,Is Milestone,மைல்கல் ஆகும்
 DocType: Daily Work Summary,Email Sent To,மின்னஞ்சல் அனுப்பப்படும்
 DocType: Budget,Warn,எச்சரிக்கை
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","வேறு எந்த கருத்துக்கள், பதிவுகள் செல்ல வேண்டும் என்று குறிப்பிடத்தக்கது முயற்சியாகும்."
@@ -4133,11 +4137,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
 DocType: Tax Rule,Purchase Tax Template,வரி வார்ப்புரு வாங்க
 ,Project wise Stock Tracking,திட்டத்தின் வாரியாக ஸ்டாக் தடமறிதல்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},பராமரிப்பு அட்டவணை {0} எதிராக இருக்கிறது {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),உண்மையான அளவு (ஆதாரம் / இலக்கு)
 DocType: Item Customer Detail,Ref Code,Ref கோட்
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ஊழியர் பதிவுகள்.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
 DocType: HR Settings,Payroll Settings,சம்பளப்பட்டியல் அமைப்புகள்
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,அல்லாத தொடர்புடைய பற்றுச்சீட்டுகள் மற்றும் கட்டணங்கள் போட்டி.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ஸ்நாக்ஸ்
@@ -4160,7 +4163,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,காசோலைகள் மற்றும் வைப்பு தவறாக அகற்றப்படும்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
 DocType: Purchase Invoice Item,Price List Rate,விலை பட்டியல் விகிதம்
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,வாடிக்கையாளர் மேற்கோள் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,வாடிக்கையாளர் மேற்கோள் உருவாக்கவும்
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",இந்த கிடங்கில் கிடைக்கும் பங்கு அடிப்படையில் &quot;ஸ்டாக் இல்லை&quot; &quot;இருப்பு&quot; காட்டு அல்லது.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),பொருட்களின் அளவுக்கான ரசீது (BOM)
 DocType: Item,Average time taken by the supplier to deliver,சப்ளையர் எடுக்கப்படும் சராசரி நேரம் வழங்க
@@ -4182,7 +4185,7 @@
 DocType: Asset,Disposal Date,நீக்கம் தேதி
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","மின்னஞ்சல்கள் அவர்கள் விடுமுறை இல்லை என்றால், கொடுக்கப்பட்ட நேரத்தில் நிறுவனத்தின் அனைத்து செயலில் ஊழியர் அனுப்பி வைக்கப்படும். மறுமொழிகளின் சுருக்கம் நள்ளிரவில் அனுப்பப்படும்."
 DocType: Employee Leave Approver,Employee Leave Approver,பணியாளர் விடுப்பு ஒப்புதல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,பயிற்சி மதிப்பீட்டு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
@@ -4190,7 +4193,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},பாடநெறி வரிசையில் கட்டாய {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc டாக்டைப்பின்
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,திருத்த/ விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,திருத்த/ விலை சேர்க்கவும்
 DocType: Batch,Parent Batch,பெற்றோர் தொகுதி
 DocType: Batch,Parent Batch,பெற்றோர் தொகுதி
 DocType: Cheque Print Template,Cheque Print Template,காசோலை அச்சு வார்ப்புரு
@@ -4235,7 +4238,7 @@
 DocType: Item,Variant Based On,மாற்று சார்ந்த அன்று
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,உங்கள் சப்ளையர்கள்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
 DocType: Request for Quotation Item,Supplier Part No,சப்ளையர் பகுதி இல்லை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',வகை &#39;மதிப்பீட்டு&#39; அல்லது &#39;Vaulation மற்றும் மொத்த&#39; க்கான போது கழித்து முடியாது
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,பெறப்படும்
@@ -4245,7 +4248,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: இருந்து {0} க்கான {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ரோ {0}: மணி மதிப்பு பூஜ்யம் விட அதிகமாக இருக்க வேண்டும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
 DocType: Issue,Content Type,உள்ளடக்க வகை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,கணினி
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
@@ -4254,20 +4257,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
 DocType: Payment Reconciliation,From Invoice Date,விலைப்பட்டியல் வரம்பு தேதி
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,பில்லிங் நாணய இயல்புநிலை comapany நாணய அல்லது கட்சி கணக்கு நாணயம் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,பில்லிங் நாணய இயல்புநிலை comapany நாணய அல்லது கட்சி கணக்கு நாணயம் சமமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,விடுப்பிற்கீடான பணம் பெறுதல்
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,அது என்ன?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,சேமிப்பு கிடங்கு வேண்டும்
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,அனைத்து மாணவர் சேர்க்கை
 ,Average Commission Rate,சராசரி கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
 DocType: School House,House Name,ஹவுஸ் பெயர்
 DocType: Purchase Taxes and Charges,Account Head,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,பொருட்களை தரையிறங்கியது செலவு கணக்கிட கூடுதல் செலவுகள் புதுப்பிக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,மின்
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,உங்கள் பயனர்கள் உங்கள் நிறுவனத்தில் மீதமுள்ள சேர்க்கவும். நீங்கள் தொடர்புகளிலிருந்து சேர்த்து அவற்றை உங்கள் போர்டல் வாடிக்கையாளர்கள் அழைக்க சேர்க்க முடியும்
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,உங்கள் பயனர்கள் உங்கள் நிறுவனத்தில் மீதமுள்ள சேர்க்கவும். நீங்கள் தொடர்புகளிலிருந்து சேர்த்து அவற்றை உங்கள் போர்டல் வாடிக்கையாளர்கள் அழைக்க சேர்க்க முடியும்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},பயனர் ஐடி பணியாளர் அமைக்க{0}
@@ -4276,7 +4279,7 @@
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Buying Settings,Naming Series,தொடர் பெயரிடும்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,காப்புறுதி தொடக்க தேதி காப்புறுதி முடிவு தேதி விட குறைவாக இருக்க வேண்டும்
@@ -4291,7 +4294,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
 DocType: Vehicle Log,Odometer,ஓடோமீட்டர்
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
@@ -4304,7 +4307,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
 DocType: Sales Invoice Timesheet,Billing Hours,பில்லிங் மணி
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,"{0} இல்லை இயல்புநிலை BOM,"
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,அவர்களை இங்கே சேர்க்கலாம் உருப்படிகளை தட்டவும்
 DocType: Fees,Program Enrollment,திட்டம் பதிவு
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},அமைக்கவும் {0}
@@ -4405,7 +4409,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
 DocType: Issue,First Responded On,முதல் தேதி இணையம்
 DocType: Website Item Group,Cross Listing of Item in multiple groups,பல குழுக்கள் பொருள் கிராஸ் பட்டியல்
-DocType: Grade Interval,Grade Interval,தரம் இடைவேளை
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},நிதியாண்டு தொடக்க தேதி மற்றும் நிதி ஆண்டு இறுதியில் தேதி ஏற்கனவே நிதி ஆண்டில் அமைக்க {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,மேம்படுத்தப்பட்டது இசைவு தேதி
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,பிரி தொகுதி
@@ -4414,6 +4417,7 @@
 DocType: Request for Quotation Supplier,Download PDF,பதிவிறக்கம் PDF
 DocType: Production Order,Planned End Date,திட்டமிட்ட தேதி
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,அங்கு பொருட்களை சேமிக்கப்படும்.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 DocType: Request for Quotation,Supplier Detail,சப்ளையர் விபரம்
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் பிழை: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,விலை விவரம் தொகை
@@ -4459,7 +4463,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,அமைப்பு என் அமைப்பு ஒரு எளிய வலைத்தளம்
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,பெற்றோர் செலவு சென்டர் உள்ளிடவும்
@@ -4518,7 +4522,7 @@
 ,Items To Be Requested,கோரப்பட்ட பொருட்களை
 DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Company,Company Info,நிறுவன தகவல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,செலவு மையம் ஒரு செலவினமாக கூற்றை பதிவு செய்ய தேவைப்படுகிறது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,இந்த பணியாளர் வருகை அடிப்படையாக கொண்டது
@@ -4531,13 +4535,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,பின்வரும் நாட்களில் விடுப்பு விண்ணப்பங்கள் செய்து பயனர்களை நிறுத்த.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,கொள்முதல் அளவு
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்ட
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,பணியாளர் நன்மைகள்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Production Order,Manufactured Qty,உற்பத்தி அளவு
 DocType: Purchase Receipt Item,Accepted Quantity,அளவு ஏற்கப்பட்டது
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} இல்லை
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} இல்லை
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,திட்ட ஐடி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
@@ -4546,15 +4550,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 படித்தல்
 ,Hub,மையம்
 DocType: GL Entry,Voucher Type,ரசீது வகை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Employee Loan Application,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
 DocType: Guardian,Guardian,பாதுகாவலர்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,மதிப்பீடு {0} {1} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
 DocType: Employee,Education,கல்வி
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,டெல்
 DocType: Selling Settings,Campaign Naming By,பிரச்சாரம் பெயரிடும் மூலம்
 DocType: Employee,Current Address Is,தற்போதைய முகவரி
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,மாற்றம்
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,கணக்கு ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
@@ -4591,7 +4597,7 @@
 DocType: Hub Settings,Hub Settings,மையம்  அமைப்புகள்
 DocType: Project,Gross Margin %,மொத்த அளவு%
 DocType: BOM,With Operations,செயல்பாடுகள் மூலம்
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
 DocType: Asset,Is Existing Asset,இருக்கும் சொத்து
 DocType: Salary Detail,Statistical Component,புள்ளி உபகரண
 DocType: Salary Detail,Statistical Component,புள்ளி உபகரண
@@ -4647,7 +4653,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,லோகோ இணைக்கவும்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,பங்கு நிலைகள்
 DocType: Customer,Commission Rate,தரகு விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,மாற்று செய்ய
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","கொடுப்பனவு வகை ஏற்றுக்கொண்டு ஒன்று இருக்க செலுத்த, உள்நாட் மாற்றம் வேண்டும்"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,அனலிட்டிக்ஸ்
@@ -4660,6 +4666,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,விடுமுறை உற்பத்தி அனுமதி
 DocType: Sales Order,Customer's Purchase Order Date,வாடிக்கையாளர் கொள்முதல் ஆணை தேதி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,மூலதன கையிருப்பு
+DocType: Shopping Cart Settings,Show Public Attachments,பொது இணைப்புகள் காட்டு
 DocType: Packing Slip,Package Weight Details,தொகுப்பு எடை விவரம்
 DocType: Payment Gateway Account,Payment Gateway Account,பணம் நுழைவாயில் கணக்கு
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,கட்டணம் முடிந்த பிறகு தேர்ந்தெடுக்கப்பட்ட பக்கம் பயனர் திருப்பி.
@@ -4684,7 +4691,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,நாணயங்கள் அடுத்த $ ஹிப்ரு போன்றவை எந்த சின்னம் காட்டாதே.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,மாணவர் தொகுதி செய்ய
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,மாணவர் தொகுதி செய்ய
 DocType: Leave Type,Is Carry Forward,முன்னோக்கி எடுத்துச்செல்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,நேரம் நாட்கள் வழிவகுக்கும்
@@ -4703,8 +4710,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: GL Entry,Is Opening,திறக்கிறது
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடரின் எண்ணிக்கையில்&gt; எண் தொடர்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடரின் எண்ணிக்கையில்&gt; எண் தொடர்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,கணக்கு {0} இல்லை
 DocType: Account,Cash,பணம்
 DocType: Employee,Short biography for website and other publications.,இணையதளம் மற்றும் பிற வெளியீடுகள் குறுகிய வாழ்க்கை.
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index b91b93c..4127aab 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,బ్యాచ్ అంశం గడువు హోదా
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
 DocType: Mode of Payment Account,Mode of Payment Account,చెల్లింపు ఖాతా మోడ్
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,షో రకరకాలు
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,షో రకరకాలు
 DocType: Academic Term,Academic Term,అకడమిక్ టర్మ్
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,మెటీరియల్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,పరిమాణం
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ఆరోగ్య సంరక్షణ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),చెల్లింపు లో ఆలస్యం (రోజులు)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,సర్వీస్ ఖర్చుల
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,వాయిస్
 DocType: Maintenance Schedule Item,Periodicity,ఆవర్తకత
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ఫిస్కల్ ఇయర్ {0} అవసరం
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ప్రకటనలు
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,అదే కంపెనీ ఒకసారి కంటే ఎక్కువ ఎంటర్ ఉంది
 DocType: Employee,Married,వివాహితులు
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},కోసం అనుమతి లేదు {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},కోసం అనుమతి లేదు {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,నుండి అంశాలను పొందండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ఉత్పత్తి {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,జాబితా అంశాలను తోబుట్టువుల
 DocType: Payment Reconciliation,Reconcile,పునరుద్దరించటానికి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,కిరాణా
 DocType: Quality Inspection Reading,Reading 1,1 పఠనం
 DocType: Process Payroll,Make Bank Entry,బ్యాంక్ ఎంట్రీ చేయండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,పెన్షన్ ఫండ్స్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,తదుపరి అరుగుదల తేదీ కొనుగోలు తేదీ ముందు ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,తదుపరి అరుగుదల తేదీ కొనుగోలు తేదీ ముందు ఉండకూడదు
 DocType: SMS Center,All Sales Person,అన్ని సేల్స్ పర్సన్
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** మంత్లీ పంపిణీ ** మీరు నెలల అంతటా బడ్జెట్ / టార్గెట్ పంపిణీ మీరు మీ వ్యాపారంలో seasonality కలిగి ఉంటే సహాయపడుతుంది.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,వస్తువులను కనుగొన్నారు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,వస్తువులను కనుగొన్నారు
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
 DocType: Lead,Person Name,వ్యక్తి పేరు
 DocType: Sales Invoice Item,Sales Invoice Item,సేల్స్ వాయిస్ అంశం
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ఉదా &quot;ప్రాథమిక స్కూల్&quot; లేదా &quot;విశ్వవిద్యాలయం&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,స్టాక్ నివేదికలు
 DocType: Warehouse,Warehouse Detail,వేర్హౌస్ వివరాలు
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,టర్మ్ ముగింపు తేదీ తర్వాత అకడమిక్ ఇయర్ ఇయర్ ఎండ్ తేదీ పదం సంబంధమున్న కంటే ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;స్థిర ఆస్తిగా&quot;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;స్థిర ఆస్తిగా&quot;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
 DocType: Vehicle Service,Brake Oil,బ్రేక్ ఆయిల్
 DocType: Tax Rule,Tax Type,పన్ను టైప్
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},మీరు ముందు ఎంట్రీలు జోడించడానికి లేదా నవీకరణ అధికారం లేదు {0}
 DocType: BOM,Item Image (if not slideshow),అంశం చిత్రం (స్లైడ్ లేకపోతే)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ఒక కస్టమర్ అదే పేరుతో
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(గంట రేట్ / 60) * అసలు ఆపరేషన్ సమయం
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,బిఒఎం ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,బిఒఎం ఎంచుకోండి
 DocType: SMS Log,SMS Log,SMS లోనికి
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,పంపిణీ వస్తువుల ధర
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} లో సెలవు తేదీ నుండి నేటివరకు మధ్య జరిగేది కాదు
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,గ్రేడ్
 DocType: Sales Invoice Item,Delivered By Supplier,సరఫరాదారు ద్వారా పంపిణీ
 DocType: SMS Center,All Contact,అన్ని సంప్రదించండి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ఉత్పత్తి ఆర్డర్ ఇప్పటికే BOM అన్ని అంశాలను రూపొందించినవారు
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ఉత్పత్తి ఆర్డర్ ఇప్పటికే BOM అన్ని అంశాలను రూపొందించినవారు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,వార్షిక జీతం
 DocType: Daily Work Summary,Daily Work Summary,డైలీ వర్క్ సారాంశం
 DocType: Period Closing Voucher,Closing Fiscal Year,ఫిస్కల్ ఇయర్ మూసివేయడం
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ఘనీభవించిన
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ఘనీభవించిన
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,దయచేసి ఖాతాల చార్ట్ సృష్టించడానికి ఉన్న కంపెనీ ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,స్టాక్ ఖర్చులు
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,పద్దు
 DocType: Journal Entry Account,Credit in Company Currency,కంపెనీ కరెన్సీ లో క్రెడిట్
 DocType: Delivery Note,Installation Status,సంస్థాపన స్థితి
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",మీరు హాజరు అప్డేట్ అనుకుంటున్నారు? <br> ప్రస్తుతం: {0} \ <br> ఆబ్సెంట్: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ప్యాక్ చేసిన అంశాల తిరస్కరించబడిన అంగీకరించిన + అంశం అందుకున్నారు పరిమాణం సమానంగా ఉండాలి {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,సప్లై రా మెటీరియల్స్ కొనుగోలు కోసం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,చెల్లింపు మోడ్ అయినా POS వాయిస్ అవసరం.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,చెల్లింపు మోడ్ అయినా POS వాయిస్ అవసరం.
 DocType: Products Settings,Show Products as a List,షో ఉత్పత్తులు జాబితా
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", మూస తగిన డేటా నింపి ఆ మారిన ఫైలులో అటాచ్. ఎంపిక కాలంలో అన్ని తేదీలు మరియు ఉద్యోగి కలయిక ఉన్న హాజరు రికార్డుల తో, టెంప్లేట్ వస్తాయి"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,అరుగుదల ఎంట్రీ చేయండి
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,అభ్యర్థన పద్ధతి
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ఉద్యోగి చేయండి
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ఉద్యోగి చేయండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,బ్రాడ్కాస్టింగ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ఎగ్జిక్యూషన్
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,కార్యకలాపాల వివరాలను చేపట్టారు.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,నిర్వహణ సందర్శనలకు ప్రణాళిక.
 DocType: SMS Settings,Enter url parameter for message,సందేశం కోసం URL పరామితి ఎంటర్
 DocType: POS Profile,Customer Groups,కస్టమర్ సమూహాలు
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ఆర్థిక నివేదికల
 DocType: Guardian,Students,స్టూడెంట్స్
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ధర మరియు రాయితీ దరఖాస్తు కోసం రూల్స్.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ధర జాబితా కొనడం లేదా అమ్మడం కోసం వర్తించే ఉండాలి
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
 DocType: Naming Series,Series List for this Transaction,ఈ లావాదేవీ కోసం సిరీస్ జాబితా
 DocType: Company,Default Payroll Payable Account,డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ఇమెయిల్ అప్డేట్ గ్రూప్
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ఇమెయిల్ అప్డేట్ గ్రూప్
 DocType: Sales Invoice,Is Opening Entry,ఎంట్రీ ప్రారంభ ఉంది
 DocType: Customer Group,Mention if non-standard receivable account applicable,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా వర్తిస్తే
 DocType: Course Schedule,Instructor Name,బోధకుడు పేరు
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,సేల్స్ వాయిస్ అంశం వ్యతిరేకంగా
 ,Production Orders in Progress,ప్రోగ్రెస్ లో ఉత్పత్తి ఆర్డర్స్
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ఫైనాన్సింగ్ నుండి నికర నగదు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
 DocType: Lead,Address & Contact,చిరునామా &amp; సంప్రదింపు
 DocType: Leave Allocation,Add unused leaves from previous allocations,మునుపటి కేటాయింపులు నుండి ఉపయోగించని ఆకులు జోడించండి
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},తదుపరి పునరావృత {0} లో రూపొందే {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),మొత్తం ఖర్చు మొత్తం (సమయం షీట్ ద్వారా)
 DocType: Item Website Specification,Item Website Specification,అంశం వెబ్సైట్ స్పెసిఫికేషన్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,బ్యాంక్ ఎంట్రీలు
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,హబ్ లో ప్రచురించండి
 DocType: Student Admission,Student Admission,విద్యార్థి అడ్మిషన్
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} అంశం రద్దు
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
 DocType: Item,Purchase Details,కొనుగోలు వివరాలు
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ఆటోమేటిక్ మెటీరియల్ అభ్యర్థన సృష్టి పై ఇమెయిల్ ద్వారా తెలియజేయి
 DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
 DocType: Payment Reconciliation Invoice,Invoice Type,వాయిస్ పద్ధతి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,డెలివరీ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,డెలివరీ గమనిక
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,పన్నులు ఏర్పాటు
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,సోల్డ్ ఆస్తి యొక్క ధర
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,మీరు వైదొలగిన తర్వాత చెల్లింపు ఎంట్రీ మారిస్తే. మళ్ళీ తీసి దయచేసి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
-DocType: Grade Interval,Min Score,min స్కోరు
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ఈ వారం పెండింగ్ కార్యకలాపాలకు సారాంశం
 DocType: Student Applicant,Admitted,చేరినవారి
 DocType: Workstation,Rent Cost,రెంట్ ఖర్చు
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ఆర్డర్ విలువ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,బ్యాంకు / క్యాష్ పార్టీకి వ్యతిరేకంగా లేదా అంతర్గత బదిలీ లావాదేవీల
 DocType: Shipping Rule,Valid for Countries,దేశములలో చెలామణి
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ఈ అంశాన్ని ఒక మూస మరియు లావాదేవీలలో ఉపయోగించబడదు. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప అంశం గుణాలను భేదకాలలోకి పైగా కాపీ అవుతుంది
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ఈ అంశాన్ని ఒక మూస మరియు లావాదేవీలలో ఉపయోగించబడదు. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప అంశం గుణాలను భేదకాలలోకి పైగా కాపీ అవుతుంది
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,భావించబడుతున్నది మొత్తం ఆర్డర్
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,నమోదు రంగంలో విలువ &#39;డే ఆఫ్ ది మంత్ రిపీట్&#39; దయచేసి
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,పన్ను శాతమ్
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ఇప్పటికే ఉద్యోగి కోసం కేటాయించిన {1} కాలానికి {2} కోసం {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,అంశాన్ని ఎంచుకోండి
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},రో # {0}: బ్యాచ్ లేవు అదే ఉండాలి {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,కాని గ్రూప్ మార్చు
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ఒక అంశం యొక్క బ్యాచ్ (చాలా).
 DocType: C-Form Invoice Detail,Invoice Date,వాయిస్ తేదీ
 DocType: GL Entry,Debit Amount,డెబిట్ మొత్తం
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,అటాచ్మెంట్ చూడండి
 DocType: Purchase Order,% Received,% పొందింది
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,విద్యార్థి సమూహాలు సృష్టించండి
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,కొటేషన్ కోసం అభ్యర్థన
 DocType: Salary Slip Timesheet,Working Hours,పని గంటలు
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,అప్పటికే ఉన్న సిరీస్ ప్రారంభం / ప్రస్తుత క్రమ సంఖ్య మార్చండి.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","బహుళ ధర రూల్స్ వ్యాప్తి చెందడం కొనసాగుతుంది, వినియోగదారులు పరిష్కరించవచ్చు మానవీయంగా ప్రాధాన్యత సెట్ కోరతారు."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,కొనుగోలు ఉత్తర్వులు సృష్టించు
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,కొనుగోలు ఉత్తర్వులు సృష్టించు
 ,Purchase Register,కొనుగోలు నమోదు
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,వర్తించే ఛార్జీలు
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,అన్ని తయారీ ప్రక్రియలకు గ్లోబల్ సెట్టింగులు.
 DocType: Accounts Settings,Accounts Frozen Upto,ఘనీభవించిన వరకు అకౌంట్స్
 DocType: SMS Log,Sent On,న పంపిన
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
 DocType: HR Settings,Employee record is created using selected field. ,Employee రికార్డు ఎంపిక రంగంలో ఉపయోగించి రూపొందించినవారు ఉంది.
 DocType: Sales Order,Not Applicable,వర్తించదు
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,హాలిడే మాస్టర్.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,ప్యాకేజీ నం నుండి
 DocType: Item Attribute,To Range,రేంజ్ కు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,సెక్యూరిటీస్ అండ్ డిపాజిట్లు
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", మదింపు విధానంగా మార్చలేము కొన్ని అంశాలను వ్యతిరేకంగా లావాదేవీలు కలిగి లేని ఉన్నాయి సొంత మదింపు పద్ధతి వార్తలు"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,కేటాయించింది మొత్తం ఆకులు తప్పనిసరి
 DocType: Job Opening,Description of a Job Opening,ఒక ఉద్యోగ అవకాశాల వివరణ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,నేడు పెండింగ్లో కార్యకలాపాలు
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
 DocType: Production Order,Additional Operating Cost,అదనపు నిర్వహణ ఖర్చు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,కాస్మటిక్స్
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
 DocType: Shipping Rule,Net Weight,నికర బరువు
 DocType: Employee,Emergency Phone,అత్యవసర ఫోన్
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,కొనుగోలు
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,దయచేసి త్రెష్ 0% గ్రేడ్ నిర్వచించే
 DocType: Sales Order,To Deliver,రక్షిం
 DocType: Purchase Invoice Item,Item,అంశం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
 DocType: Journal Entry,Difference (Dr - Cr),తేడా (డాక్టర్ - CR)
 DocType: Account,Profit and Loss,లాభం మరియు నష్టం
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,మేనేజింగ్ ఉప
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,సంస్థాపన సూచన అంశం
 DocType: Production Plan Item,Pending Qty,పెండింగ్ ప్యాక్ చేసిన అంశాల
 DocType: Budget,Ignore,విస్మరించు
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} సక్రియ కాదు
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} సక్రియ కాదు
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS క్రింది సంఖ్యలను పంపిన: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ముద్రణా సెటప్ చెక్ కొలతలు
 DocType: Salary Slip,Salary Slip Timesheet,జీతం స్లిప్ TIMESHEET
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,మొత్తం కమిషన్
 DocType: Pricing Rule,Sales Partner,సేల్స్ భాగస్వామి
 DocType: Buying Settings,Purchase Receipt Required,కొనుగోలు రసీదులు అవసరం
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,తెరవడం స్టాక్ ఎంటర్ చేస్తే వాల్యువేషన్ రేటు తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,తెరవడం స్టాక్ ఎంటర్ చేస్తే వాల్యువేషన్ రేటు తప్పనిసరి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,వాయిస్ పట్టిక కనుగొనబడలేదు రికార్డులు
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,పోగుచేసిన విలువలు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","క్షమించండి, సీరియల్ సంఖ్యలు విలీనం సాధ్యం కాదు"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 ,Lead Id,లీడ్ ID
 DocType: C-Form Invoice Detail,Grand Total,సంపూర్ణ మొత్తము
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,పునఃప్రారంభం జోడింపు
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,పునరావృత
 DocType: Leave Control Panel,Allocate,కేటాయించాల్సిన
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,సేల్స్ చూపించు
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,సేల్స్ చూపించు
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,గమనిక: మొత్తం కేటాయించింది ఆకులు {0} ఇప్పటికే ఆమోదం ఆకులు కంటే తక్కువ ఉండకూడదు {1} కాలానికి
 DocType: Announcement,Posted By,ద్వారా పోస్ట్
 DocType: Item,Delivered by Supplier (Drop Ship),సరఫరాదారు ద్వారా పంపిణీ (డ్రాప్ షిప్)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,.కొటేషన్
 DocType: Lead,Middle Income,మధ్య ఆదాయ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ప్రారంభ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,కంపెనీ సెట్ దయచేసి
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,కంపెనీ సెట్ దయచేసి
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,సేల్స్ వాయిస్ TIMESHEET
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ప్రస్తావన &amp; సూచన తేదీ అవసరం {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,బ్యాంక్ ఎంట్రీ చేయడానికి చెల్లింపు ఖాతా ఎంచుకోండి
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ఆకులు, వ్యయం వాదనలు మరియు పేరోల్ నిర్వహించడానికి ఉద్యోగి రికార్డులు సృష్టించు"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ఆకులు, వ్యయం వాదనలు మరియు పేరోల్ నిర్వహించడానికి ఉద్యోగి రికార్డులు సృష్టించు"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,నాలెడ్జ్ బేస్ జోడించండి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ప్రతిపాదన రాయడం
 DocType: Payment Entry Deduction,Payment Entry Deduction,చెల్లింపు ఎంట్రీ తీసివేత
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 తో రిలేషన్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,మేనేజర్
 DocType: Payment Entry,Payment From / To,చెల్లింపు / నుండి
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,తేదీ పరిధి
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},క్రొత్త క్రెడిట్ పరిమితి కస్టమర్ ప్రస్తుత అసాధారణ మొత్తం కంటే తక్కువగా ఉంటుంది. క్రెడిట్ పరిమితి కనీసం ఉండాలి {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},క్రొత్త క్రెడిట్ పరిమితి కస్టమర్ ప్రస్తుత అసాధారణ మొత్తం కంటే తక్కువగా ఉంటుంది. క్రెడిట్ పరిమితి కనీసం ఉండాలి {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,అదే అంశం అనేకసార్లు ఎంటర్ చెయ్యబడింది.
 DocType: SMS Settings,Receiver Parameter,స్వీకర్త పారామిత
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,మరియు &#39;గ్రూప్ ద్వారా&#39; &#39;ఆధారంగా&#39; అదే ఉండకూడదు
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,రిజల్యూషన్ తేదీ
 DocType: Student Batch Name,Batch Name,బ్యాచ్ పేరు
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,నమోదు
 DocType: Selling Settings,Customer Naming By,ద్వారా కస్టమర్ నేమింగ్
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,స్టూడెంట్ మంత్లీ హాజరు రిపోర్ట్ లో విధంగా ప్రస్తుతం విద్యార్థి చూపిస్తుంది
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,విద్యార్థి హాజరు
 DocType: Sales Invoice Timesheet,Time Sheet,సమయ పట్టిక
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush రా మెటీరియల్స్ బేస్డ్ న
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,అంశం వివరాలు నమోదు చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,అంశం వివరాలు నమోదు చేయండి
 DocType: Interest,Interest,వడ్డీ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ప్రీ సేల్స్
 DocType: Purchase Receipt,Other Details,ఇతర వివరాలు
@@ -739,7 +742,7 @@
 ,Absent Student Report,కరువవడంతో విద్యార్థి నివేదిక
 DocType: Email Digest,Next email will be sent on:,తదుపరి ఇమెయిల్ పంపబడుతుంది:
 DocType: Offer Letter Term,Offer Letter Term,లెటర్ టర్మ్ ఆఫర్
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,అంశం రకాల్లో.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,అంశం {0} దొరకలేదు
 DocType: Bin,Stock Value,స్టాక్ విలువ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,కంపెనీ {0} ఉనికిలో లేదు
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,వారంటీ గడువు తేదీ
 DocType: Material Request Item,Quantity and Warehouse,పరిమాణ మరియు వేర్హౌస్
 DocType: Sales Invoice,Commission Rate (%),కమిషన్ రేటు (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ దయచేసి
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ దయచేసి
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
 DocType: Project,Estimated Cost,అంచనా వ్యయం
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} స్టాక్ అంశం కాదు
 DocType: Mode of Payment Account,Default Account,డిఫాల్ట్ ఖాతా
 DocType: Payment Entry,Received Amount (Company Currency),అందుకున్న మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,వీక్లీ ఆఫ్ రోజును ఎంచుకోండి
 DocType: Production Order Operation,Planned End Time,అనుకున్న ముగింపు సమయం
 ,Sales Person Target Variance Item Group-Wise,సేల్స్ పర్సన్ టార్గెట్ విస్తృతి అంశం గ్రూప్-వైజ్
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,ధర జాబితా ఎంచుకోలేదు
 DocType: Employee,Family Background,కుటుంబ నేపథ్యం
 DocType: Request for Quotation Supplier,Send Email,ఇమెయిల్ పంపండి
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,అనుమతి లేదు
 DocType: Company,Default Bank Account,డిఫాల్ట్ బ్యాంక్ ఖాతా
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",పార్టీ ఆధారంగా ఫిల్టర్ ఎన్నుకోండి పార్టీ మొదటి రకం
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ఏ ఉద్యోగి దొరకలేదు
 DocType: Supplier Quotation,Stopped,ఆగిపోయింది
 DocType: Item,If subcontracted to a vendor,"ఒక వ్యాపారికి బహుకరించింది, మరలా ఉంటే"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
 DocType: SMS Center,All Customer Contact,అన్ని కస్టమర్ సంప్రదించండి
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv ద్వారా స్టాక్ సంతులనం అప్లోడ్.
 DocType: Warehouse,Tree Details,ట్రీ వివరాలు
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,కనీస ఇన్వాయిస్ మొత్తం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: వ్యయ కేంద్రం {2} కంపెనీ చెందదు {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ఖాతా {2} ఒక గ్రూప్ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,అంశం రో {IDX}: {doctype} {DOCNAME} లేదు పైన ఉనికిలో లేదు &#39;{doctype}&#39; పట్టిక
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,అంశం రో {IDX}: {doctype} {DOCNAME} లేదు పైన ఉనికిలో లేదు &#39;{doctype}&#39; పట్టిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,విధులు లేవు
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ఆటో ఇన్వాయిస్ 05, 28 etc ఉదా ఉత్పత్తి అవుతుంది ఇది నెల రోజు"
 DocType: Asset,Opening Accumulated Depreciation,పోగుచేసిన తరుగుదల తెరవడం
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,సగటు రేటు మూవింగ్
 DocType: Production Planning Tool,Select Items,ఐటమ్లను ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} బిల్లుకు వ్యతిరేకంగా {1} నాటి {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,కోర్సు షెడ్యూల్
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,కోర్సు షెడ్యూల్
 DocType: Maintenance Visit,Completion Status,పూర్తి స్థితి
 DocType: HR Settings,Enter retirement age in years,సంవత్సరాలలో విరమణ వయసు ఎంటర్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,టార్గెట్ వేర్హౌస్
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ఈ శాతం వరకు డెలివరీ లేదా రసీదులు పైగా అనుమతించు
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,దిగుమతి హాజరు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,అన్ని అంశం గుంపులు
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,అన్ని అంశం గుంపులు
 DocType: Process Payroll,Activity Log,కార్యాచరణ లాగ్
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,నికర లాభం / నష్టం
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,స్వయంచాలకంగా లావాదేవీల సమర్పణ సందేశాన్ని కంపోజ్.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,చెల్లింపు కు ఆర్డర్ కొనుగోలు
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ప్రొజెక్టెడ్ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,Payment Due Date,చెల్లింపు గడువు తేదీ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,డు ఓపెన్
 DocType: Notification Control,Delivery Note Message,డెలివరీ గమనిక సందేశం
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,రీ-ఆర్డర్ ప్యాక్ చేసిన అంశాల
 DocType: Leave Block List Date,Leave Block List Date,బ్లాక్ జాబితా తేది వదిలి
 DocType: Pricing Rule,Price or Discount,ధర లేదా డిస్కౌంట్
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,కొనుగోలు స్వీకరణపై అంశాలు పట్టికలో మొత్తం వర్తించే ఛార్జీలు మొత్తం పన్నులు మరియు ఆరోపణలు అదే ఉండాలి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,కొనుగోలు స్వీకరణపై అంశాలు పట్టికలో మొత్తం వర్తించే ఛార్జీలు మొత్తం పన్నులు మరియు ఆరోపణలు అదే ఉండాలి
 DocType: Sales Team,Incentives,ఇన్సెంటివ్స్
 DocType: SMS Log,Requested Numbers,అభ్యర్థించిన సంఖ్యలు
 DocType: Production Planning Tool,Only Obtain Raw Materials,కేవలం రా మెటీరియల్స్ పొందుము
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,డిఫాల్ట్ చెల్లించవలసిన అకౌంట్స్
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
 DocType: Fee Structure,Components,భాగాలు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,వాయిస్ అడ్వాన్స్ కొనుగోలు
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,రో {0}: సేల్స్ / కొనుగోలు ఆర్డర్ వ్యతిరేకంగా చెల్లింపు ఎల్లప్పుడూ అడ్వాన్సుగా మార్క్ చేయాలి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,కెమికల్
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ఈ మోడ్ ఎంపిక ఉన్నప్పుడు డిఫాల్ట్ బ్యాంక్ / నగదు ఖాతా స్వయంచాలకంగా జీతం జర్నల్ ఎంట్రీ లో అప్డేట్ అవుతుంది.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","గ్రేడ్ కోడ్ ఫర్ వ్యవధిలో {0} ఇతర తరగతులు ఏవిధమైన తరగతి వ్యవధిలో భర్తీ చేస్తుంది. తనిఖీ చేయండి వ్యవధిలో {0} మరియు {1}, మళ్ళీ ప్రయత్నించండి"
 DocType: BOM,Raw Material Cost(Company Currency),రా మెటీరియల్ ఖర్చు (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,అన్ని అంశాలను ఇప్పటికే ఈ ఉత్పత్తి ఆర్డర్ కోసం బదిలీ చేశారు.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},రో # {0}: రేటు ఉపయోగిస్తారు రేటు కంటే ఎక్కువ ఉండకూడదు {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,బిఒఎం వెబ్సైట్ అంశం
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,మీ లేఖ తల మరియు లోగో అప్లోడ్. (మీరు తర్వాత వాటిని సవరించవచ్చు).
 DocType: Timesheet Detail,Bill,బిల్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,వైట్
 DocType: SMS Center,All Lead (Open),అన్ని లీడ్ (ఓపెన్)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),రో {0}: కోసం ప్యాక్ చేసిన అంశాల అందుబాటులో లేదు {4} గిడ్డంగిలో {1} ప్రవేశం సమయం పోస్ట్ చేయడంలో ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ఆర్డర్ రకం ఒకటి ఉండాలి {0}
 DocType: Lead,Next Contact Date,తదుపరి సంప్రదించండి తేదీ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ప్యాక్ చేసిన అంశాల తెరవడం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
 DocType: Student Batch Name,Student Batch Name,స్టూడెంట్ బ్యాచ్ పేరు
 DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
 DocType: Repayment Schedule,Balance Loan Amount,సంతులనం రుణ మొత్తం
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},దయచేసి పేర్కొనండి ఒక {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
 DocType: Delivery Note,Delivery To,డెలివరీ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
 DocType: Production Planning Tool,Get Sales Orders,సేల్స్ ఆర్డర్స్ పొందండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ప్రతికూల ఉండకూడదు
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,డిస్కౌంట్
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,డిస్కౌంట్
 DocType: Asset,Total Number of Depreciations,Depreciations మొత్తం సంఖ్య
 DocType: Sales Invoice Item,Rate With Margin,మార్జిన్ తో రేటు
 DocType: Sales Invoice Item,Rate With Margin,మార్జిన్ తో రేటు
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,సంస్థ పేరు
 DocType: Tax Rule,Shipping State,షిప్పింగ్ రాష్ట్రం
 ,Projected Quantity as Source,మూల ప్రొజెక్టెడ్ పరిమాణం
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,అంశం బటన్ &#39;కొనుగోలు రసీదులు నుండి అంశాలు పొందండి&#39; ఉపయోగించి జత చేయాలి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,అంశం బటన్ &#39;కొనుగోలు రసీదులు నుండి అంశాలు పొందండి&#39; ఉపయోగించి జత చేయాలి
 DocType: Employee,A-,ఒక-
 DocType: Production Planning Tool,Include non-stock items,కాని స్టాక్ అంశాలను చేర్చండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,సేల్స్ ఖర్చులు
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,ఎగైనెస్ట్
 DocType: Item,Default Selling Cost Center,డిఫాల్ట్ సెల్లింగ్ ఖర్చు సెంటర్
 DocType: Sales Partner,Implementation Partner,అమలు భాగస్వామి
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,జిప్ కోడ్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,జిప్ కోడ్
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
 DocType: Opportunity,Contact Info,సంప్రదింపు సమాచారం
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,స్టాక్ ఎంట్రీలు మేకింగ్
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,పంపిణీదారు
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,షాపింగ్ కార్ట్ షిప్పింగ్ రూల్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ఉత్పత్తి ఆర్డర్ {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
 ,Ordered Items To Be Billed,క్రమ అంశాలు బిల్ టు
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,రేంజ్ తక్కువ ఉండాలి కంటే పరిధి
 DocType: Global Defaults,Global Defaults,గ్లోబల్ డిఫాల్ట్
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,బ్యాచ్ సంఖ్య పొందడానికి అంశం కోడ్ను నమోదు చేయండి
 DocType: Stock Settings,Default Item Group,డిఫాల్ట్ అంశం గ్రూప్
 DocType: Employee Loan,Partially Disbursed,పాక్షికంగా పంపించబడతాయి
-DocType: Grading Structure,Grading System Name,గ్రేడింగ్ వ్యవస్థ పేరు
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,సరఫరాదారు డేటాబేస్.
 DocType: Account,Balance Sheet,బ్యాలెన్స్ షీట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,మీ అమ్మకాలు వ్యక్తి కస్టమర్ సంప్రదించండి తేదీన ఒక రిమైండర్ పొందుతారు
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,అదే అంశం అనేకసార్లు ఎంటర్ చేయలేరు.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","మరింత ఖాతాల గుంపులు కింద తయారు చేయవచ్చు, కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు"
@@ -1230,11 +1227,11 @@
 DocType: Maintenance Visit Purpose,Work Done,పని చేసారు
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,గుణాలు పట్టిక లో కనీసం ఒక లక్షణం రాయండి
 DocType: Announcement,All Students,అన్ని స్టూడెంట్స్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,అంశం {0} ఒక కాని స్టాక్ అంశం ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,అంశం {0} ఒక కాని స్టాక్ అంశం ఉండాలి
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,చూడండి లెడ్జర్
 DocType: Grading Scale,Intervals,విరామాలు
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,తొట్టతొలి
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,స్టూడెంట్ మొబైల్ నెంబరు
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ప్రపంచంలోని మిగిలిన
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,అంశం {0} బ్యాచ్ ఉండకూడదు
@@ -1274,8 +1271,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ఘనీభవించిన ఖాతా సవరించడానికి మీకు అధికారం లేదు {0}
 DocType: Journal Entry,Get Outstanding Invoices,అసాధారణ ఇన్వాయిస్లు పొందండి
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,కొనుగోలు ఆర్డర్లు మీరు ప్లాన్ సహాయం మరియు మీ కొనుగోళ్లపై అనుసరించాల్సి
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,కొనుగోలు ఆర్డర్లు మీరు ప్లాన్ సహాయం మరియు మీ కొనుగోళ్లపై అనుసరించాల్సి
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,చిన్న
@@ -1299,7 +1296,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,మీ ఉత్పత్తులు లేదా సేవల
 DocType: Mode of Payment,Mode of Payment,చెల్లింపు విధానం
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
 DocType: Student Applicant,AP,ఏపీ
 DocType: Purchase Invoice Item,BOM,బిఒఎం
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ఈ రూట్ అంశం సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
@@ -1317,7 +1314,7 @@
 DocType: Student Group Student,Group Roll Number,గ్రూప్ రోల్ సంఖ్య
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,అన్ని పని బరువులు మొత్తం 1 ఉండాలి తదనుగుణంగా ప్రణాళిక పనులు బరువులు సర్దుబాటు చేయండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,అంశం {0} ఒక ఉప-ఒప్పంద అంశం ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,రాజధాని పరికరాలు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ధర రూల్ మొదటి ఆధారంగా ఎంపిక ఉంటుంది అంశం, అంశం గ్రూప్ లేదా బ్రాండ్ కావచ్చు, ఫీల్డ్ &#39;న వర్తించు&#39;."
@@ -1344,7 +1341,7 @@
 DocType: Depreciation Schedule,Journal Entry,జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} పురోగతి అంశాలను
 DocType: Workstation,Workstation Name,కార్యక్షేత్ర పేరు
-DocType: Grade Interval,Grade Code,గ్రేడ్ కోడ్
+DocType: Grading Scale Interval,Grade Code,గ్రేడ్ కోడ్
 DocType: POS Item Group,POS Item Group,POS అంశం గ్రూప్
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,సారాంశ ఇమెయిల్:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
@@ -1361,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,హార్డ్వేర్
 DocType: Sales Order,Recurring Upto,పునరావృత వరకు
 DocType: Attendance,HR Manager,HR మేనేజర్
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ప్రివిలేజ్ లీవ్
 DocType: Purchase Invoice,Supplier Invoice Date,సరఫరాదారు వాయిస్ తేదీ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,మీరు షాపింగ్ కార్ట్ ఎనేబుల్ చెయ్యాలి
@@ -1377,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ఆహార
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ఏజింగ్ రేంజ్ 3
 DocType: Maintenance Schedule Item,No of Visits,సందర్శనల సంఖ్య
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,మార్క్ Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,మార్క్ Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},నిర్వహణ షెడ్యూల్ {0} వ్యతిరేకంగా ఉంది {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,నమోదు అవుతున్న విద్యార్ధి
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},మూసివేయబడిన ఖాతా కరెన్సీ ఉండాలి {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},అన్ని గోల్స్ కోసం పాయింట్లు మొత్తానికి ఇది 100 ఉండాలి {0}
@@ -1426,13 +1424,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ఖాతాల చార్ట్
 DocType: Material Request,Terms and Conditions Content,నియమాలు మరియు నిబంధనలు కంటెంట్
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Detail,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
 DocType: Pricing Rule,"Higher the number, higher the priority","అధిక సంఖ్య, ఎక్కువ ప్రాధాన్యత"
 ,Purchase Invoice Trends,వాయిస్ ట్రెండ్లులో కొనుగోలు
 DocType: Employee,Better Prospects,మెరుగైన అవకాశాలు
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","రో # {0}: బ్యాచ్ {1} కేవలం {2} అంశాల ఉంది. దయచేసి {3} అంశాల అందుబాటులో ఉంది మరొక బ్యాచ్ ఎంచుకోండి లేదా బహుళ బ్యాచ్లు నుండి బట్వాడా / సమస్య, బహుళ వరుసలు లోకి వరుసగా విడిపోయి"
 DocType: Vehicle,License Plate,లైసెన్స్ ప్లేట్
 DocType: Appraisal,Goals,లక్ష్యాలు
 DocType: Warranty Claim,Warranty / AMC Status,వారంటీ / AMC స్థితి
@@ -1450,7 +1449,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ఖాతా ఘనీభవించిన ఉంటే ప్రవేశాలు పరిమితం వినియోగదారులు అనుమతించబడతాయి.
 DocType: Email Digest,Bank Balance,బ్యాంకు బ్యాలెన్స్
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","జాబ్ ప్రొఫైల్, అర్హతలు అవసరం మొదలైనవి"
 DocType: Journal Entry Account,Account Balance,ఖాతా నిలువ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,లావాదేవీలకు పన్ను రూల్.
@@ -1461,7 +1460,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,మూసివేయబడని ఆర్థిక సంవత్సరం పి &amp; L నిల్వలను చూపించు
 DocType: Shipping Rule,Shipping Account,షిప్పింగ్ ఖాతా
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ఖాతా {2} నిష్క్రియంగా
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,సేల్స్ ఆర్డర్స్ మీరు మీ పని ప్లాన్ సహాయం మరియు సమయం బట్వాడా చేయండి
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,సేల్స్ ఆర్డర్స్ మీరు మీ పని ప్లాన్ సహాయం మరియు సమయం బట్వాడా చేయండి
 DocType: Quality Inspection,Readings,రీడింగ్స్
 DocType: Stock Entry,Total Additional Costs,మొత్తం అదనపు వ్యయాలు
 DocType: Course Schedule,SH,ఎస్హెచ్
@@ -1472,7 +1471,7 @@
 DocType: Shipping Rule Condition,To Value,విలువ
 DocType: Asset Movement,Stock Manager,స్టాక్ మేనేజర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},మూల గిడ్డంగి వరుసగా తప్పనిసరి {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ప్యాకింగ్ స్లిప్
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,ప్యాకింగ్ స్లిప్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ఆఫీసు రెంట్
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,సెటప్ SMS గేట్వే సెట్టింగులు
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,దిగుమతి విఫలమైంది!
@@ -1498,7 +1497,7 @@
 DocType: Sales Invoice,Source,మూల
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,మూసి షో
 DocType: Leave Type,Is Leave Without Pay,పే లేకుండా వదిలి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ఆస్తి వర్గం స్థిర ఆస్తి అంశం తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ఆస్తి వర్గం స్థిర ఆస్తి అంశం తప్పనిసరి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,చెల్లింపు పట్టిక కనుగొనబడలేదు రికార్డులు
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ఈ {0} తో విభేదాలు {1} కోసం {2} {3}
 DocType: Student Attendance Tool,Students HTML,స్టూడెంట్స్ HTML
@@ -1516,7 +1515,7 @@
 DocType: Student,Date of Leaving,లీవింగ్ తేదీ
 DocType: Pricing Rule,For Price List,ధర జాబితా కోసం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ఎగ్జిక్యూటివ్ శోధన
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,లీడ్స్ సృష్టించు
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,లీడ్స్ సృష్టించు
 DocType: Maintenance Schedule,Schedules,షెడ్యూల్స్
 DocType: Purchase Invoice Item,Net Amount,నికర మొత్తం
 DocType: Purchase Order Item Supplied,BOM Detail No,బిఒఎం వివరాలు లేవు
@@ -1544,7 +1543,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,ప్రోగ్రామ్ నమోదు
 DocType: Sales Invoice Item,Brand Name,బ్రాండ్ పేరు
 DocType: Purchase Receipt,Transporter Details,ట్రాన్స్పోర్టర్ వివరాలు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,బాక్స్
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,సాధ్యమైన సరఫరాదారు
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,సంస్థ
@@ -1578,7 +1577,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 పఠనం
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},కోసం {0} ప్రాజెక్ట్ కోసం దొరకలేదు డిఫాల్ట్ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,కంపెనీ వ్యయం కోసం దావాలు.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","స్టూడెంట్స్ వ్యవస్థ యొక్క గుండె వద్ద ఉంటాయి, అన్ని మీ విద్యార్థులు జోడించండి"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","స్టూడెంట్స్ వ్యవస్థ యొక్క గుండె వద్ద ఉంటాయి, అన్ని మీ విద్యార్థులు జోడించండి"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},రో # {0}: క్లియరెన్స్ తేదీ {1} ప్రిపే తేదీ ముందు ఉండకూడదు {2}
 DocType: Company,Default Holiday List,హాలిడే జాబితా డిఫాల్ట్
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},రో {0}: నుండి సమయం మరియు సమయం {1} తో కలిసిపోయే ఉంది {2}
@@ -1590,20 +1589,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,మీరు సెలవు కోసం దరఖాస్తు ఇది రోజు (లు) పండుగలు. మీరు సెలవు కోసం దరఖాస్తు అవసరం లేదు.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,చెల్లింపు ఇమెయిల్ను మళ్లీ పంపండి
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,క్రొత్త విధిని
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,కొటేషన్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,కొటేషన్ చేయండి
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ఇతర నివేదికలు
 DocType: Dependent Task,Dependent Task,అస్వతంత్ర టాస్క్
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ముందుగానే X రోజులు కార్యకలాపాలు ప్రణాళిక ప్రయత్నించండి.
 DocType: HR Settings,Stop Birthday Reminders,ఆపు జన్మదిన రిమైండర్లు
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},కంపెనీ డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 DocType: SMS Center,Receiver List,స్వీకర్త జాబితా
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,శోధన అంశం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,శోధన అంశం
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,వినియోగించిన మొత్తం
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,నగదు నికర మార్పు
 DocType: Assessment Plan,Grading Scale,గ్రేడింగ్ స్కేల్
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ఇప్పటికే పూర్తి
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},చెల్లింపు అభ్యర్థన ఇప్పటికే ఉంది {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,జారీచేయబడింది వస్తువుల ధర
@@ -1641,7 +1640,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,సేకరించండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
 DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,మీరు తొలగించలేరు ఫిస్కల్ ఇయర్ {0}. ఫిస్కల్ ఇయర్ {0} గ్లోబల్ సెట్టింగ్స్ లో డిఫాల్ట్ గా సెట్
 DocType: Journal Entry,Entry Type,ఎంట్రీ రకం
 ,Customer Credit Balance,కస్టమర్ క్రెడిట్ సంతులనం
@@ -1683,8 +1682,6 @@
 DocType: Student Sibling,Studying in Same Institute,అదే ఇన్స్టిట్యూట్ అధ్యయనం
 DocType: Territory,Territory Manager,భూభాగం మేనేజర్
 DocType: Packed Item,To Warehouse (Optional),గిడ్డంగి (ఆప్షనల్)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,అంశం code&gt; అంశం గ్రూప్&gt; బ్రాండ్
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,అంశం code&gt; అంశం గ్రూప్&gt; బ్రాండ్
 DocType: Payment Entry,Paid Amount (Company Currency),మొత్తం చెల్లించారు (కంపెనీ కరెన్సీ)
 DocType: Purchase Invoice,Additional Discount,అదనపు డిస్కౌంట్
 DocType: Selling Settings,Selling Settings,సెట్టింగులు సెల్లింగ్
@@ -1694,9 +1691,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,కార్ట్ లో చూడండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
 ,Item Shortage Report,అంశం కొరత రిపోర్ట్
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,మెటీరియల్ అభ్యర్థన ఈ స్టాక్ ఎంట్రీ చేయడానికి ఉపయోగిస్తారు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,తదుపరి అరుగుదల తేదీ నూతన ఆస్తి తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,తదుపరి అరుగుదల తేదీ నూతన ఆస్తి తప్పనిసరి
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ప్రతి బ్యాచ్ కోసం ప్రత్యేక కోర్సు ఆధారంగా గ్రూప్
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ప్రతి బ్యాచ్ కోసం ప్రత్యేక కోర్సు ఆధారంగా గ్రూప్
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ఒక అంశం యొక్క సింగిల్ యూనిట్.
@@ -1713,9 +1710,7 @@
 DocType: Course Assessment Criteria,Weightage,వెయిటేజీ
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: వ్యయ కేంద్రం &#39;లాభం మరియు నష్టం&#39; ఖాతా కోసం అవసరం {2}. కంపెనీ కోసం ఒక డిఫాల్ట్ వ్యయ కేంద్రం ఏర్పాటు చేయండి.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ఒక కస్టమర్ గ్రూప్ అదే పేరుతో కస్టమర్ పేరును లేదా కస్టమర్ గ్రూప్ పేరు దయచేసి
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ఒక కస్టమర్ గ్రూప్ అదే పేరుతో కస్టమర్ పేరును లేదా కస్టమర్ గ్రూప్ పేరు దయచేసి
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,న్యూ సంప్రదించండి
 DocType: Territory,Parent Territory,మాతృ భూభాగం
 DocType: Quality Inspection Reading,Reading 2,2 చదివే
@@ -1742,21 +1737,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,సయోధ్య JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,చాలా కాలమ్. నివేదిక ఎగుమతి చేయండి మరియు స్ప్రెడ్షీట్ అనువర్తనం ఉపయోగించి ప్రింట్.
 DocType: Purchase Invoice Item,Batch No,బ్యాచ్ లేవు
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},మారక రేటు దొరక్కపోతే {0} కు {1} కీలక తేదీ కోసం {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ఒక కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ వ్యతిరేకంగా బహుళ సేల్స్ ఆర్డర్స్ అనుమతించు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 మొబైల్ లేవు
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ప్రధాన
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,వేరియంట్
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ప్రధాన
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,వేరియంట్
 DocType: Naming Series,Set prefix for numbering series on your transactions,మీ లావాదేవీలపై సిరీస్ నంబరింగ్ కోసం సెట్ ఉపసర్గ
 DocType: Employee Attendance Tool,Employees HTML,ఉద్యోగులు HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
 DocType: Employee,Leave Encashed?,Encashed వదిలి?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ఫీల్డ్ నుండి అవకాశం తప్పనిసరి
 DocType: Email Digest,Annual Expenses,వార్షిక ఖర్చులు
 DocType: Item,Variants,రకరకాలు
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
 DocType: SMS Center,Send To,పంపే
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
 DocType: Payment Reconciliation Payment,Allocated amount,కేటాయించింది మొత్తం
@@ -1776,7 +1770,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,అంచనాలు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},సీరియల్ అంశం ఏదీ ప్రవేశించింది నకిలీ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ఒక షిప్పింగ్ రూల్ ఒక పరిస్థితి
-DocType: Grading Structure,Grading Intervals,గ్రేడింగ్ విరామాలు
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,దయచేసి నమోదు చెయ్యండి
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","అంశం {0} కోసం overbill కాదు వరుసగా {1} కంటే ఎక్కువ {2}. ఓవర్ బిల్లింగ్ అనుమతించేందుకు, సెట్టింగులు కొనుగోలు లో సెట్ చెయ్యండి"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,అంశం లేదా వేర్హౌస్ ఆధారంగా వడపోత సెట్ చెయ్యండి
@@ -1789,16 +1782,17 @@
 DocType: Authorization Control,Authorization Control,అధికార కంట్రోల్
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},రో # {0}: వేర్హౌస్ తిరస్కరించబడిన తిరస్కరించిన వస్తువు వ్యతిరేకంగా తప్పనిసరి {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,చెల్లింపు
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,మీ ఆర్డర్లను నిర్వహించండి
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,మీ ఆర్డర్లను నిర్వహించండి
 DocType: Production Order Operation,Actual Time and Cost,అసలు సమయం మరియు ఖర్చు
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},గరిష్ట {0} యొక్క పదార్థం అభ్యర్థన {1} అమ్మకాల ఆర్డర్ వ్యతిరేకంగా అంశం కోసం తయారు చేయవచ్చు {2}
 DocType: Employee,Salutation,సెల్యుటేషన్
 DocType: Course,Course Abbreviation,కోర్సు సంక్షిప్తీకరణ
 DocType: Student Leave Application,Student Leave Application,స్టూడెంట్ లీవ్ అప్లికేషన్
 DocType: Item,Will also apply for variants,కూడా రూపాంతరాలు వర్తిస్తాయని
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ఉద్యోగి {0} లో హాఫ్ రోజున {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},మొత్తం పని గంటల గరిష్టంగా పని గంటల కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,పై
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,అమ్మకం జరిగే సమయంలో కట్ట అంశాలు.
 DocType: Quotation Item,Actual Qty,వాస్తవ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice Item,References,సూచనలు
@@ -1808,7 +1802,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,మీరు నకిలీ అంశాలను నమోదు చేసారు. సరిదిద్ది మళ్లీ ప్రయత్నించండి.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,అసోసియేట్
 DocType: Asset Movement,Asset Movement,ఆస్తి ఉద్యమం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,న్యూ కార్ట్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,న్యూ కార్ట్
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} అంశం సీరియల్ అంశం కాదు
 DocType: SMS Center,Create Receiver List,స్వీకర్త జాబితా సృష్టించు
 DocType: Vehicle,Wheels,వీల్స్
@@ -1840,10 +1834,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ఉత్పత్తి ఆర్డర్స్ వ్యతిరేకంగా సమయం చిట్టాల యొక్క సృష్టి ఆపివేస్తుంది. ఆపరేషన్స్ ఉత్పత్తి ఉత్తర్వు మీద ట్రాక్ ఉండదు
 DocType: Student,Student Mobile Number,స్టూడెంట్ మొబైల్ నంబర్
 DocType: Item,Has Variants,రకాల్లో
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,మంత్లీ పంపిణీ పేరు
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
 DocType: Sales Person,Parent Sales Person,మాతృ సేల్స్ పర్సన్
 DocType: Purchase Invoice,Recurring Invoice,పునరావృత వాయిస్
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ప్రాజెక్ట్స్ మేనేజింగ్
@@ -1851,7 +1845,7 @@
 DocType: Budget,Fiscal Year,ఆర్థిక సంవత్సరం
 DocType: Vehicle Log,Fuel Price,ఇంధన ధర
 DocType: Budget,Budget,బడ్జెట్
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",అది ఒక ఆదాయం వ్యయం ఖాతా కాదు బడ్జెట్ వ్యతిరేకంగా {0} కేటాయించిన సాధ్యం కాదు
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ఆర్జిత
 DocType: Student Admission,Application Form Route,అప్లికేషన్ ఫారం రూట్
@@ -1882,7 +1876,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},మొత్తం {0} {1} వ్యతిరేకంగా తీసివేయబడుతుంది {2}
 DocType: Employee,Salary Information,జీతం ఇన్ఫర్మేషన్
 DocType: Sales Person,Name and Employee ID,పేరు మరియు Employee ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
 DocType: Website Item Group,Website Item Group,వెబ్సైట్ అంశం గ్రూప్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,సుంకాలు మరియు పన్నుల
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,సూచన తేదీని ఎంటర్ చేయండి
@@ -1941,7 +1935,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,తిరిగి కస్టమర్ రెవెన్యూ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) పాత్ర &#39;ఖర్చుల అప్రూవర్గా&#39; కలిగి ఉండాలి
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,పెయిర్
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
 DocType: Asset,Depreciation Schedule,అరుగుదల షెడ్యూల్
 DocType: Bank Reconciliation Detail,Against Account,ఖాతా వ్యతిరేకంగా
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,హాఫ్ డే తేదీ తేదీ నుండి నేటివరకు మధ్య ఉండాలి
@@ -1958,13 +1952,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
 ,Quotation Trends,కొటేషన్ ట్రెండ్లులో
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
 DocType: Shipping Rule Condition,Shipping Amount,షిప్పింగ్ మొత్తం
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,పెండింగ్ మొత్తం
 DocType: Purchase Invoice Item,Conversion Factor,మార్పిడి ఫాక్టర్
 DocType: Purchase Order,Delivered,పంపిణీ
 ,Vehicle Expenses,వాహనం ఖర్చులు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
+DocType: Serial No,Invoice Details,ఇన్వాయిస్ వివరాలు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
 DocType: Purchase Receipt,Vehicle Number,వాహనం సంఖ్య
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,పునరావృత ఇన్వాయిస్ ఆపడానికి చేయబడే తేదీ
 DocType: Employee Loan,Loan Amount,అప్పు మొత్తం
@@ -1988,7 +1983,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,అదనపు డిస్కౌంట్ మొత్తం
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
 DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,కాని గ్రూప్ గ్రూప్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,క్రీడలు
 DocType: Loan Type,Loan Name,లోన్ పేరు
@@ -1999,6 +1994,7 @@
 ,Customer Acquisition and Loyalty,కస్టమర్ అక్విజిషన్ అండ్ లాయల్టీ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,మీరు తిరస్కరించారు అంశాల స్టాక్ కలిగివున్నాయి గిడ్డంగిలో
 DocType: Production Order,Skip Material Transfer,మెటీరియల్ ట్రాన్స్ఫర్ దాటవేయి
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,మారక రేటు దొరక్కపోతే {0} కు {1} కీ తేదీ కోసం {2}. దయచేసి కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు మానవీయంగా సృష్టించడానికి
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,మీ ఆర్థిక సంవత్సరం ముగుస్తుంది
 DocType: POS Profile,Price List,కొనుగోలు ధర
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} డిఫాల్ట్ ఫిస్కల్ ఇయర్ ఇప్పుడు. మార్పు ప్రభావితం కావడానికి మీ బ్రౌజర్ రిఫ్రెష్ చెయ్యండి.
@@ -2036,9 +2032,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,అంశం {0} ఇప్పటికే తిరిగి చెయ్యబడింది
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ఫిస్కల్ ఇయర్ ** ఆర్థిక సంవత్సరం సూచిస్తుంది. అన్ని అకౌంటింగ్ ఎంట్రీలు మరియు ఇతర ప్రధాన లావాదేవీల ** ** ఫిస్కల్ ఇయర్ వ్యతిరేకంగా చూడబడతాయి.
 DocType: Opportunity,Customer / Lead Address,కస్టమర్ / లీడ్ చిరునామా
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
 DocType: Student Admission,Eligibility,అర్హత
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","లీడ్స్ మీరు వ్యాపార, అన్ని మీ పరిచయాలను మరియు మరింత మీ లీడ్స్ జోడించడానికి పొందడానికి సహాయంగా"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","లీడ్స్ మీరు వ్యాపార, అన్ని మీ పరిచయాలను మరియు మరింత మీ లీడ్స్ జోడించడానికి పొందడానికి సహాయంగా"
 DocType: Production Order Operation,Actual Operation Time,అసలు ఆపరేషన్ సమయం
 DocType: Authorization Rule,Applicable To (User),వర్తించదగిన (వాడుకరి)
 DocType: Purchase Taxes and Charges,Deduct,తీసివేయు
@@ -2079,7 +2075,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,కంపెనీ ఎంచుకోండి ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,అన్ని శాఖల కోసం భావిస్తారు ఉంటే ఖాళీ వదిలి
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
 DocType: Process Payroll,Fortnightly,పక్ష
 DocType: Currency Exchange,From Currency,కరెన్సీ నుండి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","కనీసం ఒక వరుసలో కేటాయించిన మొత్తం, వాయిస్ పద్ధతి మరియు వాయిస్ సంఖ్య దయచేసి ఎంచుకోండి"
@@ -2095,7 +2091,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,మొదటి వరుసలో కోసం &#39;మునుపటి రో మొత్తం న&#39; &#39;మునుపటి రో మొత్తం మీద&#39; బాధ్యతలు రకం ఎంచుకోండి లేదా కాదు
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,చైల్డ్ అంశం ఉత్పత్తి కట్ట ఉండకూడదు. దయచేసి అంశాన్ని తీసివేసి `{0}` మరియు సేవ్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,బ్యాంకింగ్
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets జోడించండి
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets జోడించండి
 DocType: Vehicle Service,Service Item,సర్వీస్ అంశం
 DocType: Bank Guarantee,Bank Guarantee,బ్యాంకు హామీ
 DocType: Bank Guarantee,Bank Guarantee,బ్యాంకు హామీ
@@ -2145,8 +2141,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ధర జాబితా సెట్ చెయ్యకపోతే ధరలు చూపబడవు
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ఈ షిప్పింగ్ రూల్ ఒక దేశం పేర్కొనండి లేదా ప్రపంచవ్యాప్తం షిప్పింగ్ తనిఖీ చేయండి
 DocType: Stock Entry,Total Incoming Value,మొత్తం ఇన్కమింగ్ విలువ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,డెబిట్ అవసరం ఉంది
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,డెబిట్ అవసరం ఉంది
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,కొనుగోలు ధర జాబితా
 DocType: Offer Letter Term,Offer Term,ఆఫర్ టర్మ్
 DocType: Quality Inspection,Quality Manager,క్వాలిటీ మేనేజర్
@@ -2180,14 +2176,14 @@
 DocType: Opportunity,Lost Reason,లాస్ట్ కారణము
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,క్రొత్త చిరునామా
 DocType: Quality Inspection,Sample Size,నమూనా పరిమాణం
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,స్వీకరణపై డాక్యుమెంట్ నమోదు చేయండి
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,అన్ని అంశాలను ఇప్పటికే ఇన్వాయిస్ చేశారు
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,స్వీకరణపై డాక్యుమెంట్ నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,అన్ని అంశాలను ఇప్పటికే ఇన్వాయిస్ చేశారు
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;కేస్ నెం నుండి&#39; చెల్లని రాయండి
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,మరింత ఖర్చు కేంద్రాలు గుంపులు కింద తయారు చేయవచ్చు కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు
 DocType: Project,External,బాహ్య
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,వినియోగదారులు మరియు అనుమతులు
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ఉత్పత్తి ఆర్డర్స్ రూపొందించబడింది: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},ఉత్పత్తి ఆర్డర్స్ రూపొందించబడింది: {0}
 DocType: Branch,Branch,బ్రాంచ్
 DocType: Guardian,Mobile Number,మొబైల్ నంబర్
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ముద్రణ మరియు బ్రాండింగ్
@@ -2196,7 +2192,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,దొరకలేదు సీరియల్ లేవు {0}
 DocType: Scheduling Tool,Student Batch,స్టూడెంట్ బ్యాచ్
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,మీ కస్టమర్స్
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,స్టూడెంట్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,స్టూడెంట్ చేయండి
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},మీరు ప్రాజెక్ట్ సహకరించడానికి ఆహ్వానించబడ్డారు: {0}
 DocType: Leave Block List Date,Block Date,బ్లాక్ తేదీ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ఇప్పుడు వర్తించు
@@ -2219,8 +2215,9 @@
 DocType: SMS Log,Sent To,పంపిన
 DocType: Payment Request,Make Sales Invoice,సేల్స్ వాయిస్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,సాఫ్ట్వేర్పై
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,తదుపరి సంప్రదించండి తేదీ గతంలో ఉండకూడదు
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,తదుపరి సంప్రదించండి తేదీ గతంలో ఉండకూడదు
 DocType: Company,For Reference Only.,సూచన ఓన్లి.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,బ్యాచ్ ఎంచుకోండి లేవు
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},చెల్లని {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,అడ్వాన్స్ మొత్తం
@@ -2234,7 +2231,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,కేస్ నం 0 ఉండకూడదు
 DocType: Item,Show a slideshow at the top of the page,పేజీ ఎగువన ఒక స్లైడ్ చూపించు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,దుకాణాలు
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,దుకాణాలు
 DocType: Serial No,Delivery Time,డెలివరీ సమయం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ఆధారంగా ఏజింగ్
 DocType: Item,End of Life,లైఫ్ ఎండ్
@@ -2250,8 +2247,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","కార్యకలాపాలు, నిర్వహణ ఖర్చు పేర్కొనండి మరియు మీ కార్యకలాపాలను ఎలాంటి ఒక ఏకైక ఆపరేషన్ ఇస్తాయి."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ఈ పత్రం పరిమితి {0} {1} అంశం {4}. మీరు తయారు మరొక {3} అదే వ్యతిరేకంగా {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
 DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
 DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
 DocType: Stock Settings,Allow Negative Stock,ప్రతికూల స్టాక్ అనుమతించు
@@ -2262,7 +2259,7 @@
 DocType: Budget Account,Budget Account,బడ్జెట్ ఖాతా
 DocType: Quality Inspection,Verified By,ద్వారా ధృవీకరించబడిన
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ఇప్పటికే లావాదేవీలు ఉన్నాయి ఎందుకంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ మార్చలేరు. ట్రాన్సాక్షన్స్ డిఫాల్ట్ కరెన్సీ మార్చడానికి రద్దు చేయాలి."
-DocType: Grade Interval,Grade Description,గ్రేడ్ వివరణ
+DocType: Grading Scale Interval,Grade Description,గ్రేడ్ వివరణ
 DocType: Stock Entry,Purchase Receipt No,కొనుగోలు రసీదులు లేవు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ఎర్నెస్ట్ మనీ
 DocType: Process Payroll,Create Salary Slip,వేతనం స్లిప్ సృష్టించు
@@ -2300,7 +2297,7 @@
 DocType: Upload Attendance,Attendance To Date,తేదీ హాజరు
 DocType: Warranty Claim,Raised By,లేవనెత్తారు
 DocType: Payment Gateway Account,Payment Account,చెల్లింపు ఖాతా
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,స్వీకరించదగిన ఖాతాలు నికర మార్పును
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,పరిహార ఆఫ్
 DocType: Offer Letter,Accepted,Accepted
@@ -2314,7 +2311,7 @@
 DocType: Shipping Rule,Shipping Rule Label,షిప్పింగ్ రూల్ లేబుల్
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,వాడుకరి ఫోరం
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
 DocType: Employee,Previous Work Experience,మునుపటి పని అనుభవం
@@ -2328,7 +2325,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,నిబంధనలు మరియు Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ఇన్స్టిట్యూట్ యొక్క పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు చేస్తారు.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ఈ తేదీ వరకు స్తంభింప అకౌంటింగ్ ఎంట్రీ ఎవరూ / అలా క్రింద పేర్కొన్న పాత్ర తప్ప ఎంట్రీ సవరించవచ్చు.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,నిర్వహణ షెడ్యూల్ రూపొందించడానికి ముందు పత్రం సేవ్ దయచేసి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,నిర్వహణ షెడ్యూల్ రూపొందించడానికి ముందు పత్రం సేవ్ దయచేసి
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ప్రాజెక్టు హోదా
 DocType: UOM,Check this to disallow fractions. (for Nos),భిన్నాలు నిరాకరించేందుకు ఈ తనిఖీ. (NOS కోసం)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,క్రింది ఉత్పత్తి ఆర్డర్స్ ఏర్పరచారు:
@@ -2351,6 +2348,7 @@
 DocType: Email Digest,How frequently?,ఎంత తరచుగా?
 DocType: Purchase Receipt,Get Current Stock,ప్రస్తుత స్టాక్ పొందండి
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,మెటీరియల్స్ బిల్లుని ట్రీ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,అంశం code&gt; అంశం గ్రూప్&gt; బ్రాండ్
 DocType: Student,Joining Date,చేరడం తేదీ
 ,Employees working on a holiday,ఒక సెలవు ఉద్యోగులు
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,మార్క్ ప్రెజెంట్
@@ -2431,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,క్లియరెన్స్ తేదీ ప్రస్తావించలేదు
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ఉత్పత్తి
 DocType: Guardian,Occupation,వృత్తి
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,రో {0}: ప్రారంభ తేదీ ముగింపు తేదీ ముందు ఉండాలి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,రో {0}: ప్రారంభ తేదీ ముగింపు తేదీ ముందు ఉండాలి
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),మొత్తం () ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,This Document,ఈ డాక్యుమెంట్
 DocType: Installation Note Item,Installed Qty,ఇన్స్టాల్ ప్యాక్ చేసిన అంశాల
@@ -2454,8 +2452,8 @@
 DocType: Notification Control,Sales Order Message,అమ్మకాల ఆర్డర్ సందేశం
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","మొదలైనవి కంపెనీ, కరెన్సీ, ప్రస్తుత ఆర్థిక సంవత్సరంలో వంటి సెట్ డిఫాల్ట్ విలువలు"
 DocType: Payment Entry,Payment Type,చెల్లింపు పద్ధతి
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
 DocType: Process Payroll,Select Employees,Select ఉద్యోగులు
 DocType: Opportunity,Potential Sales Deal,సంభావ్య సేల్స్ డీల్
 DocType: Payment Entry,Cheque/Reference Date,ప్రిపే / ప్రస్తావన తేదీ
@@ -2472,7 +2470,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ఇప్పటికే కంపెనీ కోసం సృష్టించబడింది గ్లోబల్ POS ప్రొఫైల్ {0} {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,అన్ని BOMs లో అంశం / BOM పునఃస్థాపించుము
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,స్వీకరణపై పత్రం సమర్పించాలి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,స్వీకరణపై పత్రం సమర్పించాలి
 DocType: Purchase Invoice Item,Received Qty,స్వీకరించిన ప్యాక్ చేసిన అంశాల
 DocType: Stock Entry Detail,Serial No / Batch,సీరియల్ లేవు / బ్యాచ్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,చెల్లించిన మరియు పంపిణీ లేదు
@@ -2485,7 +2483,7 @@
 ,To Produce,ఉత్పత్తి
 apps/erpnext/erpnext/config/hr.py +93,Payroll,పేరోల్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","వరుస కోసం {0} లో {1}. అంశం రేటు {2} చేర్చడానికి, వరుసలు {3} కూడా చేర్చారు తప్పక"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,వాడుకరి చేయండి
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,వాడుకరి చేయండి
 DocType: Packing Slip,Identification of the package for the delivery (for print),డెలివరీ కోసం ప్యాకేజీ గుర్తింపు (ముద్రణ కోసం)
 DocType: Bin,Reserved Quantity,రిసర్వ్డ్ పరిమాణం
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామాను నమోదు చేయండి
@@ -2498,11 +2496,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,వికలాంగుల టెంప్లేట్ డిఫాల్ట్ టెంప్లేట్ ఉండకూడదు
 DocType: Account,Income Account,ఆదాయపు ఖాతా
 DocType: Payment Request,Amount in customer's currency,కస్టమర్ యొక్క కరెన్సీ లో మొత్తం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,డెలివరీ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,డెలివరీ
 DocType: Stock Reconciliation Item,Current Qty,ప్రస్తుత ప్యాక్ చేసిన అంశాల
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",చూడండి వ్యయంతో విభాగం లో &quot;Materials బేస్డ్ న రేటు&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,మునుపటి
 DocType: Appraisal Goal,Key Responsibility Area,కీ బాధ్యత ఏరియా
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","స్టూడెంట్ ఇస్తున్న మీరు విద్యార్థులకు హాజరు, లెక్కింపులు మరియు ఫీజు ట్రాక్ సహాయం"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","స్టూడెంట్ ఇస్తున్న మీరు విద్యార్థులకు హాజరు, లెక్కింపులు మరియు ఫీజు ట్రాక్ సహాయం"
 DocType: Payment Entry,Total Allocated Amount,మొత్తం కేటాయించిన సొమ్ము
 DocType: Item Reorder,Material Request Type,మెటీరియల్ అభ్యర్థన పద్ధతి
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},నుండి {0} కు వేతనాల కోసం Accural జర్నల్ ఎంట్రీ {1}
@@ -2525,7 +2524,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ట్రాక్ పరిశ్రమ రకం ద్వారా నడిపించును.
 DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,అన్ని చిరునామాలు.
 DocType: Company,Stock Settings,స్టాక్ సెట్టింగ్స్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","క్రింది రెండు లక్షణాలతో రికార్డులలో అదే ఉంటే విలీనం మాత్రమే సాధ్యమవుతుంది. గ్రూప్ రూట్ రకం, కంపెనీ"
@@ -2535,6 +2534,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',హోదాతో ఉద్యోగులకు ఈవెంట్ గురించి ఒక ఇమెయిల్ పంపుతుంది &#39;ఓపెన్&#39;
 DocType: Task,Depends on Tasks,విధులు ఆధారపడి
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,కస్టమర్ గ్రూప్ ట్రీ నిర్వహించండి.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,జోడింపులను షాపింగ్ కార్ట్ చేతనము చేయకుండా చూడవచ్చు
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,కొత్త ఖర్చు సెంటర్ పేరు
 DocType: Leave Control Panel,Leave Control Panel,కంట్రోల్ ప్యానెల్ వదిలి
@@ -2547,11 +2547,10 @@
 DocType: Sales Invoice,Debit To,డెబిట్
 DocType: Delivery Note,Required only for sample item.,నమూనా మాత్రమే అంశం కోసం అవసరం.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,లావాదేవీ తరువాత వాస్తవంగా ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},తోబుట్టువుల జీతం స్లిప్ మధ్య దొరకలేదు {0} మరియు {1}
 ,Pending SO Items For Purchase Request,కొనుగోలు అభ్యర్థన SO పెండింగ్లో ఉన్న అంశాలు
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,స్టూడెంట్ అడ్మిషన్స్
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
 DocType: Supplier,Billing Currency,బిల్లింగ్ కరెన్సీ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ఎక్స్ ట్రా లార్జ్
@@ -2568,7 +2567,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,హోమ్పేజీ ఫీచర్ ఉత్పత్తి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,అన్ని అసెస్మెంట్ గుంపులు
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,న్యూ వేర్హౌస్ పేరు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),మొత్తం {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),మొత్తం {0} ({1})
 DocType: C-Form Invoice Detail,Territory,భూభాగం
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,అవసరం సందర్శనల సంఖ్య చెప్పలేదు దయచేసి
 DocType: Stock Settings,Default Valuation Method,డిఫాల్ట్ లెక్కింపు విధానం
@@ -2586,7 +2585,7 @@
 DocType: Price List,Price List Master,ధర జాబితా మాస్టర్
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,మీరు సెట్ మరియు లక్ష్యాలు మానిటర్ విధంగా అన్ని సేల్స్ లావాదేవీలు బహుళ ** సేల్స్ పర్సన్స్ ** వ్యతిరేకంగా ట్యాగ్ చేయవచ్చు.
 ,S.O. No.,SO నం
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},లీడ్ నుండి కస్టమర్ సృష్టించడానికి దయచేసి {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},లీడ్ నుండి కస్టమర్ సృష్టించడానికి దయచేసి {0}
 DocType: Price List,Applicable for Countries,దేశాలు వర్తించే
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,మాత్రమే స్థితి కూడిన దరఖాస్తులను లీవ్ &#39;ఆమోదించబడింది&#39; మరియు &#39;&#39; తిరస్కరించింది సమర్పించిన చేయవచ్చు
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},స్టూడెంట్ గ్రూప్ పేరు వరుసగా తప్పనిసరి {0}
@@ -2666,7 +2665,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,స్టాక్ కోసం అకౌంటింగ్ ఎంట్రీ
 DocType: Vehicle Service,Engine Oil,ఇంజన్ ఆయిల్
 DocType: Sales Invoice,Sales Team1,సేల్స్ team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
 DocType: Sales Invoice,Customer Address,కస్టమర్ చిరునామా
 DocType: Employee Loan,Loan Details,లోన్ వివరాలు
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల సున్నా కంటే ఎక్కువ ఉండాలి.
@@ -2730,7 +2729,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో గిడ్డంగులు సమూహం మార్చబడతాయి కాదు.
 DocType: Assessment Result Tool,Result HTML,ఫలితం HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,గడువు ముగిసేది
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,స్టూడెంట్స్ జోడించండి
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,స్టూడెంట్స్ జోడించండి
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},దయచేసి ఎంచుకోండి {0}
 DocType: C-Form,C-Form No,సి ఫారం లేవు
 DocType: BOM,Exploded_items,Exploded_items
@@ -2794,7 +2793,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,పరిమితి దాటి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,వెంచర్ కాపిటల్
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ఈ &#39;విద్యా సంవత్సరం&#39; ఒక విద్యాపరమైన పదం {0} మరియు &#39;టర్మ్ పేరు&#39; {1} ఇప్పటికే ఉంది. ఈ ప్రవేశాలు మార్చి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","అంశం {0} వ్యతిరేకంగా ఇప్పటికే లావాదేవీలు ఉన్నాయి, మీరు విలువ మార్చలేరు {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","అంశం {0} వ్యతిరేకంగా ఇప్పటికే లావాదేవీలు ఉన్నాయి, మీరు విలువ మార్చలేరు {1}"
 DocType: UOM,Must be Whole Number,మొత్తం సంఖ్య ఉండాలి
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(రోజుల్లో) కేటాయించిన కొత్త ఆకులు
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,సీరియల్ లేవు {0} ఉనికిలో లేదు
@@ -2837,7 +2836,7 @@
 DocType: Supplier,Last Day of the Next Month,వచ్చే నెల చివరి డే
 DocType: Support Settings,Auto close Issue after 7 days,7 రోజుల తరువాత ఆటో దగ్గరగా ఇష్యూ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ముందు కేటాయించబడతాయి కాదు వదిలేయండి {0}, సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉన్నాడు, {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,స్టూడెంట్ దరఖాస్తుదారు
 DocType: Asset Category Account,Accumulated Depreciation Account,పోగుచేసిన తరుగుదల ఖాతా
 DocType: Stock Settings,Freeze Stock Entries,ఫ్రీజ్ స్టాక్ ఎంట్రీలు
@@ -2865,7 +2864,7 @@
 DocType: Asset,Item Code,Item కోడ్
 DocType: Production Planning Tool,Create Production Orders,ఉత్పత్తి ఆర్డర్స్ సృష్టించు
 DocType: Serial No,Warranty / AMC Details,వారంటీ / AMC వివరాలు
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
 DocType: Journal Entry,User Remark,వాడుకరి వ్యాఖ్య
 DocType: Lead,Market Segment,మార్కెట్ విభాగానికీ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
@@ -2883,7 +2882,7 @@
 DocType: Production Planning Tool,Create Material Requests,మెటీరియల్ అభ్యర్థనలు సృష్టించు
 DocType: Employee Education,School/University,స్కూల్ / విశ్వవిద్యాలయం
 DocType: Payment Request,Reference Details,రిఫరెన్స్ వివరాలు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ఆశిస్తున్న విలువ ఉపయోగకరమైన లైఫ్ తరువాత స్థూల కొనుగోలు మొత్తం కంటే తక్కువ ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ఆశిస్తున్న విలువ ఉపయోగకరమైన లైఫ్ తరువాత స్థూల కొనుగోలు మొత్తం కంటే తక్కువ ఉండాలి
 DocType: Sales Invoice Item,Available Qty at Warehouse,Warehouse వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,బిల్ మొత్తం
 DocType: Asset,Double Declining Balance,డబుల్ తగ్గుతున్న సంతులనం
@@ -2904,19 +2903,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ఈ స్టాక్ సయోధ్య ఒక ప్రారంభ ఎంట్రీ నుండి తేడా ఖాతా, ఒక ఆస్తి / బాధ్యత రకం ఖాతా ఉండాలి"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},పంపించబడతాయి మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},అంశం అవసరం ఆర్డర్ సంఖ్య కొనుగోలు {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ఉత్పత్తి ఆర్డర్ సృష్టించలేదు
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,ఉత్పత్తి ఆర్డర్ సృష్టించలేదు
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;తేదీ నుండి&#39; తర్వాత &#39;తేదీ&#39; ఉండాలి
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},విద్యార్థిగా స్థితిని మార్చలేరు {0} విద్యార్ధి అప్లికేషన్ ముడిపడి ఉంటుంది {1}
 DocType: Asset,Fully Depreciated,పూర్తిగా విలువ తగ్గుతున్న
 ,Stock Projected Qty,స్టాక్ ప్యాక్ చేసిన అంశాల ప్రొజెక్టెడ్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,గుర్తించ హాజరు HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","సుభాషితాలు, ప్రతిపాదనలు ఉన్నాయి మీరు మీ వినియోగదారులకు పంపారు వేలం"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","సుభాషితాలు, ప్రతిపాదనలు ఉన్నాయి మీరు మీ వినియోగదారులకు పంపారు వేలం"
 DocType: Sales Order,Customer's Purchase Order,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,సీరియల్ లేవు మరియు బ్యాచ్
 DocType: Warranty Claim,From Company,కంపెనీ నుండి
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,అంచనా ప్రమాణం స్కోర్లు మొత్తం {0} ఉండాలి.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,దయచేసి Depreciations సంఖ్య బుక్ సెట్
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,దయచేసి Depreciations సంఖ్య బుక్ సెట్
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,విలువ లేదా ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,నిమిషం
@@ -3044,7 +3043,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,స్టూడెంట్ గ్రూప్
 DocType: Shopping Cart Settings,Quotation Series,కొటేషన్ సిరీస్
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ఒక అంశం అదే పేరుతో ({0}), అంశం గుంపు పేరు మార్చడానికి లేదా అంశం పేరు దయచేసి"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
 DocType: C-Form,I,నేను
 DocType: Company,Asset Depreciation Cost Center,ఆస్తి అరుగుదల వ్యయ కేంద్రం
 DocType: Sales Order Item,Sales Order Date,సేల్స్ ఆర్డర్ తేదీ
@@ -3063,19 +3062,18 @@
 DocType: Vehicle,Insurance Details,భీమా వివరాలు
 DocType: Account,Payable,చెల్లించవలసిన
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,తిరిగి చెల్లించే కాలాలు నమోదు చేయండి
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),రుణగ్రస్తులు ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),రుణగ్రస్తులు ({0})
 DocType: Pricing Rule,Margin,మార్జిన్
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,కొత్త వినియోగదారులు
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,స్థూల లాభం%
 DocType: Appraisal Goal,Weightage (%),వెయిటేజీ (%)
 DocType: Bank Reconciliation Detail,Clearance Date,క్లియరెన్స్ తేదీ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,స్థూల కొనుగోలు మొత్తాన్ని తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,స్థూల కొనుగోలు మొత్తాన్ని తప్పనిసరి
 DocType: Lead,Address Desc,Desc పరిష్కరించేందుకు
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,పార్టీ తప్పనిసరి
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,టాపిక్ పేరు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,సెల్లింగ్ లేదా కొనుగోలు కనీసం ఒక ఎంపిక చేయాలి
-DocType: Grading Structure,Grade Intervals,గ్రేడ్ విరామాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,మీ వ్యాపార స్వభావం ఎంచుకోండి.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ఉత్పాదక కార్యకలాపాల ఎక్కడ నిర్వహిస్తున్నారు.
 DocType: Asset Movement,Source Warehouse,మూల వేర్హౌస్
@@ -3104,6 +3102,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,మంత్లీ పంపిణీ శాతం
 DocType: Territory,Territory Targets,భూభాగం టార్గెట్స్
 DocType: Delivery Note,Transporter Info,ట్రాన్స్పోర్టర్ సమాచారం
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},డిఫాల్ట్ {0} లో కంపెనీ సెట్ దయచేసి {1}
 DocType: Cheque Print Template,Starting position from top edge,టాప్ అంచు నుండి ప్రారంభ స్థానం
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,అదే సరఫరాదారు అనేకసార్లు నమోదు చేసిన
@@ -3155,7 +3154,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,క్రమాన్ని మార్చు ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ప్రస్తుత Job ఖాళీలు
 DocType: Company,Stock Adjustment Account,స్టాక్ అడ్జస్ట్మెంట్ ఖాతా
-DocType: Journal Entry,Write Off,ఆఫ్ వ్రాయండి
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ఆఫ్ వ్రాయండి
 DocType: Timesheet Detail,Operation ID,ఆపరేషన్ ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","వ్యవస్థ యూజర్ (లాగిన్) ID. సెట్ చేస్తే, అది అన్ని హెచ్ ఆర్ రూపాలు కోసం డిఫాల్ట్ అవుతుంది."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: నుండి {1}
@@ -3166,8 +3165,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,సరఫరాదారు కస్టమర్ కు అందిస్తాడు
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ఫారం / అంశం / {0}) స్టాక్ ముగిసింది
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,తదుపరి తేదీ వ్యాఖ్యలు తేదీ కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,షో పన్ను విడిపోవడానికి
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,షో పన్ను విడిపోవడానికి
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,డేటా దిగుమతి మరియు ఎగుమతి
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","స్టాక్ ఎంట్రీలు అందుకే మీరు తిరిగి కేటాయించి లేదా సవరించడానికి కాదు, వేర్హౌస్ {0} వ్యతిరేకంగా ఉనికిలో"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,తోబుట్టువుల విద్యార్థులు దొరకలేదు
@@ -3179,13 +3178,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
 DocType: Program Enrollment,School House,స్కూల్ హౌస్
 DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,దయచేసి కొటేషన్స్ ఎంచుకోండి
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,దయచేసి కొటేషన్స్ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
 DocType: Company,Default Cash Account,డిఫాల్ట్ నగదు ఖాతా
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,కంపెనీ (కాదు కస్టమర్ లేదా సరఫరాదారు) మాస్టర్.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ఈ ఈ విద్యార్థి హాజరు ఆధారంగా
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,స్టూడెంట్స్ లో లేవు
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,మరింత అంశాలు లేదా ఓపెన్ పూర్తి రూపం జోడించండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;ఊహించినది డెలివరీ తేదీ&#39; నమోదు చేయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,డెలివరీ గమనికలు {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
@@ -3232,9 +3232,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,సయోధ్య ముందు
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},కు {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),పన్నులు మరియు ఆరోపణలు చేర్చబడింది (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,అంశం పన్ను రో {0} రకం పన్ను లేదా ఆదాయం వ్యయం లేదా విధింపదగిన యొక్క ఖాతా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,అంశం పన్ను రో {0} రకం పన్ను లేదా ఆదాయం వ్యయం లేదా విధింపదగిన యొక్క ఖాతా ఉండాలి
 DocType: Sales Order,Partly Billed,పాక్షికంగా గుర్తింపు పొందిన
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,అంశం {0} ఒక స్థిర ఆస్తి అంశం ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,అంశం {0} ఒక స్థిర ఆస్తి అంశం ఉండాలి
 DocType: Item,Default BOM,డిఫాల్ట్ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,తిరిగి రకం కంపెనీ పేరు నిర్ధారించడానికి దయచేసి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,మొత్తం అద్భుతమైన ఆంట్
@@ -3257,7 +3257,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ధర జాబితా ఎక్స్చేంజ్ రేట్
 DocType: Purchase Invoice Item,Rate,రేటు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ఇంటర్న్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,చిరునామా పేరు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,చిరునామా పేరు
 DocType: Stock Entry,From BOM,బిఒఎం నుండి
 DocType: Assessment Code,Assessment Code,అసెస్మెంట్ కోడ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ప్రాథమిక
@@ -3282,7 +3282,7 @@
 DocType: Purchase Invoice,Print Language,ప్రింట్ భాషా
 DocType: Salary Slip,Total Working Hours,మొత్తం వర్కింగ్ అవర్స్
 DocType: Stock Entry,Including items for sub assemblies,ఉప శాసనసభలకు అంశాలు సహా
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,అన్ని ప్రాంతాలు
 DocType: Purchase Invoice,Items,అంశాలు
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,విద్యార్థిని అప్పటికే చేరతాడు.
@@ -3302,17 +3302,15 @@
 DocType: Issue,Opening Time,ప్రారంభ సమయం
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,నుండి మరియు అవసరమైన తేదీలు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,సెక్యూరిటీస్ అండ్ కమోడిటీ ఎక్స్చేంజెస్
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
 DocType: Assessment Plan,Supervisor Name,సూపర్వైజర్ పేరు
 DocType: Program Enrollment Course,Program Enrollment Course,ప్రోగ్రామ్ ఎన్రోల్మెంట్ కోర్సు
 DocType: Program Enrollment Course,Program Enrollment Course,ప్రోగ్రామ్ ఎన్రోల్మెంట్ కోర్సు
-DocType: Grading Structure,Grading Structure,గ్రేడింగ్ నిర్మాణం
 DocType: Purchase Taxes and Charges,Valuation and Total,వాల్యుయేషన్ మరియు మొత్తం
 DocType: Tax Rule,Shipping City,షిప్పింగ్ సిటీ
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ఈ అంశం {0} (మూస) యొక్క రూపాంతరం. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప గుణాలు టెంప్లేట్ నుండి పైగా కాపీ అవుతుంది
 DocType: Notification Control,Customize the Notification,నోటిఫికేషన్ అనుకూలీకరించండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ఆపరేషన్స్ నుండి నగదు ప్రవాహ
 DocType: Sales Invoice,Shipping Rule,షిప్పింగ్ రూల్
@@ -3335,6 +3333,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,మొదటి పోస్టింగ్ తేదీ దయచేసి ఎంచుకోండి
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,తేదీ తెరవడం తేదీ మూసివేయడం ముందు ఉండాలి
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్ను&gt; సెటప్ ద్వారా హాజరు ధారావాహిక సంఖ్యలో నంబరింగ్ సిరీస్
 DocType: Leave Control Panel,Carry Forward,కుంటున్న
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ఉన్న లావాదేవీలతో ఖర్చు సెంటర్ లెడ్జర్ మార్చబడతాయి కాదు
 DocType: Department,Days for which Holidays are blocked for this department.,రోజులు సెలవులు ఈ విభాగం కోసం బ్లాక్ చేయబడతాయి.
@@ -3363,7 +3362,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),మొత్తం (ఆంట్)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,వినోదం &amp; లీజర్
 DocType: Quality Inspection,Item Serial No,అంశం సీరియల్ లేవు
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ఉద్యోగి రికార్డ్స్ సృష్టించండి
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ఉద్యోగి రికార్డ్స్ సృష్టించండి
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,మొత్తం ప్రెజెంట్
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,అకౌంటింగ్ ప్రకటనలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,అవర్
@@ -3378,8 +3377,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,భర్తీ తర్వాత కొత్త BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,అమ్మకానికి పాయింట్
 DocType: Payment Entry,Received Amount,అందుకున్న మొత్తం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ఆర్డర్ మీద ఇప్పటికే పరిమాణం విస్మరించి, పూర్తి పరిమాణం సృష్టించండి"
 DocType: Account,Tax,పన్ను
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,గుర్తించబడిన
@@ -3392,7 +3389,7 @@
 DocType: Batch,Source Document Name,మూల డాక్యుమెంట్ పేరు
 DocType: Batch,Source Document Name,మూల డాక్యుమెంట్ పేరు
 DocType: Job Opening,Job Title,ఉద్యోగ శీర్షిక
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,యూజర్లను సృష్టించండి
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,యూజర్లను సృష్టించండి
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,గ్రామ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,నిర్వహణ కాల్ కోసం నివేదిక సందర్శించండి.
@@ -3404,8 +3401,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ఖర్చు ఖాతా అంశం తప్పనిసరి {0}
 DocType: BOM,Website Description,వెబ్సైట్ వివరణ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ఈక్విటీ నికర మార్పు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,స్వీకరణపై
 ,Sales Register,సేల్స్ నమోదు
@@ -3416,16 +3413,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,సవరించడానికి ఉంది ఏమీ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ఈ నెల పెండింగ్ కార్యకలాపాలకు సారాంశం
 DocType: Customer Group,Customer Group Name,కస్టమర్ గ్రూప్ పేరు
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ఇంకా వినియోగదారుడు లేవు!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,లావాదేవి నివేదిక
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,లైసెన్సు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,మీరు కూడా గత ఆర్థిక సంవత్సరం సంతులనం ఈ ఆర్థిక సంవత్సరం ఆకులు ఉన్నాయి అనుకుంటే కుంటున్న దయచేసి ఎంచుకోండి
 DocType: GL Entry,Against Voucher Type,ఓచర్ పద్ధతి వ్యతిరేకంగా
 DocType: Item,Attributes,గుణాలు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,ఖాతా ఆఫ్ వ్రాయండి నమోదు చేయండి
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,చివరి ఆర్డర్ తేదీ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
 DocType: Student,Guardian Details,గార్డియన్ వివరాలు
 DocType: C-Form,C-Form,సి ఫారం
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,బహుళ ఉద్యోగులకు మార్క్ హాజరు
@@ -3450,14 +3449,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',రో {0} # ఖాతా రకం ఉండాలి &#39;స్థిర ఆస్తి&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ప్యాక్ చేసిన అంశాల అవుట్
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,నిబంధనలు అమ్మకానికి షిప్పింగ్ మొత్తం లెక్కించేందుకు
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,సిరీస్ తప్పనిసరి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,సిరీస్ తప్పనిసరి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ఫైనాన్షియల్ సర్వీసెస్
 DocType: Student Sibling,Student ID,విద్యార్థి ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,సమయం చిట్టాలు చర్యలు రకాలు
 DocType: Tax Rule,Sales,సేల్స్
 DocType: Stock Entry Detail,Basic Amount,ప్రాథమిక సొమ్ము
 DocType: Training Event,Exam,పరీక్షా
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
 DocType: Leave Allocation,Unused leaves,ఉపయోగించని ఆకులు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,బిల్లింగ్ రాష్ట్రం
@@ -3490,7 +3489,7 @@
 DocType: Payment Entry,Account Paid From,ఖాతా నుండి చెల్లింపు
 DocType: Purchase Order Item Supplied,Raw Material Item Code,రా మెటీరియల్ Item కోడ్
 DocType: Journal Entry,Write Off Based On,బేస్డ్ న ఆఫ్ వ్రాయండి
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,లీడ్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,లీడ్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,ముద్రణ మరియు స్టేషనరీ
 DocType: Stock Settings,Show Barcode Field,షో బార్కోడ్ ఫీల్డ్
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
@@ -3506,6 +3505,7 @@
 DocType: Offer Letter,Awaiting Response,రెస్పాన్స్ వేచిఉండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,పైన
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
+DocType: Supplier,Mention if non-standard payable account,చెప్పలేదు ప్రామాణికం కాని చెల్లించవలసిన ఖాతా ఉంటే
 DocType: Salary Slip,Earning & Deduction,ఎర్నింగ్ &amp; తీసివేత
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ఐచ్ఛికము. ఈ సెట్టింగ్ వివిధ లావాదేవీలలో ఫిల్టర్ ఉపయోగించబడుతుంది.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
@@ -3542,7 +3542,7 @@
 DocType: Program Enrollment Tool,Get Students From,నుండి స్టూడెంట్స్ పొందండి
 DocType: Hub Settings,Seller Country,అమ్మకాల దేశం
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,వెబ్ సైట్ లో అంశాలను ప్రచురించు
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,వంతులవారీగా మీ విద్యార్థులు గ్రూప్
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,వంతులవారీగా మీ విద్యార్థులు గ్రూప్
 DocType: Authorization Rule,Authorization Rule,అధికార రూల్
 DocType: Sales Invoice,Terms and Conditions Details,నియమాలు మరియు నిబంధనలు వివరాలు
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,లక్షణాలు
@@ -3602,7 +3602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,పరిశీలన
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,జీతం భాగాలు
 DocType: Program Enrollment Tool,New Academic Year,కొత్త విద్యా సంవత్సరం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,రిటర్న్ / క్రెడిట్ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,రిటర్న్ / క్రెడిట్ గమనిక
 DocType: Stock Settings,Auto insert Price List rate if missing,ఆటో చొప్పించు ధర జాబితా రేటు లేదు ఉంటే
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,మొత్తం చెల్లించిన మొత్తాన్ని
 DocType: Production Order Item,Transferred Qty,బదిలీ ప్యాక్ చేసిన అంశాల
@@ -3643,6 +3643,7 @@
 ,Sales Funnel,అమ్మకాల గరాటు
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,సంక్షిప్త తప్పనిసరి
 DocType: Project,Task Progress,టాస్క్ ప్రోగ్రెస్
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,కార్ట్
 ,Qty to Transfer,బదిలీ చేసిన అంశాల
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,లీడ్స్ లేదా వినియోగదారుడు కోట్స్.
 DocType: Stock Settings,Role Allowed to edit frozen stock,పాత్ర ఘనీభవించిన స్టాక్ సవరించడానికి అనుమతించబడినవి
@@ -3676,7 +3677,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ఫీజు సేకరించండి
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
 DocType: Lead,Add to calendar on this date,ఈ తేదీ క్యాలెండర్ జోడించండి
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,షిప్పింగ్ ఖర్చులు జోడించడం కోసం రూల్స్.
 DocType: Item,Opening Stock,తెరవడం స్టాక్
@@ -3694,7 +3695,7 @@
 DocType: Customer,From Lead,లీడ్ నుండి
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ఆర్డర్స్ ఉత్పత్తి కోసం విడుదల చేసింది.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ఫిస్కల్ ఇయర్ ఎంచుకోండి ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
 DocType: Program Enrollment Tool,Enroll Students,విద్యార్ధులను నమోదు
 DocType: Hub Settings,Name Token,పేరు టోకెన్
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ప్రామాణిక సెల్లింగ్
@@ -3705,7 +3706,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} సేల్స్ వాయిస్ వ్యతిరేకంగా {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ప్రాజెక్ట్ పేరు
-DocType: Supplier,Mention if non-standard receivable account,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా ఉంటే
+DocType: Customer,Mention if non-standard receivable account,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా ఉంటే
 DocType: Journal Entry Account,If Income or Expense,ఆదాయం వ్యయం ఉంటే
 DocType: Production Order,Required Items,అవసరమైన అంశాలు
 DocType: Stock Ledger Entry,Stock Value Difference,స్టాక్ విలువ తేడా
@@ -3736,6 +3737,7 @@
 DocType: Item,Taxes,పన్నులు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,చెల్లింపు మరియు పంపిణీ
 DocType: Project,Default Cost Center,డిఫాల్ట్ ఖర్చు సెంటర్
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ దయచేసి
 DocType: Bank Guarantee,End Date,ముగింపు తేదీ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,స్టాక్ లావాదేవీలు
 DocType: Budget,Budget Accounts,బడ్జెట్ అకౌంట్స్
@@ -3800,7 +3802,7 @@
 DocType: Customer,Sales Partner and Commission,సేల్స్ భాగస్వామిలో మరియు కమిషన్
 DocType: Employee Loan,Rate of Interest (%) / Year,ఆసక్తి రేటు (%) / ఆఫ్ ది ఇయర్
 ,Project Quantity,ప్రాజెక్టు పరిమాణం
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","మొత్తం {0} అన్ని అంశాలను, సున్నా మీరు &#39;ఆధారంగా ఛార్జీలు పంపిణీ&#39; మార్చాలి ఉండవచ్చు"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","మొత్తం {0} అన్ని అంశాలను, సున్నా మీరు &#39;ఆధారంగా ఛార్జీలు పంపిణీ&#39; మార్చాలి ఉండవచ్చు"
 DocType: Opportunity,To Discuss,చర్చించడానికి
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} యొక్క యూనిట్లలో {1} {2} ఈ లావాదేవీని పూర్తి చేయడానికి అవసరమవుతారు.
 DocType: Loan Type,Rate of Interest (%) Yearly,ఆసక్తి రేటు (%) సుడి
@@ -3823,7 +3825,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,మార్క్ కరువవడంతో
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},రో {0}: పాఠశాల బిఒఎం # కరెన్సీ {1} ఎంపిక కరెన్సీ సమానంగా ఉండాలి {2}
 DocType: Journal Entry Account,Exchange Rate,ఎక్స్చేంజ్ రేట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
 DocType: Homepage,Tag Line,ట్యాగ్ లైన్
 DocType: Fee Component,Fee Component,ఫీజు భాగం
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
@@ -3840,7 +3842,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,వేర్హౌస్ {0} ఉనికిలో లేదు
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext హబ్ నమోదు
 DocType: Monthly Distribution,Monthly Distribution Percentages,మంత్లీ పంపిణీ శాతములు
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","వాల్యువేషన్ రేటు అంశం {0} కోసం అకౌంటింగ్ ఎంట్రీలు చేయాల్సి ఉంది ఇది కోసం దొరకలేదు {1} {2}. అంశం లో ఒక నమూనా అంశం వంటి లావాదేవీ ఉంటే {1}, {1} అంశం పట్టికలో పేర్కొన్నాయి దయచేసి. లేకపోతే, అంశం రికార్డు అంశం లేదా ప్రస్తావన మదింపు రేటు ఇన్కమింగ్ స్టాక్ లావాదేవీ సృష్టించండి, తరువాత submiting ప్రయత్నించండి / ఈ ఎంట్రీ రద్దు దయచేసి"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,పదార్థాల% ఈ డెలివరీ గమనిక వ్యతిరేకంగా పంపిణీ
 DocType: Project,Customer Details,కస్టమర్ వివరాలు
@@ -3857,7 +3859,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,సమర్పించిన ఆర్డర్లను తొలగించలేరని
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ఇప్పటికే డెబిట్ ఖాతా సంతులనం, మీరు &#39;క్రెడిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,క్వాలిటీ మేనేజ్మెంట్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,అంశం {0} ఆపివేయబడింది
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,అంశం {0} ఆపివేయబడింది
 DocType: Employee Loan,Repay Fixed Amount per Period,ఒక్కో వ్యవధి స్థిర మొత్తం చెల్లింపులో
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},అంశం పరిమాణం నమోదు చేయండి {0}
 DocType: Employee External Work History,Employee External Work History,Employee బాహ్య వర్క్ చరిత్ర
@@ -3884,7 +3886,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,స్టూడెంట్ అడ్రెస్
 DocType: Employee,Notice (days),నోటీసు (రోజులు)
 DocType: Tax Rule,Sales Tax Template,సేల్స్ టాక్స్ మూస
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
 DocType: Employee,Encashment Date,ఎన్క్యాష్మెంట్ తేదీ
 DocType: Training Event,Internet,ఇంటర్నెట్
 DocType: Account,Stock Adjustment,స్టాక్ అడ్జస్ట్మెంట్
@@ -3918,6 +3920,7 @@
 DocType: Purchase Invoice,Debit Note Issued,డెబిట్ గమనిక జారీచేయబడింది
 DocType: Production Order,Warehouses,గిడ్డంగులు
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ఆస్తి బదిలీ సాధ్యం కాదు
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ఈ అంశం {0} (మూస) యొక్క రూపాంతరం.
 DocType: Workstation,per hour,గంటకు
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,కొనుగోలు
 DocType: Announcement,Announcement,ప్రకటన
@@ -3933,7 +3936,7 @@
 DocType: Account,Receivable,స్వీకరించదగిన
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,రో # {0}: కొనుగోలు ఆర్డర్ ఇప్పటికే ఉనికిలో సరఫరాదారు మార్చడానికి అనుమతి లేదు
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,సెట్ క్రెడిట్ పరిధులకు మించిన లావాదేవీలు submit అనుమతి పాత్ర.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
 DocType: Item,Material Issue,మెటీరియల్ ఇష్యూ
 DocType: Hub Settings,Seller Description,అమ్మకాల వివరణ
@@ -3946,7 +3949,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,క్రమ
 DocType: Salary Detail,Component,కాంపోనెంట్
 DocType: Assessment Criteria,Assessment Criteria Group,అంచనా ప్రమాణం గ్రూప్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},పోగుచేసిన తరుగుదల తెరవడం సమానంగా కంటే తక్కువ ఉండాలి {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},పోగుచేసిన తరుగుదల తెరవడం సమానంగా కంటే తక్కువ ఉండాలి {0}
 DocType: Warehouse,Warehouse Name,వేర్హౌస్ పేరు
 DocType: Naming Series,Select Transaction,Select లావాదేవీ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,రోల్ ఆమోదిస్తోంది లేదా వాడుకరి ఆమోదిస్తోంది నమోదు చేయండి
@@ -3981,7 +3984,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",డిఫాల్ట్ గా ఈ ఆర్థిక సంవత్సరం సెట్ &#39;డిఫాల్ట్ గా సెట్&#39; పై క్లిక్
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,చేరండి
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
 DocType: Employee Loan,Repay from Salary,జీతం నుండి తిరిగి
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},వ్యతిరేకంగా చెల్లింపు అభ్యర్థించడం {0} {1} మొత్తం {2}
@@ -3999,7 +4002,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,అసెస్మెంట్ ఫలితం వివరాలు
 DocType: Employee Education,Employee Education,Employee ఎడ్యుకేషన్
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,అంశం సమూహం పట్టిక కనిపించే నకిలీ అంశం సమూహం
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
 DocType: Salary Slip,Net Pay,నికర పే
 DocType: Account,Account,ఖాతా
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,సీరియల్ లేవు {0} ఇప్పటికే అందింది
@@ -4008,7 +4011,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","వేర్హౌస్ {0} ఏదైనా ఖాతాకు అనుసంధానం లేదు, సృష్టించండి / గిడ్డంగి కోసం లింకున్న సంబంధిత (అసెట్) ఖాతా."
 DocType: Purchase Invoice,Recurring Id,పునరావృత Id
 DocType: Customer,Sales Team Details,సేల్స్ టీం వివరాలు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,శాశ్వతంగా తొలగించాలా?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,శాశ్వతంగా తొలగించాలా?
 DocType: Expense Claim,Total Claimed Amount,మొత్తం క్లెయిమ్ చేసిన మొత్తం
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,అమ్మకం కోసం సమర్థవంతమైన అవకాశాలు.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},చెల్లని {0}
@@ -4019,13 +4022,14 @@
 DocType: Warehouse,PIN,పిన్
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,లో ERPNext మీ స్కూల్ సెటప్
 DocType: Sales Invoice,Base Change Amount (Company Currency),బేస్ మార్చు మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,మొదటి డాక్యుమెంట్ సేవ్.
 DocType: Account,Chargeable,విధింపదగిన
 DocType: Company,Change Abbreviation,మార్పు సంక్షిప్తీకరణ
 DocType: Expense Claim Detail,Expense Date,ఖర్చుల తేదీ
 DocType: Item,Max Discount (%),మాక్స్ డిస్కౌంట్ (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,చివరి ఆర్డర్ పరిమాణం
+DocType: Task,Is Milestone,మైల్స్టోన్ ఉంది
 DocType: Daily Work Summary,Email Sent To,ఇమెయిల్ పంపబడింది
 DocType: Budget,Warn,హెచ్చరించు
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ఏ ఇతర స్టర్ రికార్డులలో వెళ్ళాలి అని చెప్పుకోదగిన ప్రయత్నం.
@@ -4058,11 +4062,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ఫ్రీజ్ స్టాక్స్ పాత Than`% d రోజుల కంటే తక్కువగా ఉండాలి.
 DocType: Tax Rule,Purchase Tax Template,పన్ను మూస కొనుగోలు
 ,Project wise Stock Tracking,ప్రాజెక్టు వారీగా స్టాక్ ట్రాకింగ్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},నిర్వహణ షెడ్యూల్ {0} వ్యతిరేకంగా ఉంది {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(మూలం / లక్ష్యం వద్ద) వాస్తవ ప్యాక్ చేసిన అంశాల
 DocType: Item Customer Detail,Ref Code,Ref కోడ్
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Employee రికార్డులు.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
 DocType: HR Settings,Payroll Settings,పేరోల్ సెట్టింగ్స్
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,కాని లింక్డ్ రసీదులు మరియు చెల్లింపులు ఫలితం.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ప్లేస్ ఆర్డర్
@@ -4085,7 +4088,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,చెక్కుల మరియు డిపాజిట్లు తప్పుగా క్లియర్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ఖాతా {0}: మీరు పేరెంట్ ఖాతా గా కేటాయించలేరు
 DocType: Purchase Invoice Item,Price List Rate,ధర జాబితా రేటు
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,కస్టమర్ కోట్స్ సృష్టించు
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,కస్టమర్ కోట్స్ సృష్టించు
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;స్టాక్ లో&quot; లేదా ఈ గిడ్డంగిలో అందుబాటులో స్టాక్ ఆధారంగా &quot;నాట్ స్టాక్ లో&quot; షో.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),వస్తువుల యొక్క జామా ఖర్చు (BOM)
 DocType: Item,Average time taken by the supplier to deliver,సరఫరాదారు తీసుకున్న సగటు సమయం బట్వాడా
@@ -4107,7 +4110,7 @@
 DocType: Asset,Disposal Date,తొలగింపు తేదీ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ఇమెయిళ్ళు వారు సెలవు లేకపోతే, ఇచ్చిన గంట వద్ద కంపెనీ అన్ని యాక్టివ్ ఉద్యోగులు పంపబడును. ప్రతిస్పందనల సారాంశం అర్ధరాత్రి పంపబడుతుంది."
 DocType: Employee Leave Approver,Employee Leave Approver,ఉద్యోగి సెలవు అప్రూవర్గా
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,శిక్షణ అభిప్రాయం
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ఆర్డర్ {0} సమర్పించాలి ఉత్పత్తి
@@ -4115,7 +4118,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},కోర్సు వరుసగా తప్పనిసరి {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,తేదీ తేదీ నుండి ముందు ఉండరాదు
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
 DocType: Batch,Parent Batch,మాతృ బ్యాచ్
 DocType: Batch,Parent Batch,మాతృ బ్యాచ్
 DocType: Cheque Print Template,Cheque Print Template,ప్రిపే ప్రింట్ మూస
@@ -4160,7 +4163,7 @@
 DocType: Item,Variant Based On,వేరియంట్ బేస్డ్ న
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% ఉండాలి కేటాయించిన మొత్తం వెయిటేజీ. ఇది {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,మీ సరఫరాదారులు
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
 DocType: Request for Quotation Item,Supplier Part No,సరఫరాదారు పార్ట్ లేవు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',వర్గం &#39;మదింపు&#39; లేదా &#39;Vaulation మరియు మొత్తం&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,నుండి అందుకున్న
@@ -4170,7 +4173,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: నుండి {0} కోసం {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},రో # {0}: అంశాన్ని సెట్ సరఫరాదారు {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,రో {0}: గంటలు విలువ సున్నా కంటే ఎక్కువ ఉండాలి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
 DocType: Issue,Content Type,కంటెంట్ రకం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,కంప్యూటర్
 DocType: Item,List this Item in multiple groups on the website.,వెబ్ సైట్ బహుళ సమూహాలు ఈ అంశం జాబితా.
@@ -4179,20 +4182,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,మీరు స్తంభింపచేసిన విలువ సెట్ అధికారం లేదు
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ఎంట్రీలు పొందండి
 DocType: Payment Reconciliation,From Invoice Date,వాయిస్ తేదీ నుండి
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ comapany యొక్క గాని కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీ సమానంగా ఉండాలి
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ comapany యొక్క గాని కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీ సమానంగా ఉండాలి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ఎన్క్యాష్మెంట్ వదిలి
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ఇది ఏమి చేస్తుంది?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,గిడ్డంగి
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,అన్ని విద్యార్థి అడ్మిషన్స్
 ,Average Commission Rate,సగటు కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,హాజరు భవిష్యత్తులో తేదీలు కోసం గుర్తించబడవు
 DocType: Pricing Rule,Pricing Rule Help,ధర రూల్ సహాయం
 DocType: School House,House Name,హౌస్ పేరు
 DocType: Purchase Taxes and Charges,Account Head,ఖాతా హెడ్
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,అంశాల దిగిన ఖర్చు లెక్కించేందుకు అదనపు ఖర్చులు అప్డేట్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ఎలక్ట్రికల్
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,మీ వినియోగదారులు మీ సంస్థ యొక్క మిగిలిన జోడించండి. మీరు కూడా కాంటాక్ట్స్ నుండి వారిని జోడించడం ద్వారా మీ పోర్టల్ వినియోగదారుడు ఆహ్వానించండి జోడించవచ్చు
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,మీ వినియోగదారులు మీ సంస్థ యొక్క మిగిలిన జోడించండి. మీరు కూడా కాంటాక్ట్స్ నుండి వారిని జోడించడం ద్వారా మీ పోర్టల్ వినియోగదారుడు ఆహ్వానించండి జోడించవచ్చు
 DocType: Stock Entry,Total Value Difference (Out - In),మొత్తం విలువ తేడా (అవుట్ - ఇన్)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,రో {0}: ఎక్స్చేంజ్ రేట్ తప్పనిసరి
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},వాడుకరి ID ఉద్యోగి సెట్ {0}
@@ -4201,7 +4204,7 @@
 DocType: Item,Customer Code,కస్టమర్ కోడ్
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,చివరి ఆర్డర్ నుండి రోజుల్లో
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 DocType: Buying Settings,Naming Series,నామకరణ సిరీస్
 DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,భీమా తేదీ ప్రారంభించండి భీమా ముగింపు తేదీ కంటే తక్కువ ఉండాలి
@@ -4216,7 +4219,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
 DocType: Vehicle Log,Odometer,ఓడోమీటార్
 DocType: Sales Order Item,Ordered Qty,క్రమ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},నుండి మరియు కాలం పునరావృత తప్పనిసరి తేదీలు కాలం {0}
@@ -4229,7 +4232,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),మొత్తం ఆఫ్ వ్రాయండి (కంపెనీ కరెన్సీ)
 DocType: Sales Invoice Timesheet,Billing Hours,బిల్లింగ్ గంటలు
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,కోసం {0} దొరకలేదు డిఫాల్ట్ బిఒఎం
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,వాటిని ఇక్కడ జోడించడానికి అంశాలను నొక్కండి
 DocType: Fees,Program Enrollment,ప్రోగ్రామ్ నమోదు
 DocType: Landed Cost Voucher,Landed Cost Voucher,అడుగుపెట్టాయి ఖర్చు ఓచర్
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},సెట్ దయచేసి {0}
@@ -4330,7 +4334,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,రిటైల్ &amp; టోకు
 DocType: Issue,First Responded On,మొదటి న స్పందించారు
 DocType: Website Item Group,Cross Listing of Item in multiple groups,బహుళ సమూహాలు అంశం యొక్క క్రాస్ జాబితా
-DocType: Grade Interval,Grade Interval,గ్రేడ్ ఇంటర్వెల్
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ మరియు ఫిస్కల్ ఇయర్ ఎండ్ తేదీ ఇప్పటికే ఫిస్కల్ ఇయర్ నిర్మితమయ్యాయి {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,క్లియరెన్స్ తేదీ నవీకరించబడింది
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,స్ప్లిట్ బ్యాచ్
@@ -4339,6 +4342,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF డౌన్లోడ్
 DocType: Production Order,Planned End Date,ప్రణాళిక ముగింపు తేదీ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,అంశాలను ఎక్కడ నిల్వ చేయబడతాయి.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
 DocType: Request for Quotation,Supplier Detail,సరఫరాదారు వివరాలు
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో లోపం: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,ఇన్వాయిస్ మొత్తం
@@ -4384,7 +4388,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,సెటప్ నా సంస్థ కోసం ఒక సాధారణ వెబ్సైట్
 DocType: Payment Reconciliation,Receivable / Payable Account,స్వీకరించదగిన / చెల్లించవలసిన ఖాతా
 DocType: Delivery Note Item,Against Sales Order Item,అమ్మకాల ఆర్డర్ అంశం వ్యతిరేకంగా
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
 DocType: Item,Default Warehouse,డిఫాల్ట్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},బడ్జెట్ గ్రూప్ ఖాతా వ్యతిరేకంగా కేటాయించిన సాధ్యం కాదు {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,మాతృ ఖర్చు సెంటర్ నమోదు చేయండి
@@ -4443,7 +4447,7 @@
 ,Items To Be Requested,అంశాలు అభ్యర్థించిన టు
 DocType: Purchase Order,Get Last Purchase Rate,గత కొనుగోలు రేటు పొందండి
 DocType: Company,Company Info,కంపెనీ సమాచారం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,వ్యయ కేంద్రం ఒక వ్యయం దావా బుక్ అవసరం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ఫండ్స్ (ఆస్తులు) యొక్క అప్లికేషన్
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ఈ ఈ ఉద్యోగి హాజరు ఆధారంగా
@@ -4456,13 +4460,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,కింది రోజులలో లీవ్ అప్లికేషన్స్ తయారీ నుండి వినియోగదారులు ఆపు.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,కొనుగోలు మొత్తాన్ని
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,సరఫరాదారు కొటేషన్ {0} రూపొందించారు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ఉద్యోగుల లాభాల
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},ప్యాక్ పరిమాణం వరుసగా అంశం {0} పరిమాణం సమానంగా ఉండాలి {1}
 DocType: Production Order,Manufactured Qty,తయారు ప్యాక్ చేసిన అంశాల
 DocType: Purchase Receipt Item,Accepted Quantity,అంగీకరించిన పరిమాణం
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} చేస్తుంది ఉందో
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} చేస్తుంది ఉందో
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,వినియోగదారుడు ఎదిగింది బిల్లులు.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ప్రాజెక్ట్ ఐడి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},రో లేవు {0}: మొత్తం ఖర్చు చెప్పడం {1} వ్యతిరేకంగా మొత్తం పెండింగ్ కంటే ఎక్కువ ఉండకూడదు. పెండింగ్ మొత్తంలో {2}
@@ -4471,15 +4475,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 పఠనం
 ,Hub,హబ్
 DocType: GL Entry,Voucher Type,ఓచర్ టైప్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
 DocType: Employee Loan Application,Approved,ఆమోదించబడింది
 DocType: Pricing Rule,Price,ధర
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} ఏర్పాటు చేయాలి మీద ఉపశమనం ఉద్యోగి &#39;Left&#39; గా
 DocType: Guardian,Guardian,సంరక్షకుడు
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,అప్రైసల్ {0} {1} ఇవ్వబడిన తేదీ పరిధిలో ఉద్యోగి కోసం సృష్టించబడింది
 DocType: Employee,Education,ఎడ్యుకేషన్
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,ద్వారా ప్రచారం నేమింగ్
 DocType: Employee,Current Address Is,ప్రస్తుత చిరునామా
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,చివరి మార్పు
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ఐచ్ఛికము. పేర్కొనబడలేదు ఉంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ అమర్చుతుంది."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,అకౌంటింగ్ జర్నల్ ఎంట్రీలు.
 DocType: Delivery Note Item,Available Qty at From Warehouse,గిడ్డంగి నుండి వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
@@ -4516,7 +4522,7 @@
 DocType: Hub Settings,Hub Settings,హబ్ సెట్టింగ్స్
 DocType: Project,Gross Margin %,స్థూల సరిహద్దు %
 DocType: BOM,With Operations,ఆపరేషన్స్ తో
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,అకౌంటింగ్ ఎంట్రీలు ఇప్పటికే కరెన్సీ చేసారు {0} సంస్థ కోసం {1}. కరెన్సీతో గానీ స్వీకరించదగిన లేదా చెల్లించవలసిన ఖాతాను ఎంచుకోండి {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,అకౌంటింగ్ ఎంట్రీలు ఇప్పటికే కరెన్సీ చేసారు {0} సంస్థ కోసం {1}. కరెన్సీతో గానీ స్వీకరించదగిన లేదా చెల్లించవలసిన ఖాతాను ఎంచుకోండి {0}.
 DocType: Asset,Is Existing Asset,ఆస్తి ఉన్న ఈజ్
 DocType: Salary Detail,Statistical Component,స్టాటిస్టికల్ భాగం
 DocType: Salary Detail,Statistical Component,స్టాటిస్టికల్ భాగం
@@ -4571,7 +4577,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,లోగో అటాచ్
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,స్టాక్ స్థాయిలు
 DocType: Customer,Commission Rate,కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,వేరియంట్ చేయండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,వేరియంట్ చేయండి
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,శాఖ బ్లాక్ సెలవు అప్లికేషన్లు.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","చెల్లింపు పద్ధతి, స్వీకరించండి ఒకటి ఉండాలి చెల్లించండి మరియు అంతర్గత బదిలీ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,విశ్లేషణలు
@@ -4584,6 +4590,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,సెలవులు నిర్మాణం అనుమతించు
 DocType: Sales Order,Customer's Purchase Order Date,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ తేదీ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,మూలధన నిల్వలను
+DocType: Shopping Cart Settings,Show Public Attachments,పబ్లిక్ అటాచ్మెంట్లు చూపించు
 DocType: Packing Slip,Package Weight Details,ప్యాకేజీ బరువు వివరాలు
 DocType: Payment Gateway Account,Payment Gateway Account,చెల్లింపు గేట్వే ఖాతా
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,చెల్లింపు పూర్తయిన తర్వాత ఎంపిక పేజీకి వినియోగదారు మళ్ళింపు.
@@ -4608,7 +4615,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,కరెన్సీ etc $ వంటి ఏ చిహ్నం తదుపరి చూపవద్దు.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(హాఫ్ డే)
 DocType: Supplier,Credit Days,క్రెడిట్ డేస్
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,స్టూడెంట్ బ్యాచ్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,స్టూడెంట్ బ్యాచ్ చేయండి
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,సమయం రోజులు లీడ్
@@ -4627,7 +4634,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,మంజూరు సొమ్ము
 DocType: GL Entry,Is Opening,ప్రారంభమని
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},రో {0}: డెబిట్ ప్రవేశం తో జతచేయవచ్చు ఒక {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్ను&gt; సెటప్ ద్వారా హాజరు ధారావాహిక సంఖ్యలో నంబరింగ్ సిరీస్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,ఖాతా {0} ఉనికిలో లేదు
 DocType: Account,Cash,క్యాష్
 DocType: Employee,Short biography for website and other publications.,వెబ్సైట్ మరియు ఇతర ప్రచురణలకు క్లుప్త జీవితచరిత్ర.
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 10b4662..caa45b5 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Batch รายการสถานะหมดอายุ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ตั๋วแลกเงิน
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,แสดงหลากหลายรูปแบบ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,แสดงหลากหลายรูปแบบ
 DocType: Academic Term,Academic Term,ระยะทางวิชาการ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,วัสดุ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,จำนวน
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,การดูแลสุขภาพ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ค่าใช้จ่ายในการให้บริการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ปีงบประมาณ {0} จะต้อง
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,การโฆษณา
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,บริษัท เดียวกันจะเข้ามามากกว่าหนึ่งครั้ง
 DocType: Employee,Married,แต่งงาน
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,รับรายการจาก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรบุคคล&gt; การตั้งค่าทรัพยากรบุคคล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},สินค้า {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ไม่มีรายการที่ระบุไว้
 DocType: Payment Reconciliation,Reconcile,คืนดี
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,บันทึกรายการทางธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ถัดไปวันที่ค่าเสื่อมราคาที่ไม่สามารถจะซื้อก่อนวันที่
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ถัดไปวันที่ค่าเสื่อมราคาที่ไม่สามารถจะซื้อก่อนวันที่
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** การกระจายรายเดือน ** จะช่วยให้คุณแจกจ่ายงบประมาณ / เป้าหมายข้ามเดือนถ้าคุณมีฤดูกาลในธุรกิจของคุณ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ไม่พบรายการ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,ไม่พบรายการ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
 DocType: Lead,Person Name,คนที่ชื่อ
 DocType: Sales Invoice Item,Sales Invoice Item,รายการใบแจ้งหนี้การขาย
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",เช่น &quot;โรงเรียนประถม&quot; หรือ &quot;มหาวิทยาลัย&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,รายงานสต็อกสินค้า
 DocType: Warehouse,Warehouse Detail,รายละเอียดคลังสินค้า
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,วันที่สิ้นสุดระยะเวลาที่ไม่สามารถจะช้ากว่าปีวันที่สิ้นสุดปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ไม่สามารถเพิกถอน ""คือสินทรัพย์ถาวร"" ได้เพราะมีบันทึกสินทรัพย์ที่อยู่กับรายการ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ไม่สามารถเพิกถอน ""คือสินทรัพย์ถาวร"" ได้เพราะมีบันทึกสินทรัพย์ที่อยู่กับรายการ"
 DocType: Vehicle Service,Brake Oil,น้ำมันเบรค
 DocType: Tax Rule,Tax Type,ประเภทภาษี
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},คุณยังไม่ได้ รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อนที่ {0}
 DocType: BOM,Item Image (if not slideshow),รูปภาพสินค้า (ถ้าไม่สไลด์โชว์)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(อัตราค่าแรง / 60) * เวลาที่ดำเนินงานจริง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,เลือก BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,เลือก BOM
 DocType: SMS Log,SMS Log,เข้าสู่ระบบ SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ค่าใช้จ่ายในการจัดส่งสินค้า
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,วันหยุดในวันที่ {0} ไม่ได้ระหว่างนับจากวันและวันที่
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,เกรด
 DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ใบสั่งผลิตสร้างไว้แล้วสำหรับรายการทั้งหมดที่มี BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,ใบสั่งผลิตสร้างไว้แล้วสำหรับรายการทั้งหมดที่มี BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,เงินเดือนประจำปี
 DocType: Daily Work Summary,Daily Work Summary,สรุปการทำงานประจำวัน
 DocType: Period Closing Voucher,Closing Fiscal Year,ปิดปีงบประมาณ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,กรุณาเลือก บริษัท ที่มีอยู่สำหรับการสร้างผังบัญชี
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ค่าใช้จ่ายใน สต็อก
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,ในทางตรงกันข้ามการเข้า
 DocType: Journal Entry Account,Credit in Company Currency,เครดิตสกุลเงินใน บริษัท
 DocType: Delivery Note,Installation Status,สถานะการติดตั้ง
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",คุณต้องการที่จะปรับปรุงการเข้าร่วม? <br> ปัจจุบัน: {0} \ <br> ขาด: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},จำนวนสินค้าที่ผ่านการตรวจรับ + จำนวนสินค้าที่ไม่ผ่านการตรวจรับ จะต้องมีปริมาณเท่ากับ  จำนวน สืนค้าที่ได้รับ สำหรับ รายการ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,วัตถุดิบสำหรับการซื้อวัสดุสิ้นเปลือง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,อย่างน้อยหนึ่งโหมดการชำระเงินเป็นสิ่งจำเป็นสำหรับใบแจ้งหนี้ จุดขาย
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,อย่างน้อยหนึ่งโหมดการชำระเงินเป็นสิ่งจำเป็นสำหรับใบแจ้งหนี้ จุดขาย
 DocType: Products Settings,Show Products as a List,แสดงผลิตภัณฑ์ที่เป็นรายการ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ดาวน์โหลดแม่แบบกรอกข้อมูลที่เหมาะสมและแนบไฟล์ที่ถูกแก้ไข
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,บันทึกรายการค่าเสื่อมราคา
 DocType: Appraisal Template Goal,KRA,กระ
 DocType: Lead,Request Type,ชนิดของการร้องขอ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,สร้างพนักงาน
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,สร้างพนักงาน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,การปฏิบัติ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,รายละเอียดของการดำเนินการดำเนินการ
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,แผนสำหรับการเข้าชมการบำรุงรักษา
 DocType: SMS Settings,Enter url parameter for message,ป้อนพารามิเตอร์ URL สำหรับข้อความ
 DocType: POS Profile,Customer Groups,กลุ่มลูกค้า
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,งบการเงิน
 DocType: Guardian,Students,นักเรียน
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,กฎระเบียบ สำหรับการใช้ การกำหนดราคาและ ส่วนลด
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,รายการราคา จะต้องใช้ได้กับ การซื้อ หรือการขาย
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
 DocType: Naming Series,Series List for this Transaction,รายชื่อชุดสำหรับการทำธุรกรรมนี้
 DocType: Company,Default Payroll Payable Account,เริ่มต้นเงินเดือนบัญชีเจ้าหนี้
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,อีเมลกลุ่มปรับปรุง
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,อีเมลกลุ่มปรับปรุง
 DocType: Sales Invoice,Is Opening Entry,จะเปิดรายการ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ถ้าพูดถึงไม่ได้มาตรฐานลูกหนี้บังคับ
 DocType: Course Schedule,Instructor Name,ชื่ออาจารย์ผู้สอน
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,กับใบแจ้งหนี้การขายสินค้า
 ,Production Orders in Progress,สั่งซื้อ การผลิตใน ความคืบหน้า
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,เงินสดสุทธิจากการจัดหาเงินทุน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
 DocType: Lead,Address & Contact,ที่อยู่และการติดต่อ
 DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),รวมคำนวณต้นทุนจำนวนเงิน (ผ่านใบบันทึกเวลา)
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,รายการธนาคาร
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 DocType: Student Admission,Student Admission,การรับสมัครนักศึกษา
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,หมายเหตุจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,หมายเหตุจัดส่งสินค้า
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ต้นทุนของทรัพย์สินที่ขาย
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
-DocType: Grade Interval,Min Score,คะแนนต่ำสุด
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
 DocType: Student Applicant,Admitted,ที่ยอมรับ
 DocType: Workstation,Rent Cost,ต้นทุนการ ให้เช่า
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,มูลค่าคำสั่งซื้อ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,การทำธุรกรรมธนาคาร / เงินสดกับบุคคลหรือสำหรับการถ่ายโอนภายใน
 DocType: Shipping Rule,Valid for Countries,ที่ถูกต้องสำหรับประเทศ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ยอดสั่งซื้อรวมถือว่า
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,กรุณากรอก ' ทำซ้ำ ในวัน เดือน ' ค่าของฟิลด์
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,อัตราภาษี
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} จัดสรรสำหรับพนักงาน {1} แล้วสำหรับรอบระยะเวลา {2} ถึง {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,เลือกรายการ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,แปลงที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,แบทช์ (มาก) ของรายการ
 DocType: C-Form Invoice Detail,Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: GL Entry,Debit Amount,จำนวนเงินเดบิต
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,สร้างกลุ่มนักศึกษา
@@ -440,9 +443,9 @@
 DocType: Request for Quotation,Request for Quotation,ขอใบเสนอราคา
 DocType: Salary Slip Timesheet,Working Hours,เวลาทำการ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,เปลี่ยนหมายเลขลำดับเริ่มต้น / ปัจจุบันของชุดที่มีอยู่
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,สร้างลูกค้าใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,สร้างลูกค้าใหม่
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ถ้ากฎการกำหนดราคาหลายยังคงเหนือกว่าผู้ใช้จะขอให้ตั้งลำดับความสำคัญด้วยตนเองเพื่อแก้ไขความขัดแย้ง
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,สร้างใบสั่งซื้อ
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,สร้างใบสั่งซื้อ
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ค่าใช้จ่าย
@@ -486,7 +489,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,การตั้งค่าโดยรวม สำหรับกระบวนการผลิตทั้งหมด
 DocType: Accounts Settings,Accounts Frozen Upto,บัญชีถูกแช่แข็งจนถึง
 DocType: SMS Log,Sent On,ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,นาย ฮอลิเดย์
@@ -508,6 +511,7 @@
 DocType: Packing Slip,From Package No.,จากเลขที่แพคเกจ
 DocType: Item Attribute,To Range,ช่วง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,หลักทรัพย์และ เงินฝาก
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ไม่สามารถเปลี่ยนแปลงวิธีการประเมินเนื่องจากมีธุรกรรมบางอย่างที่ไม่ได้เป็นวิธีการประเมินของตนเอง
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ใบรวมจัดสรรมีผลบังคับใช้
 DocType: Job Opening,Description of a Job Opening,คำอธิบายของการเปิดงาน
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ที่รอดำเนินการกิจกรรมสำหรับวันนี้
@@ -535,7 +539,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
 DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,เครื่องสำอาง
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ซื้อ
@@ -545,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,โปรดกำหนดระดับสำหรับเกณฑ์ 0%
 DocType: Sales Order,To Deliver,ที่จะส่งมอบ
 DocType: Purchase Invoice Item,Item,สินค้า
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
 DocType: Journal Entry,Difference (Dr - Cr),แตกต่าง ( ดร. - Cr )
 DocType: Account,Profit and Loss,กำไรและ ขาดทุน
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,รับเหมาช่วงการจัดการ
@@ -571,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 DocType: Production Plan Item,Pending Qty,รอดำเนินการจำนวน
 DocType: Budget,Ignore,ไม่สนใจ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ไม่ได้ใช้งาน
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ไม่ได้ใช้งาน
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS ที่ส่งไปยังหมายเลขดังต่อไปนี้: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ขนาดการตั้งค่าการตรวจสอบสำหรับการพิมพ์
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet สลิปเงินเดือน
@@ -580,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,คณะกรรมการรวม
 DocType: Pricing Rule,Sales Partner,พันธมิตรการขาย
 DocType: Buying Settings,Purchase Receipt Required,รับซื้อที่จำเป็น
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,อัตราการประเมินมีผลบังคับใช้หากเปิดการแจ้งเข้ามา
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,อัตราการประเมินมีผลบังคับใช้หากเปิดการแจ้งเข้ามา
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ค่าสะสม
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,สร้างการขายสินค้า
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,สร้างการขายสินค้า
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
@@ -603,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Resume สิ่งที่แนบมา
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ทำซ้ำลูกค้า
 DocType: Leave Control Panel,Allocate,จัดสรร
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,ขายกลับ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,ขายกลับ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,หมายเหตุ: ใบที่จัดสรรทั้งหมด {0} ไม่ควรจะน้อยกว่าใบอนุมัติแล้ว {1} สําหรับงวด
 DocType: Announcement,Posted By,โพสโดย
 DocType: Item,Delivered by Supplier (Drop Ship),จัดส่งโดยผู้ผลิต (Drop Ship)
@@ -613,7 +617,7 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,โปรดตั้ง บริษัท
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,โปรดตั้ง บริษัท
@@ -625,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ขายใบแจ้งหนี้ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,เลือกบัญชีการชำระเงินเพื่อเข้าธนาคาร
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",สร้างระเบียนของพนักงานในการจัดการใบเรียกร้องค่าใช้จ่ายและเงินเดือน
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",สร้างระเบียนของพนักงานในการจัดการใบเรียกร้องค่าใช้จ่ายและเงินเดือน
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,เพิ่มในฐานความรู้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,การเขียน ข้อเสนอ
 DocType: Payment Entry Deduction,Payment Entry Deduction,หักรายการชำระเงิน
@@ -667,8 +671,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ความสัมพันธ์กับ Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ผู้จัดการ
 DocType: Payment Entry,Payment From / To,การชำระเงินจาก / ถึง
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ช่วงวันที่
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},วงเงินสินเชื่อใหม่น้อยกว่าจำนวนเงินที่ค้างในปัจจุบันสำหรับลูกค้า วงเงินสินเชื่อจะต้องมีอย่างน้อย {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},วงเงินสินเชื่อใหม่น้อยกว่าจำนวนเงินที่ค้างในปัจจุบันสำหรับลูกค้า วงเงินสินเชื่อจะต้องมีอย่างน้อย {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
 DocType: SMS Settings,Receiver Parameter,พารามิเตอร์รับ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ขึ้นอยู่กับ' และ 'จัดกลุ่มโดย' ต้องไม่เหมือนกัน
@@ -678,7 +681,7 @@
 DocType: Issue,Resolution Date,วันที่ความละเอียด
 DocType: Student Batch Name,Batch Name,ชื่อแบทช์
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet สร้าง:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ลงทะเบียน
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,จะแสดงให้นักเรียนเป็นปัจจุบันในรายงานผลการเข้าร่วมประชุมรายเดือนนักศึกษา
@@ -722,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,นักศึกษาเข้าร่วม
 DocType: Sales Invoice Timesheet,Time Sheet,ใบบันทึกเวลา
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush วัตถุดิบที่ใช้ใน
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,กรุณากรอก รายละเอียดของรายการ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,กรุณากรอก รายละเอียดของรายการ
 DocType: Interest,Interest,ดอกเบี้ย
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ขายก่อน
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
@@ -740,7 +743,7 @@
 ,Absent Student Report,รายงานนักศึกษาขาด
 DocType: Email Digest,Next email will be sent on:,อีเมล์ถัดไปจะถูกส่งเมื่อ:
 DocType: Offer Letter Term,Offer Letter Term,เสนอระยะจดหมาย
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,บริษัท {0} ไม่อยู่
@@ -749,8 +752,6 @@
 DocType: Serial No,Warranty Expiry Date,วันหมดอายุการรับประกัน
 DocType: Material Request Item,Quantity and Warehouse,ปริมาณและคลังสินค้า
 DocType: Sales Invoice,Commission Rate (%),อัตราค่าคอมมิชชั่น (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,โปรดเลือกโปรแกรม
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,โปรดเลือกโปรแกรม
 DocType: Project,Estimated Cost,ค่าใช้จ่ายประมาณ
@@ -769,7 +770,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ไม่ได้เป็นรายการควบคุมสต้อก
 DocType: Mode of Payment Account,Default Account,บัญชีเริ่มต้น
 DocType: Payment Entry,Received Amount (Company Currency),ได้รับจำนวนเงิน ( บริษัท สกุล)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,กรุณาเลือก วันหยุด ประจำสัปดาห์
 DocType: Production Order Operation,Planned End Time,เวลาสิ้นสุดการวางแผน
 ,Sales Person Target Variance Item Group-Wise,คน ขาย เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
@@ -852,7 +853,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Request for Quotation Supplier,Send Email,ส่งอีเมล์
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ไม่ได้รับอนุญาต
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
@@ -865,8 +866,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Supplier Quotation,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
 DocType: SMS Center,All Customer Contact,ติดต่อลูกค้าทั้งหมด
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,อัพโหลดสมดุลหุ้นผ่าน CSV
 DocType: Warehouse,Tree Details,รายละเอียดต้นไม้
@@ -877,8 +878,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,จำนวนใบแจ้งหนี้ขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ศูนย์ต้นทุน {2} ไม่ได้เป็นของ บริษัท {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: บัญชี {2} ไม่สามารถเป็นกลุ่ม
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,รายการแถว {IDX}: {DOCTYPE} {} DOCNAME ไม่อยู่ในข้างต้น &#39;{} DOCTYPE&#39; ตาราง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,รายการแถว {IDX}: {DOCTYPE} {} DOCNAME ไม่อยู่ในข้างต้น &#39;{} DOCTYPE&#39; ตาราง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ไม่มีงาน
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","วันของเดือนที่ใบแจ้งหนี้อัตโนมัติจะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 DocType: Asset,Opening Accumulated Depreciation,เปิดค่าเสื่อมราคาสะสม
@@ -894,7 +895,7 @@
 DocType: Bin,Moving Average Rate,ย้ายอัตราเฉลี่ย
 DocType: Production Planning Tool,Select Items,เลือกรายการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,ตารางเรียน
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,ตารางเรียน
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
 DocType: HR Settings,Enter retirement age in years,ใส่อายุเกษียณในปีที่ผ่าน
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,คลังสินค้าเป้าหมาย
@@ -902,7 +903,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ทั้งหมด รายการ กลุ่ม
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ทั้งหมด รายการ กลุ่ม
 DocType: Process Payroll,Activity Log,บันทึกกิจกรรม
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,กำไร / ขาดทุน
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
@@ -913,7 +914,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','กำลังเปิด'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,เปิดให้ทำ
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
@@ -929,7 +930,7 @@
 DocType: Item Reorder,Re-Order Qty,Re สั่งซื้อจำนวน
 DocType: Leave Block List Date,Leave Block List Date,ฝากวันที่รายการบล็อก
 DocType: Pricing Rule,Price or Discount,ราคา หรือ ส่วนลด
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ค่าใช้จ่ายรวมในการซื้อโต๊ะใบเสร็จรับเงินรายการที่จะต้องเป็นเช่นเดียวกับภาษีและค่าใช้จ่ายรวม
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ค่าใช้จ่ายรวมในการซื้อโต๊ะใบเสร็จรับเงินรายการที่จะต้องเป็นเช่นเดียวกับภาษีและค่าใช้จ่ายรวม
 DocType: Sales Team,Incentives,แรงจูงใจ
 DocType: SMS Log,Requested Numbers,ตัวเลขการขอ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ขอรับเฉพาะวัตถุดิบ
@@ -987,8 +988,7 @@
 DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Fee Structure,Components,ส่วนประกอบ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
@@ -1040,8 +1040,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,สารเคมี
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,เริ่มต้นของบัญชีธนาคาร / เงินสดจะได้รับการปรับปรุงโดยอัตโนมัติในเงินเดือนวารสารรายการเมื่อโหมดนี้จะถูกเลือก
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ช่วงเวลาสำหรับรหัสเกรด {0} คาบเกี่ยวกับช่วงคะแนนสำหรับเกรดอื่น ๆ กรุณาตรวจสอบช่วงเวลา {0} และ {1} และลองอีกครั้ง
 DocType: BOM,Raw Material Cost(Company Currency),ต้นทุนวัตถุดิบ ( บริษัท สกุล)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},แถว # {0}: อัตราไม่สามารถสูงกว่าอัตราที่ใช้ใน {1} {2}
@@ -1054,7 +1052,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM รายการเว็บไซต์
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
 DocType: Timesheet Detail,Bill,บิล
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ขาว
 DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),แถว {0}: จำนวนไม่สามารถใช้ได้สำหรับ {4} ในคลังสินค้า {1} ที่โพสต์เวลาของรายการ ({2} {3})
@@ -1068,7 +1066,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},ประเภทการสั่งซื้อต้องเป็นหนึ่งใน {0}
 DocType: Lead,Next Contact Date,วันที่ถัดไปติดต่อ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,เปิด จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
 DocType: Student Batch Name,Student Batch Name,นักศึกษาชื่อชุด
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
 DocType: Repayment Schedule,Balance Loan Amount,ยอดคงเหลือวงเงินกู้
@@ -1088,10 +1086,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},โปรดระบุ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ส่วนลด
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ส่วนลด
 DocType: Asset,Total Number of Depreciations,จำนวนรวมของค่าเสื่อมราคา
 DocType: Sales Invoice Item,Rate With Margin,อัตรากับ Margin
 DocType: Sales Invoice Item,Rate With Margin,อัตรากับ Margin
@@ -1120,7 +1118,7 @@
 DocType: Lead,Organization Name,ชื่อองค์กร
 DocType: Tax Rule,Shipping State,การจัดส่งสินค้าของรัฐ
 ,Projected Quantity as Source,คาดการณ์ปริมาณเป็นแหล่ง
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,รวมถึงรายการที่ไม่สต็อก
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ค่าใช้จ่ายในการขาย
@@ -1128,7 +1126,7 @@
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,รหัสไปรษณีย์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,รหัสไปรษณีย์
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ทำรายการสต็อก
@@ -1172,7 +1170,7 @@
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
 ,Ordered Items To Be Billed,รายการที่สั่งซื้อจะเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,จากช่วงจะต้องมีน้อยกว่าในช่วง
 DocType: Global Defaults,Global Defaults,เริ่มต้นทั่วโลก
@@ -1207,11 +1205,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,กรุณากรอกรหัสสินค้าที่จะได้รับหมายเลข Batch
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
 DocType: Employee Loan,Partially Disbursed,การเบิกจ่ายบางส่วน
-DocType: Grading Structure,Grading System Name,ชื่อวัดผลระบบ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ฐานข้อมูลผู้ผลิต
 DocType: Account,Balance Sheet,รายงานงบดุล
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,คนขายของคุณจะรับการแจ้งเตือนในวันนี้ที่จะติดต่อลูกค้า
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,รายการเดียวกันไม่สามารถเข้ามาหลายครั้ง
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
@@ -1250,11 +1247,11 @@
 DocType: Maintenance Visit Purpose,Work Done,งานที่ทำ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,โปรดระบุอย่างน้อยหนึ่งแอตทริบิวต์ในตารางคุณสมบัติ
 DocType: Announcement,All Students,นักเรียนทุกคน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,รายการ {0} จะต้องเป็นรายการที่ไม่สต็อก
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,รายการ {0} จะต้องเป็นรายการที่ไม่สต็อก
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ดู บัญชีแยกประเภท
 DocType: Grading Scale,Intervals,ช่วงเวลา
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,หมายเลขโทรศัพท์มือถือของนักเรียน
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
@@ -1295,8 +1292,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,คำสั่งซื้อที่ช่วยให้คุณวางแผนและติดตามในการซื้อสินค้าของคุณ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,คำสั่งซื้อที่ช่วยให้คุณวางแผนและติดตามในการซื้อสินค้าของคุณ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,เล็ก
@@ -1320,7 +1317,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ซิงค์ข้อมูลหลัก
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
@@ -1338,7 +1335,7 @@
 DocType: Student Group Student,Group Roll Number,หมายเลขกลุ่ม
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,รวมทุกน้ำหนักงานควรจะ 1. โปรดปรับน้ำหนักของงานโครงการทั้งหมดตาม
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,อุปกรณ์ ทุน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
@@ -1365,7 +1362,7 @@
 DocType: Depreciation Schedule,Journal Entry,รายการบันทึก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} รายการ อยู่ระหว่างดำเนินการ
 DocType: Workstation,Workstation Name,ชื่อเวิร์กสเตชัน
-DocType: Grade Interval,Grade Code,รหัสเกรด
+DocType: Grading Scale Interval,Grade Code,รหัสเกรด
 DocType: POS Item Group,POS Item Group,กลุ่มสินค้า จุดขาย
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
@@ -1382,7 +1379,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ฮาร์ดแวร์
 DocType: Sales Order,Recurring Upto,ที่เกิดขึ้นไม่เกิน
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,กรุณาเลือก บริษัท
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,กรุณาเลือก บริษัท
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,สิทธิ ออก
 DocType: Purchase Invoice,Supplier Invoice Date,วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,คุณจำเป็นต้องเปิดการใช้งานรถเข็น
@@ -1398,7 +1395,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,อาหาร
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ช่วงสูงอายุ 3
 DocType: Maintenance Schedule Item,No of Visits,ไม่มีการเข้าชม
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,มาร์ค Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,มาร์ค Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},กำหนดการซ่อมบำรุง {0} อยู่กับ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,นักเรียนเข้าศึกษา
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},สกุลเงินของบัญชีจะต้องปิด {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ผลรวมของคะแนนสำหรับเป้าหมายทั้งหมดควรจะเป็น 100 มันเป็น {0}
@@ -1447,13 +1445,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ผังบัญชี
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Detail,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
 DocType: Pricing Rule,"Higher the number, higher the priority",สูงกว่าจำนวนที่สูงขึ้นมีความสำคัญ
 ,Purchase Invoice Trends,แนวโน้มการซื้อใบแจ้งหนี้
 DocType: Employee,Better Prospects,อนาคตที่ดีกว่า
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",แถว # {0}: กลุ่ม {1} มีเพียง {2} จำนวน โปรดเลือกชุดที่มีจำนวน {3} จำนวนที่มีอยู่หรือแบ่งแถวเป็นหลายแถวเพื่อส่งมอบ / ออกจากแบทช์หลายรายการ
 DocType: Vehicle,License Plate,ป้ายทะเบียนรถ
 DocType: Appraisal,Goals,เป้าหมาย
 DocType: Warranty Claim,Warranty / AMC Status,สถานะการรับประกัน / AMC
@@ -1472,7 +1471,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",หากบัญชีถูกแช่แข็ง รายการ จะได้รับอนุญาต ให้กับผู้ใช้ ที่ จำกัด
 DocType: Email Digest,Bank Balance,ยอดเงินในธนาคาร
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",รายละเอียด งาน คุณสมบัติ ที่จำเป็น อื่น ๆ
 DocType: Journal Entry Account,Account Balance,ยอดเงินในบัญชี
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
@@ -1483,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,แสดงยอดคงเหลือ P &amp; L ปีงบประมาณ unclosed ของ
 DocType: Shipping Rule,Shipping Account,บัญชีการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: บัญชี {2} ไม่ได้ใช้งาน
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ทำให้คำสั่งซื้อยอดขายที่จะช่วยให้คุณวางแผนการทำงานของคุณและส่งมอบตรงเวลา
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ทำให้คำสั่งซื้อยอดขายที่จะช่วยให้คุณวางแผนการทำงานของคุณและส่งมอบตรงเวลา
 DocType: Quality Inspection,Readings,อ่าน
 DocType: Stock Entry,Total Additional Costs,รวมค่าใช้จ่ายเพิ่มเติม
 DocType: Course Schedule,SH,SH
@@ -1494,7 +1493,7 @@
 DocType: Shipping Rule Condition,To Value,เพื่อให้มีค่า
 DocType: Asset Movement,Stock Manager,ผู้จัดการ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,สลิป
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,สลิป
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,สำนักงาน ให้เช่า
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
@@ -1520,7 +1519,7 @@
 DocType: Sales Invoice,Source,แหล่ง
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,แสดงปิด
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ประเภทสินทรัพย์ที่มีผลบังคับใช้สำหรับรายการสินทรัพย์ถาวร
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ประเภทสินทรัพย์ที่มีผลบังคับใช้สำหรับรายการสินทรัพย์ถาวร
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},นี้ {0} ขัดแย้งกับ {1} สำหรับ {2} {3}
 DocType: Student Attendance Tool,Students HTML,นักเรียน HTML
@@ -1538,7 +1537,7 @@
 DocType: Student,Date of Leaving,วันที่ออก
 DocType: Pricing Rule,For Price List,สำหรับราคาตามรายการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,สร้างโอกาสในการขาย
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,สร้างโอกาสในการขาย
 DocType: Maintenance Schedule,Schedules,ตารางเวลา
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
@@ -1566,7 +1565,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,การลงทะเบียนโปรแกรม
 DocType: Sales Invoice Item,Brand Name,ชื่อยี่ห้อ
 DocType: Purchase Receipt,Transporter Details,รายละเอียด Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,กล่อง
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ผู้ผลิตที่เป็นไปได้
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,องค์การ
@@ -1600,7 +1599,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM เริ่มต้นสำหรับ {0} ไม่พบโครงการ {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",นักเรียนจะได้หัวใจของระบบเพิ่มนักเรียนของคุณทั้งหมด
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",นักเรียนจะได้หัวใจของระบบเพิ่มนักเรียนของคุณทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},แถว # {0}: วัน Clearance {1} ไม่สามารถจะก่อนวันที่เช็ค {2}
 DocType: Company,Default Holiday List,เริ่มต้นรายการที่ฮอลิเดย์
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},แถว {0}: จากเวลาและเวลาของ {1} มีการทับซ้อนกันด้วย {2}
@@ -1612,20 +1611,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ส่งอีเมล์การชำระเงิน
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,งานใหม่
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ทำให้ใบเสนอราคา
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ทำให้ใบเสนอราคา
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,รายงานอื่น ๆ
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ลองวางแผน X วันล่วงหน้า
 DocType: HR Settings,Stop Birthday Reminders,หยุด วันเกิด การแจ้งเตือน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},กรุณาตั้งค่าเริ่มต้นเงินเดือนบัญชีเจ้าหนี้ บริษัท {0}
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ค้นหาค้นหาสินค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,ค้นหาค้นหาสินค้า
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,บริโภคจํานวนเงิน
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
 DocType: Assessment Plan,Grading Scale,ระดับคะแนน
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,เสร็จสิ้นแล้ว
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},รวมเข้ากับการชำระเงินที่มีอยู่แล้ว {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
@@ -1663,7 +1662,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,เก็บ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,คุณไม่สามารถลบปีงบประมาณ {0} ปีงบประมาณ {0} ตั้งเป็นค่าเริ่มต้นในการตั้งค่าส่วนกลาง
 DocType: Journal Entry,Entry Type,ประเภทรายการ
 ,Customer Credit Balance,เครดิตบาลานซ์ลูกค้า
@@ -1706,8 +1705,6 @@
 DocType: Student Sibling,Studying in Same Institute,กำลังศึกษาอยู่ในสถาบันเดียวกัน
 DocType: Territory,Territory Manager,ผู้จัดการดินแดน
 DocType: Packed Item,To Warehouse (Optional),คลังสินค้า (อุปกรณ์เสริม)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 DocType: Payment Entry,Paid Amount (Company Currency),จำนวนเงินที่จ่าย (บริษัท สกุล)
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
@@ -1717,9 +1714,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ดูในรถเข็น
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ขอวัสดุที่ใช้เพื่อให้รายการสินค้านี้
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ถัดไปวันที่มีผลบังคับใช้ค่าเสื่อมราคาของสินทรัพย์ใหม่
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ถัดไปวันที่มีผลบังคับใช้ค่าเสื่อมราคาของสินทรัพย์ใหม่
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,แยกกลุ่มตามหลักสูตรสำหรับทุกกลุ่ม
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,แยกกลุ่มตามหลักสูตรสำหรับทุกกลุ่ม
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,หน่วยเดียวของรายการ
@@ -1736,9 +1733,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: 'ศูนย์ต้นทุน' เป็นสิ่งจำเป็นสำหรับบัญชี 'กำไรขาดทุน ' {2} โปรดตั้งค่าเริ่มต้นสำหรับศูนย์ต้นทุนของบริษัท
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ติดต่อใหม่
 DocType: Territory,Parent Territory,ดินแดนปกครอง
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1765,21 +1760,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,JSON สมานฉันท์
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 DocType: Purchase Invoice Item,Batch No,หมายเลขชุด
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ไม่พบอัตราแลกเปลี่ยนสำหรับ {0} เป็น {1} วันสำคัญ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,อนุญาตให้หลายคำสั่งขายกับการสั่งซื้อของลูกค้า
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 มือถือไม่มี
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,หลัก
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ตัวแปร
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,หลัก
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ตัวแปร
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
 DocType: Employee Attendance Tool,Employees HTML,พนักงาน HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
 DocType: Employee,Leave Encashed?,ฝาก Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Email Digest,Annual Expenses,ค่าใช้จ่ายประจำปี
 DocType: Item,Variants,สายพันธุ์
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,สร้างใบสั่งซื้อ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,สร้างใบสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
@@ -1799,7 +1793,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,การประเมินผล
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,เงื่อนไขสำหรับกฎการจัดส่งสินค้า
-DocType: Grading Structure,Grading Intervals,ช่วงการวัดผลการศึกษา
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,กรุณากรอก
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ในการอนุญาตให้มากกว่าการเรียกเก็บเงินโปรดตั้งค่าในการซื้อการตั้งค่า
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,กรุณาตั้งค่าตัวกรองขึ้นอยู่กับสินค้าหรือคลังสินค้า
@@ -1812,16 +1805,17 @@
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,วิธีการชำระเงิน
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,จัดการคำสั่งซื้อของคุณ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,จัดการคำสั่งซื้อของคุณ
 DocType: Production Order Operation,Actual Time and Cost,เวลาที่เกิดขึ้นจริงและค่าใช้จ่าย
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ขอ วัสดุ สูงสุด {0} สามารถทำ รายการ {1} กับ การขายสินค้า {2}
 DocType: Employee,Salutation,ประณม
 DocType: Course,Course Abbreviation,ชื่อย่อแน่นอน
 DocType: Student Leave Application,Student Leave Application,แอพลิเคชันออกจากนักศึกษา
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},พนักงาน {0} ในครึ่งวันในวันที่ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ชั่วโมงการทำงานรวมไม่ควรมากกว่าชั่วโมงการทำงานสูงสุด {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,บน
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,กำรายการในเวลาของการขาย
 DocType: Quotation Item,Actual Qty,จำนวนจริง
 DocType: Sales Invoice Item,References,อ้างอิง
@@ -1831,7 +1825,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,คุณได้ป้อนรายการซ้ำกัน กรุณาแก้ไขและลองอีกครั้ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ภาคี
 DocType: Asset Movement,Asset Movement,การเคลื่อนไหวของสินทรัพย์
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,รถเข็นใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,รถเข็นใหม่
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,รายการที่ {0} ไม่ได้เป็นรายการ ต่อเนื่อง
 DocType: SMS Center,Create Receiver List,สร้างรายการรับ
 DocType: Vehicle,Wheels,ล้อ
@@ -1863,10 +1857,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ปิดการใช้งานการสร้างบันทึกเวลากับการสั่งซื้อการผลิต การดำเนินงานจะไม่ได้รับการติดตามกับใบสั่งผลิต
 DocType: Student,Student Mobile Number,หมายเลขโทรศัพท์มือถือของนักเรียน
 DocType: Item,Has Variants,มีหลากหลายรูปแบบ
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ต้องใช้รหัสแบทช์
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ต้องใช้รหัสแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ต้องใช้รหัสแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ต้องใช้รหัสแบทช์
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
 DocType: Purchase Invoice,Recurring Invoice,ใบแจ้งหนี้ที่เกิดขึ้นประจำ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,จัดการโครงการ
@@ -1874,7 +1868,7 @@
 DocType: Budget,Fiscal Year,ปีงบประมาณ
 DocType: Vehicle Log,Fuel Price,ราคาน้ำมัน
 DocType: Budget,Budget,งบประมาณ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",งบประมาณไม่สามารถกำหนดกับ {0} เป็นมันไม่ได้เป็นบัญชีรายได้หรือค่าใช้จ่าย
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ที่ประสบความสำเร็จ
 DocType: Student Admission,Application Form Route,แบบฟอร์มใบสมัครเส้นทาง
@@ -1906,7 +1900,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},จำนวน {0} {1} หักกับ {2}
 DocType: Employee,Salary Information,ข้อมูลเงินเดือน
 DocType: Sales Person,Name and Employee ID,ชื่อและลูกจ้าง ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
 DocType: Website Item Group,Website Item Group,กลุ่มสินค้าเว็บไซต์
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,หน้าที่ และภาษี
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
@@ -1965,7 +1959,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ซ้ำรายได้ของลูกค้า
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ต้องมีสิทธิ์เป็น 'ผู้อนุมัติค่าใช้จ่าย'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,คู่
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
 DocType: Asset,Depreciation Schedule,กำหนดการค่าเสื่อมราคา
 DocType: Bank Reconciliation Detail,Against Account,กับบัญชี
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ครึ่งวันวันควรอยู่ระหว่างนับจากวันและวันที่
@@ -1982,13 +1976,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
 DocType: Purchase Order,Delivered,ส่ง
 ,Vehicle Expenses,ค่าใช้จ่ายในยานพาหนะ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
+DocType: Serial No,Invoice Details,รายละเอียดใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
 DocType: Employee Loan,Loan Amount,การกู้ยืมเงิน
@@ -2011,7 +2006,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,กลุ่มที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,กีฬา
 DocType: Loan Type,Loan Name,ชื่อเงินกู้
@@ -2023,6 +2018,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,คลังสินค้าที่คุณจะรักษาสต็อกของรายการปฏิเสธ
 DocType: Production Order,Skip Material Transfer,ข้ามการถ่ายโอนวัสดุ
 DocType: Production Order,Skip Material Transfer,ข้ามการถ่ายโอนวัสดุ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ไม่สามารถหาอัตราแลกเปลี่ยนสำหรับ {0} ถึง {1} สำหรับวันสำคัญ {2} โปรดสร้างบันทึกการแลกเปลี่ยนสกุลเงินด้วยตนเอง
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ปี การเงินของคุณ จะสิ้นสุดลงใน
 DocType: POS Profile,Price List,บัญชีแจ้งราคาสินค้า
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ตอนนี้เป็นปีงบประมาณเริ่มต้น กรุณารีเฟรชเบราว์เซอร์ ของคุณ สำหรับการเปลี่ยนแปลงที่จะมีผลบังคับใช้
@@ -2060,9 +2056,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ปีงบประมาณ ** หมายถึงปีทางการเงิน ทุกรายการบัญชีและการทำธุรกรรมอื่น ๆ ที่สำคัญมีการติดตามต่อปี ** ** การคลัง
 DocType: Opportunity,Customer / Lead Address,ลูกค้า / ที่อยู่
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 DocType: Student Admission,Eligibility,เหมาะ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",นำไปสู่การช่วยให้คุณได้รับธุรกิจเพิ่มรายชื่อทั้งหมดของคุณและมากขึ้นเป็นผู้นำของคุณ
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",นำไปสู่การช่วยให้คุณได้รับธุรกิจเพิ่มรายชื่อทั้งหมดของคุณและมากขึ้นเป็นผู้นำของคุณ
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
@@ -2103,7 +2099,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,เลือก บริษัท ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
 DocType: Process Payroll,Fortnightly,รายปักษ์
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
@@ -2119,7 +2115,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ไม่สามารถเลือก ประเภท ค่าใช้จ่าย เป็น ' ใน แถว หน้า จำนวน ' หรือ ' ใน แถว หน้า รวม สำหรับ แถวแรก
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,เด็กรายการไม่ควรจะเป็น Bundle สินค้า โปรดลบรายการ `{0}` และบันทึก
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,การธนาคาร
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,เพิ่ม Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,เพิ่ม Timesheets
 DocType: Vehicle Service,Service Item,รายการบริการ
 DocType: Bank Guarantee,Bank Guarantee,การรับประกันธนาคาร
 DocType: Bank Guarantee,Bank Guarantee,การรับประกันธนาคาร
@@ -2169,8 +2165,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ราคาจะไม่แสดงถ้าราคาไม่ได้ตั้งค่า
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,โปรดระบุประเทศสำหรับกฎการจัดส่งสินค้านี้หรือตรวจสอบการจัดส่งสินค้าทั่วโลก
 DocType: Stock Entry,Total Incoming Value,ค่าเข้ามาทั้งหมด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,เดบิตในการที่จะต้อง
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,เดบิตในการที่จะต้อง
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ซื้อราคา
 DocType: Offer Letter Term,Offer Term,ระยะเวลาเสนอ
 DocType: Quality Inspection,Quality Manager,ผู้จัดการคุณภาพ
@@ -2204,14 +2200,14 @@
 DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ที่อยู่ใหม่
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,กรุณากรอกเอกสารใบเสร็จรับเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,กรุณากรอกเอกสารใบเสร็จรับเงิน
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',โปรดระบุที่ถูกต้อง &#39;จากคดีหมายเลข&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Project,External,ภายนอก
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ผู้ใช้และสิทธิ์
 DocType: Vehicle Log,VLOG.,VLOG
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ใบสั่งผลิตที่สร้างไว้: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},ใบสั่งผลิตที่สร้างไว้: {0}
 DocType: Branch,Branch,สาขา
 DocType: Guardian,Mobile Number,เบอร์มือถือ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,การพิมพ์และ การสร้างแบรนด์
@@ -2220,7 +2216,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
 DocType: Scheduling Tool,Student Batch,ชุดนักศึกษา
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ลูกค้าของคุณ
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ทำให้นักศึกษา
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ทำให้นักศึกษา
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},คุณได้รับเชิญที่จะทำงานร่วมกันในโครงการ: {0}
 DocType: Leave Block List Date,Block Date,บล็อกวันที่
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ลงทะเบียนเลย
@@ -2244,8 +2240,9 @@
 DocType: SMS Log,Sent To,ส่งไปยัง
 DocType: Payment Request,Make Sales Invoice,สร้างใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,โปรแกรม
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ถัดไปติดต่อวันที่ไม่สามารถอยู่ในอดีตที่ผ่านมา
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ถัดไปติดต่อวันที่ไม่สามารถอยู่ในอดีตที่ผ่านมา
 DocType: Company,For Reference Only.,สำหรับการอ้างอิงเท่านั้น
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,เลือกแบทช์
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,จำนวนล่วงหน้า
@@ -2259,7 +2256,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,คดีหมายเลข ไม่สามารถ เป็น 0
 DocType: Item,Show a slideshow at the top of the page,สไลด์โชว์ที่ด้านบนของหน้า
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ร้านค้า
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ร้านค้า
 DocType: Serial No,Delivery Time,เวลาจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,เอจจิ้ง อยู่ ที่
 DocType: Item,End of Life,ในตอนท้ายของชีวิต
@@ -2275,8 +2272,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,โอน วัสดุ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,เอกสารนี้เป็นเกินขีด จำกัด โดย {0} {1} สำหรับรายการ {4} คุณกำลังทำอีก {3} กับเดียวกัน {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
@@ -2287,7 +2284,7 @@
 DocType: Budget Account,Budget Account,งบประมาณของบัญชี
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",ไม่สามารถเปลี่ยน สกุลเงินเริ่มต้น ของ บริษัท เนื่องจากมี การทำธุรกรรม ที่มีอยู่ รายการที่ จะต้อง ยกเลิก การเปลี่ยน สกุลเงินเริ่มต้น
-DocType: Grade Interval,Grade Description,ชั้นประถมศึกษาปีคำอธิบาย
+DocType: Grading Scale Interval,Grade Description,ชั้นประถมศึกษาปีคำอธิบาย
 DocType: Stock Entry,Purchase Receipt No,หมายเลขใบเสร็จรับเงิน (ซื้อ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,เงินมัดจำ
 DocType: Process Payroll,Create Salary Slip,สร้างสลิปเงินเดือน
@@ -2325,7 +2322,7 @@
 DocType: Upload Attendance,Attendance To Date,วันที่เข้าร่วมประชุมเพื่อ
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Gateway Account,Payment Account,บัญชีการชำระเงิน
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,เปลี่ยนสุทธิในบัญชีลูกหนี้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ชดเชย ปิด
 DocType: Offer Letter,Accepted,ได้รับการยอมรับแล้ว
@@ -2339,7 +2336,7 @@
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ผู้ใช้งานฟอรั่ม
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
 DocType: Employee,Previous Work Experience,ประสบการณ์การทำงานก่อนหน้า
@@ -2353,7 +2350,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ชื่อของสถาบันที่คุณมีการตั้งค่าระบบนี้
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",รายการบัญชีแช่แข็งถึงวันนี้ไม่มีใครสามารถทำ / แก้ไขรายการยกเว้นบทบาทที่ระบุไว้ด้านล่าง
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,กรุณา บันทึกเอกสารก่อนที่จะ สร้าง ตารางการบำรุงรักษา
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,กรุณา บันทึกเอกสารก่อนที่จะ สร้าง ตารางการบำรุงรักษา
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,สถานะโครงการ
 DocType: UOM,Check this to disallow fractions. (for Nos),ตรวจสอบนี้จะไม่อนุญาตให้เศษส่วน (สำหรับ Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
@@ -2376,6 +2373,7 @@
 DocType: Email Digest,How frequently?,วิธีบ่อย?
 DocType: Purchase Receipt,Get Current Stock,รับสินค้าปัจจุบัน
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ต้นไม้แห่ง Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 DocType: Student,Joining Date,วันที่เข้าร่วม
 ,Employees working on a holiday,พนักงานที่ทำงานในวันหยุด
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,กำหนดให้เป็นปัจจุบัน
@@ -2477,7 +2475,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,การผลิต
 DocType: Guardian,Occupation,อาชีพ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),รวม (จำนวน)
 DocType: Sales Invoice,This Document,เอกสารฉบับนี้
 DocType: Installation Note Item,Installed Qty,จำนวนการติดตั้ง
@@ -2500,8 +2498,8 @@
 DocType: Notification Control,Sales Order Message,ข้อความสั่งซื้อขาย
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",การตั้ง ค่าเริ่มต้น เช่น บริษัท สกุลเงิน ปัจจุบัน ปีงบประมาณ ฯลฯ
 DocType: Payment Entry,Payment Type,ประเภท การชำระเงิน
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
 DocType: Process Payroll,Select Employees,เลือกพนักงาน
 DocType: Opportunity,Potential Sales Deal,ที่อาจเกิดขึ้น Deal ขาย
 DocType: Payment Entry,Cheque/Reference Date,เช็ค / วันที่อ้างอิง
@@ -2518,7 +2516,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},รายละเอียด จุดขาย ทั้งหมด {0} สร้างไว้แล้วสำหรับ บริษัท {1}
 DocType: Purchase Order,Ref SQ,SQ Ref
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,แทนที่รายการ / BOM ใน BOMs ทั้งหมด
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,เอกสารใบเสร็จรับเงินจะต้องส่ง
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,เอกสารใบเสร็จรับเงินจะต้องส่ง
 DocType: Purchase Invoice Item,Received Qty,จำนวนที่ได้รับ
 DocType: Stock Entry Detail,Serial No / Batch,หมายเลขเครื่อง / ชุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,การชำระเงินไม่ได้และไม่ได้ส่งมอบ
@@ -2531,7 +2529,7 @@
 ,To Produce,ในการ ผลิต
 apps/erpnext/erpnext/config/hr.py +93,Payroll,บัญชีเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",แถว {0} ใน {1} ที่จะรวม {2} ในอัตรารายการแถว {3} จะต้องรวม
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ทำให้ผู้ใช้
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ทำให้ผู้ใช้
 DocType: Packing Slip,Identification of the package for the delivery (for print),บัตรประจำตัวของแพคเกจสำหรับการส่งมอบ (สำหรับพิมพ์)
 DocType: Bin,Reserved Quantity,จำนวนสงวน
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,โปรดป้อนที่อยู่อีเมลที่ถูกต้อง
@@ -2545,11 +2543,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,แม่แบบสำหรับผู้พิการจะต้องไม่เป็นแม่แบบเริ่มต้น
 DocType: Account,Income Account,บัญชีรายได้
 DocType: Payment Request,Amount in customer's currency,จำนวนเงินในสกุลเงินของลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,การจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,การจัดส่งสินค้า
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",โปรดดูที่ &quot;ค่าของวัสดุบนพื้นฐานของ&quot; ต้นทุนในมาตรา
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,ก่อนหน้า
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",ชุดนักศึกษาช่วยให้คุณติดตามการเข้าร่วมการประเมินและค่าธรรมเนียมสำหรับนักเรียน
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",ชุดนักศึกษาช่วยให้คุณติดตามการเข้าร่วมการประเมินและค่าธรรมเนียมสำหรับนักเรียน
 DocType: Payment Entry,Total Allocated Amount,จำนวนเงินที่ได้รับจัดสรร
 DocType: Item Reorder,Material Request Type,ประเภทของการขอวัสดุ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural วารสารรายการสำหรับเงินเดือนจาก {0} เป็น {1}
@@ -2572,7 +2571,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
@@ -2582,6 +2581,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',จะส่งอีเมลเกี่ยวกับเหตุการณ์ที่ให้กับพนักงานที่มีสถานะ &#39;เปิด&#39;
 DocType: Task,Depends on Tasks,ขึ้นอยู่กับงาน
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,จัดการ กลุ่ม ลูกค้า ต้นไม้
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,สามารถแนบไฟล์แนบได้โดยไม่ต้องเปิดใช้งานรถเข็นช็อปปิ้ง
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
 DocType: Leave Control Panel,Leave Control Panel,ฝากแผงควบคุม
@@ -2594,12 +2594,10 @@
 DocType: Sales Invoice,Debit To,เดบิตเพื่อ
 DocType: Delivery Note,Required only for sample item.,ที่จำเป็นสำหรับรายการตัวอย่าง
 DocType: Stock Ledger Entry,Actual Qty After Transaction,จำนวนที่เกิดขึ้นจริงหลังทำรายการ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ไม่มีสลิปเงินเดือนพบกันระหว่าง {0} และ {1}
 ,Pending SO Items For Purchase Request,รายการที่รอดำเนินการเพื่อให้ใบขอซื้อ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,การรับสมัครนักศึกษา
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
 DocType: Supplier,Billing Currency,สกุลเงินการเรียกเก็บเงิน
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ขนาดใหญ่พิเศษ
@@ -2616,7 +2614,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,โฮมเพจสินค้าแนะนำ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ทุกกลุ่มการประเมิน
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ชื่อคลังสินค้าใหม่
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),รวม {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),รวม {0} ({1})
 DocType: C-Form Invoice Detail,Territory,อาณาเขต
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
@@ -2634,7 +2632,7 @@
 DocType: Price List,Price List Master,ราคาโท
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
 ,S.O. No.,เลขที่ใบสั่งขาย
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
 DocType: Price List,Applicable for Countries,ใช้งานได้สำหรับประเทศ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ทิ้งไว้เพียงการประยุกต์ใช้งานที่มีสถานะ &#39;อนุมัติ&#39; และ &#39;ปฏิเสธ&#39; สามารถส่ง
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},นักศึกษาชื่อกลุ่มมีผลบังคับใช้ในแถว {0}
@@ -2727,7 +2725,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 DocType: Vehicle Service,Engine Oil,น้ำมันเครื่อง
 DocType: Sales Invoice,Sales Team1,ขาย Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
 DocType: Employee Loan,Loan Details,รายละเอียดเงินกู้
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,แถว {0}: เสร็จสมบูรณ์จำนวนจะต้องมากกว่าศูนย์
@@ -2792,7 +2790,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงไปยังกลุ่ม
 DocType: Assessment Result Tool,Result HTML,ผล HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,หมดอายุเมื่อวันที่
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,เพิ่มนักเรียน
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,เพิ่มนักเรียน
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},กรุณาเลือก {0}
 DocType: C-Form,C-Form No,C-Form ไม่มี
 DocType: BOM,Exploded_items,Exploded_items
@@ -2857,7 +2855,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,จำกัด การข้าม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ระยะทางวิชาการกับเรื่องนี้ &#39;ปีการศึกษา&#39; {0} และ &#39;ระยะชื่อ&#39; {1} อยู่แล้ว โปรดแก้ไขรายการเหล่านี้และลองอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",เนื่องจากมีการทำธุรกรรมที่มีอยู่กับรายการ {0} คุณไม่สามารถเปลี่ยนค่าของ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",เนื่องจากมีการทำธุรกรรมที่มีอยู่กับรายการ {0} คุณไม่สามารถเปลี่ยนค่าของ {1}
 DocType: UOM,Must be Whole Number,ต้องเป็นจำนวนเต็ม
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ใบใหม่ที่จัดสรร (ในวัน)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,อนุกรม ไม่มี {0} ไม่อยู่
@@ -2901,7 +2899,7 @@
 DocType: Supplier,Last Day of the Next Month,วันสุดท้ายของเดือนถัดไป
 DocType: Support Settings,Auto close Issue after 7 days,รถยนต์ใกล้ฉบับหลังจาก 7 วัน
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ออกจากไม่สามารถได้รับการจัดสรรก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,สมัครนักศึกษา
 DocType: Asset Category Account,Accumulated Depreciation Account,บัญชีค่าเสื่อมราคาสะสม
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
@@ -2929,8 +2927,8 @@
 DocType: Asset,Item Code,รหัสสินค้า
 DocType: Production Planning Tool,Create Production Orders,สร้างคำสั่งซื้อการผลิต
 DocType: Serial No,Warranty / AMC Details,รายละเอียดการรับประกัน / AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
@@ -2949,7 +2947,7 @@
 DocType: Production Planning Tool,Create Material Requests,ขอสร้างวัสดุ
 DocType: Employee Education,School/University,โรงเรียน / มหาวิทยาลัย
 DocType: Payment Request,Reference Details,รายละเอียดอ้างอิง
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์จะต้องน้อยกว่ามวลรวมสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์จะต้องน้อยกว่ามวลรวมสั่งซื้อ
 DocType: Sales Invoice Item,Available Qty at Warehouse,จำนวนที่คลังสินค้า
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,จำนวนเงินที่ เรียกเก็บเงิน
 DocType: Asset,Double Declining Balance,ยอดลดลงสองครั้ง
@@ -2970,19 +2968,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},การเบิกจ่ายจำนวนเงินที่ไม่สามารถจะสูงกว่าจำนวนเงินกู้ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ใบสั่งผลิตไม่ได้สร้าง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,ใบสั่งผลิตไม่ได้สร้าง
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
 DocType: Asset,Fully Depreciated,ค่าเสื่อมราคาหมด
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ผู้เข้าร่วมการทำเครื่องหมาย HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",ใบเสนอราคาข้อเสนอการเสนอราคาที่คุณส่งให้กับลูกค้าของคุณ
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",ใบเสนอราคาข้อเสนอการเสนอราคาที่คุณส่งให้กับลูกค้าของคุณ
 DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ไม่มี Serial และแบทช์
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ผลรวมของคะแนนของเกณฑ์การประเมินจะต้อง {0}
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,กรุณาตั้งค่าจำนวนค่าเสื่อมราคาจอง
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,กรุณาตั้งค่าจำนวนค่าเสื่อมราคาจอง
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ค่าหรือ จำนวน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,นาที
@@ -3113,7 +3111,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,กลุ่มนักศึกษา
 DocType: Shopping Cart Settings,Quotation Series,ชุดใบเสนอราคา
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,กรุณาเลือกลูกค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,กรุณาเลือกลูกค้า
 DocType: C-Form,I,ผม
 DocType: Company,Asset Depreciation Cost Center,สินทรัพย์ศูนย์ต้นทุนค่าเสื่อมราคา
 DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
@@ -3132,19 +3130,18 @@
 DocType: Vehicle,Insurance Details,รายละเอียดการประกันภัย
 DocType: Account,Payable,ที่ต้องชำระ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,กรุณากรอกระยะเวลาการชำระคืน
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ลูกหนี้ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ลูกหนี้ ({0})
 DocType: Pricing Rule,Margin,ขอบ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ลูกค้าใหม่
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,% กำไรขั้นต้น
 DocType: Appraisal Goal,Weightage (%),weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,วันที่กวาดล้าง
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,จำนวนการสั่งซื้อขั้นต้นมีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,จำนวนการสั่งซื้อขั้นต้นมีผลบังคับใช้
 DocType: Lead,Address Desc,ลักษณะ ของ ที่อยู่
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,พรรคมีผลบังคับใช้
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ชื่อกระทู้
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,อย่างน้อยต้องเลือกหนึ่งในการขาย หรือการซื้อ
-DocType: Grading Structure,Grade Intervals,ช่วงชั้นประถมศึกษา
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,เลือกลักษณะของธุรกิจของคุณ
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,สถานที่ที่ดำเนินการผลิต
 DocType: Asset Movement,Source Warehouse,คลังสินค้าที่มา
@@ -3173,6 +3170,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,การกระจายรายเดือนร้อยละ
 DocType: Territory,Territory Targets,เป้าหมายดินแดน
 DocType: Delivery Note,Transporter Info,ข้อมูลการขนย้าย
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
 DocType: Cheque Print Template,Starting position from top edge,ตำแหน่งเริ่มต้นจากขอบด้านบน
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ผลิตเดียวกันได้รับการป้อนหลายครั้ง
@@ -3226,7 +3224,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,สั่งซื้อใหม่จำนวน
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,เปิดงานปัจจุบัน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
-DocType: Journal Entry,Write Off,เขียนปิด
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,เขียนปิด
 DocType: Timesheet Detail,Operation ID,รหัสการดำเนินงาน
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",ผู้ใช้ระบบ (login) ID ถ้าชุดก็จะกลายเป็นค่าเริ่มต้นสำหรับทุกรูปแบบทรัพยากรบุคคล
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: จาก {1}
@@ -3237,8 +3235,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ผู้ผลิตมอบให้กับลูกค้า
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (แบบ # รายการ / / {0}) ไม่มีในสต๊อก
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,วันถัดไปจะต้องมากกว่าการโพสต์วันที่
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,แสดงภาษีผิดขึ้น
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ข้อมูลนำเข้าและส่งออก
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ดังนั้นคุณจะไม่สามารถกำหนดหรือปรับเปลี่ยน
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ไม่พบนักเรียน
@@ -3250,14 +3248,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
 DocType: Program Enrollment,School House,โรงเรียนบ้าน
 DocType: Serial No,Out of AMC,ออกของ AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,โปรดเลือกใบเสนอราคา
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,โปรดเลือกใบเสนอราคา
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,โปรดเลือกใบเสนอราคา
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,โปรดเลือกใบเสนอราคา
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
 DocType: Company,Default Cash Account,บัญชีเงินสดเริ่มต้น
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,นี้ขึ้นอยู่กับการเข้าร่วมประชุมของนักศึกษานี้
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,ไม่มีนักเรียนเข้ามา
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,เพิ่มรายการมากขึ้นหรือเต็มรูปแบบเปิด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
@@ -3304,9 +3303,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ก่อนที่จะกลับไปคืนดี
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ไปที่ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ภาษีและค่าใช้จ่ายเพิ่ม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
 DocType: Sales Order,Partly Billed,จำนวนมากที่สุดเป็นส่วนใหญ่
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,รายการ {0} จะต้องเป็นรายการสินทรัพย์ถาวร
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,รายการ {0} จะต้องเป็นรายการสินทรัพย์ถาวร
 DocType: Item,Default BOM,BOM เริ่มต้น
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,รวมที่โดดเด่น Amt
@@ -3329,7 +3328,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
 DocType: Purchase Invoice Item,Rate,อัตรา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,แพทย์ฝึกหัด
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ชื่อที่อยู่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,ชื่อที่อยู่
 DocType: Stock Entry,From BOM,จาก BOM
 DocType: Assessment Code,Assessment Code,รหัสการประเมิน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ขั้นพื้นฐาน
@@ -3354,7 +3353,7 @@
 DocType: Purchase Invoice,Print Language,พิมพ์ภาษา
 DocType: Salary Slip,Total Working Hours,รวมชั่วโมงทำงาน
 DocType: Stock Entry,Including items for sub assemblies,รวมทั้งรายการสำหรับส่วนประกอบย่อย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ค่าใส่ต้องเป็นบวก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,ค่าใส่ต้องเป็นบวก
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ดินแดน ทั้งหมด
 DocType: Purchase Invoice,Items,รายการ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,นักศึกษาลงทะเบียนเรียนแล้ว
@@ -3374,17 +3373,15 @@
 DocType: Issue,Opening Time,เปิดเวลา
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,จากและถึง วันที่คุณต้องการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
 DocType: Assessment Plan,Supervisor Name,ชื่อผู้บังคับบัญชา
 DocType: Program Enrollment Course,Program Enrollment Course,หลักสูตรการลงทะเบียนเรียน
 DocType: Program Enrollment Course,Program Enrollment Course,หลักสูตรการลงทะเบียนเรียน
-DocType: Grading Structure,Grading Structure,โครงสร้างการวัดผลการศึกษา
 DocType: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
 DocType: Tax Rule,Shipping City,การจัดส่งสินค้าเมือง
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,รายการนี้เป็นตัวแปรของ {0} (Template) คุณสมบัติจะถูกคัดลอกมาจากแม่แบบเว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 DocType: Notification Control,Customize the Notification,กำหนดประกาศ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,กระแสเงินสดจากการดำเนินงาน
 DocType: Sales Invoice,Shipping Rule,กฎการจัดส่งสินค้า
@@ -3407,6 +3404,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Department,Days for which Holidays are blocked for this department.,วันที่วันหยุดจะถูกบล็อกสำหรับแผนกนี้
@@ -3434,7 +3432,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),รวม (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 DocType: Quality Inspection,Item Serial No,รายการ Serial No.
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,สร้างประวัติพนักงาน
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,สร้างประวัติพนักงาน
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ปัจจุบันทั้งหมด
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,รายการบัญชี
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ชั่วโมง
@@ -3449,8 +3447,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ใหม่หลังจากเปลี่ยน
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,จุดขาย
 DocType: Payment Entry,Received Amount,จำนวนเงินที่ได้รับ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรบุคคล&gt; การตั้งค่าทรัพยากรบุคคล
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรบุคคล&gt; การตั้งค่าทรัพยากรบุคคล
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",สร้างปริมาณเต็มรูปแบบโดยไม่คำนึงถึงปริมาณที่มีอยู่แล้วในการสั่งซื้อ
 DocType: Account,Tax,ภาษี
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ไม่ได้ทำเครื่องหมาย
@@ -3463,7 +3459,7 @@
 DocType: Batch,Source Document Name,ชื่อเอกสารต้นทาง
 DocType: Batch,Source Document Name,ชื่อเอกสารต้นทาง
 DocType: Job Opening,Job Title,ตำแหน่งงาน
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,สร้างผู้ใช้
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,สร้างผู้ใช้
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,กรัม
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,เยี่ยมชมรายงานสำหรับการบำรุงรักษาโทร
@@ -3475,8 +3471,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: BOM,Website Description,คำอธิบายเว็บไซต์
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,เปลี่ยนสุทธิในส่วนของ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ใบเสร็จรับเงิน
 ,Sales Register,ขายสมัครสมาชิก
@@ -3487,16 +3483,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ไม่มีอะไรที่จะ แก้ไข คือ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ยังไม่มีลูกค้า!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,งบกระแสเงินสด
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,การอนุญาต
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,เลือกดำเนินการต่อถ้าคุณยังต้องการที่จะรวมถึงความสมดุลในปีงบประมาณก่อนหน้านี้ออกไปในปีงบการเงิน
 DocType: GL Entry,Against Voucher Type,กับประเภทบัตร
 DocType: Item,Attributes,คุณลักษณะ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
 DocType: Student,Guardian Details,รายละเอียดผู้ปกครอง
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,มาร์คเข้าร่วมสำหรับพนักงานหลาย
@@ -3521,14 +3519,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',แถว {0} # บัญชีต้องเป็นชนิด &#39;สินทรัพย์ถาวร&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ออก จำนวน
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,กฎระเบียบในการคำนวณปริมาณการขนส่งสินค้าสำหรับการขาย
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,ชุด มีผลบังคับใช้
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,ชุด มีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,บริการทางการเงิน
 DocType: Student Sibling,Student ID,รหัสนักศึกษา
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ประเภทของกิจกรรมสำหรับบันทึกเวลา
 DocType: Tax Rule,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
 DocType: Training Event,Exam,การสอบ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
@@ -3561,7 +3559,7 @@
 DocType: Payment Entry,Account Paid From,บัญชีจ่ายจาก
 DocType: Purchase Order Item Supplied,Raw Material Item Code,วัสดุดิบรหัสสินค้า
 DocType: Journal Entry,Write Off Based On,เขียนปิดขึ้นอยู่กับ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ทำให้ตะกั่ว
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ทำให้ตะกั่ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,พิมพ์และเครื่องเขียน
 DocType: Stock Settings,Show Barcode Field,แสดงฟิลด์บาร์โค้ด
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ส่งอีเมลผู้ผลิต
@@ -3577,6 +3575,7 @@
 DocType: Offer Letter,Awaiting Response,รอการตอบสนอง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,สูงกว่า
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
+DocType: Supplier,Mention if non-standard payable account,พูดถึงบัญชีที่ต้องชำระเงินที่ไม่ได้มาตรฐาน
 DocType: Salary Slip,Earning & Deduction,รายได้และการหัก
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
@@ -3613,7 +3612,7 @@
 DocType: Program Enrollment Tool,Get Students From,รับนักเรียนจาก
 DocType: Hub Settings,Seller Country,ผู้ขายประเทศ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,รายการเผยแพร่บนเว็บไซต์
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,กลุ่มนักเรียนของคุณใน batches
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,กลุ่มนักเรียนของคุณใน batches
 DocType: Authorization Rule,Authorization Rule,กฎการอนุญาต
 DocType: Sales Invoice,Terms and Conditions Details,ข้อตกลงและเงื่อนไขรายละเอียด
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ข้อมูลจำเพาะของ
@@ -3673,7 +3672,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,การทดลอง
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ส่วนประกอบเงินเดือน
 DocType: Program Enrollment Tool,New Academic Year,ปีการศึกษาใหม่
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,กลับมา / หมายเหตุเครดิต
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,กลับมา / หมายเหตุเครดิต
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,รวมจำนวนเงินที่จ่าย
 DocType: Production Order Item,Transferred Qty,โอน จำนวน
@@ -3714,6 +3713,7 @@
 ,Sales Funnel,ช่องทาง ขาย
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ชื่อย่อมีผลบังคับใช้
 DocType: Project,Task Progress,ความคืบหน้าของงาน
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,เกวียน
 ,Qty to Transfer,จำนวน การโอน
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
@@ -3747,7 +3747,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษเล็กเศษน้อยในแถว {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,เก็บค่าธรรมเนียม
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
 DocType: Lead,Add to calendar on this date,เพิ่มไปยังปฏิทินของวันนี้
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
 DocType: Item,Opening Stock,เปิดการแจ้ง
@@ -3765,7 +3765,7 @@
 DocType: Customer,From Lead,จากช่องทาง
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,คำสั่งปล่อยให้การผลิต
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
 DocType: Program Enrollment Tool,Enroll Students,รับสมัครนักเรียน
 DocType: Hub Settings,Name Token,ชื่อ Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ขาย มาตรฐาน
@@ -3776,7 +3776,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ชื่อโครงการ
-DocType: Supplier,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
+DocType: Customer,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
 DocType: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
 DocType: Production Order,Required Items,รายการที่ต้องการ
 DocType: Stock Ledger Entry,Stock Value Difference,ความแตกต่างมูลค่าหุ้น
@@ -3807,6 +3807,7 @@
 DocType: Item,Taxes,ภาษี
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,การชำระเงินและไม่ได้ส่งมอบ
 DocType: Project,Default Cost Center,เริ่มต้นที่ศูนย์ต้นทุน
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 DocType: Bank Guarantee,End Date,วันที่สิ้นสุด
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ทำธุรกรรมซื้อขายหุ้น
 DocType: Budget,Budget Accounts,บัญชีงบประมาณ
@@ -3871,7 +3872,7 @@
 DocType: Customer,Sales Partner and Commission,พันธมิตรการขายและสำนักงานคณะกรรมการกำกับ
 DocType: Employee Loan,Rate of Interest (%) / Year,อัตราดอกเบี้ย (%) / ปี
 ,Project Quantity,จำนวนโครงการ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",รวม {0} สำหรับรายการทั้งหมดเป็นศูนย์อาจจะเป็นคุณควรเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",รวม {0} สำหรับรายการทั้งหมดเป็นศูนย์อาจจะเป็นคุณควรเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
 DocType: Opportunity,To Discuss,เพื่อหารือเกี่ยวกับ
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,ต้องการ {1} อย่างน้อย {0} หน่วย ใน {2} เพื่อที่จะทำธุรกรรมนี้
 DocType: Loan Type,Rate of Interest (%) Yearly,อัตราดอกเบี้ย (%) ประจำปี
@@ -3894,7 +3895,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,มาร์คขาด
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},แถว {0}: สกุลเงินของ BOM # {1} ควรจะเท่ากับสกุลเงินที่เลือก {2}
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 DocType: Homepage,Tag Line,สายแท็ก
 DocType: Fee Component,Fee Component,ค่าบริการตัวแทน
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,การจัดการ Fleet
@@ -3911,7 +3912,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ไม่พบคลังสินค้า {0} ในระบบ
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ลงทะเบียนสำหรับ ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,เปอร์เซ็นต์การกระจายรายเดือน
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",อัตราการประเมินไม่พบรายการ {0} ซึ่งเป็นสิ่งจำเป็นที่ต้องทำรายการบัญชีสำหรับ {1} {2} หากรายการที่จะทำธุรกรรมเป็นรายการตัวอย่างใน {1} กรุณาพูดถึงว่าใน {1} ตารางรายการ มิฉะนั้นโปรดสร้างธุรกรรมหุ้นขาเข้าสำหรับสินค้าหรือการกล่าวถึงอัตราการประเมินมูลค่าในรายการบันทึกแล้วลอง submiting / ยกเลิกรายการนี้
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ของวัสดุที่ส่งมอบเทียบกับหมายเหตุการจัดส่งนี้
 DocType: Project,Customer Details,รายละเอียดลูกค้า
@@ -3928,7 +3929,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,คำสั่งที่ส่งมาไม่สามารถลบได้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ยอดเงินในบัญชีแล้วในเดบิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เครดิต
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,การบริหารจัดการคุณภาพ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Employee Loan,Repay Fixed Amount per Period,ชำระคืนจำนวนคงที่ต่อปีระยะเวลา
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
@@ -3955,7 +3956,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,อีเมล์ ID นักศึกษา
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
 DocType: Tax Rule,Sales Tax Template,แม่แบบภาษีการขาย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
 DocType: Employee,Encashment Date,วันที่การได้เป็นเงินสด
 DocType: Training Event,Internet,อินเทอร์เน็ต
 DocType: Account,Stock Adjustment,การปรับ สต็อก
@@ -3989,6 +3990,7 @@
 DocType: Purchase Invoice,Debit Note Issued,หมายเหตุเดบิตที่ออก
 DocType: Production Order,Warehouses,โกดัง
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} สินทรัพย์ ไม่สามารถโอนได้
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,รายการนี้เป็น Variant ของ {0} (เทมเพลต)
 DocType: Workstation,per hour,ต่อชั่วโมง
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,การจัดซื้อ
 DocType: Announcement,Announcement,การประกาศ
@@ -4004,7 +4006,7 @@
 DocType: Account,Receivable,ลูกหนี้
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,แถว # {0}: ไม่อนุญาตให้ผู้ผลิตที่จะเปลี่ยนเป็นใบสั่งซื้ออยู่แล้ว
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,บทบาทที่ได้รับอนุญาตให้ส่งการทำธุรกรรมที่เกินวงเงินที่กำหนด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,เลือกรายการที่จะผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,เลือกรายการที่จะผลิต
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","การซิงค์ข้อมูลหลัก, อาจทำงานบางช่วงเวลา"
 DocType: Item,Material Issue,บันทึกการใช้วัสดุ
 DocType: Hub Settings,Seller Description,รายละเอียดผู้ขาย
@@ -4017,7 +4019,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ได้รับคำสั่ง
 DocType: Salary Detail,Component,ตัวแทน
 DocType: Assessment Criteria,Assessment Criteria Group,กลุ่มเกณฑ์การประเมิน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},เปิดค่าเสื่อมราคาสะสมต้องน้อยกว่าเท่ากับ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},เปิดค่าเสื่อมราคาสะสมต้องน้อยกว่าเท่ากับ {0}
 DocType: Warehouse,Warehouse Name,ชื่อคลังสินค้า
 DocType: Naming Series,Select Transaction,เลือกรายการ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,กรุณากรอก บทบาท การอนุมัติ หรือ ให้ความเห็นชอบ ผู้ใช้
@@ -4052,7 +4054,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",การตั้งค่า นี้ ปีงบประมาณ เป็นค่าเริ่มต้น ให้คลิกที่ 'ตั้ง เป็นค่าเริ่มต้น '
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ร่วม
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Employee Loan,Repay from Salary,ชำระคืนจากเงินเดือน
 DocType: Leave Application,LAP/,ตัก/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ร้องขอการชำระเงินจาก {0} {1} สำหรับจำนวนเงิน {2}
@@ -4070,7 +4072,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,การประเมินผลรายละเอียด
 DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,กลุ่มรายการที่ซ้ำกันที่พบในตารางกลุ่มรายการ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
 DocType: Salary Slip,Net Pay,จ่ายสุทธิ
 DocType: Account,Account,บัญชี
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,อนุกรม ไม่มี {0} ได้รับ อยู่แล้ว
@@ -4079,7 +4081,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",คลังสินค้า {0} ไม่เชื่อมโยงกับบัญชีใด ๆ โปรดสร้าง / เชื่อมโยงที่สอดคล้องกัน (สินทรัพย์) บัญชีคลังสินค้า
 DocType: Purchase Invoice,Recurring Id,รหัสที่เกิดขึ้น
 DocType: Customer,Sales Team Details,ขายรายละเอียดทีม
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ลบอย่างถาวร?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,ลบอย่างถาวร?
 DocType: Expense Claim,Total Claimed Amount,จำนวนรวมอ้าง
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,โอกาสที่มีศักยภาพสำหรับการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ไม่ถูกต้อง {0}
@@ -4090,13 +4092,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,การติดตั้งของโรงเรียนใน ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),ฐานจำนวนเปลี่ยน (สกุลเงินบริษัท)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,บันทึกเอกสารครั้งแรก
 DocType: Account,Chargeable,รับผิดชอบ
 DocType: Company,Change Abbreviation,เปลี่ยนชื่อย่อ
 DocType: Expense Claim Detail,Expense Date,วันที่ค่าใช้จ่าย
 DocType: Item,Max Discount (%),ส่วนลดสูงสุด (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,คำสั่งสุดท้ายจำนวนเงิน
+DocType: Task,Is Milestone,เป็น Milestone
 DocType: Daily Work Summary,Email Sent To,อีเมลที่ส่งไป
 DocType: Budget,Warn,เตือน
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ใด ๆ ข้อสังเกตอื่น ๆ ความพยายามที่น่าสังเกตว่าควรจะไปในบันทึก
@@ -4129,11 +4132,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,ค่าของ `อายัด (freeze) Stock ที่เก่ากว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
 DocType: Tax Rule,Purchase Tax Template,ซื้อแม่แบบภาษี
 ,Project wise Stock Tracking,หุ้นติดตามโครงการที่ชาญฉลาด
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ตาราง การบำรุงรักษา {0} อยู่ กับ {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),จำนวนที่เกิดขึ้นจริง (ที่มา / เป้าหมาย)
 DocType: Item Customer Detail,Ref Code,รหัส Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ระเบียนพนักงาน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
 DocType: HR Settings,Payroll Settings,การตั้งค่า บัญชีเงินเดือน
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ตรงกับใบแจ้งหนี้ไม่ได้เชื่อมโยงและการชำระเงิน
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,สถานที่การสั่งซื้อ
@@ -4156,7 +4158,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,เช็คและเงินฝากล้างไม่ถูกต้อง
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
 DocType: Purchase Invoice Item,Price List Rate,อัตราราคาตามรายการ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,สร้างคำพูดของลูกค้า
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,สร้างคำพูดของลูกค้า
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",แสดง &quot;ในสต็อก&quot; หรือ &quot;ไม่อยู่ในสต็อก&quot; บนพื้นฐานของหุ้นที่มีอยู่ในคลังสินค้านี้
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),บิลวัสดุ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,เวลาเฉลี่ยที่ถ่ายโดยผู้ผลิตเพื่อส่งมอบ
@@ -4178,7 +4180,7 @@
 DocType: Asset,Disposal Date,วันที่จำหน่าย
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",อีเมลจะถูกส่งไปยังพนักงานที่ใช้งานทั้งหมดของ บริษัท ในเวลาที่กำหนดหากพวกเขาไม่ได้มีวันหยุด บทสรุปของการตอบสนองจะถูกส่งในเวลาเที่ยงคืน
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,การฝึกอบรมผลตอบรับ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
@@ -4186,7 +4188,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},แน่นอนมีผลบังคับใช้ในแถว {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,เพิ่ม / แก้ไขราคา
 DocType: Batch,Parent Batch,กลุ่มผู้ปกครอง
 DocType: Batch,Parent Batch,กลุ่มผู้ปกครอง
 DocType: Cheque Print Template,Cheque Print Template,แม่แบบการพิมพ์เช็ค
@@ -4231,7 +4233,7 @@
 DocType: Item,Variant Based On,ตัวแปรอยู่บนพื้นฐานของ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ซัพพลายเออร์ ของคุณ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
 DocType: Request for Quotation Item,Supplier Part No,ผู้ผลิตชิ้นส่วน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ไม่สามารถหักค่าใช้จ่ายเมื่อเป็นหมวดหมู่สำหรับ &#39;การประเมินค่า&#39; หรือ &#39;Vaulation และรวม
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ที่ได้รับจาก
@@ -4241,7 +4243,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,แถว {0}: ค่าเวลาทำการต้องมีค่ามากกว่าศูนย์
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
 DocType: Issue,Content Type,ประเภทเนื้อหา
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
@@ -4250,20 +4252,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,จากวันที่ใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ปล่อยให้เป็นเงินสด
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,มัน ทำอะไรได้บ้าง
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ไปที่โกดัง
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ทั้งหมดเป็นนักศึกษา
 ,Average Commission Rate,อัตราเฉลี่ยของค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
 DocType: School House,House Name,ชื่อบ้าน
 DocType: Purchase Taxes and Charges,Account Head,หัวบัญชี
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ปรับปรุงค่าใช้จ่ายเพิ่มเติมในการคำนวณค่าใช้จ่ายในที่ดินของรายการ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ไฟฟ้า
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,เพิ่มส่วนที่เหลือขององค์กรของคุณเป็นผู้ใช้ของคุณ นอกจากนี้คุณยังสามารถเพิ่มเชิญลูกค้าพอร์ทัลของคุณด้วยการเพิ่มจากรายชื่อ
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,เพิ่มส่วนที่เหลือขององค์กรของคุณเป็นผู้ใช้ของคุณ นอกจากนี้คุณยังสามารถเพิ่มเชิญลูกค้าพอร์ทัลของคุณด้วยการเพิ่มจากรายชื่อ
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},รหัสผู้ใช้ ไม่ได้ ตั้งไว้สำหรับ พนักงาน {0}
@@ -4272,7 +4274,7 @@
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
 DocType: Buying Settings,Naming Series,การตั้งชื่อซีรีส์
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,วันประกันเริ่มต้นควรจะน้อยกว่าวันประกันสิ้นสุด
@@ -4287,7 +4289,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
 DocType: Vehicle Log,Odometer,วัดระยะทาง
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
@@ -4300,7 +4302,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
 DocType: Sales Invoice Timesheet,Billing Hours,ชั่วโมงทำการเรียกเก็บเงิน
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM เริ่มต้นสำหรับ {0} ไม่พบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,แตะรายการเพื่อเพิ่มที่นี่
 DocType: Fees,Program Enrollment,การลงทะเบียนโปรแกรม
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},กรุณาตั้ง {0}
@@ -4402,7 +4405,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
 DocType: Issue,First Responded On,ครั้งแรกเมื่อวันที่ง่วง
 DocType: Website Item Group,Cross Listing of Item in multiple groups,รายชื่อครอสของรายการในหลายกลุ่ม
-DocType: Grade Interval,Grade Interval,ชั้นประถมศึกษาปีช่วงเวลา
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},วันเริ่มต้นปีงบประมาณและปีงบประมาณสิ้นสุดวันที่มีการตั้งค่าอยู่แล้วในปีงบประมาณ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,โปรโมชั่นวันที่มีการปรับปรุง
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,แบ่งแบทช์
@@ -4411,6 +4413,7 @@
 DocType: Request for Quotation Supplier,Download PDF,ดาวน์โหลดไฟล์ PDF
 DocType: Production Order,Planned End Date,วันที่สิ้นสุดการวางแผน
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,ที่รายการจะถูกเก็บไว้
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
 DocType: Request for Quotation,Supplier Detail,รายละเอียดผู้จัดจำหน่าย
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},ข้อผิดพลาดในสูตรหรือเงื่อนไข: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,ใบแจ้งหนี้จํานวนเงิน
@@ -4456,7 +4459,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,การตั้งค่าเว็บไซต์ที่ง่ายสำหรับองค์กรของฉัน
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,กรุณาใส่ ศูนย์ ค่าใช้จ่าย ของผู้ปกครอง
@@ -4516,7 +4519,7 @@
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
 DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Company,Company Info,ข้อมูล บริษัท
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ศูนย์ต้นทุนจะต้องสำรองการเรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,นี้ขึ้นอยู่กับการเข้าร่วมของพนักงานนี้
@@ -4529,13 +4532,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,หยุดผู้ใช้จากการทำแอพพลิเคที่เดินทางในวันที่ดังต่อไปนี้
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ปริมาณการซื้อ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ใบเสนอราคาผู้ผลิต {0} สร้าง
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ผลประโยชน์ของพนักงาน
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Production Order,Manufactured Qty,จำนวนการผลิต
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},กรุณาตั้งค่าเริ่มต้นรายการวันหยุดสำหรับพนักงาน {0} หรือ บริษัท {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: ไม่พบ {1}
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: ไม่พบ {1}
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
@@ -4544,15 +4547,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ดุม
 DocType: GL Entry,Voucher Type,ประเภทบัตรกำนัล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Employee Loan Application,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
 DocType: Guardian,Guardian,ผู้ปกครอง
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ประเมิน {0} สร้างขึ้นสำหรับ พนักงาน {1} ใน ช่วงวันที่ ที่กำหนด
 DocType: Employee,Education,การศึกษา
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,ตั้งชื่อ ตาม แคมเปญ
 DocType: Employee,Current Address Is,ที่อยู่ ปัจจุบัน เป็น
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,การแก้ไข
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,รายการบันทึกบัญชี
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
@@ -4589,7 +4594,7 @@
 DocType: Hub Settings,Hub Settings,การตั้งค่า Hub
 DocType: Project,Gross Margin %,กำไรขั้นต้น %
 DocType: BOM,With Operations,กับการดำเนินงาน
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
 DocType: Asset,Is Existing Asset,เป็นสินทรัพย์ที่มีอยู่
 DocType: Salary Detail,Statistical Component,ส่วนประกอบทางสถิติ
 DocType: Salary Detail,Statistical Component,ส่วนประกอบทางสถิติ
@@ -4645,7 +4650,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,แนบ โลโก้
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ระดับสต็อก
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ทำให้ตัวแปร
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",ประเภทการชำระเงินต้องเป็นหนึ่งในการรับชำระเงินและการโอนเงินภายใน
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -4658,6 +4663,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,อนุญาตให้ผลิตในวันหยุด
 DocType: Sales Order,Customer's Purchase Order Date,วันที่สั่งซื้อของลูกค้าสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ทุนหลักทรัพย์
+DocType: Shopping Cart Settings,Show Public Attachments,แสดงเอกสารแนบสาธารณะ
 DocType: Packing Slip,Package Weight Details,รายละเอียดแพคเกจน้ำหนัก
 DocType: Payment Gateway Account,Payment Gateway Account,บัญชี Gateway การชำระเงิน
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,หลังจากเสร็จสิ้นการชำระเงินเปลี่ยนเส้นทางผู้ใช้ไปยังหน้าเลือก
@@ -4682,7 +4688,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ไม่แสดงสัญลักษณ์ใด ๆ เช่น ฯลฯ $ ต่อไปกับเงินสกุล
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,สร้างกลุ่มนักศึกษา
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,สร้างกลุ่มนักศึกษา
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,รับสินค้า จาก BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,นำวันเวลา
@@ -4701,8 +4707,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: GL Entry,Is Opening,คือการเปิด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,บัญชี {0} ไม่อยู่
 DocType: Account,Cash,เงินสด
 DocType: Employee,Short biography for website and other publications.,ชีวประวัติสั้นสำหรับเว็บไซต์และสิ่งพิมพ์อื่น ๆ
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 33bb643..3644dd8 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -68,7 +68,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Banka Havalesi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Banka poliçesi
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Şekli Hesabı
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Göster Varyantlar
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Göster Varyantlar
 DocType: Academic Term,Academic Term,Akademik Dönem
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Malzeme
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Miktar
@@ -87,6 +87,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ödeme Gecikme (Gün)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,hizmet Gideri
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
@@ -141,10 +142,12 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aynı şirket birden fazla girilir
 DocType: Employee,Married,Evli
 DocType: Employee,Married,Evli
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Izin verilmez {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Izin verilmez {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Öğeleri alın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Ürün {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Listelenen öğe yok
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Bakkal
@@ -153,10 +156,10 @@
 DocType: Process Payroll,Make Bank Entry,Banka Girişi Yap
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Sonraki Amortisman Tarihi Satın Alma Tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sonraki Amortisman Tarihi Satın Alma Tarihinden önce olamaz
 DocType: SMS Center,All Sales Person,Bütün Satış Kişileri
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,İşinizde sezonluk değişkenlik varsa **Aylık Dağılım** Bütçe/Hedef'i aylara dağıtmanıza yardımcı olur.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ürün bulunamadı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,ürün bulunamadı
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Maaş Yapısı Eksik
 DocType: Lead,Person Name,Kişi Adı
 DocType: Sales Invoice Item,Sales Invoice Item,Satış Faturası Ürünü
@@ -165,16 +168,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","örneğin, &quot;İlköğretim Okulu&quot; ya da &quot;Üniversite&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stok Raporları
 DocType: Warehouse,Warehouse Detail,Depo Detayı
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Bitiş Tarihi sonradan terim bağlantılı olduğu için Akademik Yılı Yıl Sonu tarihi daha olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
 DocType: Vehicle Service,Brake Oil,fren Yağı
 DocType: Tax Rule,Tax Type,Vergi Türü
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
 DocType: BOM,Item Image (if not slideshow),Ürün Görüntü (yoksa slayt)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Aynı isimle bulunan bir müşteri
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saat Hızı / 60) * Gerçek Çalışma Süresi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,seç BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,seç BOM
 DocType: SMS Log,SMS Log,SMS Kayıtları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Teslim Öğeler Maliyeti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} üzerinde tatil Tarihten itibaren ve Tarihi arasında değil
@@ -227,11 +230,11 @@
 DocType: Training Result Employee,Grade,sınıf
 DocType: Sales Invoice Item,Delivered By Supplier,Tedarikçi Tarafından Teslim
 DocType: SMS Center,All Contact,Tüm İrtibatlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Üretim Sipariş zaten BOM ile tüm öğeler için yaratılmış
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Üretim Sipariş zaten BOM ile tüm öğeler için yaratılmış
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Yıllık Gelir
 DocType: Daily Work Summary,Daily Work Summary,Günlük Çalışma Özeti
 DocType: Period Closing Voucher,Closing Fiscal Year,Mali Yılı Kapanış
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} donduruldu
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} donduruldu
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Hesap tablosu oluşturmak için Varolan Firma seçiniz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stok Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stok Giderleri
@@ -241,12 +244,12 @@
 DocType: Journal Entry,Contra Entry,Hesaba Alacak Girişi
 DocType: Journal Entry Account,Credit in Company Currency,Şirket Para Kredi
 DocType: Delivery Note,Installation Status,Kurulum Durumu
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Eğer yoklama güncellemek istiyor musunuz? <br> Mevcut: {0} \ <br> Yok: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Tedarik Hammadde Satın Alma için
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Ödeme en az bir mod POS fatura için gereklidir.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Ödeme en az bir mod POS fatura için gereklidir.
 DocType: Products Settings,Show Products as a List,Ürünlerine bir liste olarak
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", Şablon İndir uygun verileri doldurmak ve değiştirilmiş dosya ekleyin.
@@ -264,7 +267,7 @@
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,İstek Türü
 DocType: Lead,Request Type,İstek Türü
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Çalışan Girişi Yap
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Çalışan Girişi Yap
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Yerine Getirme
@@ -283,6 +286,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Bakım ziyaretleri planı
 DocType: SMS Settings,Enter url parameter for message,Mesaj için url parametresi girin
 DocType: POS Profile,Customer Groups,Müşteri Grupları
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finansal Tablolar
 DocType: Guardian,Students,Öğrenciler
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Fiyatlandırma ve indirim uygulanması için kurallar.
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Fiyatlandırma ve indirim uygulanması için kurallar.
@@ -314,7 +318,7 @@
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Company,Default Payroll Payable Account,Standart Bordro Ödenecek Hesap
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Güncelleme E-posta Grubu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Güncelleme E-posta Grubu
 DocType: Sales Invoice,Is Opening Entry,Açılış Girdisi
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mansiyon standart dışı alacak hesabı varsa
 DocType: Course Schedule,Instructor Name,Öğretim Elemanının Adı
@@ -327,7 +331,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Satış Faturası Ürün Karşılığı
 ,Production Orders in Progress,Devam eden Üretim Siparişleri
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Finansman Sağlanan Net Nakit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
 DocType: Lead,Address & Contact,Adres ve İrtibat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Önceki tahsisleri kullanılmayan yaprakları ekleyin
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
@@ -354,7 +358,7 @@
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Banka Girişler
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yıllık
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yıllık
@@ -376,7 +380,7 @@
 DocType: Item,Publish in Hub,Hub Yayınla
 DocType: Student Admission,Student Admission,Öğrenci Kabulü
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Ürün {0} iptal edildi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Malzeme Talebi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
@@ -437,12 +441,11 @@
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,İrsaliye
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Satılan Varlığın Maliyeti
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Bunu çekti sonra Ödeme Giriş modifiye edilmiştir. Tekrar çekin lütfen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
-DocType: Grade Interval,Min Score,Min Skor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
 DocType: Student Applicant,Admitted,Başvuruldu
 DocType: Workstation,Rent Cost,Kira Bedeli
@@ -456,7 +459,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Sipariş Değeri
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,partiye karşı veya dahili transfer için Banka / Para Çekme işlemleri
 DocType: Shipping Rule,Valid for Countries,Ülkeler için geçerli
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Bu Ürün Şablon ve işlemlerde kullanılamaz. 'Hayır Kopyala' ayarlanmadığı sürece Öğe özellikleri varyantları içine üzerinden kopyalanır
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Bu Ürün Şablon ve işlemlerde kullanılamaz. 'Hayır Kopyala' ayarlanmadığı sürece Öğe özellikleri varyantları içine üzerinden kopyalanır
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Dikkat Toplam Sipariş
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ayın 'Belli Gününde Tekrarla' alanına değer giriniz
@@ -466,14 +469,14 @@
 DocType: Item Tax,Tax Rate,Vergi Oranı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} zaten Çalışan tahsis {1} dönem {2} için {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Öğe Seç
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Olmayan gruba dönüştürme
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Bir Öğe toplu (lot).
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: GL Entry,Debit Amount,Borç Tutarı
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Eke bakın
 DocType: Purchase Order,% Received,% Alındı
 DocType: Purchase Order,% Received,% Alındı
@@ -511,9 +514,9 @@
 DocType: Request for Quotation,Request for Quotation,Fiyat Teklif Talebi
 DocType: Salary Slip Timesheet,Working Hours,Iş saatleri
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Yeni müşteri oluştur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Yeni müşteri oluştur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Birden fazla fiyatlandırma Kuralo hakimse, kullanıcılardan zorunu çözmek için Önceliği elle ayarlamaları istenir"
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Satınalma Siparişleri oluşturun
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Satınalma Siparişleri oluşturun
 ,Purchase Register,Satın alma kaydı
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Uygulanabilir Ücretler
@@ -566,7 +569,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
 DocType: HR Settings,Employee record is created using selected field. ,Çalışan kaydı seçilen alan kullanılarak yapılmıştır
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
@@ -593,6 +596,7 @@
 DocType: Packing Slip,From Package No.,Ambalaj Numarasından.
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Teminatlar ve Mevduatlar
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Kendi değerleme yöntemine sahip olmayan bazı ürünlere karşı işlemler olduğu için değerleme yöntemini değiştiremezsiniz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tahsis edilen toplam yaprakları zorunludur
 DocType: Job Opening,Description of a Job Opening,İş Açılış Açıklaması
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bugün için Bekleyen faaliyetler
@@ -624,7 +628,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
 DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
 DocType: Shipping Rule,Net Weight,Net Ağırlık
 DocType: Employee,Emergency Phone,Acil Telefon
 DocType: Employee,Emergency Phone,Acil Telefon
@@ -636,7 +640,7 @@
 DocType: Sales Order,To Deliver,Teslim edilecek
 DocType: Purchase Invoice Item,Item,Ürün
 DocType: Purchase Invoice Item,Item,Ürün
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Account,Profit and Loss,Kar ve Zarar
@@ -669,7 +673,7 @@
 DocType: Production Plan Item,Pending Qty,Bekleyen Adet
 DocType: Budget,Ignore,Yoksay
 DocType: Budget,Ignore,Yoksay
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} aktif değil
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} aktif değil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS aşağıdaki numaralardan gönderilen: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Baskı için Kurulum onay boyutları
 DocType: Salary Slip,Salary Slip Timesheet,Maaş Kayma Zaman Çizelgesi
@@ -681,14 +685,14 @@
 DocType: Pricing Rule,Sales Partner,Satış Ortağı
 DocType: Pricing Rule,Sales Partner,Satış Ortağı
 DocType: Buying Settings,Purchase Receipt Required,Gerekli Satın alma makbuzu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Açılış Stok girdiyseniz Değerleme Oranı zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Açılış Stok girdiyseniz Değerleme Oranı zorunludur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Birikmiş Değerler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Satış Emri verin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Satış Emri verin
 DocType: Project Task,Project Task,Proje Görevi
 ,Lead Id,Talep Yaratma  Kimliği
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
@@ -707,7 +711,7 @@
 DocType: Job Applicant,Resume Attachment,Devam Eklenti
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Tekrar Müşteriler
 DocType: Leave Control Panel,Allocate,Tahsis
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Satış İade
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Satış İade
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Not: Toplam tahsis edilen yaprakları {0} zaten onaylanmış yaprakları daha az olmamalıdır {1} dönem için
 DocType: Announcement,Posted By,Tarafından gönderildi
 DocType: Item,Delivered by Supplier (Drop Ship),Yüklenici tarafından teslim (Bırak Gemi)
@@ -720,7 +724,7 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lütfen şirketi ayarlayın.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lütfen şirketi ayarlayın.
@@ -732,7 +736,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Satış Faturası Çizelgesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seç Ödeme Hesabı Banka girişi yapmak için
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Yaprakları, harcama talepleri ve bordro yönetmek için Çalışan kaydı oluşturma"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Yaprakları, harcama talepleri ve bordro yönetmek için Çalışan kaydı oluşturma"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Bilgi Bankası'na ekle
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Teklifi Yazma
@@ -781,8 +785,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Yönetici
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Yönetici
 DocType: Payment Entry,Payment From / To,From / To Ödeme
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Tarih aralığı
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yeni kredi limiti müşteri için geçerli kalan miktar daha azdır. Kredi limiti en az olmak zorundadır {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yeni kredi limiti müşteri için geçerli kalan miktar daha azdır. Kredi limiti en az olmak zorundadır {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
@@ -794,7 +797,7 @@
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Student Batch Name,Batch Name,toplu Adı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Zaman Çizelgesi oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,kaydetmek
 DocType: Selling Settings,Customer Naming By,Müşterinin Bilinen Adı
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Öğrenci Aylık Seyirci Raporunda olarak Şimdiki öğrenci gösterecek
@@ -845,7 +848,7 @@
 DocType: Student Attendance,Student Attendance,Öğrenci Seyirci
 DocType: Sales Invoice Timesheet,Time Sheet,Kartela
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Hammaddeleri Dayalı
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Lütfen ayrıntıları girin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Lütfen ayrıntıları girin
 DocType: Interest,Interest,Faiz
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Ön satış
 DocType: Purchase Receipt,Other Details,Diğer Detaylar
@@ -867,7 +870,7 @@
 ,Absent Student Report,Yok Öğrenci Raporu
 DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
 DocType: Offer Letter Term,Offer Letter Term,Mektubu Dönem Teklif
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Öğe varyantları vardır.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
 DocType: Bin,Stock Value,Stok Değeri
@@ -880,7 +883,6 @@
 DocType: Material Request Item,Quantity and Warehouse,Miktar ve Depo
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Naming Series&#39;i ayarlayın.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Lütfen Program Seçiniz
 DocType: Project,Estimated Cost,Tahmini maliyeti
 DocType: Purchase Order,Link to material requests,materyal isteklere Bağlantı
@@ -901,7 +903,7 @@
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Payment Entry,Received Amount (Company Currency),Alınan Tutar (Şirket Para Birimi)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Talepten fırsat oluşturuldu ise talep ayarlanmalıdır
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Talepten fırsat oluşturuldu ise talep ayarlanmalıdır
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Haftalık izin gününü seçiniz
 DocType: Production Order Operation,Planned End Time,Planlanan Bitiş Zamanı
 ,Sales Person Target Variance Item Group-Wise,Satış Personeli Hedef Varyans Ürün Grup Bilgisi
@@ -992,7 +994,7 @@
 DocType: Employee,Family Background,Aile Geçmişi
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,İzin yok
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
@@ -1008,8 +1010,8 @@
 DocType: Supplier Quotation,Stopped,Durduruldu
 DocType: Supplier Quotation,Stopped,Durduruldu
 DocType: Item,If subcontracted to a vendor,Bir satıcıya taşeron durumunda
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
 DocType: SMS Center,All Customer Contact,Bütün Müşteri İrtibatları
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv üzerinden stok bakiyesini yükle.
 DocType: Warehouse,Tree Details,ağaç Detayları
@@ -1020,8 +1022,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Asgari Fatura Tutarı
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Maliyet Merkezi {2} Şirket&#39;e ait olmayan {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Hesap {2} Grup olamaz
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ürün Satır {idx}: {doctype} {docname} Yukarıdaki mevcut değildir &#39;{doctype}&#39; tablosu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Zaman Çizelgesi {0} tamamlanmış veya iptal edilir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ürün Satır {idx}: {doctype} {docname} Yukarıdaki mevcut değildir &#39;{doctype}&#39; tablosu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Zaman Çizelgesi {0} tamamlanmış veya iptal edilir
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,görev yok
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Otomatik fatura 05, 28 vb gibi oluşturulur hangi ayın günü"
 DocType: Asset,Opening Accumulated Depreciation,Birikmiş Amortisman Açılış
@@ -1038,7 +1040,7 @@
 DocType: Bin,Moving Average Rate,Hareketli Ortalama Kuru
 DocType: Production Planning Tool,Select Items,Ürünleri Seçin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kurs programı
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kurs programı
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: HR Settings,Enter retirement age in years,yıllarda emeklilik yaşı girin
@@ -1047,7 +1049,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Bu kadar yüzde teslimatı veya makbuz üzerinde izin ver
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,İthalat Katılımı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Bütün Ürün Grupları
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Bütün Ürün Grupları
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Net Kar / Zarar
@@ -1060,7 +1062,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Öngörülen Tutar
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Açılış&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,To Do Aç
 DocType: Notification Control,Delivery Note Message,İrsaliye Mesajı
@@ -1080,7 +1082,7 @@
 DocType: Leave Block List Date,Leave Block List Date,İzin engel listesi tarihi
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Satın Alma Makbuzu Öğeler tablosundaki toplam Uygulanabilir Masraflar Toplam Vergi ve Masraflar aynı olmalıdır
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Satın Alma Makbuzu Öğeler tablosundaki toplam Uygulanabilir Masraflar Toplam Vergi ve Masraflar aynı olmalıdır
 DocType: Sales Team,Incentives,Teşvikler
 DocType: Sales Team,Incentives,Teşvikler
 DocType: SMS Log,Requested Numbers,Talep Sayılar
@@ -1147,8 +1149,7 @@
 DocType: Supplier,Default Payable Accounts,Standart Borç Hesapları
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Fee Structure,Components,Bileşenler
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
@@ -1207,8 +1208,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Bu mod seçildiğinde varsayılan Banka / Kasa hesabı otomatik Maaş Dergisi girdisi güncellenecektir.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Sınıf Kodu için aralıkları {0} diğer sınıflar için sınıf aralıklarla çakışıyor. kontrol edin aralıkları {0} ve {1} ve yeniden deneyin
 DocType: BOM,Raw Material Cost(Company Currency),Hammadde Maliyeti (Şirket Para Birimi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Sıra # {0}: Oran, {1} {2} &#39;de kullanılan hızdan daha büyük olamaz"
@@ -1222,7 +1221,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Sitesi Öğe
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
 DocType: Timesheet Detail,Bill,fatura
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Beyaz
 DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Satır {0}: için Adet mevcut değil {4} depoda {1} giriş saati gönderme de ({2} {3})
@@ -1237,7 +1236,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Sipariş türü şunlardan biri olmalıdır {0}
 DocType: Lead,Next Contact Date,Sonraki İrtibat Tarihi
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Açılış Miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
 DocType: Student Batch Name,Student Batch Name,Öğrenci Toplu Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
@@ -1260,11 +1259,11 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Lütfen belirtin a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
 DocType: Delivery Note,Delivery To,Teslim
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Planning Tool,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negatif olamaz
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Indirim
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Indirim
 DocType: Asset,Total Number of Depreciations,Amortismanlar Sayısı
 DocType: Sales Invoice Item,Rate With Margin,Marjla Oran
 DocType: Sales Invoice Item,Rate With Margin,Marjla Oran
@@ -1295,7 +1294,7 @@
 DocType: Lead,Organization Name,Kuruluş Adı
 DocType: Tax Rule,Shipping State,Nakliye Devlet
 ,Projected Quantity as Source,Kaynak olarak Öngörülen Miktarı
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Ürün düğmesi 'satın alma makbuzlarını Öğeleri alın' kullanılarak eklenmelidir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Ürün düğmesi 'satın alma makbuzlarını Öğeleri alın' kullanılarak eklenmelidir
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Stokta olmayan öğeleri içerir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Satış Giderleri
@@ -1307,7 +1306,7 @@
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Posta Kodu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Posta Kodu
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Satış Sipariş {0} {1}
 DocType: Opportunity,Contact Info,İletişim Bilgileri
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Stok Girişleri Yapımı
@@ -1355,7 +1354,7 @@
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 DocType: Global Defaults,Global Defaults,Küresel Varsayılanlar
@@ -1395,12 +1394,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Toplu Numarası almak için Ürün Kodu giriniz
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
 DocType: Employee Loan,Partially Disbursed,Kısmen dönemlerde toplanan
-DocType: Grading Structure,Grading System Name,Not Sistemi Adı
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tedarikçi Veritabanı.
 DocType: Account,Balance Sheet,Bilanço
 DocType: Account,Balance Sheet,Bilanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Ödeme Modu yapılandırılmamış. Hesap Ödemeler Modu veya POS Profili ayarlanmış olup olmadığını kontrol edin.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Ödeme Modu yapılandırılmamış. Hesap Ödemeler Modu veya POS Profili ayarlanmış olup olmadığını kontrol edin.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Satış kişiniz bu tarihte müşteriyle irtibata geçmek için bir hatırlama alacaktır
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Aynı madde birden çok kez girilemez.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ek hesaplar Gruplar altında yapılabilir, ancak girişler olmayan Gruplar karşı yapılabilir"
@@ -1445,12 +1443,12 @@
 DocType: Maintenance Visit Purpose,Work Done,Yapılan İş
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Nitelikler masada en az bir özellik belirtin
 DocType: Announcement,All Students,Tüm Öğrenciler
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} stok korunmayan ürün olmalıdır
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} stok korunmayan ürün olmalıdır
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Değerlendirme Defteri
 DocType: Grading Scale,Intervals,Aralıklar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Öğrenci Mobil No
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Dünyanın geri kalanı
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
@@ -1493,8 +1491,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
 DocType: Journal Entry,Get Outstanding Invoices,Bekleyen Faturaları alın
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Satın alma siparişleri planı ve alışverişlerinizi takip
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Satın alma siparişleri planı ve alışverişlerinizi takip
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Malzeme Talebi toplam Sayı / Aktarım miktarı {0} {1} \ Ürün için istenen miktar {2} daha büyük olamaz {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Küçük
@@ -1523,7 +1521,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ürünleriniz veya hizmetleriniz
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Ürün Ağacı
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
@@ -1543,7 +1541,7 @@
 DocType: Student Group Student,Group Roll Number,Grup Rulosu Numarası
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,tüm görev ağırlıkları toplamı 1. buna göre tüm proje görevleri ağırlıkları ayarlayın olmalıdır
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
@@ -1577,7 +1575,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ürün işlemde
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
-DocType: Grade Interval,Grade Code,sınıf Kodu
+DocType: Grading Scale Interval,Grade Code,sınıf Kodu
 DocType: POS Item Group,POS Item Group,POS Ürün Grubu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
@@ -1597,7 +1595,7 @@
 DocType: Sales Order,Recurring Upto,Tekrarlanan Kadar
 DocType: Attendance,HR Manager,İK Yöneticisi
 DocType: Attendance,HR Manager,İK Yöneticisi
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Bir Şirket seçiniz
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Bir Şirket seçiniz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege bırak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege bırak
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
@@ -1616,7 +1614,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Yiyecek Grupları
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Yaşlanma Aralığı 3
 DocType: Maintenance Schedule Item,No of Visits,Ziyaret sayısı
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Devam
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Mark Devam
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},{1} ile ilgili Bakım Çizelgesi {0} var
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,kaydolunan öğrenci
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Kapanış Hesap Para olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Tüm hedefler için puan toplamı It is 100. olmalıdır {0}
@@ -1677,13 +1676,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Hesap Tablosu
 DocType: Material Request,Terms and Conditions Content,Şartlar ve Koşullar İçeriği
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
 DocType: Employee,Owned,Hisseli
 DocType: Salary Detail,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
 DocType: Pricing Rule,"Higher the number, higher the priority","Yüksek sayı, yüksek öncelikli"
 ,Purchase Invoice Trends,Satın alma fatura eğilimleri
 DocType: Employee,Better Prospects,Iyi Beklentiler
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Sıra # {0}: Toplu işlem {1} yalnızca {2} adetlik bir miktara sahip. Lütfen {3} adet mevcut olan başka bir partiyi seçin veya satırı birden çok partiye dağıtmak / yayınlamak için satırı birden çok satıra bölün.
 DocType: Vehicle,License Plate,Plaka
 DocType: Appraisal,Goals,Hedefler
 DocType: Appraisal,Goals,Hedefler
@@ -1706,7 +1706,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hesap dondurulmuş ise, girdiler kısıtlı kullanıcılara açıktır."
 DocType: Email Digest,Bank Balance,Banka hesap bakiyesi
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","İş Profili, gerekli nitelikler vb"
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
@@ -1719,7 +1719,7 @@
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Hesap {2} etkin değil
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Satış Siparişleri işinizi planlamak ve zamanında teslim etmek olun
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Satış Siparişleri işinizi planlamak ve zamanında teslim etmek olun
 DocType: Quality Inspection,Readings,Okumalar
 DocType: Stock Entry,Total Additional Costs,Toplam Ek Maliyetler
 DocType: Course Schedule,SH,SH
@@ -1732,7 +1732,7 @@
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Asset Movement,Stock Manager,Stok Müdürü
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Satır {0} Kaynak depo zorunludur
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Ambalaj Makbuzu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Ambalaj Makbuzu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
@@ -1764,7 +1764,7 @@
 DocType: Sales Invoice,Source,Kaynak
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Kapalı olanları göster
 DocType: Leave Type,Is Leave Without Pay,Pay Yapmadan mı
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Sabit Varlık için Varlık Kategorisi zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Sabit Varlık için Varlık Kategorisi zorunludur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Bu {0} çatışmalar {1} için {2} {3}
@@ -1785,7 +1785,7 @@
 DocType: Student,Date of Leaving,Ayrılış tarihi
 DocType: Pricing Rule,For Price List,Fiyat Listesi İçin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Yürütücü Arama
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,İlanlar oluştur
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,İlanlar oluştur
 DocType: Maintenance Schedule,Schedules,Programlar
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
@@ -1815,7 +1815,7 @@
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Purchase Receipt,Transporter Details,Taşıyıcı Detayları
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kutu
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kutu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Olası Tedarikçi
@@ -1855,7 +1855,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} Proje için bulunamadı için varsayılan BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Şirket Gideri Talepleri.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Öğrenciler sisteminin kalbi, tüm öğrenci ekleyebilir edilir"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Öğrenciler sisteminin kalbi, tüm öğrenci ekleyebilir edilir"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Satır # {0}: Boşluk tarihi {1} Çek tarihinden önce olamaz {2}
 DocType: Company,Default Holiday List,Tatil Listesini Standart
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Satır {0}: Zaman ve zaman {1} ile örtüşen {2}
@@ -1868,21 +1868,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Eğer izin için başvuruda edildiği gün (ler) tatildir. Sen izin talebinde gerekmez.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ödeme E-posta tekrar gönder
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Yeni görev
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Teklifi Yap
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Teklifi Yap
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,diğer Raporlar
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Şirket Standart Bordro Ödenecek Hesap ayarlayın {0}
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: SMS Center,Receiver List,Alıcı Listesi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Arama Öğe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Arama Öğe
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tüketilen Tutar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nakit Net Değişim
 DocType: Assessment Plan,Grading Scale,Notlandırma ölçeği
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Zaten tamamlandı
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Ödeme Talebi zaten var {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
@@ -1925,7 +1925,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Tedarikçi karşı Fatura {0} tarihli {1}
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Customer,Default Price List,Standart Fiyat Listesi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Silemezsiniz Mali Yılı {0}. Mali yıl {0} Genel ayarlar varsayılan olarak ayarlanır
 DocType: Journal Entry,Entry Type,Girdi Türü
 ,Customer Credit Balance,Müşteri Kredi Bakiyesi
@@ -1972,8 +1972,6 @@
 DocType: Territory,Territory Manager,Bölge Müdürü
 DocType: Territory,Territory Manager,Bölge Müdürü
 DocType: Packed Item,To Warehouse (Optional),Depo (İsteğe bağlı)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 DocType: Payment Entry,Paid Amount (Company Currency),Ücretli Tutar (Şirket Para)
 DocType: Purchase Invoice,Additional Discount,Ek İndirim
 DocType: Selling Settings,Selling Settings,Satış Ayarları
@@ -1986,9 +1984,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Pazarlama Giderleri
 ,Item Shortage Report,Ürün yetersizliği Raporu
 ,Item Shortage Report,Ürün yetersizliği Raporu
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Bu stok girdisini yapmak için kullanılan Malzeme Talebi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Sonraki Amortisman Tarihi yeni varlık için zorunludur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sonraki Amortisman Tarihi yeni varlık için zorunludur
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Her Toplu İş için Ayrılmış Kurs Tabanlı Grup
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Her Toplu İş için Ayrılmış Kurs Tabanlı Grup
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Bir Ürünün tek birimi
@@ -2006,9 +2004,7 @@
 DocType: Course Assessment Criteria,Weightage,Ağırlık
 DocType: Packing Slip,PS-,ps
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kar/zarar hesabı {2} için Masraf Merkezi tanımlanmalıdır. Lütfen aktif şirket için varsayılan bir Masraf Merkezi tanımlayın.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Yeni bağlantı
 DocType: Territory,Parent Territory,Ana Bölge
 DocType: Quality Inspection Reading,Reading 2,2 Okuma
@@ -2040,22 +2036,21 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Çok fazla sütun. Raporu çıkarın ve spreadsheet uygulaması kullanarak yazdırın.
 DocType: Purchase Invoice Item,Batch No,Parti No
 DocType: Purchase Invoice Item,Batch No,Parti No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},için döviz kurunu bulunamıyor {0} için {1} tuşuna tarih {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Bir Müşterinin Satınalma Siparişi karşı birden Satış Siparişine izin ver
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobil yok
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Ana
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varyant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Ana
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varyant
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
 DocType: Employee Attendance Tool,Employees HTML,"Çalışanlar, HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
 DocType: Employee,Leave Encashed?,İzin Tahsil Edilmiş mi?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Kimden alanında Fırsat zorunludur
 DocType: Email Digest,Annual Expenses,yıllık giderler
 DocType: Item,Variants,Varyantlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Satın Alma Emri verin
 DocType: SMS Center,Send To,Gönder
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
 DocType: Payment Reconciliation Payment,Allocated amount,Ayrılan miktarı
@@ -2078,7 +2073,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nakliye Kuralı için koşul
-DocType: Grading Structure,Grading Intervals,Notlandırma aralıkları
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Girin lütfen
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Arka arkaya Item {0} için Overbill olamaz {1} daha {2}. aşırı faturalama sağlamak için, Ayarlar Alış belirlenen lütfen"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Madde veya Depo dayalı filtre ayarlayın
@@ -2092,7 +2086,7 @@
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Satır # {0}: Depo Reddedildi reddedilen Öğe karşı zorunludur {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Tahsilat
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,siparişlerinizi yönetin
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,siparişlerinizi yönetin
 DocType: Production Order Operation,Actual Time and Cost,Gerçek Zaman ve Maliyet
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Maksimum {0} Malzeme Talebi Malzeme {1} için Satış Emri {2} karşılığında yapılabilir
 DocType: Employee,Salutation,Hitap
@@ -2100,9 +2094,10 @@
 DocType: Course,Course Abbreviation,Ders Kısaltma
 DocType: Student Leave Application,Student Leave Application,Öğrenci bırak Uygulaması
 DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},"Yarım günde Çalışan {0}, {1}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Toplam çalışma süresi maksimum çalışma saatleri fazla olmamalıdır {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Üzerinde
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Satış zamanı toplam Ürünler.
 DocType: Quotation Item,Actual Qty,Gerçek Adet
 DocType: Sales Invoice Item,References,Kaynaklar
@@ -2113,7 +2108,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Ortak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Ortak
 DocType: Asset Movement,Asset Movement,Varlık Hareketi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Yeni Sepet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Yeni Sepet
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Ürün {0} bir seri Ürün değildir
 DocType: SMS Center,Create Receiver List,Alıcı listesi oluşturma
 DocType: Vehicle,Wheels,Tekerlekler
@@ -2148,9 +2143,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Üretim Siparişleri karşı gerçek zamanlı günlükleri oluşturulmasını devre dışı bırakır. Operasyonlar Üretim Emri karşı izlenen edilmeyecektir
 DocType: Student,Student Mobile Number,Öğrenci Cep Numarası
 DocType: Item,Has Variants,Varyasyoları var
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Toplu İşlem Kimliği zorunludur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Toplu İşlem Kimliği zorunludur
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
 DocType: Purchase Invoice,Recurring Invoice,Mükerrer Fatura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projeleri yönetme
@@ -2159,7 +2154,7 @@
 DocType: Vehicle Log,Fuel Price,yakıt Fiyatı
 DocType: Budget,Budget,Bütçe
 DocType: Budget,Budget,Bütçe
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Sabit Kıymet Öğe olmayan bir stok kalemi olmalıdır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Sabit Kıymet Öğe olmayan bir stok kalemi olmalıdır.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bir gelir ya da gider hesabı değil gibi Bütçe, karşı {0} atanamaz"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arşivlendi
 DocType: Student Admission,Application Form Route,Başvuru Formu Rota
@@ -2198,7 +2193,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},"{0} {1} miktarı, {2}'ye karşılık düşürülecek"
 DocType: Employee,Salary Information,Maaş Bilgisi
 DocType: Sales Person,Name and Employee ID,İsim ve Çalışan Kimliği
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Harç ve Vergiler
@@ -2265,7 +2260,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) rolü 'Gider onaylayansanız' olmalıdır
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Çift
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Çift
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
 DocType: Asset,Depreciation Schedule,Amortisman Programı
 DocType: Bank Reconciliation Detail,Against Account,Hesap karşılığı
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Yarım Gün Tarih Tarihinden ve Tarihi arasında olmalıdır
@@ -2283,7 +2278,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},{0} {1} Miktarları {2} {3}'e karşılık
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bekleyen Tutar
@@ -2291,7 +2286,8 @@
 DocType: Purchase Invoice Item,Conversion Factor,Katsayı
 DocType: Purchase Order,Delivered,Teslim Edildi
 ,Vehicle Expenses,araç Giderleri
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
+DocType: Serial No,Invoice Details,Fatura detayları
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
 DocType: Purchase Receipt,Vehicle Number,Araç Sayısı
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Yinelenen faturanın durdurulacağı tarih
 DocType: Employee Loan,Loan Amount,Kredi miktarı
@@ -2317,7 +2313,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Sigara Grup Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
@@ -2333,6 +2329,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Reddedilen Ürün stoklarını muhafaza ettiğiniz depo
 DocType: Production Order,Skip Material Transfer,Malzeme Transferini Atla
 DocType: Production Order,Skip Material Transfer,Malzeme Transferini Atla
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Anahtar tarih {2} için {0} ila {1} arası döviz kuru bulunamadı. Lütfen bir Döviz Değiştirme kaydı el ile oluşturun
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Mali yılınız şu tarihte sona eriyor:
 DocType: POS Profile,Price List,Fiyat listesi
 DocType: POS Profile,Price List,Fiyat listesi
@@ -2375,9 +2372,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mali Yılı ** Mali Yılı temsil eder. Tüm muhasebe kayıtları ve diğer önemli işlemler ** ** Mali Yılı karşı izlenir.
 DocType: Opportunity,Customer / Lead Address,Müşteri Adresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 DocType: Student Admission,Eligibility,uygunluk
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","İlanlar iş, tüm kişileri ve daha fazla potansiyel müşteri olarak eklemek yardımcı"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","İlanlar iş, tüm kişileri ve daha fazla potansiyel müşteri olarak eklemek yardımcı"
 DocType: Production Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
@@ -2425,7 +2422,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Firma Seçin ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tüm bölümler için kabul ise boş bırakın
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","İstihdam (daimi, sözleşmeli, stajyer vb) Türleri."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
 DocType: Process Payroll,Fortnightly,iki haftada bir
 DocType: Currency Exchange,From Currency,Para biriminden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
@@ -2444,7 +2441,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Çocuk Ürün Ürün Paketi olmamalıdır. öğeyi kaldırmak `{0}` ve saklayın
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ekle
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ekle
 DocType: Vehicle Service,Service Item,servis Öğe
 DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
 DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
@@ -2497,8 +2494,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Fiyat Listesi ayarlı değilse fiyatları gösterilmeyecektir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Bu Nakliye Kural için bir ülke belirtin ya da Dünya Denizcilik&#39;in kontrol edin
 DocType: Stock Entry,Total Incoming Value,Toplam Gelen Değeri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Bankamatik To gereklidir
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Bankamatik To gereklidir
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Satınalma Fiyat Listesi
 DocType: Offer Letter Term,Offer Term,Teklif Dönem
 DocType: Quality Inspection,Quality Manager,Kalite Müdürü
@@ -2537,14 +2534,14 @@
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Yeni Adres
 DocType: Quality Inspection,Sample Size,Numune Miktarı
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Makbuz Belge giriniz
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Makbuz Belge giriniz
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Lütfen geçerlli bir 'durum nodan başlayarak' belirtiniz
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
 DocType: Project,External,Harici
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kullanıcılar ve İzinler
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Üretim Siparişleri düzenlendi: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Üretim Siparişleri düzenlendi: {0}
 DocType: Branch,Branch,Şube
 DocType: Guardian,Mobile Number,Cep numarası
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Baskı ve Markalaşma
@@ -2555,7 +2552,7 @@
 DocType: Scheduling Tool,Student Batch,Öğrenci Toplu
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Müşterileriniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Öğrenci olun
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Öğrenci olun
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},{0} projesine katkıda bulunmak için davet edildiniz
 DocType: Leave Block List Date,Block Date,Blok Tarih
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Şimdi Başvur
@@ -2582,8 +2579,9 @@
 DocType: SMS Log,Sent To,Gönderildiği Kişi
 DocType: Payment Request,Make Sales Invoice,Satış Faturası Oluştur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Yazılımlar
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Sonraki İletişim Tarih geçmişte olamaz
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sonraki İletişim Tarih geçmişte olamaz
 DocType: Company,For Reference Only.,Başvuru için sadece.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Toplu İş Numarayı Seç
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Geçersiz {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-ret
 DocType: Sales Invoice Advance,Advance Amount,Avans miktarı
@@ -2600,8 +2598,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Durum No 0 olamaz
 DocType: Item,Show a slideshow at the top of the page,Sayfanın üstünde bir slayt gösterisi göster
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM&#39;ları
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Mağazalar
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Mağazalar
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Mağazalar
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Mağazalar
 DocType: Serial No,Delivery Time,İrsaliye Zamanı
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Yaşlanma Temeli
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
@@ -2620,8 +2618,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Malzemesi
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","İşlemleri, işlem maliyetlerini belirtiniz ve işlemlerinize kendilerine özgü işlem numaraları veriniz."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Bu belge ile sınırı üzerinde {0} {1} öğe için {4}. yapıyoruz aynı karşı başka {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Seç değişim miktarı hesabı
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Seç değişim miktarı hesabı
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Naming Series,User must always select,Kullanıcı her zaman seçmelidir
@@ -2635,7 +2633,7 @@
 DocType: Budget Account,Budget Account,Bütçe Hesabı
 DocType: Quality Inspection,Verified By,Onaylayan Kişi
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Mevcut işlemler olduğundan, şirketin varsayılan para birimini değiştiremezsiniz. İşlemler Varsayılan para birimini değiştirmek için iptal edilmelidir."
-DocType: Grade Interval,Grade Description,sınıf Açıklama
+DocType: Grading Scale Interval,Grade Description,sınıf Açıklama
 DocType: Stock Entry,Purchase Receipt No,Satın alma makbuzu numarası
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
@@ -2678,8 +2676,8 @@
 DocType: Upload Attendance,Attendance To Date,Tarihine kadar katılım
 DocType: Warranty Claim,Raised By,Talep eden
 DocType: Payment Gateway Account,Payment Account,Ödeme Hesabı
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Alacak Hesapları Net Değişim
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Telafi İzni
 DocType: Offer Letter,Accepted,Onaylanmış
@@ -2693,7 +2691,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Kargo Kural Etiketi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,kullanıcı Forumu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hızlı Kayıt Girdisi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
@@ -2708,7 +2706,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Enstitünün adı kendisi için bu sistemi kuruyoruz.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Muhasebe entry bu tarihe kadar dondurulmuş, kimse / aşağıda belirtilen rolü dışında girdisini değiştirin yapabilirsiniz."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Bakım programı oluşturmadan önce belgeyi kaydedin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Bakım programı oluşturmadan önce belgeyi kaydedin
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Proje Durumu
 DocType: UOM,Check this to disallow fractions. (for Nos),Kesirlere izin vermemek için işaretleyin (Numaralar için)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Aşağıdaki Üretim Siparişleri yaratıldı:
@@ -2735,6 +2733,7 @@
 DocType: Email Digest,How frequently?,Ne sıklıkla?
 DocType: Purchase Receipt,Get Current Stock,Cari Stok alın
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Malzeme Listesinde Ağacı
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 DocType: Student,Joining Date,birleştirme tarihi
 ,Employees working on a holiday,tatil çalışanlar
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mevcut İşaretle
@@ -2845,7 +2844,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Üretim
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Üretim
 DocType: Guardian,Occupation,Meslek
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Toplam (Adet)
 DocType: Sales Invoice,This Document,Bu belge
 DocType: Installation Note Item,Installed Qty,Kurulan Miktar
@@ -2873,8 +2872,8 @@
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Şirket, Para Birimi, Mali yıl vb gibi standart değerleri ayarlayın"
 DocType: Payment Entry,Payment Type,Ödeme Şekli
 DocType: Payment Entry,Payment Type,Ödeme Şekli
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
 DocType: Process Payroll,Select Employees,Seçin Çalışanlar
 DocType: Opportunity,Potential Sales Deal,Potansiyel Satış Fırsat
 DocType: Payment Entry,Cheque/Reference Date,Çek / Referans Tarihi
@@ -2893,7 +2892,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Zaten şirket için oluşturulan küresel POS Profili {0} {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Bütün BOMlarla Ürün/BOM değiştir
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Makbuz belge teslim edilmelidir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Makbuz belge teslim edilmelidir
 DocType: Purchase Invoice Item,Received Qty,Alınan Miktar
 DocType: Purchase Invoice Item,Received Qty,Alınan Miktar
 DocType: Stock Entry Detail,Serial No / Batch,Seri No / Parti
@@ -2907,7 +2906,7 @@
 ,To Produce,Üretilecek
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bordro
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Kullanıcı Yap
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Kullanıcı Yap
 DocType: Packing Slip,Identification of the package for the delivery (for print),(Baskı için) teslimat için ambalajın tanımlanması
 DocType: Bin,Reserved Quantity,Ayrılan Miktar
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Lütfen geçerli e-posta adresini girin
@@ -2922,11 +2921,12 @@
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Payment Request,Amount in customer's currency,Müşterinin para miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,İrsaliye
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Maliyetlendirme Bölümünde ""Dayalı Ürünler Br.Fiyatına"" bakınız"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Önceki
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Öğrenci Partileri Eğer öğrenciler için katılım, değerlendirme ve ücretler izlemenize yardımcı"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Öğrenci Partileri Eğer öğrenciler için katılım, değerlendirme ve ücretler izlemenize yardımcı"
 DocType: Payment Entry,Total Allocated Amount,Toplam Ayrılan Tutar
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
@@ -2955,7 +2955,7 @@
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
@@ -2967,6 +2967,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',durumu ile çalışanlara etkinlikle ilgili bir e-posta göndereceğiz &#39;Aç&#39;
 DocType: Task,Depends on Tasks,Görevler bağlıdır
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Müşteri Grupbu Ağacını Yönetin.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Ekler alışveriş sepetini etkinleştirmeden gösterilebilir
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Yeni Maliyet Merkezi Adı
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Yeni Maliyet Merkezi Adı
@@ -2980,12 +2981,10 @@
 DocType: Sales Invoice,Debit To,Borç
 DocType: Delivery Note,Required only for sample item.,Sadece örnek Ürün için gereklidir.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,İşlem sonrası gerçek Adet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},arasında bulunamadı maaş kayma {0} ve {1}
 ,Pending SO Items For Purchase Request,Satın Alma Talebi bekleyen PO Ürünleri
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Öğrenci Kabulleri
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} devre dışı
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} devre dışı
 DocType: Supplier,Billing Currency,Fatura Döviz
 DocType: Sales Invoice,SINV-RET-,SINV-ret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra Büyük
@@ -3006,7 +3005,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Anasayfa Özel Ürün
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Bütün Değerlendirme Grupları
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Yeni Depo Adı
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Toplam {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Toplam {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Bölge
 DocType: C-Form Invoice Detail,Territory,Bölge
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
@@ -3027,7 +3026,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Ayarlamak ve hedefleri izleyebilirsiniz böylece tüm satış işlemleri birden ** Satış Kişilerin ** karşı etiketlenmiş olabilir.
 ,S.O. No.,Satış Emri No
 ,S.O. No.,Satış Emri No
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
 DocType: Price List,Applicable for Countries,Ülkeler için geçerlidir
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Sadece sunulabilir &#39;Reddedildi&#39; &#39;Onaylandı&#39; ve statülü Uygulamaları bırakın
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Öğrenci Grubu Adı satırda zorunludur {0}
@@ -3125,7 +3124,7 @@
 DocType: Vehicle Service,Engine Oil,Motor yağı
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Ürün {0} yoktur
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Employee Loan,Loan Details,kredi Detayları
@@ -3202,7 +3201,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Mevcut işlem ile depolar grubuna dönüştürülemez.
 DocType: Assessment Result Tool,Result HTML,Sonuç HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Tarihinde sona eriyor
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Öğrenciler ekle
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Öğrenciler ekle
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Lütfen  {0} seçiniz
 DocType: C-Form,C-Form No,C-Form No
 DocType: C-Form,C-Form No,C-Form No
@@ -3282,7 +3281,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Bu &#39;Akademik Yılı&#39; ile akademik bir terim {0} ve &#39;Vadeli Adı&#39; {1} zaten var. Bu girişleri değiştirmek ve tekrar deneyin.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","öğe {0} karşı varolan işlemler vardır gibi, değerini değiştiremezsiniz {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","öğe {0} karşı varolan işlemler vardır gibi, değerini değiştiremezsiniz {1}"
 DocType: UOM,Must be Whole Number,Tam Numara olmalı
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Tahsis Edilen Yeni İzinler (Günler)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Seri No {0} yok
@@ -3330,7 +3329,7 @@
 DocType: Supplier,Last Day of the Next Month,Sonraki Ay Son Gün
 DocType: Support Settings,Auto close Issue after 7 days,7 gün sonra otomatik yakın Sayı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Önce tahsis edilemez bırakın {0}, izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Öğrenci Başvuru
 DocType: Asset Category Account,Accumulated Depreciation Account,Birikmiş Amortisman Hesabı
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
@@ -3363,7 +3362,7 @@
 DocType: Production Planning Tool,Create Production Orders,Üretim Emirleri Oluştur
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
 DocType: Journal Entry,User Remark,Kullanıcı Açıklaması
 DocType: Lead,Market Segment,Pazar Segmenti
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},"Ödenen tutar, toplam negatif ödenmemiş miktardan daha fazla olamaz {0}"
@@ -3383,7 +3382,7 @@
 DocType: Production Planning Tool,Create Material Requests,Malzeme İstekleri Oluştur
 DocType: Employee Education,School/University,Okul / Üniversite
 DocType: Payment Request,Reference Details,Referans Detayları
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Kullanım süresi sonunda beklenen değer, brüt alım maliyetinden düşük olmalıdır"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Kullanım süresi sonunda beklenen değer, brüt alım maliyetinden düşük olmalıdır"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Depoda mevcut miktar
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Faturalı Tutar
 DocType: Asset,Double Declining Balance,Çift Azalan Bakiye
@@ -3406,19 +3405,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Bu Stok Uzlaşma bir Açılış Giriş olduğundan fark Hesabı, bir Aktif / Pasif tipi hesabı olmalıdır"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Bir Kullanım Tutarı Kredi Miktarı daha büyük olamaz {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Üretim Sipariş oluşturulmadı
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Üretim Sipariş oluşturulmadı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
 DocType: Asset,Fully Depreciated,Değer kaybı tamamlanmış
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,İşaretlenmiş Devamlılık HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Alıntılar, müşterilerinize gönderilen adres teklifler önerileri şunlardır"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Alıntılar, müşterilerinize gönderilen adres teklifler önerileri şunlardır"
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seri No ve Toplu
 DocType: Warranty Claim,From Company,Şirketten
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Değerlendirme Kriterleri Puanlarının Toplamı {0} olması gerekir.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Amortisman Sayısı rezervasyonu ayarlayın
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Amortisman Sayısı rezervasyonu ayarlayın
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Değer veya Miktar
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Dakika
@@ -3564,7 +3563,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Öğrenci Grubu
 DocType: Shopping Cart Settings,Quotation Series,Teklif Serisi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,müşteri seçiniz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,müşteri seçiniz
 DocType: C-Form,I,ben
 DocType: Company,Asset Depreciation Cost Center,Varlık Değer Kaybı Maliyet Merkezi
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
@@ -3585,19 +3584,18 @@
 DocType: Vehicle,Insurance Details,Sigorta Detayları
 DocType: Account,Payable,Borç
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Geri Ödeme Süreleri giriniz
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Borçlular ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Borçlular ({0})
 DocType: Pricing Rule,Margin,Kar Marjı
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Yeni Müşteriler
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Brüt Kazanç%
 DocType: Appraisal Goal,Weightage (%),Ağırlık (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Gümrükleme Tarih
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Brüt sipariş tutarı zorunludur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Brüt sipariş tutarı zorunludur
 DocType: Lead,Address Desc,Azalan Adres
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Parti zorunludur
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Konu Adı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Satış veya Alıştan en az biri seçilmelidir
-DocType: Grading Structure,Grade Intervals,sınıf aralıkları
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,işinizin doğası seçin.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Üretim operasyonları nerede yapılmaktadır.
 DocType: Asset Movement,Source Warehouse,Kaynak Depo
@@ -3632,6 +3630,7 @@
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Delivery Note,Transporter Info,Taşıyıcı Bilgisi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Şirket varsayılan {0} set Lütfen {1}
 DocType: Cheque Print Template,Starting position from top edge,üst kenardan başlama pozisyonu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Aynı Tedarikçi birden fazla kez girilmiş
@@ -3687,7 +3686,7 @@
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Güncel İş Olanakları
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
-DocType: Journal Entry,Write Off,Silmek
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Silmek
 DocType: Timesheet Detail,Operation ID,Operasyon Kimliği
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem kullanıcı (giriş) kimliği, bütün İK formları için varsayılan olacaktır"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: gönderen {1}
@@ -3698,8 +3697,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Tedarikçi Müşteriye teslim
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) stokta yok
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Sonraki Tarih Gönderme Tarihi daha büyük olmalıdır
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Göster vergi break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,İçeri/Dışarı Aktar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stok girişleri dolayısıyla yeniden atamak veya değiştiremez, {0} Warehouse karşı mevcut"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Hiçbir öğrenci Bulundu
@@ -3711,15 +3710,16 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
 DocType: Program Enrollment,School House,Okul Evi
 DocType: Serial No,Out of AMC,Çıkış AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Lütfen Teklifler&#39;i seçin
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Lütfen Teklifler&#39;i seçin
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Bakım Ziyareti Yapın
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Lütfen Teklifler&#39;i seçin
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Lütfen Teklifler&#39;i seçin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bakım Ziyareti Yapın
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Şirket (değil Müşteri veya alanı) usta.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,"Bu, bu Öğrencinin katılımıyla dayanmaktadır"
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Içinde öğrenci yok
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Daha fazla ürün ekle veya Tam formu aç
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
@@ -3771,9 +3771,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Uzlaşma önce
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Şu kişiye {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Eklenen Vergi ve Harçlar (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
 DocType: Sales Order,Partly Billed,Kısmen Faturalandı
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Öğe {0} Sabit Kıymet Öğe olmalı
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Öğe {0} Sabit Kıymet Öğe olmalı
 DocType: Item,Default BOM,Standart BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Toplam Alacakların Tutarı
@@ -3800,7 +3800,7 @@
 DocType: Purchase Invoice Item,Rate,Birim Fiyat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adres adı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Adres adı
 DocType: Stock Entry,From BOM,BOM Gönderen
 DocType: Assessment Code,Assessment Code,Değerlendirme Kodu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Temel
@@ -3832,7 +3832,7 @@
 DocType: Purchase Invoice,Print Language,baskı Dili
 DocType: Salary Slip,Total Working Hours,Toplam Çalışma Saatleri
 DocType: Stock Entry,Including items for sub assemblies,Alt montajlar için öğeleri içeren
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Enter değeri pozitif olmalıdır
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Enter değeri pozitif olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Bütün Bölgeler
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Purchase Invoice,Items,Ürünler
@@ -3855,18 +3855,16 @@
 DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Tarih aralığı gerekli
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
 DocType: Assessment Plan,Supervisor Name,Süpervizör Adı
 DocType: Program Enrollment Course,Program Enrollment Course,Program Kayıt Kursu
 DocType: Program Enrollment Course,Program Enrollment Course,Program Kayıt Kursu
-DocType: Grading Structure,Grading Structure,Notlandırma Yapısı
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Tax Rule,Shipping City,Nakliye Şehri
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Bu Öğe {0} (Şablon) bir Variant olduğunu. 'Hayır Kopyala' ayarlanmadığı sürece Öznitelikler şablon üzerinden kopyalanır
 DocType: Notification Control,Customize the Notification,Bildirim özelleştirin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Faaliyetlerden Nakit Akışı
 DocType: Sales Invoice,Shipping Rule,Kargo Kuralı
@@ -3892,6 +3890,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarih Açılış Tarihi Kapanış önce olmalıdır
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum aracılığıyla Katılım için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
 DocType: Leave Control Panel,Carry Forward,Nakletmek
 DocType: Leave Control Panel,Carry Forward,Nakletmek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Maliyet Merkezi mevcut işlemlere ana deftere dönüştürülemez
@@ -3927,7 +3926,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Çalışan Kayıtları Oluşturma
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Çalışan Kayıtları Oluşturma
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Toplam Mevcut
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Muhasebe Tabloları
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Saat
@@ -3943,8 +3942,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Değiştirilmesinden sonra yeni BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Satış Noktası
 DocType: Payment Entry,Received Amount,alınan Tutar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",Tam miktar oluşturma amacıyla zaten miktar göz ardı
 DocType: Account,Tax,Vergi
 DocType: Account,Tax,Vergi
@@ -3960,7 +3957,7 @@
 DocType: Batch,Source Document Name,Kaynak Belge Adı
 DocType: Batch,Source Document Name,Kaynak Belge Adı
 DocType: Job Opening,Job Title,İş Unvanı
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Kullanıcılar oluştur
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Kullanıcılar oluştur
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bakım araması için ziyaret raporu.
@@ -3973,8 +3970,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
 DocType: BOM,Website Description,Web Sitesi Açıklaması
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Özkaynak Net Değişim
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-posta adresi zaten var, benzersiz olmalıdır {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posta adresi zaten var, benzersiz olmalıdır {0}"
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Makbuz
 ,Sales Register,Satış Kayıt
@@ -3987,16 +3984,18 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Henüz müşteri yok!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Nakit Akım Tablosu
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
 DocType: GL Entry,Against Voucher Type,Dekont  Tipi Karşılığı
 DocType: Item,Attributes,Nitelikler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Borç Silme Hesabı Girin
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Son Sipariş Tarihi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
 DocType: Student,Guardian Details,Guardian Detayları
 DocType: C-Form,C-Form,C-Formu
 DocType: C-Form,C-Form,C-Formu
@@ -4026,7 +4025,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Satır {0}: Hesap türü 'Sabit Varlık' olmalıdır
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Çıkış Miktarı
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Bir Satış için nakliye miktarı hesaplama için kuralları
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seri zorunludur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seri zorunludur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 DocType: Student Sibling,Student ID,Öğrenci Kimliği
@@ -4034,7 +4033,7 @@
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
 DocType: Training Event,Exam,sınav
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Fatura Kamu
@@ -4071,7 +4070,7 @@
 DocType: Payment Entry,Account Paid From,Hesap şuradan ödenmiş
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Hammadde Malzeme Kodu
 DocType: Journal Entry,Write Off Based On,Dayalı Borç Silme
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Kurşun olun
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Kurşun olun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Baskı ve Kırtasiye
 DocType: Stock Settings,Show Barcode Field,Göster Barkod Alanı
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Tedarikçi E-postalarını Gönder
@@ -4087,6 +4086,7 @@
 DocType: Offer Letter,Awaiting Response,Tepki bekliyor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Yukarıdaki
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Standart dışı borç hesabı ise
 DocType: Salary Slip,Earning & Deduction,Kazanma & Kesintisi
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
@@ -4124,7 +4124,7 @@
 DocType: Program Enrollment Tool,Get Students From,Gönderen Öğrenciler alın
 DocType: Hub Settings,Seller Country,Satıcı Ülke
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Web sitesinde Ürünleri yayınlayın
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,gruplar halinde Grup öğrencilerinizin
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,gruplar halinde Grup öğrencilerinizin
 DocType: Authorization Rule,Authorization Rule,Yetki Kuralı
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
@@ -4198,7 +4198,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Deneme Süresi
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Maaş Bileşenleri
 DocType: Program Enrollment Tool,New Academic Year,Yeni Akademik Yıl
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,İade / Kredi Notu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,İade / Kredi Notu
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Toplam Ödenen Tutar
 DocType: Production Order Item,Transferred Qty,Transfer Edilen Miktar
@@ -4243,6 +4243,7 @@
 ,Sales Funnel,Satış Yolu
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Kısaltma zorunludur
 DocType: Project,Task Progress,görev İlerleme
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Araba
 ,Qty to Transfer,Transfer edilecek Miktar
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Müşterilere veya Taleplere verilen fiyatlar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,dondurulmuş stok düzenlemeye İzinli rol
@@ -4279,7 +4280,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Ücretleri toplayın
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
 DocType: Lead,Add to calendar on this date,Bu tarihe Takvime ekle
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Nakliye maliyetleri ekleme  Kuralları.
 DocType: Item,Opening Stock,Açılış Stok
@@ -4302,7 +4303,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Üretim için verilen emirler.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Mali Yıl Seçin ...
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Program Enrollment Tool,Enroll Students,Öğrenciler kayıt
 DocType: Hub Settings,Name Token,İsim Jetonu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
@@ -4317,7 +4318,7 @@
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Proje Adı
 DocType: Request for Quotation Item,Project Name,Proje Adı
-DocType: Supplier,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
+DocType: Customer,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
 DocType: Journal Entry Account,If Income or Expense,Gelir veya Gider ise
 DocType: Production Order,Required Items,gerekli Öğeler
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
@@ -4353,6 +4354,7 @@
 DocType: Item,Taxes,Vergiler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Ücretli ve Teslim Edilmedi
 DocType: Project,Default Cost Center,Standart Maliyet Merkezi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Naming Series&#39;i ayarlayın.
 DocType: Bank Guarantee,End Date,Bitiş Tarihi
 DocType: Bank Guarantee,End Date,Bitiş Tarihi
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stok İşlemleri
@@ -4425,7 +4427,7 @@
 DocType: Customer,Sales Partner and Commission,Satış Ortağı ve Komisyon
 DocType: Employee Loan,Rate of Interest (%) / Year,İlgi (%) / Yılın Oranı
 ,Project Quantity,Proje Miktarı
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Toplam {0} tüm öğeler için size &#39;Dayalı Suçlamaları dağıtın&#39; değişmelidir olabilir sıfırdır
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Toplam {0} tüm öğeler için size &#39;Dayalı Suçlamaları dağıtın&#39; değişmelidir olabilir sıfırdır
 DocType: Opportunity,To Discuss,Görüşülecek
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,Bu işlemi tamamlamak için {2} içinde {0} birim {1} gerekli.
 DocType: Loan Type,Rate of Interest (%) Yearly,İlgi Oranı (%) Yıllık
@@ -4449,7 +4451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Gelmedi işaretle
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Satır {0}: BOM # Döviz {1} seçilen para birimi eşit olmalıdır {2}
 DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
 DocType: Homepage,Tag Line,Etiket Hattı
 DocType: Fee Component,Fee Component,ücret Bileşeni
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Filo yönetimi
@@ -4467,7 +4469,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Depo {0} yoktur
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub için Kayıt
 DocType: Monthly Distribution,Monthly Distribution Percentages,Aylık Dağılımı Yüzdeler
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Değerleme oranı için muhasebe kayıtlarını yapmasını gerektiren durumlar Madde {0} için bulunamadı {1} {2}. öğesi örnek bir öğe olarak işlem yapan ise {1}, {1} Öğe tabloda bu belirtin. Aksi takdirde, / submiting deneyin bu girişi iptal sonra Öğe kaydındaki madde veya söz değerleme oranı için gelen stok hareket oluşturmak ve lütfen"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% malzeme bu İrsaliye karşılığında teslim edildi
 DocType: Project,Customer Details,Müşteri Detayları
@@ -4488,7 +4490,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kalite Yönetimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kalite Yönetimi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} devredışı bırakılmış
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} devredışı bırakılmış
 DocType: Employee Loan,Repay Fixed Amount per Period,Dönem başına Sabit Tutar Repay
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
 DocType: Employee External Work History,Employee External Work History,Çalışan Harici İş Geçmişi
@@ -4518,7 +4520,7 @@
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Tax Rule,Sales Tax Template,Satış Vergisi Şablon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
 DocType: Employee,Encashment Date,Nakit Çekim Tarihi
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stok Ayarı
@@ -4557,6 +4559,7 @@
 DocType: Production Order,Warehouses,Depolar
 DocType: Production Order,Warehouses,Depolar
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} varlığı transfer edilemez
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,"Bu Öğe, {0} (Şablon) değişkenidir."
 DocType: Workstation,per hour,saat başına
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,satın alma
 DocType: Announcement,Announcement,Duyuru
@@ -4576,7 +4579,7 @@
 DocType: Account,Receivable,Alacak
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredi limiti ayarlarını geçen işlemleri teslim etmeye izinli rol
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,İmalat Öğe seç
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,İmalat Öğe seç
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
 DocType: Item,Material Issue,Malzeme Verilişi
 DocType: Hub Settings,Seller Description,Satıcı Açıklaması
@@ -4593,7 +4596,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 DocType: Salary Detail,Component,Bileşen
 DocType: Assessment Criteria,Assessment Criteria Group,Değerlendirme Ölçütleri Grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Birikmiş Amortisman Açılış eşit az olmalıdır {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Birikmiş Amortisman Açılış eşit az olmalıdır {0}
 DocType: Warehouse,Warehouse Name,Depo Adı
 DocType: Warehouse,Warehouse Name,Depo Adı
 DocType: Naming Series,Select Transaction,İşlem Seçin
@@ -4634,7 +4637,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Birleştir
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Employee Loan,Repay from Salary,Maaş dan ödemek
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},"karşı ödeme talep {0}, {1} miktarda {2}"
@@ -4653,7 +4656,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Değerlendirme Sonuçlarının Ayrıntıları
 DocType: Employee Education,Employee Education,Çalışan Eğitimi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,öğe grubu tablosunda bulunan yinelenen öğe grubu
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
 DocType: Salary Slip,Net Pay,Net Ödeme
 DocType: Account,Account,Hesap
 DocType: Account,Account,Hesap
@@ -4664,7 +4667,7 @@
 DocType: Purchase Invoice,Recurring Id,Tekrarlanan Kimlik
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Kalıcı olarak silinsin mi?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Kalıcı olarak silinsin mi?
 DocType: Expense Claim,Total Claimed Amount,Toplam İade edilen Tutar
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Satış için potansiyel Fırsatlar.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Geçersiz {0}
@@ -4677,7 +4680,7 @@
 DocType: Warehouse,PIN,TOPLU İĞNE
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext ayarlarını yap Okul
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baz Değişim Miktarı (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,İlk belgeyi kaydedin.
 DocType: Account,Chargeable,Ücretli
 DocType: Account,Chargeable,Ücretli
@@ -4685,6 +4688,7 @@
 DocType: Expense Claim Detail,Expense Date,Gider Tarih
 DocType: Item,Max Discount (%),En fazla İndirim (%
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Son Sipariş Miktarı
+DocType: Task,Is Milestone,Milestone mu?
 DocType: Daily Work Summary,Email Sent To,E-posta Gönderilen
 DocType: Budget,Warn,Uyarmak
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Başka bir konuşmasında, kayıtlarda gitmeli kayda değer çaba."
@@ -4723,14 +4727,13 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Older Than` %d günden daha kısa olmalıdır.
 DocType: Tax Rule,Purchase Tax Template,Vergi Şablon Satınalma
 ,Project wise Stock Tracking,Proje bilgisi Stok Takibi
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Bakım Programı {0} {0} karşılığında mevcuttur
 DocType: Stock Entry Detail,Actual Qty (at source/target),Fiili Miktar (kaynak / hedef)
 DocType: Stock Entry Detail,Actual Qty (at source/target),Fiili Miktar (kaynak / hedef)
 DocType: Item Customer Detail,Ref Code,Referans Kodu
 DocType: Item Customer Detail,Ref Code,Referans Kodu
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Çalışan kayıtları.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Çalışan kayıtları.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Bağlantısız Faturaları ve Ödemeleri eşleştirin.
@@ -4757,7 +4760,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
 DocType: Purchase Invoice Item,Price List Rate,Fiyat Listesi Oranı
 DocType: Purchase Invoice Item,Price List Rate,Fiyat Listesi Oranı
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Müşteri tırnak oluşturun
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Müşteri tırnak oluşturun
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Depodaki mevcut stok durumuna göre ""Stokta"" veya ""Stokta değil"" olarak göster"
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Malzeme Listesi (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Tedarikçinin ortalama teslim süresi
@@ -4780,7 +4783,7 @@
 DocType: Asset,Disposal Date,Bertaraf tarihi
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Onlar tatil yoksa e-postalar, verilen saatte şirketin tüm Aktif Çalışanların gönderilecektir. Yanıtların Özeti gece yarısı gönderilecektir."
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Eğitim Görüşleri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
@@ -4789,7 +4792,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tarihine kadar kısmı tarihinden itibaren kısmından önce olamaz
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Fiyatları Ekle / Düzenle
 DocType: Batch,Parent Batch,Ana Batch
 DocType: Batch,Parent Batch,Ana Batch
 DocType: Cheque Print Template,Cheque Print Template,Çek Baskı Şablon
@@ -4844,7 +4847,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Tedarikçileriniz
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
 DocType: Request for Quotation Item,Supplier Part No,Tedarikçi Parça No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',kategori &#39;Değerleme&#39; veya &#39;Vaulation ve Toplam&#39; için ne zaman tenzil edemez
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Dan alındı
@@ -4855,7 +4858,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Satır {0}: Saat değeri sıfırdan büyük olmalıdır.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
@@ -4866,7 +4869,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Donmuş değeri ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
 DocType: Payment Reconciliation,From Invoice Date,Fatura Tarihinden İtibaren
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fatura para ya varsayılan comapany para birimi ya da parti hesap para eşit olmalıdır
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fatura para ya varsayılan comapany para birimi ya da parti hesap para eşit olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Tahsil bırakın
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ne yapar?
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ne yapar?
@@ -4874,7 +4877,7 @@
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tüm Öğrenci Kabulleri
 ,Average Commission Rate,Ortalama Komisyon Oranı
 ,Average Commission Rate,Ortalama Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
 DocType: School House,House Name,Evin adı
@@ -4883,7 +4886,7 @@
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Öğelerin indi maliyetini hesaplamak için ek maliyetler güncelleyin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrik
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,kullanıcılarınıza olarak kuruluşunuz geri kalanını ekleyin. Ayrıca Rehber onları ekleyerek portalına Müşteriler davet ekleyebilir
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,kullanıcılarınıza olarak kuruluşunuz geri kalanını ekleyin. Ayrıca Rehber onları ekleyerek portalına Müşteriler davet ekleyebilir
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Çalışan {0} için kullanıcı kimliği ayarlanmamış
@@ -4894,7 +4897,7 @@
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sigorta Başlangıç tarihi Bitiş tarihi Sigortası daha az olmalıdır
@@ -4912,7 +4915,7 @@
 DocType: Vehicle Log,Odometer,Kilometre sayacı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Ürün Ağacı hiç Stok Ürünü içermiyor
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Kimden ve Dönemi yinelenen için zorunlu tarihler için Dönem {0}
@@ -4925,7 +4928,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
 DocType: Sales Invoice Timesheet,Billing Hours,fatura Saatleri
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} bulunamadı için varsayılan BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Buraya eklemek için öğelere dokunun
 DocType: Fees,Program Enrollment,programı Kaydı
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lütfen {0} ayarlayınız
@@ -5049,7 +5053,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 DocType: Issue,First Responded On,İlk cevap verilen
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Çoklu gruplarda Ürün Cross İlanı
-DocType: Grade Interval,Grade Interval,sınıf Aralığı
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Mali Yıl {0} da Mali Yıl Başlangıç Tarihi ve Mali Yıl Bitiş Tarihi zaten ayarlanmış
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Gümrükleme Tarihi güncellendi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Bölme Bölmesi
@@ -5058,6 +5061,7 @@
 DocType: Request for Quotation Supplier,Download PDF,PDF İndir
 DocType: Production Order,Planned End Date,Planlanan Bitiş Tarihi
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Ürünlerin saklandığı yer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 DocType: Request for Quotation,Supplier Detail,Tedarikçi Detayı
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Formül ya da durumun hata: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Faturalanan Tutar
@@ -5107,7 +5111,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Kur benim organizasyon için basit bir web sitesi
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Siparişi Ürün Karşılığı
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
@@ -5172,7 +5176,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Son Alım Br.Fİyatını alın
 DocType: Company,Company Info,Şirket Bilgisi
 DocType: Company,Company Info,Şirket Bilgisi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Seçmek veya yeni müşteri eklemek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Seçmek veya yeni müşteri eklemek
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Maliyet merkezi gider iddiayı kitaba gereklidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fon (varlık) başvurusu
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Bu, bu Çalışan katılımı esas alır"
@@ -5187,14 +5191,14 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Kullanıcıların şu günlerde İzin almasını engelle.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Satın alma miktarı
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Tedarikçi Fiyat Teklifi {0} oluşturuldu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Yıl Sonu Başlangıç Yıl önce olamaz
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Yıl Sonu Başlangıç Yıl önce olamaz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Çalışanlara Sağlanan Faydalar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
 DocType: Production Order,Manufactured Qty,Üretilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Çalışan bir varsayılan Tatil Listesi set Lütfen {0} veya Şirket {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} mevcut değil
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} mevcut değil
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Müşterilere artırılan faturalar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
@@ -5204,7 +5208,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 Okuma
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Föy Türü
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
 DocType: Employee Loan Application,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
@@ -5213,8 +5217,10 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Verilen aralıkta Çalışan {1} için oluşturulan değerlendirme {0}
 DocType: Employee,Education,Eğitim
 DocType: Employee,Education,Eğitim
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampanya İsimlendirmesini yapan
 DocType: Employee,Current Address Is,Güncel Adresi
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,değiştirilmiş
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","İsteğe bağlı. Eğer belirtilmemişse, şirketin varsayılan para birimini belirler."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Muhasebe günlük girişleri.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
@@ -5260,7 +5266,7 @@
 DocType: Project,Gross Margin %,Brüt Kar Marjı%
 DocType: BOM,With Operations,Operasyon ile
 DocType: BOM,With Operations,Operasyon ile
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
 DocType: Asset,Is Existing Asset,Varlık Mevcut mı
 DocType: Salary Detail,Statistical Component,İstatistiksel Bileşen
 DocType: Salary Detail,Statistical Component,İstatistiksel Bileşen
@@ -5318,7 +5324,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo Ekleyin
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stok Seviyeleri
 DocType: Customer,Commission Rate,Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Variant oluştur
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Variant oluştur
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Ödeme Şekli, Alma biri Öde ve İç Transferi gerekir"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5333,6 +5339,7 @@
 DocType: Sales Order,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
 DocType: Sales Order,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Öz sermaye
+DocType: Shopping Cart Settings,Show Public Attachments,Genel Ekleri Göster
 DocType: Packing Slip,Package Weight Details,Ambalaj Ağırlığı Detayları
 DocType: Payment Gateway Account,Payment Gateway Account,Ödeme Gateway Hesabı
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Ödeme tamamlandıktan sonra seçilen sayfaya yönlendirmek.
@@ -5360,7 +5367,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Para birimlerinin yanında $ vb semboller kullanmayın.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Yarım Gün)
 DocType: Supplier,Credit Days,Kredi Günleri
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Öğrenci Toplu yapın
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Öğrenci Toplu yapın
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM dan Ürünleri alın
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Teslim zamanı Günü
@@ -5380,8 +5387,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,tasdik edilmiş tutar
 DocType: GL Entry,Is Opening,Açılır
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum aracılığıyla Katılım için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum aracılığıyla Katılım için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Hesap {0} yok
 DocType: Account,Cash,Nakit
 DocType: Account,Cash,Nakit
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index f2f770d..0891924 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Пакетна Пункт експірації Статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банківський чек
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Показати варіанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Показати варіанти
 DocType: Academic Term,Academic Term,академічний термін
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,матеріал
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Кількість
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Охорона здоров&#39;я
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Затримка в оплаті (дні)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,послуги Expense
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фінансовий рік {0} вимагається
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Те ж компанія увійшла більш ніж один раз
 DocType: Employee,Married,Одружений
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускається для {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не допускається для {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Отримати елементи з
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть службовців систему імен в людських ресурсах&gt; HR Налаштування"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,немає Перелічене
 DocType: Payment Reconciliation,Reconcile,Узгодити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продукти
 DocType: Quality Inspection Reading,Reading 1,Читання 1
 DocType: Process Payroll,Make Bank Entry,Зробити запис банку
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсійні фонди
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Наступна амортизація Дата не може бути перед покупкою Дати
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Наступна амортизація Дата не може бути перед покупкою Дати
 DocType: SMS Center,All Sales Person,Всі Відповідальні з продажу
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"**Щомісячний розподіл** дозволяє розподілити Бюджет/Мету по місяцях, якщо у вашому бізнесі є сезонність."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Чи не знайшли товар
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Чи не знайшли товар
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Відсутня Структура зарплати
 DocType: Lead,Person Name,Ім&#39;я особи
 DocType: Sales Invoice Item,Sales Invoice Item,Позиція вихідного рахунку
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","наприклад, &quot;Початкова школа&quot; або &quot;Університет&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Складські звіти
 DocType: Warehouse,Warehouse Detail,Детальна інформація по складу
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Термін Дата закінчення не може бути пізніше, ніж за рік Дата закінчення навчального року, до якого цей термін пов&#39;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
 DocType: Vehicle Service,Brake Oil,гальмівні масла
 DocType: Tax Rule,Tax Type,Податки Тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"У Вас немає прав, щоб додавати або оновлювати записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Пункт зображення (якщо не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Уразливість існує клієнтів з тим же ім&#39;ям
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Тарифна ставка / 60) * Фактичний Час роботи
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Виберіть BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Виберіть BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Вартість комплектності
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,"Вихідні {0} не між ""Дата з"" та ""Дата По"""
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,клас
 DocType: Sales Invoice Item,Delivered By Supplier,Доставлено постачальником
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Виробничий замовлення вже створений для всіх елементів з BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Виробничий замовлення вже створений для всіх елементів з BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Річна заробітна плата
 DocType: Daily Work Summary,Daily Work Summary,Щодня Резюме Робота
 DocType: Period Closing Voucher,Closing Fiscal Year,Закриття фінансового року
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} заблоковано
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} заблоковано
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Будь ласка, виберіть існуючу компанію для створення плану рахунків"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Витрати на запаси
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Виберіть Target Warehouse
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Виправна запис
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валюті компанії
 DocType: Delivery Note,Installation Status,Стан установки
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ви хочете оновити відвідуваність? <br> Присутні: {0} \ <br> Були відсутні: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прийнята+Відхилена к-сть має дорівнювати кількостіЮ що надійшла для позиції {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Постачання сировини для покупки
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Принаймні один спосіб оплати потрібно для POS рахунку.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Принаймні один спосіб оплати потрібно для POS рахунку.
 DocType: Products Settings,Show Products as a List,Показувати продукцію списком
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Завантажте шаблон, заповніть відповідні дані і долучіть змінений файл. Усі поєднання дат і співробітників в обраному періоді потраплять у шаблон разом з існуючими записами відвідуваності"
@@ -223,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Створити операцію амортизації
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип запиту
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,зробити Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,зробити Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радіомовлення
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Виконання
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детальна інформація про виконані операції.
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План візитів для тех. обслуговування.
 DocType: SMS Settings,Enter url parameter for message,Введіть URL параметр для повідомлення
 DocType: POS Profile,Customer Groups,Групи клієнтів
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Фінансова звітність
 DocType: Guardian,Students,студенти
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила застосування цін і знижки.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист має застосовуватисьі для купівлі або продажу
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},"Сума авансу не може бути більше, ніж {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список серій для даної транзакції
 DocType: Company,Default Payroll Payable Account,За замовчуванням Payroll оплати рахунків
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Оновлення Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Оновлення Email Group
 DocType: Sales Invoice,Is Opening Entry,Введення залишків
 DocType: Customer Group,Mention if non-standard receivable account applicable,Вказати якщо застосовано нестандартний рахунок заборгованості
 DocType: Course Schedule,Instructor Name,ім&#39;я інструктора
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,По позиціях вхідного рахунку-фактури
 ,Production Orders in Progress,Виробничі замовлення у роботі
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чисті грошові кошти від фінансової
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
 DocType: Lead,Address & Contact,Адреса та контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористані дні відпустки від попередніх призначень
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Загальна калькуляція Сума (за допомогою Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банківські записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Позиція Інвентаризації
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,Опублікувати в Hub
 DocType: Student Admission,Student Admission,прийому студентів
 ,Terretory,Територія
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Пункт {0} скасовується
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Замовлення матеріалів
 DocType: Bank Reconciliation,Update Clearance Date,Оновити Clearance дату
 DocType: Item,Purchase Details,Закупівля детальніше
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичних Замовлень матеріалів
 DocType: Journal Entry,Multi Currency,Мультивалютна
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип рахунку-фактури
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Накладна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Накладна
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Налаштування податків
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Собівартість проданих активів
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата була змінена після pull. Ласка, pull it знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,"{0} введений двічі в ""Податки"""
-DocType: Grade Interval,Min Score,мінімальна Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,"{0} введений двічі в ""Податки"""
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Результати для цього тижня та незакінчена діяльність
 DocType: Student Applicant,Admitted,зізнався
 DocType: Workstation,Rent Cost,Вартість оренди
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,вартість замовлення
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банк / Касові операції проти партії або для внутрішньої передачі
 DocType: Shipping Rule,Valid for Countries,Дійсно для країн
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Цей об’єкт є шаблоном і не може бути використаний в операціях. Атрибути цієї позиції будуть копіюватися у варіанти, якщо не встановлено: ""Не копіювати"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Цей об’єкт є шаблоном і не може бути використаний в операціях. Атрибути цієї позиції будуть копіюватися у варіанти, якщо не встановлено: ""Не копіювати"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Всього Замовити вважається
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Посада працівника (як-от, генеральний директор, директор тощо)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Будь ласка, введіть &quot;Повторіть День Місяць&quot; значення поля"
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,Ставка податку
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} вже виділено Робітника {1} для періоду {2} в {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Вибрати пункт
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Вхідний рахунок-фактура {0} вже проведений
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Вхідний рахунок-фактура {0} вже проведений
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Номер партії має бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Перетворити в негрупповой
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Партія (багато) номенклатурних позицій.
 DocType: C-Form Invoice Detail,Invoice Date,Дата рахунку-фактури
 DocType: GL Entry,Debit Amount,Дебет Сума
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,% Отримано
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створення студентських груп
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Запит пропозиції
 DocType: Salary Slip Timesheet,Working Hours,Робочі години
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Змінити стартову / поточний порядковий номер існуючого ряду.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Створення нового клієнта
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Створення нового клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Якщо кілька правил ціноутворення продовжують переважати, користувачам пропонується встановити пріоритет вручну та вирішити конфлікт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Створення замовлень на поставку
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Створення замовлень на поставку
 ,Purchase Register,Реєстр закупівель
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Застосовувані Збори
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заблоковано по
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Майстер вихідних.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,З пакета №
 DocType: Item Attribute,To Range,Для Діапазон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Цінні папери та депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Неможливо змінити метод оцінки, так як є угоди щодо деяких пунктів, які не мають його власний метод оцінки"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всього листя, виділені є обов&#39;язковим"
 DocType: Job Opening,Description of a Job Opening,Опис роботу Відкриття
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В очікуванні діяльність на сьогоднішній день
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
 DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Купівля
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Будь ласка, визначте клас для Threshold 0%"
 DocType: Sales Order,To Deliver,Доставити
 DocType: Purchase Invoice Item,Item,Номенклатура
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
 DocType: Journal Entry,Difference (Dr - Cr),Різниця (Д - Cr)
 DocType: Account,Profit and Loss,Про прибутки та збитки
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управління субпідрядом
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Номенклатура відмітки про встановлення
 DocType: Production Plan Item,Pending Qty,К-сть в очікуванні
 DocType: Budget,Ignore,Ігнорувати
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не активний
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не активний
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS відправлено наступних номерів: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Встановіть розміри чеку для друку
 DocType: Salary Slip,Salary Slip Timesheet,Табель зарплатного розрахунку
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Всього комісія
 DocType: Pricing Rule,Sales Partner,Торговий партнер
 DocType: Buying Settings,Purchase Receipt Required,Потрібна прихідна накладна
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Собівартість обов'язкова при введенні залишків
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Собівартість обов'язкова при введенні залишків
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не знайдено записів у таблиці рахунку-фактури
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Будь ласка, виберіть компанію та контрагента спершу"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,накопичені значення
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","На жаль, серійні номери не можуть бути об'єднані"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Зробити замовлення на продаж
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Зробити замовлення на продаж
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,резюме Додаток
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійні клієнти
 DocType: Leave Control Panel,Allocate,Виділяти
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Продажі Повернутися
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Примітка: Сумарна кількість виділених листя {0} не повинно бути менше, ніж вже затверджених листя {1} на період"
 DocType: Announcement,Posted By,Автор
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляється Постачальником (Пряма доставка)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,Пропозиція для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),На початок (Кт)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Розподілена сума не може бути негативною
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Будь ласка, встановіть компанії"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Будь ласка, встановіть компанії"
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Розклад вихідних рахунків-фактур
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Підстава:Номер та Підстава:Дата необхідні для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Виберіть Обліковий запис Оплата зробити Банк Стажер
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Створення записів співробітників для управління листя, витрат і заробітної плати претензій"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Створення записів співробітників для управління листя, витрат і заробітної плати претензій"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додати в бази знань
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Пропозиція Написання
 DocType: Payment Entry Deduction,Payment Entry Deduction,Відрахування з Оплати
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Зв&#39;язок з Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менеджер
 DocType: Payment Entry,Payment From / To,Оплата с / з
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Проміжок часу
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новий кредитний ліміт менше поточної суми заборгованості для клієнта. Кредитний ліміт повинен бути зареєстровано не менше {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новий кредитний ліміт менше поточної суми заборгованості для клієнта. Кредитний ліміт повинен бути зареєстровано не менше {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
 DocType: SMS Settings,Receiver Parameter,Параметр отримувача
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Базується на"" і ""Згруповано за"" не можуть бути однаковими"
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,Дозвіл Дата
 DocType: Student Batch Name,Batch Name,пакетна Ім&#39;я
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Табель робочого часу створено:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,зараховувати
 DocType: Selling Settings,Customer Naming By,Називати клієнтів по
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Покажу студент як присутній в студентській Monthly відвідуваності звіту
@@ -719,7 +722,7 @@
 DocType: Student Attendance,Student Attendance,Student Учасники
 DocType: Sales Invoice Timesheet,Time Sheet,Розклад
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,З зворотним промиванням Сировина матеріали на основі
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Будь ласка, введіть дані товаром"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Будь ласка, введіть дані товаром"
 DocType: Interest,Interest,інтерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Препродаж
 DocType: Purchase Receipt,Other Details,Інші подробиці
@@ -737,7 +740,7 @@
 ,Absent Student Report,Відсутня Student Report
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Offer Letter Term,Offer Letter Term,Пропозиція Лист термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Номенклатурна позиція має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Номенклатурна позиція має варіанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Значення запасів
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компанія {0} не існує
@@ -746,8 +749,6 @@
 DocType: Serial No,Warranty Expiry Date,Термін дії гарантії
 DocType: Material Request Item,Quantity and Warehouse,Кількість і Склад
 DocType: Sales Invoice,Commission Rate (%),Ставка комісії (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Іменування Series для {0} через Setup&gt; Установки&gt; Naming Series"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Іменування Series для {0} через Setup&gt; Установки&gt; Naming Series"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Будь ласка, виберіть Програми"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Будь ласка, виберіть Програми"
 DocType: Project,Estimated Cost,орієнтовна вартість
@@ -766,7 +767,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} не відноситься до інвентаря
 DocType: Mode of Payment Account,Default Account,Рахунок/обліковий запис за замовчуванням
 DocType: Payment Entry,Received Amount (Company Currency),Отримана сума (Компанія Валюта)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Lead повинен бути встановлений, якщо Нагода зроблена з Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"Lead повинен бути встановлений, якщо Нагода зроблена з Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Будь ласка, виберіть щотижневий вихідний день"
 DocType: Production Order Operation,Planned End Time,Плановані Час закінчення
 ,Sales Person Target Variance Item Group-Wise,Розбіжності цілей Відповідальних з продажу (по групах товарів)
@@ -830,7 +831,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Прайс-лист не вибраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Request for Quotation Supplier,Send Email,Відправити e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Немає доступу
 DocType: Company,Default Bank Account,Банківський рахунок за замовчуванням
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
@@ -843,8 +844,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Жоден працівник не знайдено
 DocType: Supplier Quotation,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо підряджено постачальникові
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студентська група вже була поновлена.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студентська група вже була поновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студентська група вже була поновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студентська група вже була поновлена.
 DocType: SMS Center,All Customer Contact,Всі Контакти клієнта
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Завантажити складські залишки з CSV.
 DocType: Warehouse,Tree Details,деталі Дерева
@@ -855,8 +856,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Мінімальна Сума рахунку
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Центр витрат {2} не належить Компанії {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Рахунок {2} не може бути групою
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Рядок {IDX}: {доктайпів} {DOCNAME} не існує в вище &#39;{доктайпів}&#39; таблиця
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Табель {0} вже завершено або скасовано
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Рядок {IDX}: {доктайпів} {DOCNAME} не існує в вище &#39;{доктайпів}&#39; таблиця
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Табель {0} вже завершено або скасовано
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,немає завдання
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День місяця, в який авто-рахунок-фактура буде створений, наприклад, 05, 28 і т.д."
 DocType: Asset,Opening Accumulated Depreciation,Накопичений знос на момент відкриття
@@ -872,7 +873,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Оберіть товари
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} проти рахунку {1} від {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Розклад курсу
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Розклад курсу
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: HR Settings,Enter retirement age in years,Введіть вік виходу на пенсію в роках
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Склад призначення
@@ -880,7 +881,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити перевищення доставки або накладної до цього відсотка
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваності
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Всі Групи товарів
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Всі Групи товарів
 DocType: Process Payroll,Activity Log,Журнал активності
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Чистий прибуток / збиток
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
@@ -891,7 +892,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Замовлення на придбання у Оплату
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозована к-сть
 DocType: Sales Invoice,Payment Due Date,Дата платежу
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Відкривається"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Відкрити To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
@@ -907,7 +908,7 @@
 DocType: Item Reorder,Re-Order Qty,Кількість Дозамовлення
 DocType: Leave Block List Date,Leave Block List Date,Дата списку блокування відпусток
 DocType: Pricing Rule,Price or Discount,Ціна зі знижкою або
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всього Застосовуються збори в таблиці Purchase квитанцій Елементів повинні бути такими ж, як всі податки і збори"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всього Застосовуються збори в таблиці Purchase квитанцій Елементів повинні бути такими ж, як всі податки і збори"
 DocType: Sales Team,Incentives,Стимули
 DocType: SMS Log,Requested Numbers,Необхідні Номери
 DocType: Production Planning Tool,Only Obtain Raw Materials,Отримати тільки сировину
@@ -965,8 +966,7 @@
 DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
 DocType: Fee Structure,Components,компоненти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Варіанти позиції {0} оновлено
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Передоплата по вхідному рахунку
@@ -1018,8 +1018,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплати згідно Замовлення клієнта/Замовлення на  придбання повинні бути завжди відмічені як аванси
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хімічна
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"За замовчуванням банк / Готівковий рахунок буде автоматично оновлюватися в Зарплатний Запис в журналі, коли обраний цей режим."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Інтервали для коду Grade {0} перетинається з інтервалами класу для інших класів. Будь ласка, перевірте інтервали {0} і {1} і спробуйте ще раз"
 DocType: BOM,Raw Material Cost(Company Currency),Вартість сировини (Компанія Валюта)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Рядок # {0}: Оцінити не може бути більше, ніж швидкість використовуваної в {1} {2}"
@@ -1032,7 +1030,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Сайт товару
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Відвантажити ваш фірмовий заголовок та логотип. (Ви зможете відредагувати їх пізніше).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Введена дата наступної амортизації - у минулому
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Введена дата наступної амортизації - у минулому
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Білий
 DocType: SMS Center,All Lead (Open),Всі Lead (відкрито)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Рядок {0}: К-сть недоступна для {4} на складі {1} на час проведення ({2} {3})
@@ -1047,7 +1045,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Тип замовлення повинна бути однією з {0}
 DocType: Lead,Next Contact Date,Наступна контактна дата
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,К-сть на початок роботи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
 DocType: Student Batch Name,Student Batch Name,Student Пакетне Ім&#39;я
 DocType: Holiday List,Holiday List Name,Ім'я списку вихідних
 DocType: Repayment Schedule,Balance Loan Amount,Баланс Сума кредиту
@@ -1067,10 +1065,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Введіть {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати Замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може бути від’ємним
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Знижка
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Знижка
 DocType: Asset,Total Number of Depreciations,Загальна кількість амортизацій
 DocType: Sales Invoice Item,Rate With Margin,Швидкість З полями
 DocType: Sales Invoice Item,Rate With Margin,Швидкість З полями
@@ -1099,7 +1097,7 @@
 DocType: Lead,Organization Name,Назва організації
 DocType: Tax Rule,Shipping State,Штат доставки
 ,Projected Quantity as Source,Запланована кількість як джерело
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Позиція повинна додаватися за допомогою кнопки ""Отримати позиції з прихідної накладної"""
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Позиція повинна додаватися за допомогою кнопки ""Отримати позиції з прихідної накладної"""
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Включити позабіржові пункти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Витрати на збут
@@ -1107,7 +1105,7 @@
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,Центр витрат продажу за замовчуванням
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ЗІП код
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,ЗІП код
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Замовлення клієнта {0} {1}
 DocType: Opportunity,Contact Info,Контактна інформація
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Створення Руху ТМЦ
@@ -1151,7 +1149,7 @@
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Правило доставки для кошику
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Виробниче замовлення {0} має бути скасоване до скасування цього замовлення клієнта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
 ,Ordered Items To Be Billed,"Замовлені товари, на які не виставлені рахунки"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"С Діапазон повинен бути менше, ніж діапазон"
 DocType: Global Defaults,Global Defaults,Глобальні значення за замовчуванням
@@ -1186,11 +1184,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Будь ласка, введіть код товару, щоб отримати номер партії"
 DocType: Stock Settings,Default Item Group,Група за замовчуванням
 DocType: Employee Loan,Partially Disbursed,частково Освоєно
-DocType: Grading Structure,Grading System Name,Назва системи класифікації
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База даних постачальника
 DocType: Account,Balance Sheet,Бухгалтерський баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплати не налаштований. Будь ласка, перевірте, чи вибрний рахунок у Режимі Оплати або у POS-профілі."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплати не налаштований. Будь ласка, перевірте, чи вибрний рахунок у Режимі Оплати або у POS-профілі."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ваш відповідальний з продажу отримає нагадування в цей день, щоб зв'язатися з клієнтом"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Той же елемент не може бути введений кілька разів.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
@@ -1229,11 +1226,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Зроблено
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Будь ласка, вкажіть як мінімум один атрибут в таблиці атрибутів"
 DocType: Announcement,All Students,всі студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Номенклатурна позиція {0} має бути неінвентарною
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Номенклатурна позиція {0} має бути неінвентарною
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Подивитися Леджер
 DocType: Grading Scale,Intervals,інтервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Існує група з такою самою назвою, будь ласка, змініть назву елементу або перейменуйте групу"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Існує група з такою самою назвою, будь ласка, змініть назву елементу або перейменуйте групу"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Позиція {0} не може мати партій
@@ -1274,8 +1271,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не дозволено редагувати заблокований рахунок {0}
 DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачені рахунки-фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Замовлення клієнта {0} не є допустимим
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Замовлення допоможуть вам планувати і стежити за ваші покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Замовлення допоможуть вам планувати і стежити за ваші покупки
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Загальна кількість  / Переміщена кількість {0} у Замовленні матеріалів {1} \ не може бути більше необхідної кількості {2} для позиції {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Невеликий
@@ -1299,7 +1296,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Дані майстра синхронізації
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Норми
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
@@ -1317,7 +1314,7 @@
 DocType: Student Group Student,Group Roll Number,Група Ролл Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сума всіх ваг завдання повинна бути 1. Будь ласка, поміняйте ваги всіх завдань проекту, відповідно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Накладна {0} не проведена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Накладна {0} не проведена
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Позиція {0} має бути субпідрядною
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капітальні обладнання
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цінове правило базується на полі ""Застосовується до"", у якому можуть бути: номенклатурна позиція, група або бренд."
@@ -1344,7 +1341,7 @@
 DocType: Depreciation Schedule,Journal Entry,Проводка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} виготовляються товари
 DocType: Workstation,Workstation Name,Назва робочої станції
-DocType: Grade Interval,Grade Code,код Оцінка
+DocType: Grading Scale Interval,Grade Code,код Оцінка
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
@@ -1361,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Апаратний
 DocType: Sales Order,Recurring Upto,повторювані Upto
 DocType: Attendance,HR Manager,менеджер з персоналу
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Будь ласка, виберіть компанію"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Будь ласка, виберіть компанію"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привілейований Залишити
 DocType: Purchase Invoice,Supplier Invoice Date,Дата рахунку постачальника
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Вам необхідно включити Кошик
@@ -1377,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Їжа
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старіння Діапазон 3
 DocType: Maintenance Schedule Item,No of Visits,Кількість відвідувань
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Графік обслуговування {0} існує проти {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,поступово студент
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закритті рахунку повинні бути {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума балів за всі цілі повинні бути 100. Зараз {0}
@@ -1426,13 +1424,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,План рахунків
 DocType: Material Request,Terms and Conditions Content,Зміст положень та умов
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Detail,Depends on Leave Without Pay,Залежить у відпустці без
 DocType: Pricing Rule,"Higher the number, higher the priority","Чим вище число, тим вище пріоритет"
 ,Purchase Invoice Trends,Динаміка вхідних рахунків
 DocType: Employee,Better Prospects,Кращі перспективи
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Рядок # {0}: Завантаження {1} має тільки {2} Кількість. Будь ласка, виберіть іншу партію, яка має {3} Кількість доступні або розділити рядок на кілька рядків, щоб доставити / випуск з декількох партій"
 DocType: Vehicle,License Plate,Номерний знак
 DocType: Appraisal,Goals,Мети
 DocType: Warranty Claim,Warranty / AMC Status,Гарантія / Статус річного обслуговування
@@ -1450,7 +1449,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Співробітник не може повідомити собі.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Якщо обліковий запис заморожується, записи дозволяється заборонених користувачів."
 DocType: Email Digest,Bank Balance,Банківський баланс
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профіль роботи, потрібна кваліфікація і т.д."
 DocType: Journal Entry Account,Account Balance,Баланс
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Податкове правило для операцій
@@ -1461,7 +1460,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Показати сальдо прибутків/збитків незакритого фіскального року
 DocType: Shipping Rule,Shipping Account,Рахунок доставки
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Рахунок {2} неактивний
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Зробити замовлення клієнтів, щоб допомогти вам спланувати роботу і поставити на час"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Зробити замовлення клієнтів, щоб допомогти вам спланувати роботу і поставити на час"
 DocType: Quality Inspection,Readings,Показання
 DocType: Stock Entry,Total Additional Costs,Всього Додаткові витрати
 DocType: Course Schedule,SH,SH
@@ -1472,7 +1471,7 @@
 DocType: Shipping Rule Condition,To Value,До вартості
 DocType: Asset Movement,Stock Manager,Товарознавець
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Вихідний склад є обов'язковим для рядка {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Пакувальний лист
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Пакувальний лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Оренда площі для офісу
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Встановіть налаштування шлюзу SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Імпорт вдалося!
@@ -1498,7 +1497,7 @@
 DocType: Sales Invoice,Source,Джерело
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показати закрито
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Категорія активів є обов&#39;язковим для фіксованого елемента активів
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Категорія активів є обов&#39;язковим для фіксованого елемента активів
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Записи не знайдені в таблиці Оплата
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Це {0} конфлікти з {1} для {2} {3}
 DocType: Student Attendance Tool,Students HTML,студенти HTML
@@ -1516,7 +1515,7 @@
 DocType: Student,Date of Leaving,Дата Залишаючи
 DocType: Pricing Rule,For Price List,Для Прайс-листу
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,створення потенційних
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,створення потенційних
 DocType: Maintenance Schedule,Schedules,Розклади
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
 DocType: Purchase Order Item Supplied,BOM Detail No,Номер деталі у нормах
@@ -1544,7 +1543,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,програма Учнів
 DocType: Sales Invoice Item,Brand Name,Назва бренду
 DocType: Purchase Receipt,Transporter Details,Transporter Деталі
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Коробка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,можливий постачальник
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Організація
@@ -1578,7 +1577,7 @@
 DocType: Quality Inspection Reading,Reading 4,Читання 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},За замовчуванням BOM для {0} не знайдено для проекту {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Претензії рахунок компанії.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студенти в центрі системи, додайте всі студенти"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студенти в центрі системи, додайте всі студенти"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Рядок # {0}: clearence дата {1} не може бути менша дати чеку {2}
 DocType: Company,Default Holiday List,Список вихідних за замовчуванням
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Рядок {0}: Від часу і часу {1} перекривається з {2}
@@ -1590,20 +1589,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"День(дні), на якій ви подаєте заяву на відпустку - вихідні. Вам не потрібно подавати заяву."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплати на e-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Нове завдання
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Зробіть цитати
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Зробіть цитати
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Інші звіти
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Відпустка типу {0} не може бути довше ніж {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Спробуйте планувати операції X днів вперед.
 DocType: HR Settings,Stop Birthday Reminders,Стоп нагадування про дні народження
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Будь ласка, встановіть за замовчуванням Payroll розрахунковий рахунок в компанії {0}"
 DocType: SMS Center,Receiver List,Список отримувачів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Пошук товару
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Пошук товару
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Споживана Сума
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чиста зміна грошових коштів
 DocType: Assessment Plan,Grading Scale,оціночна шкала
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Вже завершено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Запит про оплату {0} вже існує
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
@@ -1641,7 +1640,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,збирати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,Прайс-лист за замовчуванням
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Рух активів {0} створено
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Рух активів {0} створено
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете видаляти фінансовий рік {0}. Фінансовий рік {0} встановлено за замовчанням в розділі Глобальні параметри
 DocType: Journal Entry,Entry Type,Тип запису
 ,Customer Credit Balance,Кредитний Баланс клієнтів
@@ -1684,8 +1683,6 @@
 DocType: Student Sibling,Studying in Same Institute,Навчання в тому ж інституті
 DocType: Territory,Territory Manager,Регіональний менеджер
 DocType: Packed Item,To Warehouse (Optional),На склад (Необов&#39;язково)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Пункт Group&gt; Марка
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Пункт Group&gt; Марка
 DocType: Payment Entry,Paid Amount (Company Currency),Платні Сума (Компанія валют)
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Налаштування продаж
@@ -1695,9 +1692,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Дивіться в кошик
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Повідомлення про нестачу номенклатурних позицій
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Замовлення матеріалів, що зробило цей Рух ТМЦ"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Наступна дата амортизації є обов'язковою для нового активу
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Наступна дата амортизації є обов'язковою для нового активу
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Окремий курс на основі групи для кожної партії
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Окремий курс на основі групи для кожної партії
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Одномісний блок елемента.
@@ -1714,8 +1711,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Центр доходів/витрат необхідний для рахунку  прибутків/збитків {2}. Налаштуйте центр витрат за замовчуванням для Компанії.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група клієнтів з таким ім'ям вже існує. Будь ласка, змініть Ім'я клієнта або перейменуйте Групу клієнтів"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група клієнтів з таким ім'ям вже існує. Будь ласка, змініть Ім'я клієнта або перейменуйте Групу клієнтів"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Новий контакт
 DocType: Territory,Parent Territory,Батьківський елемент території
 DocType: Quality Inspection Reading,Reading 2,Читання 2
@@ -1742,21 +1738,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Примирення JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 DocType: Purchase Invoice Item,Batch No,Партія №
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Неможливо знайти обмінний курс {0} до {1} для ключа дату {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень клієнта на один оригінал замовлення клієнта
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Немає
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Головна
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Варіант
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Головна
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варіант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії ваших операцій
 DocType: Employee Attendance Tool,Employees HTML,співробітники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Норми за замовчуванням ({0}) мають бути активними для даного елемента або його шаблону
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Норми за замовчуванням ({0}) мають бути активними для даного елемента або його шаблону
 DocType: Employee,Leave Encashed?,Оплачуване звільнення?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Поле ""З"" у Нагоді є обов'язковим"
 DocType: Email Digest,Annual Expenses,річні витрати
 DocType: Item,Variants,Варіанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Зробіть Замовлення на придбання
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Зробіть Замовлення на придбання
 DocType: SMS Center,Send To,Відправити
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Недостатньо днів залишилося для типу відпусток {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Розподілена сума
@@ -1776,7 +1771,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,атестації
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Умова для Правила доставки
-DocType: Grading Structure,Grading Intervals,інтервали Оцінювання
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Будь ласка введіть
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не може overbill для пункту {0} в рядку {1} більше, ніж {2}. Щоб дозволити завищені рахунки, будь ласка, встановіть в покупці Налаштування"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Будь ласка, встановіть фільтр, заснований на пункті або на складі"
@@ -1789,16 +1783,17 @@
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Оплата
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Керуйте свої замовлення
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Керуйте свої замовлення
 DocType: Production Order Operation,Actual Time and Cost,Фактичний час і вартість
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Замовлення матеріалів на максимум {0} можуть бути зроблено для позиції {1} за Замовленням клієнта {2}
 DocType: Employee,Salutation,Привітання
 DocType: Course,Course Abbreviation,Абревіатура курсу
 DocType: Student Leave Application,Student Leave Application,Студент Залишити заявку
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Співробітник {0} на півдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,на
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Комплектувати у момент продажу.
 DocType: Quotation Item,Actual Qty,Фактична к-сть
 DocType: Sales Invoice Item,References,Посилання
@@ -1808,7 +1803,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ви ввели елементи, що повторюються. Будь-ласка, виправіть та спробуйте ще раз."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Асоціювати
 DocType: Asset Movement,Asset Movement,Рух активів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Нова кошик
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Нова кошик
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} серіалізовані товару
 DocType: SMS Center,Create Receiver List,Створити список отримувачів
 DocType: Vehicle,Wheels,колеса
@@ -1840,10 +1835,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,"Відключення створення журналів по Виробничих замовленнях. Операції, не повинні відслідковуватись по виробничих замовленнях"
 DocType: Student,Student Mobile Number,Студент Мобільний телефон
 DocType: Item,Has Variants,Має Варіанти
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назва помісячного розподілу
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID є обов&#39;язковим
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID є обов&#39;язковим
 DocType: Sales Person,Parent Sales Person,Батьківський Відповідальний з продажу
 DocType: Purchase Invoice,Recurring Invoice,Періодичний рахунок
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управління проектами
@@ -1851,7 +1846,7 @@
 DocType: Budget,Fiscal Year,Звітний рік
 DocType: Vehicle Log,Fuel Price,паливо Ціна
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не може бути призначений на {0}, так як це не доход або витрата рахунки"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Досягнутий
 DocType: Student Admission,Application Form Route,Заявка на маршрут
@@ -1882,7 +1877,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Сума {0} {1} відняті {2}
 DocType: Employee,Salary Information,Інформація по зарплаті
 DocType: Sales Person,Name and Employee ID,Ім'я та ідентифікатор працівника
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
 DocType: Website Item Group,Website Item Group,Група об’єктів веб-сайту
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Мита і податки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Будь ласка, введіть дату Reference"
@@ -1941,7 +1936,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Виручка від постійних клієнтів
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) повинен мати роль ""Підтверджувач витрат"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Пара
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
 DocType: Asset,Depreciation Schedule,Запланована амортизація
 DocType: Bank Reconciliation Detail,Against Account,Кор.рахунок
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Поаяся Дата повинна бути в межах від дати і до теперішнього часу
@@ -1958,13 +1953,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Сума {0} {1} проти {2} {3}
 ,Quotation Trends,Тренд пропозицій
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Група елемента не згадується у майстрі для елементу {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
 DocType: Shipping Rule Condition,Shipping Amount,Сума доставки
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
 DocType: Purchase Order,Delivered,Доставлено
 ,Vehicle Expenses,Витрати транспортних засобів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
+DocType: Serial No,Invoice Details,Інформація про рахунки
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку періодичний рахунок перестане створюватись"
 DocType: Employee Loan,Loan Amount,Розмір позики
@@ -1988,7 +1984,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Додаткова знижка Сума
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
 DocType: Leave Block List Allow,Leave Block List Allow,Список блокування відпусток дозволяє
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група не-групи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортивний
 DocType: Loan Type,Loan Name,кредит Ім&#39;я
@@ -2000,6 +1996,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, де зберігаються неприйняті товари"
 DocType: Production Order,Skip Material Transfer,Пропустити перенесення матеріалу
 DocType: Production Order,Skip Material Transfer,Пропустити перенесення матеріалу
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Неможливо знайти обмінний курс {0} до {1} для ключа дати {2}. Будь ласка, створіть запис Обмін валюти вручну"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Ваш фінансовий рік закінчується
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} тепер є фінансовим роком за замовчуванням. Будь ласка, оновіть сторінку у вашому переглядачі, щоб зміни вступили в силу."
@@ -2037,9 +2034,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Пункт {0} вже повернулися
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фінансовий рік ** являє собою фінансовий рік. Всі бухгалтерські та інші основні операції відслідковуються у розрізі ** ** фінансовий рік.
 DocType: Opportunity,Customer / Lead Address,Адреса Клієнта /  Lead-а
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
 DocType: Student Admission,Eligibility,прийнятність
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Веде допомогти вам отримати бізнес, додати всі ваші контакти і багато іншого в ваших потенційних клієнтів"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Веде допомогти вам отримати бізнес, додати всі ваші контакти і багато іншого в ваших потенційних клієнтів"
 DocType: Production Order Operation,Actual Operation Time,Фактична Час роботи
 DocType: Authorization Rule,Applicable To (User),Застосовується до (Користувач)
 DocType: Purchase Taxes and Charges,Deduct,Відняти
@@ -2080,7 +2077,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Виберіть компанію ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
 DocType: Process Payroll,Fortnightly,раз на два тижні
 DocType: Currency Exchange,From Currency,З валюти
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть суму розподілу, тип та номер рахунку-фактури в принаймні одному рядку"
@@ -2096,7 +2093,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можна обрати тип стягнення «На суму попереднього рядка» або «На Загальну суму попереднього рядка 'для першого рядка
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Підпорядкована позиція не повинна бути комплектом. Будь ласка, видаліть позицію `{0}` та збережіть"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банківські
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Додати розкладу
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Додати розкладу
 DocType: Vehicle Service,Service Item,послуги Пункт
 DocType: Bank Guarantee,Bank Guarantee,Банківська гарантія
 DocType: Bank Guarantee,Bank Guarantee,Банківська гарантія
@@ -2146,8 +2143,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ціни не будуть показані, якщо прайс-лист не встановлено"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Будь ласка, вкажіть країну цьому правилі судноплавства або перевірити Доставка по всьому світу"
 DocType: Stock Entry,Total Incoming Value,Загальна суму приходу
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебет вимагається
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебет вимагається
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Прайс-лист закупівлі
 DocType: Offer Letter Term,Offer Term,Пропозиція термін
 DocType: Quality Inspection,Quality Manager,Менеджер з якості
@@ -2181,14 +2178,14 @@
 DocType: Opportunity,Lost Reason,Забули Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Будь ласка, введіть Квитанція документ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Всі деталі вже виставлений
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Будь ласка, введіть Квитанція документ"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Всі деталі вже виставлений
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Будь ласка, вкажіть дійсний &quot;Від справі № &#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Наступні центри витрат можна створювати під групами, але у проводках використовуються не-групи"
 DocType: Project,External,Зовнішній
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Люди і дозволу
 DocType: Vehicle Log,VLOG.,Відеоблогу.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Виробничі замовлення Створено: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Виробничі замовлення Створено: {0}
 DocType: Branch,Branch,Філія
 DocType: Guardian,Mobile Number,Номер мобільного
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Друк і брендинг
@@ -2197,7 +2194,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серійний номер {0} не знайдений
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваші клієнти
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,зробити Студент
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,зробити Студент
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ви були запрошені для спільної роботи над проектом: {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Подати заявку
@@ -2221,8 +2218,9 @@
 DocType: SMS Log,Sent To,Відправлено
 DocType: Payment Request,Make Sales Invoice,Зробити вихідний рахунок
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Наступна контактна дата не може бути у минулому
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Наступна контактна дата не може бути у минулому
 DocType: Company,For Reference Only.,Для довідки тільки.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Виберіть Batch Немає
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невірний {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Сума авансу
@@ -2236,7 +2234,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Справа № не може бути 0
 DocType: Item,Show a slideshow at the top of the page,Показати слайд-шоу у верхній частині сторінки
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазини
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазини
 DocType: Serial No,Delivery Time,Час доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,На підставі проблем старіння
 DocType: Item,End of Life,End of Life (дата завершення роботи з товаром)
@@ -2252,8 +2250,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Передача матеріалів
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Цей документ знаходиться над межею {0} {1} для елемента {4}. Ви робите інший {3} проти того ж {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Вибрати рахунок для суми змін
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Вибрати рахунок для суми змін
 DocType: Purchase Invoice,Price List Currency,Валюта прайс-листа
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити від'ємні залишки
@@ -2264,7 +2262,7 @@
 DocType: Budget Account,Budget Account,бюджет аккаунта
 DocType: Quality Inspection,Verified By,Перевірено
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Неможливо змінити валюту за замовчуванням компанії, тому що є існуючі угоди. Угоди повинні бути скасовані, щоб поміняти валюту за замовчуванням."
-DocType: Grade Interval,Grade Description,оцінка Опис
+DocType: Grading Scale Interval,Grade Description,оцінка Опис
 DocType: Stock Entry,Purchase Receipt No,Прихідна накладна номер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Аванс-завдаток
 DocType: Process Payroll,Create Salary Slip,Створити Зарплатний розрахунок
@@ -2302,7 +2300,7 @@
 DocType: Upload Attendance,Attendance To Date,Відвідуваність по дату
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Рахунок оплати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Чиста зміна дебіторської заборгованості
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсаційні Викл
 DocType: Offer Letter,Accepted,Прийняті
@@ -2316,7 +2314,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Ярлик правил доставки
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум користувачів
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Швидка проводка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити вартість, якщо для елементу вказані Норми"
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
@@ -2330,7 +2328,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Умови та положення1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Назва інституту, для якого ви встановлюєте цю систему."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерські проводки заблоковано до цієї дати, ніхто не зможе зробити або змінити проводки крім ролі вказаної нижче."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Будь ласка, збережіть документ, перш ніж генерувати розклад технічного обслуговування"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Будь ласка, збережіть документ, перш ніж генерувати розклад технічного обслуговування"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекту
 DocType: UOM,Check this to disallow fractions. (for Nos),"Перевірте це, щоб заборонити фракції. (для №)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Були створені такі Виробничі замовлення:
@@ -2353,6 +2351,7 @@
 DocType: Email Digest,How frequently?,Як часто?
 DocType: Purchase Receipt,Get Current Stock,Отримати поточний запас
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дерево Норм
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Пункт Group&gt; Марка
 DocType: Student,Joining Date,приєднання Дата
 ,Employees working on a holiday,"Співробітники, що працюють у вихідні"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Відзначити даний
@@ -2434,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Clearance дата не вказано
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Виробництво
 DocType: Guardian,Occupation,рід занять
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всього (Кількість)
 DocType: Sales Invoice,This Document,цей документ
 DocType: Installation Note Item,Installed Qty,Встановлена к-сть
@@ -2457,8 +2456,8 @@
 DocType: Notification Control,Sales Order Message,Повідомлення замовлення клієнта
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Встановити значення за замовчуванням, як-от компанія, валюта, поточний фінансовий рік і т.д."
 DocType: Payment Entry,Payment Type,Тип оплати
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
 DocType: Process Payroll,Select Employees,Виберіть Співробітники
 DocType: Opportunity,Potential Sales Deal,Угода потенційних продажів
 DocType: Payment Entry,Cheque/Reference Date,Дата Чеку / Посилання
@@ -2475,7 +2474,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобальний POS-профіль {0} вже створено для компанії {1}
 DocType: Purchase Order,Ref SQ,Посилання SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Замінити позицію / Норми у всіх Нормах витрат
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Квитанція документ повинен бути представлений
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Квитанція документ повинен бути представлений
 DocType: Purchase Invoice Item,Received Qty,Отримана к-сть
 DocType: Stock Entry Detail,Serial No / Batch,Серійний номер / партія
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не оплачуються і не доставляється
@@ -2488,7 +2487,7 @@
 ,To Produce,Виробляти
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Платіжна відомість
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряду {0} в {1}. Щоб включити {2} у розмірі Item ряди також повинні бути включені {3}
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,зробити користувача
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,зробити користувача
 DocType: Packing Slip,Identification of the package for the delivery (for print),Ідентифікація пакета для доставки (для друку)
 DocType: Bin,Reserved Quantity,Зарезервовано Кількість
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Будь ласка, введіть адресу електронної пошти"
@@ -2501,11 +2500,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Відключений шаблон не може бути шаблоном за замовчуванням
 DocType: Account,Income Account,Рахунок доходів
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Поточна к-сть
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Див ""Вартість матеріалів базується на"" в розділі калькуляції"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Попередня
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студентські Порції допомагають відслідковувати відвідуваність, оцінки та збори для студентів"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студентські Порції допомагають відслідковувати відвідуваність, оцінки та збори для студентів"
 DocType: Payment Entry,Total Allocated Amount,Загальна розподілена сума
 DocType: Item Reorder,Material Request Type,Тип Замовлення матеріалів
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural журнал запис на зарплату від {0} до {1}
@@ -2528,7 +2528,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Відслідковувати Lead-и за галуззю.
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Налаштування інвентаря
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
@@ -2538,6 +2538,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Чи буде надіслати електронною поштою про подію співробітникам зі статусом &#39;Open&#39;
 DocType: Task,Depends on Tasks,Залежно від завдань
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Додатки можуть бути показані без включення кошика
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Назва нового центру витрат
 DocType: Leave Control Panel,Leave Control Panel,Залишити Панель управління
@@ -2550,12 +2551,10 @@
 DocType: Sales Invoice,Debit To,Дебет
 DocType: Delivery Note,Required only for sample item.,Потрібно лише для зразка пункту.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Фактична к-сть після операції
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Немає зарплати ковзання знаходиться між {0} і {1}
 ,Pending SO Items For Purchase Request,"Замовлені товари, які очікують закупки"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зараховуються студентів
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} відключений
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} відключений
 DocType: Supplier,Billing Currency,Валюта оплати
 DocType: Sales Invoice,SINV-RET-,Вих_Рах-Пов-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Дуже великий
@@ -2572,7 +2571,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Головна Рекомендовані продукт
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Всі групи по оцінці
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Новий склад Ім&#39;я
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Підсумок {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Підсумок {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територія
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
 DocType: Stock Settings,Default Valuation Method,Метод оцінка за замовчуванням
@@ -2590,7 +2589,7 @@
 DocType: Price List,Price List Master,Майстер Прайс-листа
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Для всіх операцій продажу можна вказувати декількох ""Відповідальних з продажу"", так що ви можете встановлювати та контролювати цілі."
 ,S.O. No.,КО №
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Будь ласка, створіть клієнта з Lead {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Будь ласка, створіть клієнта з Lead {0}"
 DocType: Price List,Applicable for Countries,Стосується для країн
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Тільки залиште додатки зі статусом «Схвалено» і «Відхилено» можуть бути представлені
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Студентська група Ім&#39;я є обов&#39;язковим в рядку {0}
@@ -2671,7 +2670,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Проводки по запасах
 DocType: Vehicle Service,Engine Oil,Машинне мастило
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Адреса клієнта
 DocType: Employee Loan,Loan Details,кредит Детальніше
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Рядок {0}: Завершена кількість має бути більше нуля.
@@ -2736,7 +2735,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Склади з існуючої транзакцією не можуть бути перетворені у групу.
 DocType: Assessment Result Tool,Result HTML,результат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Діє до
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Додати студентів
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Додати студентів
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Будь ласка, виберіть {0}"
 DocType: C-Form,C-Form No,С-Форма Немає
 DocType: BOM,Exploded_items,Exploded_items
@@ -2801,7 +2800,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,межа Схрещені
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурний капітал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академічний термін з цим &quot;Академічний рік&quot; {0} і &#39;Term Name &quot;{1} вже існує. Будь ласка, поміняйте ці записи і спробуйте ще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Як є існуючі операції проти пункту {0}, ви не можете змінити значення {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Як є існуючі операції проти пункту {0}, ви не можете змінити значення {1}"
 DocType: UOM,Must be Whole Number,Повинно бути ціле число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нові листя Виділені (у днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серійний номер {0} не існує
@@ -2845,7 +2844,7 @@
 DocType: Supplier,Last Day of the Next Month,Останній день наступного місяця
 DocType: Support Settings,Auto close Issue after 7 days,Авто близько Issue через 7 днів
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Відпустка не може бути призначена до{0}, оскільки залишок днів вже перенесений у наступний документ Призначення відпусток{1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студент Абітурієнт
 DocType: Asset Category Account,Accumulated Depreciation Account,Рахунок накопиченого зносу
 DocType: Stock Settings,Freeze Stock Entries,Заморозити Рухи ТМЦ
@@ -2873,8 +2872,8 @@
 DocType: Asset,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
 DocType: Serial No,Warranty / AMC Details,Гарантія / Деталі контракту на річне обслуговування
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
 DocType: Journal Entry,User Remark,Зауваження користувача
 DocType: Lead,Market Segment,Сегмент ринку
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
@@ -2893,7 +2892,7 @@
 DocType: Production Planning Tool,Create Material Requests,Створити Замовлення матеріалів
 DocType: Employee Education,School/University,Школа / університет
 DocType: Payment Request,Reference Details,Посилання Детальніше
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Очікувана вартість після терміну використання ма бути менша за повну вартість придбання.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очікувана вартість після терміну використання ма бути менша за повну вартість придбання.
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступна к-сть на складі
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Сума виставлених рахунків
 DocType: Asset,Double Declining Balance,Double Declining Balance
@@ -2914,19 +2913,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Рахунок різниці повинен бути типу актив / зобов'язання, оскільки ця Інвентаризація - це введення залишків"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоєно Сума не може бути більше, ніж сума позики {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Номер Замовлення на придбання, необхідний для {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Виробничий замовлення не створено
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Виробничий замовлення не створено
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Від дати"" має бути раніше ""До дати"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов&#39;язаний з додатком студента {1}
 DocType: Asset,Fully Depreciated,повністю амортизується
 ,Stock Projected Qty,Прогнозований складський залишок
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Внесена відвідуваність HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Котирування є пропозиціями, пропозиціями відправлених до своїх клієнтів"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Котирування є пропозиціями, пропозиціями відправлених до своїх клієнтів"
 DocType: Sales Order,Customer's Purchase Order,Оригінал замовлення клієнта
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серійний номер та партія
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Сума десятків критеріїв оцінки має бути {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Будь ласка, встановіть кількість зарезервованих амортизацій"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Будь ласка, встановіть кількість зарезервованих амортизацій"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Значення або Кількість
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Хвилин
@@ -3057,7 +3056,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студентська група
 DocType: Shopping Cart Settings,Quotation Series,Серії пропозицій
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Будь ласка, виберіть клієнта"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,"Будь ласка, виберіть клієнта"
 DocType: C-Form,I,Я
 DocType: Company,Asset Depreciation Cost Center,Центр витрат амортизації
 DocType: Sales Order Item,Sales Order Date,Дата Замовлення клієнта
@@ -3076,19 +3075,18 @@
 DocType: Vehicle,Insurance Details,Страхування Детальніше
 DocType: Account,Payable,До оплати
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Будь ласка, введіть терміни погашення"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Боржники ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Боржники ({0})
 DocType: Pricing Rule,Margin,маржа
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нові клієнти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Загальний прибуток %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance дата
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Загальна вартість придбання є обов'язковою
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Загальна вартість придбання є обов'язковою
 DocType: Lead,Address Desc,Опис адреси
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Контрагент є обов'язковим
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Назва теми
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Принаймні один з продажу або покупки повинен бути обраний
-DocType: Grading Structure,Grade Intervals,інтервали Оцінка
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Виберіть характер вашого бізнесу.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Де проводяться виробничі операції.
 DocType: Asset Movement,Source Warehouse,Вихідний склад
@@ -3117,6 +3115,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Щомісячний Процентний розподіл
 DocType: Territory,Territory Targets,Територія Цілі
 DocType: Delivery Note,Transporter Info,Інформація про перевізника
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в компанії {1}"
 DocType: Cheque Print Template,Starting position from top edge,Початкове положення від верхнього краю
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Те ж постачальник був введений кілька разів
@@ -3170,7 +3169,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Кількість перезамовлення
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Поточні вакансії Вакансії
 DocType: Company,Stock Adjustment Account,Рахунок підлаштування інвентаря
-DocType: Journal Entry,Write Off,Списувати
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списувати
 DocType: Timesheet Detail,Operation ID,Код операції
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Ім’я Системного користувача. Якщо зазначене, то воно стане за замовчуванням для всіх форм відділу кадрів."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: З {1}
@@ -3181,8 +3180,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Постачальник доставляє клієнтові
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Форма/Об’єкт/{0}) немає в наявності
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Наступна дата повинна бути більше, ніж Дата публікації / створення"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Показати податок розпад
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Імпорт та експорт даних
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","На Складі {0} вже є Рухи ТМЦ, отже, ви не можете повторно призначити або змінити його"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,"Немає студентів, не знайдено"
@@ -3194,14 +3193,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Будь ласка, виберіть Витяги"
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Будь ласка, виберіть Витяги"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Зробити Візит тех. обслуговування
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Будь ласка, виберіть Витяги"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Будь ласка, виберіть Витяги"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Зробити Візит тех. обслуговування
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
 DocType: Company,Default Cash Account,Грошовий рахунок за замовчуванням
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Це засновано на відвідуваності цього студента
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,немає Студенти
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додайте більше деталей або відкриту повну форму
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
@@ -3249,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Перед інвентаризацією
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Податки та збори додано (Валюта компанії)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
 DocType: Sales Order,Partly Billed,Частково є у виставлених рахунках
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Пункт {0} повинен бути Fixed Asset Item
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Пункт {0} повинен бути Fixed Asset Item
 DocType: Item,Default BOM,Норми за замовчуванням
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Будь ласка, повторіть введення назви компанії, щоб підтвердити"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Загальна неоплачена сума
@@ -3274,7 +3274,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Обмінний курс прайс-листа
 DocType: Purchase Invoice Item,Rate,Ціна
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Інтерн
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адреса Ім&#39;я
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Адреса Ім&#39;я
 DocType: Stock Entry,From BOM,З норм
 DocType: Assessment Code,Assessment Code,код оцінки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основний
@@ -3299,7 +3299,7 @@
 DocType: Purchase Invoice,Print Language,Мова друку
 DocType: Salary Slip,Total Working Hours,Всього годин роботи
 DocType: Stock Entry,Including items for sub assemblies,Включаючи позиції для наівфабрикатів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Значення має бути позитивним
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Значення має бути позитивним
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Всі території
 DocType: Purchase Invoice,Items,Номенклатура
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент вже надійшов.
@@ -3319,17 +3319,15 @@
 DocType: Issue,Opening Time,Час відкриття
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Від і До дати, необхідних"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
 DocType: Assessment Plan,Supervisor Name,Ім'я супервайзера
 DocType: Program Enrollment Course,Program Enrollment Course,Програма Зарахування курс
 DocType: Program Enrollment Course,Program Enrollment Course,Програма Зарахування курс
-DocType: Grading Structure,Grading Structure,градація Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
 DocType: Tax Rule,Shipping City,Місто доставки
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Цей пункт є Варіантом {0} (шаблон). Атрибути будуть перезаписані з шаблону, хіба що встановлене ""Не копіювати"""
 DocType: Notification Control,Customize the Notification,Налаштувати повідомлення
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Рух грошових коштів від операцій
 DocType: Sales Invoice,Shipping Rule,Правило доставки
@@ -3352,6 +3350,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Немає Норм за замовчуванням для елемента {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Будь ласка, виберіть спочатку дату запису"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Відкриття Дата повинна бути, перш ніж Дата закриття"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідуваності через Setup&gt; Нумерація серії"
 DocType: Leave Control Panel,Carry Forward,Переносити
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"Центр витрат з існуючими операціями, не може бути перетворений у книгу"
 DocType: Department,Days for which Holidays are blocked for this department.,"Дні, для яких вихідні заблоковані для цього відділу."
@@ -3380,7 +3379,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Разом (Сум)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
 DocType: Quality Inspection,Item Serial No,Серійний номер номенклатурної позиції
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Створення Employee записів
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Створення Employee записів
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Разом Поточна
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Бухгалтерська звітність
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Година
@@ -3395,8 +3394,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Нові Норми після заміни
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,POS
 DocType: Payment Entry,Received Amount,отримана сума
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть службовців систему імен в людських ресурсах&gt; HR Налаштування"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть службовців систему імен в людських ресурсах&gt; HR Налаштування"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Створити для повного кількості, ігноруючи кількість вже на замовлення"
 DocType: Account,Tax,Податок
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,без маркування
@@ -3409,7 +3406,7 @@
 DocType: Batch,Source Document Name,Джерело Назва документа
 DocType: Batch,Source Document Name,Джерело Назва документа
 DocType: Job Opening,Job Title,Професія
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,створення користувачів
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,створення користувачів
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Звіт по візиту на виклик по тех. обслуговуванню.
@@ -3421,8 +3418,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
 DocType: BOM,Website Description,Опис веб-сайту
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чиста зміна в капіталі
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
 DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,розписка
 ,Sales Register,Реєстр продаж
@@ -3433,16 +3430,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Там немає нічого для редагування
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Результати для цього місяця та незакінчена діяльність
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Немає клієнтів ще!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Звіт про рух грошових коштів
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ліцензія
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year
 DocType: GL Entry,Against Voucher Type,Згідно док-ту типу
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Будь ласка, введіть рахунок списання"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Остання дата замовлення
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
 DocType: Student,Guardian Details,Детальніше Гардіан
 DocType: C-Form,C-Form,С-форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк відвідуваності для декількох співробітників
@@ -3467,14 +3466,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Рядок {0} # Рахунок повинен бути типу &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Розхід у к-сті
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила для розрахунку кількості вантажу для продажу
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серії є обов'язковими
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серії є обов'язковими
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Фінансові послуги
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Види діяльності для Час Журнали
 DocType: Tax Rule,Sales,Продаж
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
 DocType: Training Event,Exam,іспит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
 DocType: Leave Allocation,Unused leaves,Невикористані дні відпустки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Штат (оплата)
@@ -3507,7 +3506,7 @@
 DocType: Payment Entry,Account Paid From,Рахунок Оплачено з
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Номенклатура давальної сировини
 DocType: Journal Entry,Write Off Based On,Списання заснований на
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,зробити Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,зробити Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Друк та канцелярські
 DocType: Stock Settings,Show Barcode Field,Показати поле штрих-коду
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Надіслати Постачальник електронних листів
@@ -3523,6 +3522,7 @@
 DocType: Offer Letter,Awaiting Response,В очікуванні відповіді
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Вище
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Згадка якщо нестандартні до оплати рахунків
 DocType: Salary Slip,Earning & Deduction,Нарахування та відрахування
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Необов'язково. Цей параметр буде використовуватися для фільтрації в різних операціях.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Від'ємна собівартість не допускається
@@ -3558,7 +3558,7 @@
 DocType: Program Enrollment Tool,Get Students From,Отримати студентів з
 DocType: Hub Settings,Seller Country,Продавець Країна
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Опублікувати об’єкти на веб-сайті
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група ваших студентів в партіях
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група ваших студентів в партіях
 DocType: Authorization Rule,Authorization Rule,Авторизація Правило
 DocType: Sales Invoice,Terms and Conditions Details,Деталі положень та умов
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Специфікації
@@ -3618,7 +3618,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Випробувальний термін
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатні Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новий навчальний рік
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Повернення / Кредит Примітка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Повернення / Кредит Примітка
 DocType: Stock Settings,Auto insert Price List rate if missing,Відсутня прайс-лист ціна для автовставки
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Всього сплачена сума
 DocType: Production Order Item,Transferred Qty,Переведений Кількість
@@ -3659,6 +3659,7 @@
 ,Sales Funnel,Воронка продажів
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Скорочення є обов'язковим
 DocType: Project,Task Progress,Завдання про хід роботи
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Візок
 ,Qty to Transfer,К-сть для передачі
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Квоти для Lead-ів або клієнтів.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль з дозволом редагувати заблоковані складські рухи
@@ -3692,7 +3693,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,стягувати збори
 DocType: Attendance,ATT-,попит-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
 DocType: Item,Opening Stock,Початкові залишки
@@ -3710,7 +3711,7 @@
 DocType: Customer,From Lead,З Lead-а
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Замовлення випущений у виробництво.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Виберіть фінансовий рік ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
 DocType: Program Enrollment Tool,Enroll Students,зарахувати студентів
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартний Продаж
@@ -3721,7 +3722,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} по вихідних рахунках-фактурах {1}
 DocType: Sales Invoice,SINV-,Вих_Рах-
 DocType: Request for Quotation Item,Project Name,Назва проекту
-DocType: Supplier,Mention if non-standard receivable account,Вказати якщо нестандартний рахунок заборгованості
+DocType: Customer,Mention if non-standard receivable account,Вказати якщо нестандартний рахунок заборгованості
 DocType: Journal Entry Account,If Income or Expense,Якщо доходи або витрати
 DocType: Production Order,Required Items,необхідні товари
 DocType: Stock Ledger Entry,Stock Value Difference,Різниця значень запасів
@@ -3752,6 +3753,7 @@
 DocType: Item,Taxes,Податки
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Платні і не доставляється
 DocType: Project,Default Cost Center,Центр доходів/витрат за замовчуванням
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Іменування Series для {0} через Setup&gt; Установки&gt; Naming Series"
 DocType: Bank Guarantee,End Date,Дата закінчення
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Операції з інвентарем
 DocType: Budget,Budget Accounts,рахунки бюджету
@@ -3816,7 +3818,7 @@
 DocType: Customer,Sales Partner and Commission,Торговий партнер та комісія
 DocType: Employee Loan,Rate of Interest (%) / Year,Процентна ставка (%) / рік
 ,Project Quantity,проект Кількість
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може бути, ви повинні змінити «Розподілити плату на основі»"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може бути, ви повинні змінити «Розподілити плату на основі»"
 DocType: Opportunity,To Discuss,Обговорити
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} одиниць {1} необхідні {2}, щоб завершити цю угоду."
 DocType: Loan Type,Rate of Interest (%) Yearly,Процентна ставка (%) Річний
@@ -3839,7 +3841,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Відсутня
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Рядок {0}: Валюта BOM # {1} має дорівнювати вибрану валюту {2}
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,плата компонентів
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управління флотом
@@ -3856,7 +3858,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Склад {0} не існує
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зареєструватися на Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Щомісячні Відсотки розподілу
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Обрана номенклатурна позиція не може мати партій
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Обрана номенклатурна позиція не може мати партій
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Швидкість оцінки не знайдено для пункту {0}, яке потрібно робити бухгалтерські записи для {1} {2}. Якщо елемент угод як елемент зразка в {1}, будь ласка, відзначити, що в {1} таблиці Item. В іншому випадку, будь ласка, створити входять акції угоду по ст або згадки ставки оцінки в запису товару, а потім спробувати завершенням заповнення / скасуванням цього запису"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Матеріалів доставляється по цій накладній
 DocType: Project,Customer Details,Реквізити клієнта
@@ -3873,7 +3875,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Відправив замовлення не можуть бути видалені
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Управління якістю
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Пункт {0} відключена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Пункт {0} відключена
 DocType: Employee Loan,Repay Fixed Amount per Period,Погашати фіксовану суму за період
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Будь ласка, введіть кількість для {0}"
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
@@ -3900,7 +3902,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Попередження (днів)
 DocType: Tax Rule,Sales Tax Template,Шаблон податків на продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
 DocType: Employee,Encashment Date,Дата виплати
 DocType: Training Event,Internet,інтернет
 DocType: Account,Stock Adjustment,Підлаштування інвентаря
@@ -3934,6 +3936,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Дебет Примітка Випущений
 DocType: Production Order,Warehouses,Склади
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} актив не може бути передано
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Цей пункт є Варіант {0} (шаблон).
 DocType: Workstation,per hour,в годину
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупівля
 DocType: Announcement,Announcement,Оголошення
@@ -3949,7 +3952,7 @@
 DocType: Account,Receivable,Дебіторська заборгованість
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не дозволено змінювати Постачальника оскільки вже існує Замовлення на придбання
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, що дозволяє проводити операції, які перевищують ліміти кредитів."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Вибір елементів для виготовлення
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Вибір елементів для виготовлення
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
 DocType: Item,Material Issue,Матеріал Випуск
 DocType: Hub Settings,Seller Description,Продавець Опис
@@ -3962,7 +3965,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Замовлено
 DocType: Salary Detail,Component,компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерії оцінки Група
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Накопичений знос на момент відкриття має бути менше або дорівнювати {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Накопичений знос на момент відкриття має бути менше або дорівнювати {0}
 DocType: Warehouse,Warehouse Name,Назва складу
 DocType: Naming Series,Select Transaction,Виберіть операцію
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Будь ласка, введіть затвердження роль або затвердження Користувач"
@@ -3997,7 +4000,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку &quot;Встановити за замовчуванням&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,приєднатися
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Брак к-сті
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 DocType: Employee Loan,Repay from Salary,Погашати із заробітної плати
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Запит платіж проти {0} {1} на суму {2}
@@ -4015,7 +4018,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Оцінка результату Detail
 DocType: Employee Education,Employee Education,Співробітник Освіта
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Повторювана група знахідку в таблиці групи товарів
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
 DocType: Salary Slip,Net Pay,"Сума ""на руки"""
 DocType: Account,Account,Рахунок
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серійний номер {0} вже отриманий
@@ -4024,7 +4027,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не пов&#39;язаний з якою-небудь облікового запису, будь ласка, створіть / зв&#39;язати відповідний рахунок (актив) для складу."
 DocType: Purchase Invoice,Recurring Id,Ідентифікатор періодичності
 DocType: Customer,Sales Team Details,Продажі команд Детальніше
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Видалити назавжди?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Видалити назавжди?
 DocType: Expense Claim,Total Claimed Amount,Усього сума претензії
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенційні можливості для продажу.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Невірний {0}
@@ -4035,13 +4038,14 @@
 DocType: Warehouse,PIN,PIN-код
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Визначення своєї школи в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базова Зміна Сума (Компанія Валюта)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Спочатку збережіть документ.
 DocType: Account,Chargeable,Оплаті
 DocType: Company,Change Abbreviation,Змінити абревіатуру
 DocType: Expense Claim Detail,Expense Date,Витрати Дата
 DocType: Item,Max Discount (%),Макс Знижка (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Останнє Сума замовлення
+DocType: Task,Is Milestone,Чи є Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail Надіслати
 DocType: Budget,Warn,Попереджати
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Будь-які інші зауваження, відзначити зусилля, які повинні йти в записах."
@@ -4074,11 +4078,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"Значення `Заморозити активи старіші ніж` повинно бути менше, ніж %d днів."
 DocType: Tax Rule,Purchase Tax Template,Шаблон податку на закупку
 ,Project wise Stock Tracking,Стеження за запасами у рамках проекту
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Заплановане обслуговування {0} існує по {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Фактична к-сть (в джерелі / цілі)
 DocType: Item Customer Detail,Ref Code,Код посилання
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Співробітник записів.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Будь ласка, встановіть наступну дату амортизації"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Будь ласка, встановіть наступну дату амортизації"
 DocType: HR Settings,Payroll Settings,Налаштування платіжної відомості
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Зв'язати рахунки-фактури з платежами.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Зробити замовлення
@@ -4101,7 +4104,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,"Чеки та депозити неправильно ""очищені"""
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити рахунок як батьківський до себе
 DocType: Purchase Invoice Item,Price List Rate,Ціна з прайс-листа
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Створення котирування клієнтів
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Створення котирування клієнтів
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Показати ""На складі"" або ""немає на складі"", базуючись на наявності на цьому складі."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),"Норми витрат (НВ),"
 DocType: Item,Average time taken by the supplier to deliver,Середній час потрібний постачальникові для поставки
@@ -4123,7 +4126,7 @@
 DocType: Asset,Disposal Date,Утилізація Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Електронні листи будуть відправлені до всіх активні працівники компанії на даний час, якщо у них немає відпустки. Резюме відповідей буде відправлений опівночі."
 DocType: Employee Leave Approver,Employee Leave Approver,Погоджувач відпустки працівника
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Перезамовлення вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Перезамовлення вже існує для цього складу {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не можете бути оголошений як втрачений, бо вже зроблена пропозиція."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Навчання Зворотній зв&#39;язок
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Виробниче замовлення {0} повинно бути проведеним
@@ -4131,7 +4134,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курс є обов&#39;язковим в рядку {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Додати / Редагувати Ціни
 DocType: Batch,Parent Batch,батько Batch
 DocType: Batch,Parent Batch,батько Batch
 DocType: Cheque Print Template,Cheque Print Template,Шаблон друку чеків
@@ -4176,7 +4179,7 @@
 DocType: Item,Variant Based On,Варіант Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ваші Постачальники
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
 DocType: Request for Quotation Item,Supplier Part No,Номер деталі постачальника
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Чи не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Vaulation і Total &#39;"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Отримано від
@@ -4186,7 +4189,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: З {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Рядок {0}: значення годин має бути більше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {0}, долучене до об’єкту {1} не може бути знайдене"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {0}, долучене до об’єкту {1} не може бути знайдене"
 DocType: Issue,Content Type,Тип вмісту
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Комп&#39;ютер
 DocType: Item,List this Item in multiple groups on the website.,Включити цей товар у декілька груп на веб сайті.
@@ -4195,20 +4198,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Вам не дозволено встановлювати блокування
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
 DocType: Payment Reconciliation,From Invoice Date,Рахунки-фактури з датою від
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Валюта оплати має співпадати з валютою компанії або валютою рахунку контрагента
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Валюта оплати має співпадати з валютою компанії або валютою рахунку контрагента
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Залиште Інкасацію
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Що це робить?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,На склад
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Все Вступникам Student
 ,Average Commission Rate,Середня ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Відвідуваність не можна вносити для майбутніх дат
 DocType: Pricing Rule,Pricing Rule Help,Довідка з цінових правил
 DocType: School House,House Name,Назва будинку
 DocType: Purchase Taxes and Charges,Account Head,Рахунок
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Оновіть додаткові витрат для розрахунку кінцевої вартості товарів
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Електричний
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додайте решту вашої організації в якості користувачів. Ви можете також додати запрошувати клієнтів на ваш портал, додавши їх зі списку контактів"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додайте решту вашої організації в якості користувачів. Ви можете також додати запрошувати клієнтів на ваш портал, додавши їх зі списку контактів"
 DocType: Stock Entry,Total Value Difference (Out - In),Загальна різниця (Розх - Прих)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Ідентифікатор користувача не встановлений Employee {0}
@@ -4217,7 +4220,7 @@
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Нагадування про день народження для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дні з останнього ордена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Назва списку блокування відпусток
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхування початку повинна бути менше, ніж дата страхування End"
@@ -4232,7 +4235,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Зарплатний розрахунок для працівника {0} вже створений на основі табелю {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Sales Order Item,Ordered Qty,Замовлена (ordered) к-сть
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Рухи ТМЦ заблоковано по
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Норми не містять жодного елементу запасів
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
@@ -4245,7 +4248,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Оплачувані години
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,За замовчуванням BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість перезамовлення"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість перезамовлення"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Натисніть пункти, щоб додати їх тут"
 DocType: Fees,Program Enrollment,Програма подачі заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Документ кінцевої вартості
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Будь ласка, встановіть {0}"
@@ -4346,7 +4350,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
 DocType: Issue,First Responded On,По-перше відгукнувся на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Хрест Лістинг Пункт в декількох групах
-DocType: Grade Interval,Grade Interval,інтервал Оцінка
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Дата початку та закінчення вже встановлені для фінансового року {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance дату оновлено
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4354,6 +4357,7 @@
 DocType: Request for Quotation Supplier,Download PDF,завантажити PDF
 DocType: Production Order,Planned End Date,Планована Дата закінчення
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Де елементи зберігаються.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
 DocType: Request for Quotation,Supplier Detail,Постачальник: Подробиці
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Помилка у формулі або умова: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Сума за рахунками
@@ -4399,7 +4403,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Налаштувати простий веб-сайт для моєї організації
 DocType: Payment Reconciliation,Receivable / Payable Account,Рахунок Кредиторської / Дебіторської заборгованості
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,Склад за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Будь ласка, введіть батьківський центр витрат"
@@ -4459,7 +4463,7 @@
 ,Items To Be Requested,Товари до відвантаження
 DocType: Purchase Order,Get Last Purchase Rate,Отримати останню ціну закупівлі
 DocType: Company,Company Info,Інформація про компанію
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Вибрати або додати нового клієнта
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Вибрати або додати нового клієнта
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,МВЗ потрібно замовити вимога про витрати
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Це засновано на відвідуваності цього співробітника
@@ -4472,13 +4476,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Завадити користувачам створювати заяви на відпустки на наступні дні.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Закупівельна сума
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Пропозицію постачальника {0} створено
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Виплати працівникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Production Order,Manufactured Qty,Вироблена к-сть
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнята кількість
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть список вихідних за замовчуванням для працівника {0} або Компанії {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не існує
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не існує
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Рядок № {0}: Сума не може бути більша ніж сума до погодження по Авансовому звіту {1}. Сума до погодження = {2}
@@ -4487,15 +4491,17 @@
 DocType: Quality Inspection Reading,Reading 3,Читання 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Тип документа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Прайс-лист не знайдений або відключений
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Прайс-лист не знайдений або відключений
 DocType: Employee Loan Application,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
 DocType: Guardian,Guardian,охоронець
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оцінка {0} створений для працівника {1} в зазначений діапазон дат
 DocType: Employee,Education,Освіта
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Називати кампанії за
 DocType: Employee,Current Address Is,Поточна адреса
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модифікований
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Необов&#39;язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступна к-сть на вихідному складі
@@ -4532,7 +4538,7 @@
 DocType: Hub Settings,Hub Settings,Налаштування концентратора
 DocType: Project,Gross Margin %,Валовий дохід %
 DocType: BOM,With Operations,З операцій
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
 DocType: Asset,Is Existing Asset,Існуючий актив
 DocType: Salary Detail,Statistical Component,Статистичний компонент
 DocType: Salary Detail,Statistical Component,Статистичний компонент
@@ -4588,7 +4594,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Долучити логотип
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Сток Рівні
 DocType: Customer,Commission Rate,Ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Зробити варіанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Зробити варіанти
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блокувати заяви на відпустки по підрозділу.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплати повинен бути одним з Надсилати, Pay і внутрішній переказ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Аналітика
@@ -4601,6 +4607,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволити виробництво на вихідних
 DocType: Sales Order,Customer's Purchase Order Date,Дата оригінала замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Основний капітал
+DocType: Shopping Cart Settings,Show Public Attachments,Показати Публічні вкладення
 DocType: Packing Slip,Package Weight Details,Вага упаковки Детальніше
 DocType: Payment Gateway Account,Payment Gateway Account,Обліковий запис платіжного шлюзу
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Після завершення оплати перенаправити користувача на обрану сторінку.
@@ -4625,7 +4632,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Не показувати жодних символів на кшталт ""₴"" і подібних поряд з валютами."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Є переносити
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Отримати елементи з норм
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Час на поставку в днях
@@ -4644,8 +4651,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонована сума
 DocType: GL Entry,Is Opening,Введення залишків
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідуваності через Setup&gt; Нумерація серії"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідуваності через Setup&gt; Нумерація серії"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Рахунок {0} не існує
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 5d4af43..66e9acc 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,بیچ آئٹم ختم ہونے کی حیثیت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,بینک ڈرافٹ
 DocType: Mode of Payment Account,Mode of Payment Account,ادائیگی اکاؤنٹ کے موڈ
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,دکھائیں متغیرات
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,دکھائیں متغیرات
 DocType: Academic Term,Academic Term,تعلیمی مدت
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مواد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,مقدار
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,صحت کی دیکھ بھال
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ادائیگی میں تاخیر (دن)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,سروس کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,انوائس
 DocType: Maintenance Schedule Item,Periodicity,مدت
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالی سال {0} کی ضرورت ہے
@@ -116,18 +117,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ایڈورٹائزنگ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ایک ہی کمپنی ایک سے زیادہ بار داخل کیا جاتا ہے
 DocType: Employee,Married,شادی
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},کی اجازت نہیں {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},کی اجازت نہیں {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,سے اشیاء حاصل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,کوئی آئٹم مندرج
 DocType: Payment Reconciliation,Reconcile,مصالحت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,گروسری
 DocType: Quality Inspection Reading,Reading 1,1 پڑھنا
 DocType: Process Payroll,Make Bank Entry,بینک اندراج
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,پنشن فنڈز
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,اگلا ہراس تاریخ تاریخ کی خریداری سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,اگلا ہراس تاریخ تاریخ کی خریداری سے پہلے نہیں ہو سکتا
 DocType: SMS Center,All Sales Person,تمام فروخت شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماہانہ ڈسٹریبیوش ** آپ کو مہینوں بھر بجٹ / نشانے کی تقسیم سے آپ کو آپ کے کاروبار میں seasonality کے ہو تو میں مدد ملتی ہے.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,آئٹم نہیں ملا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,آئٹم نہیں ملا
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,تنخواہ ساخت لاپتہ
 DocType: Lead,Person Name,شخص کا نام
 DocType: Sales Invoice Item,Sales Invoice Item,فروخت انوائس آئٹم
@@ -136,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",مثلا &quot;پرائمری سکول&quot; یا &quot;یونیورسٹی&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,اسٹاک کی رپورٹ
 DocType: Warehouse,Warehouse Detail,گودام تفصیل
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,اصطلاح آخر تاریخ بعد میں جس چیز کی اصطلاح منسلک ہے کے تعلیمی سال کے سال آخر تاریخ سے زیادہ نہیں ہو سکتا ہے (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;فکسڈ اثاثہ ہے&quot; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;فکسڈ اثاثہ ہے&quot; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
 DocType: Vehicle Service,Brake Oil,وقفے تیل
 DocType: Tax Rule,Tax Type,ٹیکس کی قسم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تم سے پہلے اندراجات شامل کرنے یا اپ ڈیٹ کرنے کی اجازت نہیں ہے {0}
 DocType: BOM,Item Image (if not slideshow),آئٹم تصویر (سلائڈ شو نہیں تو)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ایک کسٹمر کو ایک ہی نام کے ساتھ موجود
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,ڰنٹےکی شرح / 60) * اصل آپریشن کے وقت)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM منتخب
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,BOM منتخب
 DocType: SMS Log,SMS Log,ایس ایم ایس لاگ ان
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ہونے والا اشیا کی لاگت
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} پر چھٹی تاریخ سے اور تاریخ کے درمیان نہیں ہے
@@ -190,11 +193,11 @@
 DocType: Training Result Employee,Grade,گریڈ
 DocType: Sales Invoice Item,Delivered By Supplier,سپلائر کی طرف سے نجات بخشی
 DocType: SMS Center,All Contact,تمام رابطہ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,پروڈکشن آرڈر پہلے سے ہی BOM کے ساتھ تمام اشیاء کے لئے پیدا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,پروڈکشن آرڈر پہلے سے ہی BOM کے ساتھ تمام اشیاء کے لئے پیدا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,سالانہ تنخواہ
 DocType: Daily Work Summary,Daily Work Summary,روز مرہ کے کام کا خلاصہ
 DocType: Period Closing Voucher,Closing Fiscal Year,مالی سال بند
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,اکاؤنٹس کا چارٹ بنانے کے لئے موجودہ کمپنی براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,اسٹاک اخراجات
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,کے ھدف گودام کریں
@@ -203,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,برعکس انٹری
 DocType: Journal Entry Account,Credit in Company Currency,کمپنی کرنسی میں کریڈٹ
 DocType: Delivery Note,Installation Status,تنصیب کی حیثیت
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",آپ کی حاضری کو اپ ڈیٹ کرنا چاہتے ہیں؟ <br> موجودہ: {0} \ <br> غائب: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},مقدار مسترد منظور + شے کے لئے موصول مقدار کے برابر ہونا چاہیے {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,خام مال کی سپلائی کی خریداری کے لئے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ادائیگی کی کم از کم ایک موڈ POS انوائس کے لئے ضروری ہے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ادائیگی کی کم از کم ایک موڈ POS انوائس کے لئے ضروری ہے.
 DocType: Products Settings,Show Products as a List,شو کی مصنوعات ایک فہرست کے طور
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",، سانچہ ڈاؤن لوڈ مناسب اعداد و شمار کو بھرنے کے اور نظر ثانی شدہ فائل منسلک. منتخب مدت میں تمام تاریخوں اور ملازم مجموعہ موجودہ حاضری کے ریکارڈز کے ساتھ، سانچے میں آ جائے گا
@@ -222,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ہراس اندراج
 DocType: Appraisal Template Goal,KRA,سے Kra
 DocType: Lead,Request Type,درخواست کی قسم
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ملازم بنائیں
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ملازم بنائیں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,نشریات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,پھانسی
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,آپریشن کی تفصیلات سے کئے گئے.
@@ -236,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,بحالی کے دوروں کے لئے منصوبہ بندی.
 DocType: SMS Settings,Enter url parameter for message,پیغام کے لئے یو آر ایل پیرامیٹر درج
 DocType: POS Profile,Customer Groups,کسٹمر گروپوں
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,مالیاتی گوشوارے
 DocType: Guardian,Students,طلباء
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,قیمتوں کا تعین اور رعایت کا اطلاق کے لئے قوانین.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,قیمت کی فہرست خرید یا فروخت کے لئے قابل ہونا چاہئے
@@ -261,7 +265,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
 DocType: Naming Series,Series List for this Transaction,اس ٹرانزیکشن کے لئے سیریز
 DocType: Company,Default Payroll Payable Account,پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ای میل تازہ کاری گروپ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ای میل تازہ کاری گروپ
 DocType: Sales Invoice,Is Opening Entry,انٹری افتتاح ہے
 DocType: Customer Group,Mention if non-standard receivable account applicable,ذکر غیر معیاری وصولی اکاؤنٹ اگر قابل اطلاق ہو
 DocType: Course Schedule,Instructor Name,انسٹرکٹر نام
@@ -273,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,فروخت انوائس آئٹم خلاف
 ,Production Orders in Progress,پیش رفت میں پیداوار کے احکامات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,فنانسنگ کی طرف سے نیٹ کیش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
 DocType: Lead,Address & Contact,ایڈریس اور رابطہ
 DocType: Leave Allocation,Add unused leaves from previous allocations,گزشتہ آونٹن سے غیر استعمال شدہ پتے شامل
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},اگلا مکرر {0} پر پیدا کیا جائے گا {1}
@@ -299,7 +303,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),کل لاگت کی رقم (وقت شیٹ کے ذریعے)
 DocType: Item Website Specification,Item Website Specification,شے کی ویب سائٹ کی تفصیلات
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,بینک لکھے
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالانہ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,اسٹاک مصالحتی آئٹم
@@ -318,7 +322,7 @@
 DocType: Item,Publish in Hub,حب میں شائع
 DocType: Student Admission,Student Admission,طالب علم داخلہ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
 DocType: Item,Purchase Details,خریداری کی تفصیلات
@@ -368,12 +372,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,خود کار طریقے سے مواد کی درخواست کی تخلیق پر ای میل کے ذریعے مطلع کریں
 DocType: Journal Entry,Multi Currency,ملٹی کرنسی
 DocType: Payment Reconciliation Invoice,Invoice Type,انوائس کی قسم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ترسیل کے نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,ترسیل کے نوٹ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ٹیکس قائم
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,فروخت اثاثہ کی قیمت
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,آپ اسے نکالا بعد ادائیگی انٹری پر نظر ثانی کر دیا گیا ہے. اسے دوبارہ ھیںچو براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
-DocType: Grade Interval,Min Score,کم سے کم اسکور
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,اس ہفتے اور زیر التواء سرگرمیوں کا خلاصہ
 DocType: Student Applicant,Admitted,اعتراف کیا
 DocType: Workstation,Rent Cost,کرایہ لاگت
@@ -386,7 +389,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,آرڈر ویلیو
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,بینک / کیش پارٹی کے خلاف یا اندرونی منتقلی کے لئے لین دین
 DocType: Shipping Rule,Valid for Countries,ممالک کے لئے درست
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,یہ آئٹم ایک ٹیمپلیٹ ہے اور لین دین میں استعمال نہیں کیا جا سکتا. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک آئٹم صفات مختلف حالتوں میں سے زیادہ کاپی کیا جائے گا
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,یہ آئٹم ایک ٹیمپلیٹ ہے اور لین دین میں استعمال نہیں کیا جا سکتا. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک آئٹم صفات مختلف حالتوں میں سے زیادہ کاپی کیا جائے گا
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,سمجھا کل آرڈر
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,درج میدان قیمت &#39;دن ماہ پر دہرائیں براہ مہربانی
@@ -396,13 +399,13 @@
 DocType: Item Tax,Tax Rate,ٹیکس کی شرح
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} پہلے ہی ملازم کے لئے مختص {1} کی مدت {2} کے لئے {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,منتخب آئٹم
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},صف # {0}: بیچ کوئی طور پر ایک ہی ہونا ضروری ہے {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,غیر گروپ میں تبدیل
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ایک آئٹم کے بیچ (بہت).
 DocType: C-Form Invoice Detail,Invoice Date,انوائس کی تاریخ
 DocType: GL Entry,Debit Amount,ڈیبٹ رقم
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,منسلکہ ملاحظہ کریں
 DocType: Purchase Order,% Received,٪ موصول
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,طلبہ تنظیموں بنائیں
@@ -431,9 +434,9 @@
 DocType: Request for Quotation,Request for Quotation,کوٹیشن کے لئے درخواست
 DocType: Salary Slip Timesheet,Working Hours,کام کے اوقات
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ایک موجودہ سیریز کے شروع / موجودہ ترتیب تعداد کو تبدیل کریں.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ایک نئے گاہک بنائیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,ایک نئے گاہک بنائیں
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ایک سے زیادہ قیمتوں کا تعین قواعد غالب کرنے کے لئے جاری ہے، صارفین تنازعہ کو حل کرنے دستی طور پر ترجیح مقرر کرنے کو کہا جاتا.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,خریداری کے آرڈر بنائیں
 ,Purchase Register,خریداری رجسٹر
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,لاگو چارجز
@@ -477,7 +480,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تمام مینوفیکچرنگ کے عمل کے لئے عالمی ترتیبات.
 DocType: Accounts Settings,Accounts Frozen Upto,منجمد تک اکاؤنٹس
 DocType: SMS Log,Sent On,پر بھیجا
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
 DocType: HR Settings,Employee record is created using selected field. ,ملازم ریکارڈ منتخب کردہ میدان کا استعمال کرتے ہوئے تخلیق کیا جاتا ہے.
 DocType: Sales Order,Not Applicable,قابل اطلاق نہیں
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,چھٹیوں ماسٹر.
@@ -499,6 +502,7 @@
 DocType: Packing Slip,From Package No.,پیکیج نمبر سے
 DocType: Item Attribute,To Range,کی حد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,سیکورٹیز اور جمع
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",کچھ آئٹمز کے خلاف لین دین جو نہیں ہے جس سے ہیں کے طور پر، تشخیص کا طریقہ تبدیل نہیں ہوسکتی کی اپنی تشخیص کا طریقہ ہے
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مختص کل پتے لازمی ہے
 DocType: Job Opening,Description of a Job Opening,ایک کام افتتاحی تفصیل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,آج کے لئے زیر غور سرگرمیوں
@@ -526,7 +530,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
 DocType: Production Order,Additional Operating Cost,اضافی آپریٹنگ لاگت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,کاسمیٹک
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
 DocType: Shipping Rule,Net Weight,سارا وزن
 DocType: Employee,Emergency Phone,ایمرجنسی فون
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,خریدنے
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,حد 0 فیصد گریڈ کی وضاحت براہ مہربانی
 DocType: Sales Order,To Deliver,نجات کے لئے
 DocType: Purchase Invoice Item,Item,آئٹم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
 DocType: Journal Entry,Difference (Dr - Cr),فرق (ڈاکٹر - CR)
 DocType: Account,Profit and Loss,نفع اور نقصان
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,منیجنگ ذیلی سمجھوتے
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,تنصیب نوٹ آئٹم
 DocType: Production Plan Item,Pending Qty,زیر مقدار
 DocType: Budget,Ignore,نظر انداز
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} فعال نہیں ہے
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} فعال نہیں ہے
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ایس ایم ایس مندرجہ ذیل نمبروں کے لئے بھیجا: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,پرنٹنگ کے لئے سیٹ اپ کے چیک جہتوں
 DocType: Salary Slip,Salary Slip Timesheet,تنخواہ کی پرچی Timesheet
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,کل کمیشن
 DocType: Pricing Rule,Sales Partner,سیلز پارٹنر
 DocType: Buying Settings,Purchase Receipt Required,خریداری کی رسید کی ضرورت ہے
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,اسٹاک کھولنے میں داخل ہوئے تو اندازہ شرح لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,اسٹاک کھولنے میں داخل ہوئے تو اندازہ شرح لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,انوائس ٹیبل میں پایا کوئی ریکارڈ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,جمع اقدار
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",معذرت، سیریل نمبر ضم نہیں کیا جا سکتا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,سیلز آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,سیلز آرڈر بنائیں
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 ,Lead Id,لیڈ کی شناخت
 DocType: C-Form Invoice Detail,Grand Total,مجموعی عدد
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,پھر جاری منسلکہ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,دوبارہ گاہکوں
 DocType: Leave Control Panel,Allocate,مختص
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,سیلز واپس
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,سیلز واپس
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوٹ: کل روانہ مختص {0} پہلے ہی منظور پتیوں سے کم نہیں ہونا چاہئے {1} مدت کے لئے
 DocType: Announcement,Posted By,کی طرف سے پوسٹ
 DocType: Item,Delivered by Supplier (Drop Ship),سپلائر کی طرف سے نجات بخشی (ڈراپ جہاز)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,کے لئے کوٹیشن
 DocType: Lead,Middle Income,درمیانی آمدنی
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاحی (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,کمپنی قائم کی مہربانی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,کمپنی قائم کی مہربانی
@@ -616,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فروخت انوائس Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},حوالہ کوئی اور حوالہ تاریخ کے لئے ضروری ہے {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,بینک اندراج کرنے کے لئے منتخب ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",پتیوں، اخراجات دعووں اور پے رول انتظام کرنے کے لئے ملازم ریکارڈز تخلیق کریں
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",پتیوں، اخراجات دعووں اور پے رول انتظام کرنے کے لئے ملازم ریکارڈز تخلیق کریں
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,سویدی میں شامل کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,تجویز تحریری طور پر
 DocType: Payment Entry Deduction,Payment Entry Deduction,ادائیگی انٹری کٹوتی
@@ -658,7 +662,6 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 ساتھ تعلق
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مینیجر
 DocType: Payment Entry,Payment From / To,/ سے ادائیگی
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,تاریخ کی حد
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,ایک ہی شے کے ایک سے زیادہ مرتبہ داخل کیا گیا ہے.
 DocType: SMS Settings,Receiver Parameter,وصول پیرامیٹر
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,اور گروپ سے &#39;&#39; کی بنیاد پر &#39;ہی نہیں ہو سکتا
@@ -668,7 +671,7 @@
 DocType: Issue,Resolution Date,قرارداد تاریخ
 DocType: Student Batch Name,Batch Name,بیچ کا نام
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,اندراج کریں
 DocType: Selling Settings,Customer Naming By,کی طرف سے گاہک نام دینے
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,میں طالب علم ماہانہ حاضری کی رپورٹ کے طور پر موجود طالب علم کو دکھائے گا
@@ -712,7 +715,7 @@
 DocType: Student Attendance,Student Attendance,طلبا کی حاضری
 DocType: Sales Invoice Timesheet,Time Sheet,وقت شیٹ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مال کی بنیاد پر
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,شے کی تفصیلات درج کریں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,شے کی تفصیلات درج کریں
 DocType: Interest,Interest,دلچسپی
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پہلی فروخت
 DocType: Purchase Receipt,Other Details,دیگر تفصیلات
@@ -730,7 +733,7 @@
 ,Absent Student Report,غائب Student کی رپورٹ
 DocType: Email Digest,Next email will be sent on:,پیچھے اگلا، دوسرا ای میل پر بھیجا جائے گا:
 DocType: Offer Letter Term,Offer Letter Term,خط مدتی پیشکش
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,آئٹم مختلف حالتوں ہے.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,آئٹم {0} نہیں ملا
 DocType: Bin,Stock Value,اسٹاک کی قیمت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,درخت کی قسم
@@ -738,8 +741,6 @@
 DocType: Serial No,Warranty Expiry Date,وارنٹی ختم ہونے کی تاریخ
 DocType: Material Request Item,Quantity and Warehouse,مقدار اور گودام
 DocType: Sales Invoice,Commission Rate (%),کمیشن کی شرح (٪)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کیلئے نام دینے سیریز مقرر مہربانی
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کیلئے نام دینے سیریز مقرر مہربانی
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,براہ مہربانی منتخب کریں پروگرام
 DocType: Project,Estimated Cost,تخمینی لاگت
 DocType: Purchase Order,Link to material requests,مواد درخواستوں کا لنک
@@ -757,7 +758,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} اسٹاک شے نہیں ہے
 DocType: Mode of Payment Account,Default Account,پہلے سے طے شدہ اکاؤنٹ
 DocType: Payment Entry,Received Amount (Company Currency),موصولہ رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ہفتہ وار چھٹی کا دن منتخب کریں
 DocType: Production Order Operation,Planned End Time,منصوبہ بندی اختتام وقت
 ,Sales Person Target Variance Item Group-Wise,فروخت شخص ہدف تغیر آئٹم گروپ حکیم
@@ -819,7 +820,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,قیمت کی فہرست منتخب نہیں
 DocType: Employee,Family Background,خاندانی پس منظر
 DocType: Request for Quotation Supplier,Send Email,ای میل بھیجیں
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,کوئی اجازت
 DocType: Company,Default Bank Account,پہلے سے طے شدہ بینک اکاؤنٹ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
@@ -832,8 +833,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,کوئی ملازم پایا
 DocType: Supplier Quotation,Stopped,روک
 DocType: Item,If subcontracted to a vendor,ایک وینڈر کے ٹھیکے تو
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
 DocType: SMS Center,All Customer Contact,تمام کسٹمر رابطہ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV کے ذریعے اسٹاک توازن کو اپ لوڈ کریں.
 DocType: Warehouse,Tree Details,درخت کی تفصیلات دیکھیں
@@ -844,8 +845,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,کم از کم انوائس کی رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: لاگت مرکز {2} کمپنی سے تعلق نہیں ہے {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: اکاؤنٹ {2} ایک گروپ نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,آئٹم صف {IDX): (DOCTYPE} {} DOCNAME مندرجہ بالا میں موجود نہیں ہے &#39;{DOCTYPE}&#39; کے ٹیبل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} پہلے ہی مکمل یا منسوخ کر دیا ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,آئٹم صف {IDX): (DOCTYPE} {} DOCNAME مندرجہ بالا میں موجود نہیں ہے &#39;{DOCTYPE}&#39; کے ٹیبل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} پہلے ہی مکمل یا منسوخ کر دیا ہے
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,کوئی کاموں
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",آٹو رسید 05، 28 وغیرہ مثال کے طور پر پیدا کیا جائے گا جس پر مہینے کا دن
 DocType: Asset,Opening Accumulated Depreciation,جمع ہراس کھولنے
@@ -861,7 +862,7 @@
 DocType: Bin,Moving Average Rate,اوسط شرح منتقل
 DocType: Production Planning Tool,Select Items,منتخب شدہ اشیاء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} بل کے خلاف {1} ء {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,کورس شیڈول
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,کورس شیڈول
 DocType: Maintenance Visit,Completion Status,تکمیل کی حیثیت
 DocType: HR Settings,Enter retirement age in years,سال میں ریٹائرمنٹ کی عمر درج کریں
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ہدف گودام
@@ -869,7 +870,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,اس فی صد تک کی ترسیل یا رسید سے زیادہ کرنے کی اجازت دیں
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,درآمد حاضری
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,تمام آئٹم گروپس
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,تمام آئٹم گروپس
 DocType: Process Payroll,Activity Log,سرگرمی لاگ ان
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,خالص منافع / خسارہ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,خود کار طریقے سے لین دین کی جمع کرانے پر پیغام لکھیں.
@@ -880,7 +881,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ادائیگی آرڈر خریدیں
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,متوقع مقدار
 DocType: Sales Invoice,Payment Due Date,ادائیگی کی وجہ سے تاریخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',افتتاحی'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ایسا کرنے کے لئے کھلے
 DocType: Notification Control,Delivery Note Message,ترسیل کے نوٹ پیغام
@@ -896,7 +897,7 @@
 DocType: Item Reorder,Re-Order Qty,دوبارہ آرڈر کی مقدار
 DocType: Leave Block List Date,Leave Block List Date,بلاک فہرست تاریخ چھوڑ دو
 DocType: Pricing Rule,Price or Discount,قیمت یا ڈسکاؤنٹ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,خریداری کی رسید اشیا ٹیبل میں تمام قابل اطلاق چارجز کل ٹیکس اور الزامات طور پر ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,خریداری کی رسید اشیا ٹیبل میں تمام قابل اطلاق چارجز کل ٹیکس اور الزامات طور پر ایک ہی ہونا چاہیے
 DocType: Sales Team,Incentives,ترغیبات
 DocType: SMS Log,Requested Numbers,درخواست نمبر
 DocType: Production Planning Tool,Only Obtain Raw Materials,صرف خام مال حاصل
@@ -953,7 +954,6 @@
 DocType: Supplier,Default Payable Accounts,پہلے سے طے شدہ قابل ادائیگی اکاؤنٹس
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
 DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,انوائس پیشگی خریداری
@@ -1005,8 +1005,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: سیلز / خریداری کے آرڈر کے خلاف ادائیگی ہمیشہ پیشگی کے طور پر نشان لگا دیا جائے چاہئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کیمیکل
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,پہلے سے طے شدہ بینک / کیش اکاؤنٹ خود کار طریقے تنخواہ جرنل اندراج میں اپ ڈیٹ کیا جائے گا جب اس موڈ کو منتخب کیا گیا.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",گریڈ کوڈ کے وقفے {0} دوسرے گریڈ کے لئے گریڈ وقفے چھو رہی ہے. وقفے براہ مہربانی چیک کریں {0} اور {1} اور دوبارہ کوشش کریں
 DocType: BOM,Raw Material Cost(Company Currency),خام مواد کی لاگت (کمپنی کرنسی)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,تمام اشیاء پہلے ہی اس پروڈکشن آرڈر کے لئے منتقل کر دیا گیا ہے.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},صف # {0}: شرح میں استعمال کی شرح سے زیادہ نہیں ہو سکتا {1} {2}
@@ -1019,7 +1017,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM ویب آئٹم
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,اپنے خط سر اور علامت (لوگو). (آپ کو بعد ان میں ترمیم کر سکتے ہیں).
 DocType: Timesheet Detail,Bill,بل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,وائٹ
 DocType: SMS Center,All Lead (Open),تمام لیڈ (کھولیں) تیار
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: کے لئے مقدار دستیاب نہیں {4} گودام میں {1} اندراج کے وقت پوسٹنگ میں ({2} {3})
@@ -1034,7 +1032,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},آرڈر کی قسم سے ایک ہونا ضروری {0}
 DocType: Lead,Next Contact Date,اگلی رابطہ تاریخ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,مقدار کھولنے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
 DocType: Student Batch Name,Student Batch Name,Student کی بیچ کا نام
 DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
 DocType: Repayment Schedule,Balance Loan Amount,بیلنس قرض کی رقم
@@ -1054,10 +1052,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},وضاحت کریں ایک {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
 DocType: Delivery Note,Delivery To,کی ترسیل کے
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,وصف میز لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,وصف میز لازمی ہے
 DocType: Production Planning Tool,Get Sales Orders,سیلز احکامات حاصل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} منفی نہیں ہو سکتا
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ڈسکاؤنٹ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ڈسکاؤنٹ
 DocType: Asset,Total Number of Depreciations,Depreciations کی کل تعداد
 DocType: Sales Invoice Item,Rate With Margin,مارجن کے ساتھ کی شرح
 DocType: Sales Invoice Item,Rate With Margin,مارجن کے ساتھ کی شرح
@@ -1086,7 +1084,7 @@
 DocType: Lead,Organization Name,تنظیم کا نام
 DocType: Tax Rule,Shipping State,شپنگ ریاست
 ,Projected Quantity as Source,ماخذ کے طور پر پیش مقدار
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,غیر اسٹاک اشیاء شامل ہیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,فروخت کے اخراجات
@@ -1094,7 +1092,7 @@
 DocType: GL Entry,Against,کے خلاف
 DocType: Item,Default Selling Cost Center,پہلے سے طے شدہ فروخت لاگت مرکز
 DocType: Sales Partner,Implementation Partner,نفاذ ساتھی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,زپ کوڈ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,زپ کوڈ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
 DocType: Opportunity,Contact Info,رابطے کی معلومات
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,اسٹاک اندراجات کر رہے ہیں
@@ -1137,7 +1135,7 @@
 DocType: Sales Partner,Distributor,ڈسٹریبیوٹر
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خریداری کی ٹوکری شپنگ حکمرانی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,پروڈکشن آرڈر {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
 ,Ordered Items To Be Billed,کو حکم دیا اشیاء بل بھیجا جائے کرنے کے لئے
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,رینج کم ہونا ضروری ہے کے مقابلے میں رینج کے لئے
 DocType: Global Defaults,Global Defaults,گلوبل ڈیفالٹس
@@ -1172,11 +1170,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,بیچ نمبر حاصل کرنے آئٹم کوڈ داخل کریں
 DocType: Stock Settings,Default Item Group,پہلے سے طے شدہ آئٹم گروپ
 DocType: Employee Loan,Partially Disbursed,جزوی طور پر زرعی قرضوں کی فراہمی
-DocType: Grading Structure,Grading System Name,گریڈنگ سسٹم کا نام
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پردایک ڈیٹا بیس.
 DocType: Account,Balance Sheet,بیلنس شیٹ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,آپ کی فروخت کے شخص گاہک سے رابطہ کرنے اس تاریخ پر ایک یاد دہانی حاصل کریں گے
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ایک ہی شے کے کئی بار داخل نہیں کیا جا سکتا.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",مزید اکاؤنٹس گروپوں کے تحت بنایا جا سکتا ہے، لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
@@ -1214,11 +1211,11 @@
 DocType: Maintenance Visit Purpose,Work Done,کام ہو گیا
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,صفات ٹیبل میں کم از کم ایک وصف کی وضاحت کریں
 DocType: Announcement,All Students,تمام طلباء
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,لنک لیجر
 DocType: Grading Scale,Intervals,وقفے
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیم ترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,طالب علم کے موبائل نمبر
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,باقی دنیا کے
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,آئٹم {0} بیچ نہیں کر سکتے ہیں
@@ -1257,8 +1254,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},منجمد اکاؤنٹ میں ترمیم کرنے کی اجازت نہیں {0}
 DocType: Journal Entry,Get Outstanding Invoices,بقایا انوائس حاصل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,خریداری کے احکامات کو آپ کی منصوبہ بندی کی مدد کرنے اور آپ کی خریداری پر عمل
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,خریداری کے احکامات کو آپ کی منصوبہ بندی کی مدد کرنے اور آپ کی خریداری پر عمل
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مسئلہ / ٹرانسفر کی مقدار {0} مواد کی درخواست میں {1} \ {2} کی درخواست کی مقدار آئٹم کے لئے سے زیادہ نہیں ہو سکتا {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,چھوٹے
@@ -1282,7 +1279,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,اپنی مصنوعات یا خدمات
 DocType: Mode of Payment,Mode of Payment,ادائیگی کا طریقہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,یہ ایک جڑ شے گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
@@ -1300,7 +1297,7 @@
 DocType: Student Group Student,Group Roll Number,گروپ رول نمبر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,تمام کام وزن کی کل ہونا چاہئے 1. اس کے مطابق تمام منصوبے کے کاموں کے وزن کو ایڈجسٹ کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,آئٹم {0} ایک ذیلی کنٹریکٹڈ آئٹم ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,کیپٹل سازوسامان
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قیمتوں کا تعین اصول سب سے پہلے کی بنیاد پر منتخب کیا جاتا ہے آئٹم آئٹم گروپ یا برانڈ ہو سکتا ہے، میدان &#39;پر لگائیں&#39;.
@@ -1326,7 +1323,7 @@
 DocType: Depreciation Schedule,Journal Entry,جرنل اندراج
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} رفت میں اشیاء
 DocType: Workstation,Workstation Name,کارگاہ نام
-DocType: Grade Interval,Grade Code,گریڈ کوڈ
+DocType: Grading Scale Interval,Grade Code,گریڈ کوڈ
 DocType: POS Item Group,POS Item Group,POS آئٹم گروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ڈائجسٹ ای میل کریں:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
@@ -1342,7 +1339,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ہارڈ ویئر
 DocType: Sales Order,Recurring Upto,مکرر تک
 DocType: Attendance,HR Manager,HR مینیجر
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ایک کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ایک کمپنی کا انتخاب کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,استحقاق رخصت
 DocType: Purchase Invoice,Supplier Invoice Date,سپلائر انوائس تاریخ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,آپ کی خریداری کی ٹوکری کو چالو کرنے کی ضرورت ہے
@@ -1358,7 +1355,7 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,خوراک
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,خستہ رینج 3
 DocType: Maintenance Schedule Item,No of Visits,دوروں کی کوئی
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,مارک Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,مارک Attendence
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,اندراج کے طالب علم
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},بند اکاؤنٹ کی کرنسی ہونا ضروری ہے {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},تمام مقاصد کے لئے پوائنٹس کی رقم یہ ہے 100. ہونا چاہئے {0}
@@ -1406,13 +1403,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,اکاؤنٹس کا چارٹ
 DocType: Material Request,Terms and Conditions Content,شرائط و ضوابط مواد
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Detail,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
 DocType: Pricing Rule,"Higher the number, higher the priority",زیادہ تعداد، اعلی ترجیح
 ,Purchase Invoice Trends,انوائس رجحانات خریدیں
 DocType: Employee,Better Prospects,بہتر امکانات
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",صف # {0}: بیچ {1} صرف {2} قی ہے. ایک اور بیچ دستیاب ہے جس {3} قی منتخب کریں یا / مسئلہ ایک سے زیادہ بیچوں سے فراہم کرنے کے لئے، ایک سے زیادہ قطاروں میں صف تقسیم مہربانی
 DocType: Vehicle,License Plate,لائسنس پلیٹ
 DocType: Appraisal,Goals,اہداف
 DocType: Warranty Claim,Warranty / AMC Status,وارنٹی / AMC رتبہ
@@ -1430,7 +1428,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ملازم خود کو رپورٹ نہیں دے سکتے.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اکاؤنٹ منجمد ہے، اندراجات محدود صارفین کو اجازت دی جاتی ہے.
 DocType: Email Digest,Bank Balance,بینک کی بیلنس
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",ایوب پروفائل، قابلیت کی ضرورت وغیرہ
 DocType: Journal Entry Account,Account Balance,اکاؤنٹ بیلنس
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,لین دین کے لئے ٹیکس اصول.
@@ -1440,7 +1438,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,نا بند کردہ مالی سال کی P &amp; L بیلنس دکھائیں
 DocType: Shipping Rule,Shipping Account,شپنگ اکاؤنٹ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: اکاؤنٹ {2} غیر فعال ہے
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,آپ کو آپ کے کام کی منصوبہ بندی اور مدد کرنے کے لئے سیلز آرڈر پر وقت بچا بنائیں
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,آپ کو آپ کے کام کی منصوبہ بندی اور مدد کرنے کے لئے سیلز آرڈر پر وقت بچا بنائیں
 DocType: Quality Inspection,Readings,ریڈنگ
 DocType: Stock Entry,Total Additional Costs,کل اضافی اخراجات
 DocType: Course Schedule,SH,ایسیچ
@@ -1451,7 +1449,7 @@
 DocType: Shipping Rule Condition,To Value,قدر میں
 DocType: Asset Movement,Stock Manager,اسٹاک مینیجر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ماخذ گودام صف کے لئے لازمی ہے {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,پیکنگ پرچی
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,پیکنگ پرچی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,دفتر کرایہ پر دستیاب
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,سیٹ اپ SMS گیٹ وے کی ترتیبات
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,درآمد میں ناکام!
@@ -1476,7 +1474,7 @@
 DocType: Sales Invoice,Source,ماخذ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,بند کر کے دکھائیں
 DocType: Leave Type,Is Leave Without Pay,تنخواہ کے بغیر چھوڑ
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ایسیٹ قسم فکسڈ اثاثہ شے کے لئے لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ایسیٹ قسم فکسڈ اثاثہ شے کے لئے لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ادائیگی ٹیبل میں پایا کوئی ریکارڈ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},اس {0} کے ساتھ تنازعات {1} کو {2} {3}
 DocType: Student Attendance Tool,Students HTML,طلباء HTML
@@ -1494,7 +1492,7 @@
 DocType: Student,Date of Leaving,چھوڑنا کی تاریخ
 DocType: Pricing Rule,For Price List,قیمت کی فہرست کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ایگزیکٹو تلاش کریں
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,لیڈز بنائیں
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,لیڈز بنائیں
 DocType: Maintenance Schedule,Schedules,شیڈول
 DocType: Purchase Invoice Item,Net Amount,اصل رقم
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفصیل کوئی
@@ -1522,7 +1520,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,پروگرام کا اندراج
 DocType: Sales Invoice Item,Brand Name,برانڈ کا نام
 DocType: Purchase Receipt,Transporter Details,ٹرانسپورٹر تفصیلات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,باکس
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ممکنہ سپلائر
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,تنظیم
@@ -1556,7 +1554,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 پڑھنا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} پروجیکٹ کے لئے نہیں پایا کیلئے ڈیفالٹ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,کمپنی اخراجات کے دعوے.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",طلباء کے نظام کے دل میں ہیں، آپ کے تمام طالب علموں کو شامل
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",طلباء کے نظام کے دل میں ہیں، آپ کے تمام طالب علموں کو شامل
 DocType: Company,Default Holiday List,چھٹیوں فہرست پہلے سے طے شدہ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: وقت اور کرنے کے وقت سے {1} ساتھ اتیویاپی ہے {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,اسٹاک واجبات
@@ -1567,20 +1565,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,آپ کی چھٹی کے لئے درخواست دے رہے ہیں جس دن (ے) تعطیلات ہیں. آپ کو چھوڑ کے لئے درخواست دینے کی ضرورت نہیں ہے.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ادائیگی ای میل بھیج
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,نیا کام
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,کوٹیشن بنائیں
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,کوٹیشن بنائیں
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,دیگر رپورٹوں
 DocType: Dependent Task,Dependent Task,منحصر ٹاسک
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,پیشگی ایکس دنوں کے لئے کی منصوبہ بندی کرنے کی کوشش کریں.
 DocType: HR Settings,Stop Birthday Reminders,سٹاپ سالگرہ تخسمارک
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},کمپنی میں پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 DocType: SMS Center,Receiver List,وصول کی فہرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,تلاش آئٹم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,تلاش آئٹم
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,بسم رقم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,کیش میں خالص تبدیلی
 DocType: Assessment Plan,Grading Scale,گریڈنگ پیمانے
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,پہلے ہی مکمل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ادائیگی کی درخواست پہلے سے موجود ہے {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تاریخ اجراء اشیا کی لاگت
@@ -1618,7 +1616,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع کریں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
 DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
 DocType: Journal Entry,Entry Type,اندراج کی قسم
 ,Customer Credit Balance,کسٹمر کے کریڈٹ بیلنس
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,قابل ادائیگی اکاؤنٹس میں خالص تبدیلی
@@ -1658,8 +1656,6 @@
 DocType: Student Sibling,Studying in Same Institute,اسی انسٹیٹیوٹ میں زیر تعلیم
 DocType: Territory,Territory Manager,علاقہ مینیجر
 DocType: Packed Item,To Warehouse (Optional),گودام میں (اختیاری)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Payment Entry,Paid Amount (Company Currency),ادائیگی کی رقم (کمپنی کرنسی)
 DocType: Purchase Invoice,Additional Discount,اضافی رعایت
 DocType: Selling Settings,Selling Settings,ترتیبات فروخت
@@ -1669,9 +1665,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ٹوکری میں دیکھیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,مارکیٹنگ کے اخراجات
 ,Item Shortage Report,آئٹم کمی رپورٹ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,مواد کی درخواست یہ اسٹاک اندراج کرنے کے لئے استعمال کیا جاتا ہے
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,اگلا ہراس تاریخ نیا اثاثہ کے لئے لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,اگلا ہراس تاریخ نیا اثاثہ کے لئے لازمی ہے
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ہر بیچ کے لئے الگ الگ کورس مبنی گروپ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ہر بیچ کے لئے الگ الگ کورس مبنی گروپ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ایک آئٹم کی سنگل یونٹ.
@@ -1687,9 +1683,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
 DocType: Course Assessment Criteria,Weightage,اہمیت
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ایک گاہک گروپ ایک ہی نام کے ساتھ موجود ہے کسٹمر کا نام تبدیل کرنے یا گاہک گروپ کا نام تبدیل کریں
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ایک گاہک گروپ ایک ہی نام کے ساتھ موجود ہے کسٹمر کا نام تبدیل کرنے یا گاہک گروپ کا نام تبدیل کریں
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,نیا رابطہ
 DocType: Territory,Parent Territory,والدین علاقہ
 DocType: Quality Inspection Reading,Reading 2,2 پڑھنا
@@ -1720,16 +1714,16 @@
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 موبائل نمبر
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,مین
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ویرینٹ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,مین
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ویرینٹ
 DocType: Naming Series,Set prefix for numbering series on your transactions,آپ کے لین دین پر سیریز تعداد کے لئے مقرر اپسرگ
 DocType: Employee Attendance Tool,Employees HTML,ملازمین ایچ ٹی ایم ایل
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
 DocType: Employee,Leave Encashed?,Encashed چھوڑ دیں؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,میدان سے مواقع لازمی ہے
 DocType: Email Digest,Annual Expenses,سالانہ اخراجات
 DocType: Item,Variants,متغیرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,خریداری کے آرڈر بنائیں
 DocType: SMS Center,Send To,کے لئے بھیج
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مختص رقم
@@ -1747,7 +1741,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,تشخیص
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},سیریل کوئی آئٹم کے لئے داخل نقل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ایک شپنگ حکمرانی کے لئے ایک شرط
-DocType: Grading Structure,Grading Intervals,گریڈنگ وقفے
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,درج کریں
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",قطار میں آئٹم {0} کے لئے overbill نہیں کر سکتے ہیں {1} سے زیادہ {2}. زیادہ بلنگ کی اجازت دینے کے لئے، ترتیبات خریدنے میں قائم کریں
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,شے یا گودام کی بنیاد پر فلٹر مقرر کریں
@@ -1759,7 +1752,7 @@
 DocType: Authorization Control,Authorization Control,اجازت کنٹرول
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ادائیگی
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,آپ کے احکامات کو منظم کریں
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,آپ کے احکامات کو منظم کریں
 DocType: Production Order Operation,Actual Time and Cost,اصل وقت اور لاگت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},زیادہ سے زیادہ {0} کے مواد کی درخواست {1} سیلز آرڈر کے خلاف شے کے لئے بنایا جا سکتا ہے {2}
 DocType: Employee,Salutation,آداب
@@ -1767,6 +1760,7 @@
 DocType: Student Leave Application,Student Leave Application,Student کی رخصت کی درخواست
 DocType: Item,Will also apply for variants,بھی مختلف حالتوں کے لئے لاگو ہوں گے
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ملازم {0} پر نصف دن پر {1}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,پر
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,فروخت کے وقت بنڈل اشیاء.
 DocType: Quotation Item,Actual Qty,اصل مقدار
 DocType: Sales Invoice Item,References,حوالہ جات
@@ -1776,7 +1770,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,آپ کو ڈپلیکیٹ اشیاء میں داخل ہے. کو بہتر بنانے اور دوبارہ کوشش کریں.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ایسوسی ایٹ
 DocType: Asset Movement,Asset Movement,ایسیٹ موومنٹ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,نیا ٹوکری
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,نیا ٹوکری
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} آئٹم وجہ سے serialized شے نہیں ہے
 DocType: SMS Center,Create Receiver List,وصول فہرست بنائیں
 DocType: Vehicle,Wheels,پہیے
@@ -1808,9 +1802,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,پیداوار کے احکامات کے خلاف وقت نوشتہ کی تخلیق غیر فعال. آپریشنز پروڈکشن آرڈر کے خلاف ٹریک نہیں کیا جائے گا
 DocType: Student,Student Mobile Number,طالب علم کے موبائل نمبر
 DocType: Item,Has Variants,مختلف حالتوں ہے
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ماہانہ تقسیم کے نام
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,بیچ ID لازمی ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,بیچ ID لازمی ہے
 DocType: Sales Person,Parent Sales Person,والدین فروخت شخص
 DocType: Purchase Invoice,Recurring Invoice,مکرر انوائس
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,منصوبوں کو منظم کرنے
@@ -1818,7 +1812,7 @@
 DocType: Budget,Fiscal Year,مالی سال
 DocType: Vehicle Log,Fuel Price,ایندھن کی قیمت
 DocType: Budget,Budget,بجٹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",یہ ایک آمدنی یا اخراجات کے اکاؤنٹ نہیں ہے کے طور پر بجٹ کے خلاف {0} تفویض نہیں کیا جا سکتا
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,حاصل کیا
 DocType: Student Admission,Application Form Route,درخواست فارم روٹ
@@ -1846,7 +1840,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},رقم {0} {1} خلاف کٹوتی {2}
 DocType: Employee,Salary Information,تنخواہ معلومات
 DocType: Sales Person,Name and Employee ID,نام اور ملازم ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
 DocType: Website Item Group,Website Item Group,ویب سائٹ آئٹم گروپ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,ڈیوٹی اور ٹیکس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,حوالہ کوڈ داخل کریں.
@@ -1904,7 +1898,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,گاہک ریونیو
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1})کردارکے لیے 'اخراجات کی منظوری دینے والا' کردار ضروری ہے
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,جوڑی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
 DocType: Asset,Depreciation Schedule,ہراس کا شیڈول
 DocType: Bank Reconciliation Detail,Against Account,کے اکاؤنٹ کے خلاف
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,آدھا دن تاریخ تاریخ سے اور تاریخ کے درمیان ہونا چاہئے
@@ -1920,12 +1914,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
 ,Quotation Trends,کوٹیشن رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
 DocType: Shipping Rule Condition,Shipping Amount,شپنگ رقم
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,زیر التواء رقم
 DocType: Purchase Invoice Item,Conversion Factor,تبادلوں فیکٹر
 DocType: Purchase Order,Delivered,ہونے والا
 ,Vehicle Expenses,گاڑیوں کے اخراجات
+DocType: Serial No,Invoice Details,انوائس کی تفصیلات دیکھیں
 DocType: Purchase Receipt,Vehicle Number,گاڑی نمبر
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,بار بار چلنے والی انوائس بند کیا جائے گا جس کی تاریخ
 DocType: Employee Loan,Loan Amount,قرضے کی رقم
@@ -1949,7 +1944,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,اضافی ڈسکاؤنٹ رقم
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
 DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,غیر گروپ سے گروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,کھیل
 DocType: Loan Type,Loan Name,قرض نام
@@ -1998,9 +1993,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,آئٹم {0} پہلے ہی واپس کر دیا گیا ہے
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** مالی سال ** ایک مالی سال کی نمائندگی کرتا ہے. تمام اکاؤنٹنگ اندراجات اور دیگر اہم لین دین *** مالی سال کے ساقھ ٹریک کر رہے ہیں.
 DocType: Opportunity,Customer / Lead Address,کسٹمر / لیڈ ایڈریس
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
 DocType: Student Admission,Eligibility,اہلیت
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",لیڈز آپ کو ملتا کاروبار، آپ لیڈز کے طور پر آپ کے تمام رابطوں اور مزید شامل کی مدد
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",لیڈز آپ کو ملتا کاروبار، آپ لیڈز کے طور پر آپ کے تمام رابطوں اور مزید شامل کی مدد
 DocType: Production Order Operation,Actual Operation Time,اصل آپریشن کے وقت
 DocType: Authorization Rule,Applicable To (User),لاگو (صارف)
 DocType: Purchase Taxes and Charges,Deduct,منہا
@@ -2041,7 +2036,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,کمپنی کو منتخب کریں ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,تمام محکموں کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
 DocType: Process Payroll,Fortnightly,پندرہ روزہ
 DocType: Currency Exchange,From Currency,کرنسی سے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",کم سے کم ایک قطار میں مختص رقم، انوائس کی قسم اور انوائس تعداد کو منتخب کریں
@@ -2057,7 +2052,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,پہلی صف کے لئے &#39;پچھلے صف کل پر&#39; &#39;پچھلے صف کی رقم پر&#39; کے طور پر چارج کی قسم منتخب کریں یا نہیں کر سکتے ہیں
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,چائلڈ آئٹم ایک پروڈکٹ بنڈل نہیں ہونا چاہئے. براہ مہربانی شے کو دور `{0}` اور محفوظ کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بینکنگ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,timesheets کو شامل کریں
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,timesheets کو شامل کریں
 DocType: Vehicle Service,Service Item,سروس شے
 DocType: Bank Guarantee,Bank Guarantee,بینک گارنٹی
 DocType: Bank Guarantee,Bank Guarantee,بینک گارنٹی
@@ -2105,8 +2100,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت کی فہرست مقرر نہیں ہے تو قیمتیں نہیں دکھایا جائے گا
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,یہ شپنگ حکمرانی کے لئے ایک ملک کی وضاحت یا دنیا بھر میں شپنگ براہ مہربانی چیک کریں
 DocType: Stock Entry,Total Incoming Value,کل موصولہ ویلیو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قیمت خرید کی فہرست
 DocType: Offer Letter Term,Offer Term,پیشکش ٹرم
 DocType: Quality Inspection,Quality Manager,کوالٹی منیجر
@@ -2138,8 +2133,8 @@
 DocType: Opportunity,Lost Reason,کھو وجہ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,نیا ایڈریس
 DocType: Quality Inspection,Sample Size,نمونہ سائز
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,رسید دستاویز درج کریں
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,تمام اشیاء پہلے ہی انوائس کیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,رسید دستاویز درج کریں
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,تمام اشیاء پہلے ہی انوائس کیا گیا ہے
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;کیس نمبر سے&#39; درست وضاحت کریں
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مزید لاگت کے مراکز گروپوں کے تحت بنایا جا سکتا ہے لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
 DocType: Project,External,بیرونی
@@ -2153,7 +2148,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,نہیں ملا سیریل کوئی {0}
 DocType: Scheduling Tool,Student Batch,Student کی بیچ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,آپ کے گاہکوں کو
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,طالب علم بنائیں
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,طالب علم بنائیں
 DocType: Leave Block List Date,Block Date,بلاک تاریخ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,اب لگائیں
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},اصل مقدار {0} / انتظار قی {1}
@@ -2176,8 +2171,9 @@
 DocType: SMS Log,Sent To,کو بھیجا
 DocType: Payment Request,Make Sales Invoice,فروخت انوائس بنائیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,سافٹ ویئر
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,اگلی تاریخ سے رابطہ ماضی میں نہیں ہو سکتا
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,اگلی تاریخ سے رابطہ ماضی میں نہیں ہو سکتا
 DocType: Company,For Reference Only.,صرف ریفرنس کے لئے.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,بیچ منتخب نہیں
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},غلط {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,ایڈوانس رقم
@@ -2191,7 +2187,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,کیس نمبر 0 نہیں ہو سکتا
 DocType: Item,Show a slideshow at the top of the page,صفحے کے سب سے اوپر ایک سلائڈ شو دکھانے کے
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,سٹورز
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,سٹورز
 DocType: Serial No,Delivery Time,ڈیلیوری کا وقت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,کی بنیاد پر خستہ
 DocType: Item,End of Life,زندگی کے اختتام
@@ -2207,8 +2203,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,منتقلی مواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",آپریشن، آپریٹنگ لاگت کی وضاحت کریں اور اپنے آپریشن کی کوئی ایک منفرد آپریشن دے.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,یہ دستاویز کی طرف سے حد سے زیادہ ہے {0} {1} شے کے لئے {4}. آپ کر رہے ہیں ایک اور {3} اسی کے خلاف {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
 DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
 DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
 DocType: Stock Settings,Allow Negative Stock,منفی اسٹاک کی اجازت دیں
@@ -2219,7 +2215,7 @@
 DocType: Budget Account,Budget Account,بجٹ اکاؤنٹ
 DocType: Quality Inspection,Verified By,کی طرف سے تصدیق
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",موجودہ لین دین موجود ہیں کیونکہ، کمپنی کی پہلے سے طے شدہ کرنسی تبدیل نہیں کر سکتے. معاملات پہلے سے طے شدہ کرنسی تبدیل کرنے منسوخ کر دیا جائے ضروری ہے.
-DocType: Grade Interval,Grade Description,گریڈ تفصیل
+DocType: Grading Scale Interval,Grade Description,گریڈ تفصیل
 DocType: Stock Entry,Purchase Receipt No,خریداری کی رسید نہیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیانا رقم
 DocType: Process Payroll,Create Salary Slip,تنخواہ پرچی بنائیں
@@ -2256,7 +2252,7 @@
 DocType: Upload Attendance,Attendance To Date,تاریخ کرنے کے لئے حاضری
 DocType: Warranty Claim,Raised By,طرف سے اٹھائے گئے
 DocType: Payment Gateway Account,Payment Account,ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,اکاؤنٹس وصولی میں خالص تبدیلی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,مائکر آف
 DocType: Offer Letter,Accepted,قبول کر لیا
@@ -2270,7 +2266,7 @@
 DocType: Shipping Rule,Shipping Rule Label,شپنگ حکمرانی لیبل
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,صارف فورم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,فوری جرنل اندراج
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
 DocType: Employee,Previous Work Experience,گزشتہ کام کا تجربہ
@@ -2284,7 +2280,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,شرائط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,انسٹی ٹیوٹ کے نام جس کے لئے آپ کو اس نظام قائم کر رہے ہیں.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",اس تاریخ تک منجمد اکاؤنٹنگ اندراج، کوئی / کرتے ذیل کے متعین کردہ کردار سوائے اندراج میں ترمیم کرسکتے ہیں.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,بحالی کے شیڈول پیدا کرنے سے پہلے دستاویز کو بچانے کے کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,بحالی کے شیڈول پیدا کرنے سے پہلے دستاویز کو بچانے کے کریں
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,منصوبے کی حیثیت
 DocType: UOM,Check this to disallow fractions. (for Nos),کسور کو رد کرنا اس کی جانچ پڑتال. (نمبر کے لئے)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,مندرجہ ذیل پیداوار کے احکامات کو پیدا کیا گیا تھا:
@@ -2307,6 +2303,7 @@
 DocType: Email Digest,How frequently?,کتنی بار؟
 DocType: Purchase Receipt,Get Current Stock,موجودہ اسٹاک حاصل کریں
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,مواد کے بل کے پیڑ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Student,Joining Date,شمولیت تاریخ
 ,Employees working on a holiday,چھٹی پر کام کرنے والے ملازمین
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,مارک موجودہ
@@ -2387,7 +2384,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,کلیئرنس تاریخ کا ذکر نہیں
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,پیداوار
 DocType: Guardian,Occupation,کاروبار
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,صف {0}: شروع کرنے کی تاریخ تاریخ اختتام سے پہلے ہونا ضروری ہے
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,صف {0}: شروع کرنے کی تاریخ تاریخ اختتام سے پہلے ہونا ضروری ہے
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),کل (مقدار)
 DocType: Sales Invoice,This Document,یہ دستاویز
 DocType: Installation Note Item,Installed Qty,نصب مقدار
@@ -2410,8 +2407,8 @@
 DocType: Notification Control,Sales Order Message,سیلز آرڈر پیغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",وغیرہ کمپنی، کرنسی، رواں مالی سال کی طرح پہلے سے طے شدہ اقدار
 DocType: Payment Entry,Payment Type,ادائیگی کی قسم
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
 DocType: Process Payroll,Select Employees,منتخب ملازمین
 DocType: Opportunity,Potential Sales Deal,ممکنہ فروخت ڈیل
 DocType: Payment Entry,Cheque/Reference Date,چیک / حوالہ تاریخ
@@ -2428,7 +2425,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},پہلے ہی کمپنی کے لئے پیدا گلوبل پوزیشن پروفائل {0} {1}
 DocType: Purchase Order,Ref SQ,ممبران SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,تمام BOMs میں آئٹم / BOM بدل
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,رسید دستاویز پیش کرنا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,رسید دستاویز پیش کرنا ضروری ہے
 DocType: Purchase Invoice Item,Received Qty,موصولہ مقدار
 DocType: Stock Entry Detail,Serial No / Batch,سیریل نمبر / بیچ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,نہیں ادا کی اور نجات نہیں
@@ -2441,7 +2438,7 @@
 ,To Produce,پیدا کرنے کے لئے
 apps/erpnext/erpnext/config/hr.py +93,Payroll,پے رول
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",صف کے لئے {0} میں {1}. شے کی درجہ بندی میں {2} شامل کرنے کے لئے، قطار {3} بھی شامل کیا جانا چاہئے
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,یوزر بنائیں
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,یوزر بنائیں
 DocType: Packing Slip,Identification of the package for the delivery (for print),کی ترسیل کے لئے پیکج کی شناخت (پرنٹ کے لئے)
 DocType: Bin,Reserved Quantity,محفوظ مقدار
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,درست ای میل ایڈریس درج کریں
@@ -2453,11 +2450,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,معذور کے سانچے ڈیفالٹ ٹیمپلیٹ نہیں ہونا چاہئے
 DocType: Account,Income Account,انکم اکاؤنٹ
 DocType: Payment Request,Amount in customer's currency,کسٹمر کی کرنسی میں رقم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ڈلیوری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,ڈلیوری
 DocType: Stock Reconciliation Item,Current Qty,موجودہ مقدار
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ملاحظہ کریں لاگت سیکشن میں &quot;مواد کی بنیاد پر کی شرح&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,پچھلا
 DocType: Appraisal Goal,Key Responsibility Area,کلیدی ذمہ داری کے علاقے
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",طالب علم بیچوں آپ کے طالب علموں کے لئے حاضری، جائزوں اور فیس کو ٹریک میں مدد
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",طالب علم بیچوں آپ کے طالب علموں کے لئے حاضری، جائزوں اور فیس کو ٹریک میں مدد
 DocType: Payment Entry,Total Allocated Amount,کل مختص رقم
 DocType: Item Reorder,Material Request Type,مواد درخواست کی قسم
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},سے {0} کو تنخواہوں کے لئے Accural جرنل اندراج {1}
@@ -2480,7 +2478,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ٹریک صنعت کی قسم کی طرف جاتا ہے.
 DocType: Item Supplier,Item Supplier,آئٹم پردایک
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام پتے.
 DocType: Company,Stock Settings,اسٹاک ترتیبات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",مندرجہ ذیل خصوصیات دونوں کے ریکارڈ میں ایک ہی ہیں تو ولی ہی ممکن ہے. گروپ، جڑ کی قسم، کمپنی ہے
@@ -2490,6 +2488,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',حیثیت کے ساتھ ملازمین کو واقعہ کے بارے میں ایک ای میل بھیجیں گے &#39;کھولیں&#39;
 DocType: Task,Depends on Tasks,ٹاسکس پر انحصار کرتا ہے
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,گاہک گروپ درخت کا انتظام کریں.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,آئٹم کے ساتھ منسلک کی خریداری کی ٹوکری کو چالو کرنے کے بغیر دکھایا جا سکتا ہے
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,نیا لاگت مرکز نام
 DocType: Leave Control Panel,Leave Control Panel,کنٹرول پینل چھوڑنا
@@ -2502,12 +2501,10 @@
 DocType: Sales Invoice,Debit To,ڈیبٹ
 DocType: Delivery Note,Required only for sample item.,صرف نمونے شے کے لئے کی ضرورت ہے.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ٹرانزیکشن کے بعد اصل مقدار
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},کوئی تنخواہ کی پرچی کے درمیان پایا {0} اور {1}
 ,Pending SO Items For Purchase Request,خریداری کی درخواست کے لئے بہت اشیا زیر التواء
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,طالب علم داخلہ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
 DocType: Supplier,Billing Currency,بلنگ کی کرنسی
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,اضافی بڑا
@@ -2524,7 +2521,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,مرکزی صفحہ نمایاں مصنوعات کی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,تمام تعین گروپ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,نیا گودام نام
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),کل {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),کل {0} ({1})
 DocType: C-Form Invoice Detail,Territory,علاقہ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ضرورت دوروں کا کوئی ذکر کریں
 DocType: Stock Settings,Default Valuation Method,پہلے سے طے شدہ تشخیص کا طریقہ
@@ -2542,7 +2539,7 @@
 DocType: Price List,Price List Master,قیمت کی فہرست ماسٹر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,آپ کی مقرر کردہ اور اہداف کی نگرانی کر سکتے ہیں تاکہ تمام سیلز معاملات سے زیادہ ** سیلز افراد ** خلاف ٹیگ کیا جا سکتا.
 ,S.O. No.,تو نمبر
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},لیڈ سے گاہک بنانے کے براہ مہربانی {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},لیڈ سے گاہک بنانے کے براہ مہربانی {0}
 DocType: Price List,Applicable for Countries,ممالک کے لئے قابل اطلاق
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,صرف حیثیت کے ساتھ درخواستیں چھوڑ دو &#39;منظور&#39; اور &#39;مسترد&#39; جمع کی جا سکتی
 DocType: Homepage,Products to be shown on website homepage,مصنوعات کی ویب سائٹ کے ہوم پیج پر دکھایا جائے گا
@@ -2621,7 +2618,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,اسٹاک کے لئے اکاؤنٹنگ انٹری
 DocType: Vehicle Service,Engine Oil,انجن کا تیل
 DocType: Sales Invoice,Sales Team1,سیلز Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
 DocType: Sales Invoice,Customer Address,گاہک پتہ
 DocType: Employee Loan,Loan Details,قرض کی تفصیلات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,صف {0}: مکمل مقدار صفر سے زیادہ ہونا چاہیے.
@@ -2686,7 +2683,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,موجودہ منتقلی کے ساتھ گوداموں گروپ کو تبدیل نہیں کیا جا سکتا.
 DocType: Assessment Result Tool,Result HTML,نتیجہ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,اختتامی میعاد
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,طلباء شامل کریں
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,طلباء شامل کریں
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},براہ مہربانی منتخب کریں {0}
 DocType: C-Form,C-Form No,سی فارم نہیں
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2746,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,حد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,وینچر کیپیٹل کی
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,اس &#39;تعلیمی سال&#39; کے ساتھ ایک تعلیمی اصطلاح {0} اور &#39;کی اصطلاح کا نام&#39; {1} پہلے سے موجود ہے. ان اندراجات پر نظر ثانی کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",شے {0} خلاف موجودہ ٹرانزیکشنز ہیں کے طور پر، آپ کی قدر کو تبدیل نہیں کر سکتے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",شے {0} خلاف موجودہ ٹرانزیکشنز ہیں کے طور پر، آپ کی قدر کو تبدیل نہیں کر سکتے {1}
 DocType: UOM,Must be Whole Number,پورے نمبر ہونا لازمی ہے
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(دنوں میں) مختص نئے پتے
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,سیریل نمبر {0} موجود نہیں ہے
@@ -2792,7 +2789,7 @@
 DocType: Supplier,Last Day of the Next Month,اگلے ماہ کے آخری دن
 DocType: Support Settings,Auto close Issue after 7 days,7 دن کے بعد آٹو بند مسئلہ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",پہلے مختص نہیں کیا جا سکتا چھوڑ {0}، چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,طالب علم کی درخواست گزار
 DocType: Asset Category Account,Accumulated Depreciation Account,جمع ہراس اکاؤنٹ
 DocType: Stock Settings,Freeze Stock Entries,جھروکے اسٹاک میں لکھے
@@ -2820,8 +2817,8 @@
 DocType: Asset,Item Code,آئٹم کوڈ
 DocType: Production Planning Tool,Create Production Orders,پیداوار کے احکامات بنائیں
 DocType: Serial No,Warranty / AMC Details,وارنٹی / AMC تفصیلات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
 DocType: Journal Entry,User Remark,صارف تبصرہ
 DocType: Lead,Market Segment,مارکیٹ کے علاقے
 DocType: Employee Internal Work History,Employee Internal Work History,ملازم اندرونی کام تاریخ
@@ -2838,7 +2835,7 @@
 DocType: Production Planning Tool,Create Material Requests,مواد درخواست پیدا
 DocType: Employee Education,School/University,سکول / یونیورسٹی
 DocType: Payment Request,Reference Details,حوالہ تفصیلات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,مفید زندگی کے بعد کی متوقع قدر مجموعی خریداری کی رقم سے کم ہونا چاہیے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,مفید زندگی کے بعد کی متوقع قدر مجموعی خریداری کی رقم سے کم ہونا چاہیے
 DocType: Sales Invoice Item,Available Qty at Warehouse,گودام میں دستیاب مقدار
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,بل کی گئی رقم
 DocType: Asset,Double Declining Balance,ڈبل کمی توازن
@@ -2858,17 +2855,17 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},ذریعہ اور ہدف گودام صف کے لئے ہی نہیں ہو سکتا {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",یہ اسٹاک مصالحتی ایک افتتاحی انٹری ہے کے بعد سے فرق اکاؤنٹ، ایک اثاثہ / ذمہ داری قسم اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},آئٹم کے لئے ضروری آرڈر نمبر خریداری {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,پروڈکشن آرڈر نہیں بنائی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,پروڈکشن آرڈر نہیں بنائی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;تاریخ سے&#39; کے بعد &#39;تاریخ کے لئے&#39; ہونا ضروری ہے
 DocType: Asset,Fully Depreciated,مکمل طور پر فرسودگی
 ,Stock Projected Qty,اسٹاک مقدار متوقع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,نشان حاضری ایچ ٹی ایم ایل
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",کوٹیشن، تجاویز ہیں بولیاں آپ اپنے گاہکوں کو بھیجا ہے
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",کوٹیشن، تجاویز ہیں بولیاں آپ اپنے گاہکوں کو بھیجا ہے
 DocType: Sales Order,Customer's Purchase Order,گاہک کی خریداری کے آرڈر
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,سیریل نمبر اور بیچ
 DocType: Warranty Claim,From Company,کمپنی کی طرف سے
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,قیمت یا مقدار
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,منٹ
@@ -2994,7 +2991,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,طالب علم گروپ
 DocType: Shopping Cart Settings,Quotation Series,کوٹیشن سیریز
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",ایک شے کے اسی نام کے ساتھ موجود ({0})، شے گروپ کا نام تبدیل یا شے کا نام تبدیل کریں
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,کسٹمر براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,کسٹمر براہ مہربانی منتخب کریں
 DocType: C-Form,I,میں
 DocType: Company,Asset Depreciation Cost Center,اثاثہ ہراس لاگت سینٹر
 DocType: Sales Order Item,Sales Order Date,سیلز آرڈر کی تاریخ
@@ -3013,19 +3010,18 @@
 DocType: Vehicle,Insurance Details,انشورنس کی تفصیلات دیکھیں
 DocType: Account,Payable,قابل ادائیگی
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,واپسی کا دورانیہ درج کریں
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),دیندار ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),دیندار ({0})
 DocType: Pricing Rule,Margin,مارجن
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نئے گاہکوں
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,کل منافع ٪
 DocType: Appraisal Goal,Weightage (%),اہمیت (٪)
 DocType: Bank Reconciliation Detail,Clearance Date,کلیئرنس تاریخ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,مجموعی خریداری کی رقم لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,مجموعی خریداری کی رقم لازمی ہے
 DocType: Lead,Address Desc,DESC ایڈریس
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,پارٹی لازمی ہے
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,موضوع کا نام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,فروخت یا خرید کی کم سے کم ایک منتخب ہونا ضروری ہے
-DocType: Grading Structure,Grade Intervals,گریڈ وقفے
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,آپ کے کاروبار کی نوعیت کو منتخب کریں.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,مینوفیکچرنگ آپریشنز کہاں کئے جاتے ہیں.
 DocType: Asset Movement,Source Warehouse,ماخذ گودام
@@ -3054,6 +3050,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ماہانہ تقسیم فی صد
 DocType: Territory,Territory Targets,علاقہ اہداف
 DocType: Delivery Note,Transporter Info,ٹرانسپورٹر معلومات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 DocType: Cheque Print Template,Starting position from top edge,اوپر کے کنارے سے پوزیشن پر شروع
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,ایک ہی سپلائر کئی بار داخل کیا گیا ہے
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,مجموعی منافع / نقصان
@@ -3105,7 +3102,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ترتیب مقدار
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,موجودہ کام سوراخ
 DocType: Company,Stock Adjustment Account,اسٹاک ایڈجسٹمنٹ بلنگ
-DocType: Journal Entry,Write Off,لکھ دینا
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لکھ دینا
 DocType: Timesheet Detail,Operation ID,آپریشن ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",نظام صارف (لاگ ان) کی شناخت. مقرر کیا ہے تو، یہ سب HR فارم کے لئے پہلے سے طے شدہ ہو جائے گا.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: سے {1}
@@ -3116,8 +3113,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,پردایک کسٹمر کو فراہم
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0})موجود نھی ھے
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,اگلی تاریخ پوسٹنگ کی تاریخ سے زیادہ ہونا چاہیے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,دکھائیں ٹیکس بریک اپ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,دکھائیں ٹیکس بریک اپ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ڈیٹا کی درآمد اور برآمد
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,کوئی طالب علم نہیں ملا
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,انوائس پوسٹنگ کی تاریخ
@@ -3128,14 +3125,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
 DocType: Program Enrollment,School House,سکول ہاؤس
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,بحالی دورہ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,بحالی دورہ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
 DocType: Company,Default Cash Account,پہلے سے طے شدہ کیش اکاؤنٹ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,کمپنی (نہیں مستقل خریدار یا سپلائر) ماسٹر.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,یہ اس طالب علم کی حاضری پر مبنی ہے
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,کوئی طلبا میں
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,مزید آئٹمز یا کھلی مکمل فارم شامل کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;متوقع تاریخ کی ترسیل&#39; درج کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ترسیل نوٹوں {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
@@ -3181,9 +3179,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,مفاہمت پہلے
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},کرنے کے لئے {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ٹیکس اور الزامات شامل کر دیا گیا (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,آئٹم ٹیکس صف {0} قسم ٹیکس یا آمدنی یا اخراجات یا ادائیگی کے اکاؤنٹ ہونا لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,آئٹم ٹیکس صف {0} قسم ٹیکس یا آمدنی یا اخراجات یا ادائیگی کے اکاؤنٹ ہونا لازمی ہے
 DocType: Sales Order,Partly Billed,جزوی طور پر بل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,آئٹم {0} ایک فکسڈ اثاثہ آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,آئٹم {0} ایک فکسڈ اثاثہ آئٹم ہونا ضروری ہے
 DocType: Item,Default BOM,پہلے سے طے شدہ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,دوبارہ ٹائپ کمپنی کا نام کی توثیق کے لئے براہ کرم
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,کل بقایا AMT
@@ -3206,7 +3204,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,قیمت کی فہرست زر مبادلہ کی شرح
 DocType: Purchase Invoice Item,Rate,شرح
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,انٹرن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ایڈریس نام
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,ایڈریس نام
 DocType: Stock Entry,From BOM,BOM سے
 DocType: Assessment Code,Assessment Code,تشخیص کے کوڈ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,بنیادی
@@ -3231,7 +3229,7 @@
 DocType: Purchase Invoice,Print Language,پرنٹ کریں زبان
 DocType: Salary Slip,Total Working Hours,کل کام کے گھنٹے
 DocType: Stock Entry,Including items for sub assemblies,ذیلی اسمبلیوں کے لئے اشیاء سمیت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,درج قدر مثبت ہونا چاہئے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,درج قدر مثبت ہونا چاہئے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,تمام علاقوں
 DocType: Purchase Invoice,Items,اشیا
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,طالب علم پہلے سے ہی مندرج ہے.
@@ -3251,17 +3249,15 @@
 DocType: Issue,Opening Time,افتتاحی وقت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,سے اور مطلوبہ تاریخوں کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,سیکورٹیز اینڈ ایکسچینج کماڈٹی
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Delivery Note Item,From Warehouse,گودام سے
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
 DocType: Assessment Plan,Supervisor Name,سپروائزر کا نام
 DocType: Program Enrollment Course,Program Enrollment Course,پروگرام اندراج کورس
 DocType: Program Enrollment Course,Program Enrollment Course,پروگرام اندراج کورس
-DocType: Grading Structure,Grading Structure,گریڈنگ کی ساخت
 DocType: Purchase Taxes and Charges,Valuation and Total,تشخیص اور کل
 DocType: Tax Rule,Shipping City,شپنگ شہر
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,یہ آئٹم {0} (ٹیمپلیٹ) کے ایک مختلف ہے. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک کہ صفات سانچے سے کاپی کیا جائے گا
 DocType: Notification Control,Customize the Notification,اطلاع کو حسب ضرورت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,آپریشنز سے کیش فلو
 DocType: Sales Invoice,Shipping Rule,شپنگ حکمرانی
@@ -3284,6 +3280,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,پہلے پوسٹنگ کی تاریخ منتخب کریں
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,تاریخ افتتاحی تاریخ بند کرنے سے پہلے ہونا چاہئے
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
 DocType: Leave Control Panel,Carry Forward,آگے لے جانے
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,موجودہ لین دین کے ساتھ سرمایہ کاری سینٹر اکاؤنٹ میں تبدیل نہیں کیا جا سکتا
 DocType: Department,Days for which Holidays are blocked for this department.,دن جس کے لئے چھٹیاں اس سیکشن کے لئے بلاک کر رہے ہیں.
@@ -3312,7 +3309,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),کل (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,تفریح اور تفریح
 DocType: Quality Inspection,Item Serial No,آئٹم سیریل نمبر
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ملازم ریکارڈز تخلیق کریں
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ملازم ریکارڈز تخلیق کریں
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,کل موجودہ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,اکاؤنٹنگ بیانات
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,قیامت
@@ -3327,8 +3324,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,تبدیل کرنے کے بعد نئے BOM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,فروخت پوائنٹ
 DocType: Payment Entry,Received Amount,موصولہ رقم
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",، مکمل مقدار کے لئے بنائیں حکم پر پہلے سے ہی مقدار کو نظر انداز
 DocType: Account,Tax,ٹیکس
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,نشان نہیں
@@ -3341,7 +3336,7 @@
 DocType: Batch,Source Document Name,ماخذ دستاویز کا نام
 DocType: Batch,Source Document Name,ماخذ دستاویز کا نام
 DocType: Job Opening,Job Title,ملازمت کا عنوان
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,صارفین تخلیق
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,صارفین تخلیق
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,گرام
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,بحالی کال کے لئے رپورٹ ملاحظہ کریں.
@@ -3353,7 +3348,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},اخراجات کے اکاؤنٹ شے کے لئے لازمی ہے {0}
 DocType: BOM,Website Description,ویب سائٹ تفصیل
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ایکوئٹی میں خالص تبدیلی
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,رسید
 ,Sales Register,سیلز رجسٹر
@@ -3364,15 +3359,17 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ترمیم کرنے کے لئے کچھ بھی نہیں ہے.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
 DocType: Customer Group,Customer Group Name,گاہک گروپ کا نام
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ابھی تک کوئی گاہک!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,کیش فلو کا بیان
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,لائسنس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,آپ کو بھی گزشتہ مالی سال کے توازن رواں مالی سال کے لئے چھوڑ دیتا شامل کرنے کے لئے چاہتے ہیں تو آگے بڑھانے براہ مہربانی منتخب کریں
 DocType: GL Entry,Against Voucher Type,واؤچر قسم کے خلاف
 DocType: Item,Attributes,صفات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,اکاؤنٹ لکھنے داخل کریں
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,آخری آرڈر کی تاریخ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
 DocType: Student,Guardian Details,گارڈین کی تفصیلات دیکھیں
 DocType: C-Form,C-Form,سی فارم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ایک سے زیادہ ملازمین کے لئے نشان حاضری
@@ -3396,14 +3393,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',صف {0} # اکاؤنٹ کی قسم کا ہونا چاہیے &#39;فکسڈ اثاثہ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,مقدار باہر
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,قواعد فروخت کے لئے شپنگ رقم کا حساب کرنے
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,سیریز لازمی ہے
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,سیریز لازمی ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,مالیاتی خدمات
 DocType: Student Sibling,Student ID,طالب علم کی شناخت
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,وقت لاگز کے لئے سرگرمیوں کی اقسام
 DocType: Tax Rule,Sales,سیلز
 DocType: Stock Entry Detail,Basic Amount,بنیادی رقم
 DocType: Training Event,Exam,امتحان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
 DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,کروڑ
 DocType: Tax Rule,Billing State,بلنگ ریاست
@@ -3435,7 +3432,7 @@
 DocType: Payment Entry,Account Paid From,اکاؤنٹ سے ادا
 DocType: Purchase Order Item Supplied,Raw Material Item Code,خام مال آئٹم کوڈ
 DocType: Journal Entry,Write Off Based On,کی بنیاد پر لکھنے
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,لیڈ بنائیں
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,لیڈ بنائیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,پرنٹ اور سٹیشنری
 DocType: Stock Settings,Show Barcode Field,دکھائیں بارکوڈ فیلڈ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,پردایک ای میلز بھیجیں
@@ -3451,6 +3448,7 @@
 DocType: Offer Letter,Awaiting Response,جواب کا منتظر
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,اوپر
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},غلط وصف {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ذکر غیر معیاری قابل ادائیگی اکاؤنٹ ہے تو
 DocType: Salary Slip,Earning & Deduction,کمائی اور کٹوتی
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاری. یہ ترتیب مختلف لین دین میں فلٹر کیا جائے گا.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
@@ -3486,7 +3484,7 @@
 DocType: Program Enrollment Tool,Get Students From,سے طالب علموں کو حاصل کریں
 DocType: Hub Settings,Seller Country,فروش ملک
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ویب سائٹ پر اشیاء شائع
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,بیچوں میں آپ کے طالب علموں کے گروپ
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,بیچوں میں آپ کے طالب علموں کے گروپ
 DocType: Authorization Rule,Authorization Rule,اجازت اصول
 DocType: Sales Invoice,Terms and Conditions Details,شرائط و ضوابط تفصیلات
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,نردجیکرن
@@ -3545,7 +3543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,پروبیشن
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,تنخواہ کے اجزاء
 DocType: Program Enrollment Tool,New Academic Year,نئے تعلیمی سال
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,واپسی / کریڈٹ نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,واپسی / کریڈٹ نوٹ
 DocType: Stock Settings,Auto insert Price List rate if missing,آٹو ڈالیں قیمت کی فہرست شرح لاپتہ ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,کل ادا کی گئی رقم
 DocType: Production Order Item,Transferred Qty,منتقل مقدار
@@ -3586,6 +3584,7 @@
 ,Sales Funnel,سیلز قیف
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,مخفف لازمی ہے
 DocType: Project,Task Progress,ٹاسک پیش رفت
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ٹوکری
 ,Qty to Transfer,منتقلی کی مقدار
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,لیڈز یا گاہکوں کو قیمت.
 DocType: Stock Settings,Role Allowed to edit frozen stock,کردار منجمد اسٹاک ترمیم کرنے کی اجازت
@@ -3619,7 +3618,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,فیس جمع
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
 DocType: Lead,Add to calendar on this date,اس تاریخ پر کیلنڈر میں شامل کریں
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,شپنگ کے اخراجات شامل کرنے کے لئے رولز.
 DocType: Item,Opening Stock,اسٹاک کھولنے
@@ -3637,7 +3636,7 @@
 DocType: Customer,From Lead,لیڈ سے
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,احکامات کی پیداوار کے لئے جاری.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,مالی سال منتخب کریں ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
 DocType: Program Enrollment Tool,Enroll Students,طلباء اندراج کریں
 DocType: Hub Settings,Name Token,نام ٹوکن
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,سٹینڈرڈ فروخت
@@ -3648,7 +3647,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} فروخت انوائس کے خلاف {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,پراجیکٹ کا نام
-DocType: Supplier,Mention if non-standard receivable account,ذکر غیر معیاری وصولی اکاؤنٹ تو
+DocType: Customer,Mention if non-standard receivable account,ذکر غیر معیاری وصولی اکاؤنٹ تو
 DocType: Journal Entry Account,If Income or Expense,آمدنی یا اخراجات تو
 DocType: Production Order,Required Items,مطلوبہ اشیاء
 DocType: Stock Ledger Entry,Stock Value Difference,اسٹاک کی قیمت فرق
@@ -3677,6 +3676,7 @@
 DocType: Item,Taxes,ٹیکسز
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,ادا کی اور نجات نہیں
 DocType: Project,Default Cost Center,پہلے سے طے شدہ لاگت مرکز
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کیلئے نام دینے سیریز مقرر مہربانی
 DocType: Bank Guarantee,End Date,آخری تاریخ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,اسٹاک معاملات
 DocType: Budget,Budget Accounts,بجٹ کے اکاؤنٹس
@@ -3760,7 +3760,7 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,کسٹمر کی شناخت
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک غائب
 DocType: Journal Entry Account,Exchange Rate,زر مبادلہ کی شرح
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
 DocType: Homepage,Tag Line,ٹیگ لائن
 DocType: Fee Component,Fee Component,فیس اجزاء
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,بیڑے کے انتظام
@@ -3777,7 +3777,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,گودام {0} موجود نہیں ہے
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext حب کے لئے اندراج کروائیں
 DocType: Monthly Distribution,Monthly Distribution Percentages,ماہانہ تقسیم فی صد
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,منتخب شے بیچ نہیں کر سکتے ہیں
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,منتخب شے بیچ نہیں کر سکتے ہیں
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",تشخیص کی شرح کے لئے اکاؤنٹنگ اندراجات کو ایسا کرنے کی ضرورت ہے جس آئٹم {0}، کے لئے نہیں پایا {1} {2}. آئٹم میں ایک نمونہ شے کے طور transacting کر رہا ہے تو {1}، {1} آئٹم ٹیبل میں کہ ذکر کریں. دوسری صورت میں، آئٹم کے ریکارڈ میں شے یا ذکر تشخیص کی شرح کے لئے ایک آنے والے اسٹاک ٹرانزیکشن کی تخلیق، اور پھر submiting کوشش کریں / اس اندراج منسوخ کریں براہ مہربانی
 DocType: Delivery Note,% of materials delivered against this Delivery Note,مواد کی یہ ترسیل کے نوٹ کے خلاف ہونے والا
 DocType: Project,Customer Details,گاہک کی تفصیلات
@@ -3794,7 +3794,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,پیش احکامات خارج کر دیا نہیں کیا جا سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",پہلے سے ڈیبٹ میں اکاؤنٹ بیلنس، آپ کو کریڈٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,معیار منظم رکھنا
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} آئٹم غیر فعال ہوگئی ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} آئٹم غیر فعال ہوگئی ہے
 DocType: Employee Loan,Repay Fixed Amount per Period,فی وقفہ مقررہ رقم ادا
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},شے کے لئے مقدار درج کریں {0}
 DocType: Employee External Work History,Employee External Work History,ملازم بیرونی کام کی تاریخ
@@ -3821,7 +3821,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student کی ای میل آئی ڈی
 DocType: Employee,Notice (days),نوٹس (دن)
 DocType: Tax Rule,Sales Tax Template,سیلز ٹیکس سانچہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
 DocType: Employee,Encashment Date,معاوضہ تاریخ
 DocType: Training Event,Internet,انٹرنیٹ
 DocType: Account,Stock Adjustment,اسٹاک ایڈجسٹمنٹ
@@ -3855,6 +3855,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ڈیبٹ نوٹ اجراء
 DocType: Production Order,Warehouses,گوداموں
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} اثاثہ منتقل نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,یہ آئٹم {0} (سانچہ) کی ایک مختلف ہے.
 DocType: Workstation,per hour,فی گھنٹہ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,پرچیزنگ
 DocType: Announcement,Announcement,اعلان
@@ -3870,7 +3871,7 @@
 DocType: Account,Receivable,وصولی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,صف # {0}: خریداری کے آرڈر پہلے سے موجود ہے کے طور پر سپلائر تبدیل کرنے کی اجازت نہیں
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,مقرر کریڈٹ کی حد سے تجاوز ہے کہ لین دین پیش کرنے کی اجازت ہے کہ کردار.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
 DocType: Item,Material Issue,مواد مسئلہ
 DocType: Hub Settings,Seller Description,فروش تفصیل
@@ -3917,7 +3918,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",، پہلے سے طے شدہ طور پر اس مالی سال مقرر کرنے کیلئے &#39;پہلے سے طے شدہ طور پر مقرر کریں&#39; پر کلک کریں
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,شامل ہوں
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
 DocType: Employee Loan,Repay from Salary,تنخواہ سے ادا
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,تنخواہ پرچی
@@ -3934,7 +3935,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,تشخیص کے نتائج کا تفصیل
 DocType: Employee Education,Employee Education,ملازم تعلیم
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,مثنی شے گروپ شے گروپ کے ٹیبل میں پایا
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
 DocType: Salary Slip,Net Pay,نقد ادائیگی
 DocType: Account,Account,اکاؤنٹ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,سیریل نمبر {0} پہلے سے حاصل کیا گیا ہے
@@ -3943,7 +3944,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",گودام {0} کسی بھی اکاؤنٹ سے منسلک نہیں ہے، / گودام کے لئے اسی (اثاثہ) اکاؤنٹ لنک بنانے کے لئے براہ مہربانی.
 DocType: Purchase Invoice,Recurring Id,مکرر شناخت
 DocType: Customer,Sales Team Details,سیلز ٹیم تفصیلات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,مستقل طور پر خارج کر دیں؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,مستقل طور پر خارج کر دیں؟
 DocType: Expense Claim,Total Claimed Amount,کل دعوی رقم
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فروخت کے لئے ممکنہ مواقع.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},غلط {0}
@@ -3954,13 +3955,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext میں اپنے سکول کا سیٹ اپ
 DocType: Sales Invoice,Base Change Amount (Company Currency),بیس بدلیں رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,پہلی دستاویز کو بچانے کے.
 DocType: Account,Chargeable,ادائیگی
 DocType: Company,Change Abbreviation,پیج مخفف
 DocType: Expense Claim Detail,Expense Date,اخراجات تاریخ
 DocType: Item,Max Discount (%),زیادہ سے زیادہ ڈسکاؤنٹ (٪)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,آخری آرڈر رقم
+DocType: Task,Is Milestone,سنگ میل ہے
 DocType: Daily Work Summary,Email Sent To,ای میل بھیجا
 DocType: Budget,Warn,انتباہ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کسی بھی دوسرے ریمارکس، ریکارڈ میں جانا چاہئے کہ قابل ذکر کوشش.
@@ -3993,11 +3995,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`جھروکے سٹاکس پرانے Than`٪ d دن سے چھوٹا ہونا چاہئے.
 DocType: Tax Rule,Purchase Tax Template,ٹیکس سانچہ خریداری
 ,Project wise Stock Tracking,پروجیکٹ وار اسٹاک ٹریکنگ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},بحالی کے شیڈول {0} کے خلاف موجود {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(ماخذ / ہدف میں) اصل مقدار
 DocType: Item Customer Detail,Ref Code,ممبران کوڈ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ملازم کے ریکارڈ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
 DocType: HR Settings,Payroll Settings,پے رول کی ترتیبات
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غیر منسلک انوائس اور ادائیگی ملاپ.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,حکم صادر کریں
@@ -4020,7 +4021,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,چیک اور ڈپازٹس غلط کی منظوری دے دی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,اکاؤنٹ {0}: آپ والدین کے اکاؤنٹ کے طور پر خود کی وضاحت نہیں کر سکتے ہیں
 DocType: Purchase Invoice Item,Price List Rate,قیمت کی فہرست شرح
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,کسٹمر کی قیمت درج بنائیں
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,کسٹمر کی قیمت درج بنائیں
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",&quot;اسٹاک میں&quot; یا اس گودام میں دستیاب اسٹاک کی بنیاد پر &quot;نہیں اسٹاک میں&quot; دکھائیں.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),مواد کے بل (BOM)
 DocType: Item,Average time taken by the supplier to deliver,سپلائر کی طرف سے اٹھائے اوسط وقت فراہم کرنے کے لئے
@@ -4041,14 +4042,14 @@
 DocType: Asset,Disposal Date,ڈسپوزل تاریخ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ای میلز، دی وقت کمپنی کے تمام فعال ملازمین کو بھیجی جائے گی وہ چھٹی نہیں ہے تو. جوابات کا خلاصہ آدھی رات کو بھیجا جائے گا.
 DocType: Employee Leave Approver,Employee Leave Approver,ملازم کی رخصت کی منظوری دینے والا
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ٹریننگ کی رائے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,آرڈر {0} پیش کرنا ضروری ہے پیداوار
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},شے کے لئے شروع کرنے کی تاریخ اور اختتام تاریخ کا انتخاب کریں براہ کرم {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تاریخ کی تاریخ کی طرف سے پہلے نہیں ہو سکتا
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ ترمیم قیمتیں شامل
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ ترمیم قیمتیں شامل
 DocType: Batch,Parent Batch,والدین بیچ
 DocType: Batch,Parent Batch,والدین بیچ
 DocType: Cheque Print Template,Cheque Print Template,چیک پرنٹ سانچہ
@@ -4091,7 +4092,7 @@
 DocType: Item,Variant Based On,ویرینٹ بنیاد پر
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100٪ ہونا چاہئے تفویض کل اہمیت. یہ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,اپنے سپلائرز
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
 DocType: Request for Quotation Item,Supplier Part No,پردایک حصہ نہیں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',زمرہ &#39;تشخیص&#39; یا &#39;Vaulation اور کل&#39; کے لیے ہے جب کٹوتی نہیں کی جا سکتی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,کی طرف سے موصول
@@ -4101,7 +4102,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: سے {0} کے لئے {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},صف # {0}: شے کے لئے مقرر پردایک {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,صف {0}: گھنٹے قدر صفر سے زیادہ ہونا چاہیے.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
 DocType: Issue,Content Type,مواد کی قسم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کمپیوٹر
 DocType: Item,List this Item in multiple groups on the website.,ویب سائٹ پر ایک سے زیادہ گروہوں میں اس شے کی فہرست.
@@ -4110,20 +4111,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,آپ منجمد قیمت مقرر کرنے کی اجازت نہیں ہے
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled لکھے حاصل
 DocType: Payment Reconciliation,From Invoice Date,انوائس کی تاریخ سے
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,بلنگ کی کرنسی comapany کی یا تو ڈیفالٹ کرنسی یا پارٹی کے اکاؤنٹ کی کرنسی کے برابر ہونا چاہیے
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,بلنگ کی کرنسی comapany کی یا تو ڈیفالٹ کرنسی یا پارٹی کے اکاؤنٹ کی کرنسی کے برابر ہونا چاہیے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,معاوضہ چھوڑ دو
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,یہ کیا کرتا ہے؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,گودام میں
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,تمام طالب علم داخلہ
 ,Average Commission Rate,اوسط کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حاضری مستقبل کی تاریخوں کے لئے نشان لگا دیا گیا نہیں کیا جا سکتا
 DocType: Pricing Rule,Pricing Rule Help,قیمتوں کا تعین حکمرانی کی مدد
 DocType: School House,House Name,ایوان نام
 DocType: Purchase Taxes and Charges,Account Head,اکاؤنٹ ہیڈ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,اشیاء کی قیمت کا حساب کرنے اترا اضافی اخراجات کو اپ ڈیٹ کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,الیکٹریکل
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,آپ کے صارفین کے طور پر آپ کی تنظیم کے باقی میں شامل کریں. آپ بھی رابطے سے انہیں شامل کر کے اپنے پورٹل پر صارفین کی دعوت دیتے ہیں شامل کر سکتے ہیں
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,آپ کے صارفین کے طور پر آپ کی تنظیم کے باقی میں شامل کریں. آپ بھی رابطے سے انہیں شامل کر کے اپنے پورٹل پر صارفین کی دعوت دیتے ہیں شامل کر سکتے ہیں
 DocType: Stock Entry,Total Value Difference (Out - In),کل قیمت فرق (باہر - میں)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,صف {0}: زر مبادلہ کی شرح لازمی ہے
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},صارف ID ملازم کے لئے مقرر نہیں {0}
@@ -4132,7 +4133,7 @@
 DocType: Item,Customer Code,کسٹمر کوڈ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,آخری آرڈر کے بعد دن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 DocType: Buying Settings,Naming Series,نام سیریز
 DocType: Leave Block List,Leave Block List Name,بلاک کریں فہرست کا نام چھوڑ دو
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,انشورنس تاریخ آغاز انشورنس تاریخ اختتام سے کم ہونا چاہئے
@@ -4147,7 +4148,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ملازم کی تنخواہ کی پرچی {0} کے پاس پہلے وقت شیٹ کے لئے پیدا {1}
 DocType: Vehicle Log,Odometer,مسافت پیما
 DocType: Sales Order Item,Ordered Qty,کا حکم دیا مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},سے اور مدت بار بار چلنے والی کے لئے لازمی تاریخوں کی مدت {0}
@@ -4160,7 +4161,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),رقم لکھیں (کمپنی کرنسی)
 DocType: Sales Invoice Timesheet,Billing Hours,بلنگ کے اوقات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} نہیں پایا کیلئے ڈیفالٹ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,انہیں یہاں شامل کرنے کے لئے اشیاء کو تھپتھپائیں
 DocType: Fees,Program Enrollment,پروگرام کا اندراج
 DocType: Landed Cost Voucher,Landed Cost Voucher,لینڈڈ لاگت واؤچر
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},مقرر کریں {0}
@@ -4258,7 +4260,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خوردہ اور تھوک فروشی
 DocType: Issue,First Responded On,پہلے جواب
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ایک سے زیادہ گروہوں میں شے کی کراس لسٹنگ
-DocType: Grade Interval,Grade Interval,گریڈ وقفہ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالی سال شروع کرنے کی تاریخ اور مالی سال کے اختتام تاریخ پہلے ہی مالی سال میں مقرر کیا جاتا ہے {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,کلیئرنس کی تاریخ اپ ڈیٹ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,سپلٹ بیچ
@@ -4267,6 +4268,7 @@
 DocType: Request for Quotation Supplier,Download PDF,لوڈ PDF
 DocType: Production Order,Planned End Date,منصوبہ بندی اختتام تاریخ
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,اشیاء کہاں محفوظ کیا جاتا ہے.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 DocType: Request for Quotation,Supplier Detail,پردایک تفصیل
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,انوائس کی رقم
 DocType: Attendance,Attendance,حاضری
@@ -4310,7 +4312,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,سیٹ اپ میری تنظیم کے لئے ایک سادہ ویب سائٹ
 DocType: Payment Reconciliation,Receivable / Payable Account,وصولی / قابل ادائیگی اکاؤنٹ
 DocType: Delivery Note Item,Against Sales Order Item,سیلز آرڈر آئٹم خلاف
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
 DocType: Item,Default Warehouse,پہلے سے طے شدہ گودام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بجٹ گروپ کے اکاؤنٹ کے خلاف مقرر نہیں کیا جا سکتا {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,والدین لاگت مرکز درج کریں
@@ -4369,7 +4371,7 @@
 ,Items To Be Requested,اشیا درخواست کی جائے
 DocType: Purchase Order,Get Last Purchase Rate,آخری خریداری کی شرح حاصل
 DocType: Company,Company Info,کمپنی کی معلومات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,منتخب یا نئے گاہک شامل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,منتخب یا نئے گاہک شامل
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,لاگت مرکز ایک اخراجات کے دعوی کی بکنگ کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),فنڈز (اثاثے) کی درخواست
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,یہ اس ملازم کی حاضری پر مبنی ہے
@@ -4381,12 +4383,12 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{0} {1} has been modified. Please refresh.,{0} {1} نظر ثانی کی گئی ہے. ریفریش کریں.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,مندرجہ ذیل دنوں میں رخصت کی درخواستیں کرنے سے صارفین کو روکنے کے.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,خریداری کی رقم
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ملازم فوائد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},پیک مقدار قطار میں آئٹم {0} کے لئے مقدار برابر ضروری {1}
 DocType: Production Order,Manufactured Qty,تیار مقدار
 DocType: Purchase Receipt Item,Accepted Quantity,منظور مقدار
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} نہیں موجود
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} نہیں موجود
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,گاہکوں کو اٹھایا بل.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروجیکٹ کی شناخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},صف کوئی {0}: رقم خرچ دعوی {1} کے خلاف زیر التواء رقم سے زیادہ نہیں ہو سکتا. زیر التواء رقم ہے {2}
@@ -4395,15 +4397,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 پڑھنا
 ,Hub,حب
 DocType: GL Entry,Voucher Type,واؤچر کی قسم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
 DocType: Employee Loan Application,Approved,منظور
 DocType: Pricing Rule,Price,قیمت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} مقرر کیا جانا چاہئے پر فارغ ملازم &#39;بائیں&#39; کے طور پر
 DocType: Guardian,Guardian,گارڈین
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,تشخیص {0} {1} مقررہ تاریخ کی حد میں ملازم کے لئے پیدا
 DocType: Employee,Education,تعلیم
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ڈیل
 DocType: Selling Settings,Campaign Naming By,مہم کا نام دینے
 DocType: Employee,Current Address Is,موجودہ پتہ ہے
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,نظر ثانی کی
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاری. کی وضاحت نہیں کی ہے تو، کمپنی کے پہلے سے طے شدہ کرنسی سیٹ.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,اکاؤنٹنگ جرنل اندراج.
 DocType: Delivery Note Item,Available Qty at From Warehouse,گودام سے پر دستیاب مقدار
@@ -4440,7 +4444,7 @@
 DocType: Hub Settings,Hub Settings,حب ترتیبات
 DocType: Project,Gross Margin %,مجموعی مارجن٪
 DocType: BOM,With Operations,آپریشن کے ساتھ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,اکاؤنٹنگ اندراجات پہلے ہی کرنسی میں بنایا گیا ہے {0} کمپنی کے لئے {1}. کرنسی کے ساتھ ایک وصولی یا قابل ادائیگی اکاؤنٹ منتخب کریں {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,اکاؤنٹنگ اندراجات پہلے ہی کرنسی میں بنایا گیا ہے {0} کمپنی کے لئے {1}. کرنسی کے ساتھ ایک وصولی یا قابل ادائیگی اکاؤنٹ منتخب کریں {0}.
 DocType: Asset,Is Existing Asset,اثاثہ موجود ہے
 DocType: Salary Detail,Statistical Component,شماریاتی اجزاء
 ,Monthly Salary Register,ماہانہ تنخواہ رجسٹر
@@ -4494,7 +4498,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,علامت (لوگو) منسلک کریں
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,اسٹاک کی سطح
 DocType: Customer,Commission Rate,کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,مختلف بنائیں
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,مختلف بنائیں
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,محکمہ کی طرف سے بلاک چھٹی ایپلی کیشنز.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",ادائیگی کی قسم، وصول میں سے ایک ہو تنخواہ اور اندرونی منتقلی ضروری ہے
 apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیات
@@ -4507,6 +4511,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,چھٹیاں پیداوار کی اجازت دیتے ہیں
 DocType: Sales Order,Customer's Purchase Order Date,گاہک کی خریداری آرڈر کی تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,دارالحکومت اسٹاک
+DocType: Shopping Cart Settings,Show Public Attachments,پبلک منسلک دکھائیں
 DocType: Packing Slip,Package Weight Details,پیکیج وزن تفصیلات
 DocType: Payment Gateway Account,Payment Gateway Account,ادائیگی کے گیٹ وے اکاؤنٹ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ادائیگی مکمل ہونے کے بعد منتخب صفحے پر صارف ری.
@@ -4531,7 +4536,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,کرنسیاں وغیرہ $ طرح کسی بھی علامت اگلے ظاہر نہیں کیا.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),آدھا دن
 DocType: Supplier,Credit Days,کریڈٹ دنوں
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Student کی بیچ بنائیں
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Student کی بیچ بنائیں
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM سے اشیاء حاصل
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,وقت دن کی قیادت
@@ -4550,8 +4555,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,منظور رقم
 DocType: GL Entry,Is Opening,افتتاحی ہے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},صف {0}: ڈیبٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,اکاؤنٹ {0} موجود نہیں ہے
 DocType: Account,Cash,کیش
 DocType: Employee,Short biography for website and other publications.,ویب سائٹ اور دیگر مطبوعات کے لئے مختصر سوانح عمری.
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 7930125..98d1117 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,Đợt hàng hết hạn Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Phương thức thanh toán Tài khoản
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Hiện biến thể
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Hiện biến thể
 DocType: Academic Term,Academic Term,Thời hạn học tập
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Vật chất
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Số lượng
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Chi phí dịch vụ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Năm tài chính {0} là cần thiết
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Quảng cáo
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Cùng Công ty được nhập nhiều hơn một lần
 DocType: Employee,Married,Kết hôn
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Không được phép cho {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Không được phép cho {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Lấy dữ liệu từ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Sản phẩm {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Không có mục nào được liệt kê
 DocType: Payment Reconciliation,Reconcile,Hòa giải
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Cửa hàng tạp hóa
 DocType: Quality Inspection Reading,Reading 1,Đọc 1
 DocType: Process Payroll,Make Bank Entry,Hãy nhập Ngân hàng
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Quỹ lương hưu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Tiếp Khấu hao ngày không được trước ngày mua hàng
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Tiếp Khấu hao ngày không được trước ngày mua hàng
 DocType: SMS Center,All Sales Person,Tất cả nhân viên kd
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Phân phối hàng tháng ** giúp bạn phân phối Ngân sách/Mục tiêu hàngtháng nếu việc kinh doanh của bạn có tính thời vụ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Không tìm thấy mặt hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,Không tìm thấy mặt hàng
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Cơ cấu tiền lương Thiếu
 DocType: Lead,Person Name,Tên người
 DocType: Sales Invoice Item,Sales Invoice Item,Hóa đơn bán hàng hàng
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ví dụ: &quot;Trường Tiểu học&quot; hay &quot;Đại học&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Báo cáo hàng tồn kho
 DocType: Warehouse,Warehouse Detail,Chi tiết kho
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được thông qua cho khách hàng {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được thông qua cho khách hàng {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Những ngày cuối kỳ không thể muộn hơn so với ngày cuối năm của năm học mà thuật ngữ này được liên kết (Academic Year {}). Xin vui lòng sửa ngày và thử lại.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Là Tài Sản Cố Định"" không thể bỏ đánh dấu, vì bản ghi Tài Sản tồn tại cùng hạng mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Là Tài Sản Cố Định"" không thể bỏ đánh dấu, vì bản ghi Tài Sản tồn tại cùng hạng mục"
 DocType: Vehicle Service,Brake Oil,dầu phanh
 DocType: Tax Rule,Tax Type,Loại thuế
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Bạn không được phép thêm hoặc cập nhật bút toán trước ngày {0}
 DocType: BOM,Item Image (if not slideshow),Mục Hình ảnh (nếu không slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,tên khách hàng đã tồn tại
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Thời gian hoạt động thực tế
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Chọn BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,Chọn BOM
 DocType: SMS Log,SMS Log,Đăng nhập tin nhắn SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Chi phí của mục Delivered
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Các kỳ nghỉ trên {0} không phải là giữa Từ ngày và Đến ngày
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,Cấp
 DocType: Sales Invoice Item,Delivered By Supplier,Giao By Nhà cung cấp
 DocType: SMS Center,All Contact,Tất cả Liên hệ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Sản xuất theo thứ tự đã được tạo ra cho tất cả các mục có BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,Sản xuất theo thứ tự đã được tạo ra cho tất cả các mục có BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Mức lương hàng năm
 DocType: Daily Work Summary,Daily Work Summary,Tóm tắt công việc hàng ngày
 DocType: Period Closing Voucher,Closing Fiscal Year,Đóng cửa năm tài chính
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0}{1} bị đóng băng
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0}{1} bị đóng băng
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vui lòng chọn Công ty hiện có để tạo biểu đồ của tài khoản
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Chi phí hàng tồn kho
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Chọn Kho mục tiêu
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,Contra nhập
 DocType: Journal Entry Account,Credit in Company Currency,Tín dụng tại Công ty ngoại tệ
 DocType: Delivery Note,Installation Status,Tình trạng cài đặt
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Bạn có muốn cập nhật tham dự? <br> Trình bày: {0} \ <br> Vắng mặt: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Số lượng chấp nhận + từ chối phải bằng số lượng giao nhận {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Cung cấp nguyên liệu thô cho Purchase
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,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/accounts/doctype/sales_invoice/sales_invoice.py +139,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.
 DocType: Products Settings,Show Products as a List,Hiện sản phẩm như một List
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Tải file mẫu, điền dữ liệu thích hợp và đính kèm các tập tin sửa đổi.
@@ -224,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Hãy Khấu hao nhập
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Yêu cầu Loại
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,làm nhân viên
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,làm nhân viên
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Phát thanh truyền hình
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Thực hiện
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Chi tiết về các hoạt động thực hiện.
@@ -240,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Lập kế hoạch cho lần bảo trì.
 DocType: SMS Settings,Enter url parameter for message,Nhập tham số url cho tin nhắn
 DocType: POS Profile,Customer Groups,Nhóm khách hàng
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Báo cáo tài chính
 DocType: Guardian,Students,Sinh viên
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Quy tắc áp dụng giá và giảm giá.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Bảng giá phải được áp dụng cho mua hàng hoặc bán hàng
@@ -265,7 +269,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Danh sách loạt cho các giao dịch này
 DocType: Company,Default Payroll Payable Account,Mặc định lương Account Payable
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Cập nhật Email Nhóm
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Cập nhật Email Nhóm
 DocType: Sales Invoice,Is Opening Entry,Được mở cửa nhập
 DocType: Customer Group,Mention if non-standard receivable account applicable,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn áp dụng
 DocType: Course Schedule,Instructor Name,Tên giảng viên
@@ -277,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Theo hàng hóa có hóa đơn
 ,Production Orders in Progress,Đơn đặt hàng sản xuất trong tiến độ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Tiền thuần từ tài chính
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
 DocType: Lead,Address & Contact,Địa chỉ & Liên hệ
 DocType: Leave Allocation,Add unused leaves from previous allocations,Thêm lá không sử dụng từ phân bổ trước
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
@@ -303,7 +307,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Tổng số Costing Số tiền (thông qua Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bút toán Ngân hàng
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Cổ hòa giải hàng
@@ -322,7 +326,7 @@
 DocType: Item,Publish in Hub,Xuất bản trong Hub
 DocType: Student Admission,Student Admission,Nhập học sinh viên
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Mục {0} bị hủy bỏ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Yêu cầu tài liệu
 DocType: Bank Reconciliation,Update Clearance Date,Cập nhật thông quan ngày
 DocType: Item,Purchase Details,Thông tin chi tiết mua
@@ -375,12 +379,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Thông báo qua email trên tạo ra các yêu cầu vật liệu tự động
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
 DocType: Payment Reconciliation Invoice,Invoice Type,Loại hóa đơn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Giao hàng Ghi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,Giao hàng Ghi
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Chi phí của tài sản bán
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Nhập thanh toán đã được sửa đổi sau khi bạn kéo nó. Hãy kéo nó một lần nữa.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} Đã nhập hai lần vào chỉ tiêu Thuế của khoản mục
-DocType: Grade Interval,Min Score,min Điểm
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} Đã nhập hai lần vào chỉ tiêu Thuế của khoản mục
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
 DocType: Student Applicant,Admitted,Thừa nhận
 DocType: Workstation,Rent Cost,Chi phí thuê
@@ -393,7 +396,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Giá trị đặt hàng
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Ngân hàng / Tiền giao dịch với bên hoặc chuyển giao nội bộ
 DocType: Shipping Rule,Valid for Countries,Hợp lệ cho các nước
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Mục này là một Template và không thể được sử dụng trong các giao dịch. Thuộc tính item sẽ được sao chép vào các biến thể trừ 'Không Copy' được thiết lập
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Mục này là một Template và không thể được sử dụng trong các giao dịch. Thuộc tính item sẽ được sao chép vào các biến thể trừ 'Không Copy' được thiết lập
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Tổng số thứ tự coi
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Chỉ định nhân viên (ví dụ: Giám đốc điều hành, Giám đốc vv.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Vui lòng nhập 'Lặp lại vào ngày của tháng ""giá trị trường"
@@ -403,13 +406,13 @@
 DocType: Item Tax,Tax Rate,Thuế suất
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} đã được phân bổ cho nhân viên {1} cho kỳ {2} đến {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Chọn nhiều Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Không phải giống như {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Chuyển đổi sang non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lô của mục.
 DocType: C-Form Invoice Detail,Invoice Date,Hóa đơn ngày
 DocType: GL Entry,Debit Amount,Số tiền ghi nợ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Xin vui lòng xem file đính kèm
 DocType: Purchase Order,% Received,% Nhận Hàng
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tạo Sinh viên nhóm
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Yêu cầu báo giá
 DocType: Salary Slip Timesheet,Working Hours,Giờ làm việc
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Thay đổi bắt đầu / hiện số thứ tự của một loạt hiện có.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Tạo một khách hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,Tạo một khách hàng mới
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nếu nhiều quy giá tiếp tục chiếm ưu thế, người dùng được yêu cầu để thiết lập ưu tiên bằng tay để giải quyết xung đột."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Tạo đơn đặt hàng mua
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Tạo đơn đặt hàng mua
 ,Purchase Register,Đăng ký mua
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Phí áp dụng
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Thiết lập chung cho tất cả quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,Đóng băng tài khoản đến ngày
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Chủ lễ.
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Từ gói thầu số
 DocType: Item Attribute,To Range,Thành vùng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Chứng khoán và tiền gửi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Không thể thay đổi phương pháp định giá vì có các giao dịch đối với một số mặt hàng không có phương pháp định giá riêng
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tổng số lá được giao là bắt buộc
 DocType: Job Opening,Description of a Job Opening,Mô tả công việc một Opening
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
 DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
 DocType: Shipping Rule,Net Weight,Trọng lượng
 DocType: Employee,Emergency Phone,Điện thoại khẩn cấp
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Mua
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vui lòng xác định mức cho ngưỡng 0%
 DocType: Sales Order,To Deliver,Giao Hàng
 DocType: Purchase Invoice Item,Item,Hạng mục
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nối tiếp không có mục không thể là một phần
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,Nối tiếp không có mục không thể là một phần
 DocType: Journal Entry,Difference (Dr - Cr),Sự khác biệt (Tiến sĩ - Cr)
 DocType: Account,Profit and Loss,Báo cáo kết quả hoạt động kinh doanh
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Quản lý Hợp đồng phụ
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Lưu ý cài đặt hàng
 DocType: Production Plan Item,Pending Qty,Pending Qty
 DocType: Budget,Ignore,Bỏ qua
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} không hoạt động
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} không hoạt động
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS gửi đến số điện thoại sau: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,kích thước thiết lập kiểm tra cho in ấn
 DocType: Salary Slip,Salary Slip Timesheet,Mức lương trượt Timesheet
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Tổng tiền Hoa hồng
 DocType: Pricing Rule,Sales Partner,Đại lý bán hàng
 DocType: Buying Settings,Purchase Receipt Required,Hóa đơn mua hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Tỷ lệ đánh giá là bắt buộc nếu mở cửa bước vào Cổ
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Tỷ lệ đánh giá là bắt buộc nếu mở cửa bước vào Cổ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vui lòng chọn Công ty và Đảng Loại đầu tiên
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Giá trị lũy kế
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Xin lỗi, Serial Nos không thể được sáp nhập"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Thực hiện bán hàng đặt hàng
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,Thực hiện bán hàng đặt hàng
 DocType: Project Task,Project Task,Dự án công tác
 ,Lead Id,Id Tiềm năng
 DocType: C-Form Invoice Detail,Grand Total,Tổng cộng
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,Resume đính kèm
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Khách hàng lặp lại
 DocType: Leave Control Panel,Allocate,Phân bổ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,Bán hàng trở lại
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Lưu ý: Tổng lá phân bổ {0} không được nhỏ hơn lá đã được phê duyệt {1} cho giai đoạn
 DocType: Announcement,Posted By,Gửi bởi
 DocType: Item,Delivered by Supplier (Drop Ship),Cung cấp bởi Nhà cung cấp (Drop Ship)
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,Báo giá cho
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Hãy đặt Công ty
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Hãy đặt Công ty
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Không tham khảo và tham khảo ngày là cần thiết cho {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Chọn tài khoản thanh toán để làm cho Ngân hàng nhập
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Tạo hồ sơ nhân viên để quản lý lá, tuyên bố chi phí và biên chế"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Tạo hồ sơ nhân viên để quản lý lá, tuyên bố chi phí và biên chế"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Thêm vào kiến thức cơ sở
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Đề nghị Viết
 DocType: Payment Entry Deduction,Payment Entry Deduction,Thanh toán nhập khấu trừ
@@ -666,8 +670,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Mối quan hệ với Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Chi cục trưởng
 DocType: Payment Entry,Payment From / To,Thanh toán Từ / Để
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Phạm vi ngày
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},hạn mức tín dụng mới thấp hơn số dư hiện tại cho khách hàng. Hạn mức tín dụng phải có ít nhất {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},hạn mức tín dụng mới thấp hơn số dư hiện tại cho khách hàng. Hạn mức tín dụng phải có ít nhất {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
 DocType: SMS Settings,Receiver Parameter,Nhận thông số
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dựa Trên' và 'Nhóm Bởi' không thể giống nhau
@@ -677,7 +680,7 @@
 DocType: Issue,Resolution Date,Độ phân giải ngày
 DocType: Student Batch Name,Batch Name,Tên hàng loạt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet tạo:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Ghi danh
 DocType: Selling Settings,Customer Naming By,đặt tên khách hàng theo
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Sẽ hiển thị các sinh viên như hiện tại trong Student Report Attendance tháng
@@ -721,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,Tham dự sinh
 DocType: Sales Invoice Timesheet,Time Sheet,Thời gian biểu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raw Materials Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Xin vui lòng nhập các chi tiết sản phẩm
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Xin vui lòng nhập các chi tiết sản phẩm
 DocType: Interest,Interest,Quan tâm
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Các chi tiết khác
@@ -739,7 +742,7 @@
 ,Absent Student Report,Báo cáo Sinh viên vắng mặt
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi về:
 DocType: Offer Letter Term,Offer Letter Term,Offer Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Mục có các biến thể.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Mục {0} không tìm thấy
 DocType: Bin,Stock Value,Giá trị tồn
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Công ty {0} không tồn tại
@@ -748,8 +751,6 @@
 DocType: Serial No,Warranty Expiry Date,Ngày Bảo hành hết hạn
 DocType: Material Request Item,Quantity and Warehouse,Số lượng và kho
 DocType: Sales Invoice,Commission Rate (%),Hoa hồng Tỷ lệ (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vui lòng chọn Chương trình
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vui lòng chọn Chương trình
 DocType: Project,Estimated Cost,Chi phí ước tính
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} không phải là 1 vật tư hàng hóa
 DocType: Mode of Payment Account,Default Account,Tài khoản mặc định
 DocType: Payment Entry,Received Amount (Company Currency),Số tiền nhận được (Công ty ngoại tệ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Tiềm năng phải được thiết lập nếu Cơ hội được tạo từ Tiềm năng
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,Tiềm năng phải được thiết lập nếu Cơ hội được tạo từ Tiềm năng
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vui lòng chọn ngày nghỉ hàng tuần
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Người bán hàng mục tiêu phương sai mục Nhóm-Wise
@@ -832,7 +833,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Danh sách giá không được chọn
 DocType: Employee,Family Background,Gia đình nền
 DocType: Request for Quotation Supplier,Send Email,Gởi thư
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Không phép
 DocType: Company,Default Bank Account,Tài khoản Ngân hàng mặc định
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Để lọc dựa vào Đảng, Đảng chọn Gõ đầu tiên"
@@ -845,8 +846,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Không có nhân viên tìm thấy
 DocType: Supplier Quotation,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
 DocType: SMS Center,All Customer Contact,Tất cả Liên hệ Khách hàng
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Tải lên số tồn kho thông qua file csv.
 DocType: Warehouse,Tree Details,Chi tiết Tree
@@ -857,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Số tiền Hoá đơn tối thiểu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Trung tâm Chi phí {2} không thuộc về Công ty {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Tài khoản {2} không thể là một Nhóm
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Mục Row {idx}: {DOCTYPE} {} DOCNAME không tồn tại trên &#39;{} DOCTYPE&#39; bảng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} đã được hoàn thành hoặc bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Mục Row {idx}: {DOCTYPE} {} DOCNAME không tồn tại trên &#39;{} DOCTYPE&#39; bảng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} đã được hoàn thành hoặc bị hủy bỏ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,không nhiệm vụ
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Các ngày trong tháng mà tự động hóa đơn sẽ được tạo ra ví dụ như 05, 28 vv"
 DocType: Asset,Opening Accumulated Depreciation,Mở Khấu hao lũy kế
@@ -874,7 +875,7 @@
 DocType: Bin,Moving Average Rate,Tỷ lệ trung bình di chuyển
 DocType: Production Planning Tool,Select Items,Chọn mục
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} gắn với phiếu t.toán {1} ngày {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Lịch khóa học
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Lịch khóa học
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: HR Settings,Enter retirement age in years,Nhập tuổi nghỉ hưu trong năm
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Mục tiêu kho
@@ -882,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Cho phép trên giao nhận tối đa tỷ lệ này
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tất cả các nhóm hàng
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tất cả các nhóm hàng
 DocType: Process Payroll,Activity Log,Nhật ký công việc
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Lợi nhuận ròng / lỗ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
@@ -893,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Mua hàng để thanh toán
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,SL của Dự án
 DocType: Sales Invoice,Payment Due Date,Thanh toán Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Đang mở'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Mở để làm
 DocType: Notification Control,Delivery Note Message,Giao hàng tận nơi Lưu ý tin nhắn
@@ -909,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-trật tự Qty
 DocType: Leave Block List Date,Leave Block List Date,Để lại Danh sách Chặn ngày
 DocType: Pricing Rule,Price or Discount,Giá hoặc giảm giá
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Tổng số phí áp dụng tại Purchase bảng Receipt mục phải giống như Tổng Thuế và Phí
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Tổng số phí áp dụng tại Purchase bảng Receipt mục phải giống như Tổng Thuế và Phí
 DocType: Sales Team,Incentives,Ưu đãi
 DocType: SMS Log,Requested Numbers,Số yêu cầu
 DocType: Production Planning Tool,Only Obtain Raw Materials,Chỉ Lấy Nguyên liệu thô
@@ -967,8 +968,7 @@
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Fee Structure,Components,Các thành phần
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vui lòng nhập tài sản Thể loại trong mục {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vui lòng nhập tài sản Thể loại trong mục {0}
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Mua hóa đơn trước
@@ -1020,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Thanh toán chống Bán hàng / Mua hàng nên luôn luôn được đánh dấu là trước
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Mối nguy hóa học
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Mặc định tài khoản Ngân hàng / Tiền sẽ được tự động cập nhật trong Lương Journal nhập khi chế độ này được chọn.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Khoảng Mã Lớp {0} trùng với khoảng thời gian lớp cho các lớp khác. Vui lòng kiểm tra khoảng {0} và {1} và thử lại
 DocType: BOM,Raw Material Cost(Company Currency),Nguyên liệu Chi phí (Công ty ngoại tệ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Hàng # {0}: Tỷ lệ không được lớn hơn tỷ lệ được sử dụng trong {1} {2}
@@ -1034,7 +1032,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM Trang web mục
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Tải lên tiêu đề trang và logo. (Bạn có thể chỉnh sửa chúng sau này).
 DocType: Timesheet Detail,Bill,Hóa đơn
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Tiếp Khấu hao ngày được nhập như ngày trong quá khứ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Tiếp Khấu hao ngày được nhập như ngày trong quá khứ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Trắng
 DocType: SMS Center,All Lead (Open),Tất cả Tiềm năng (Mở)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Số lượng không có sẵn cho {4} trong kho {1} tại đăng thời gian nhập cảnh ({2} {3})
@@ -1049,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
 DocType: Lead,Next Contact Date,Ngày Liên hệ Tiếp theo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Mở Số lượng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
 DocType: Student Batch Name,Student Batch Name,Tên sinh viên hàng loạt
 DocType: Holiday List,Holiday List Name,Kỳ nghỉ Danh sách Tên
 DocType: Repayment Schedule,Balance Loan Amount,Dư nợ cho vay Số tiền
@@ -1069,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Vui lòng ghi rõ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
 DocType: Delivery Note,Delivery To,Để giao hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Chọn đơn đặt hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} không thể bị âm
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Giảm giá
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Giảm giá
 DocType: Asset,Total Number of Depreciations,Tổng Số khấu hao
 DocType: Sales Invoice Item,Rate With Margin,Tỷ lệ Giãn
 DocType: Sales Invoice Item,Rate With Margin,Tỷ lệ Giãn
@@ -1101,7 +1099,7 @@
 DocType: Lead,Organization Name,Tên tổ chức
 DocType: Tax Rule,Shipping State,Vận Chuyển Nhà nước
 ,Projected Quantity as Source,Số lượng dự kiến là nguồn
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Item phải được bổ sung bằng cách sử dụng 'Nhận Items từ Mua Tiền thu' nút
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Item phải được bổ sung bằng cách sử dụng 'Nhận Items từ Mua Tiền thu' nút
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Bao gồm các mặt hàng không cổ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Chi phí bán hàng
@@ -1109,7 +1107,7 @@
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Bộ phận chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Mã Bưu Chính
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,Mã Bưu Chính
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Đơn hàng {0} là {1}
 DocType: Opportunity,Contact Info,Thông tin Liên hệ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Làm Cổ Entries
@@ -1153,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
 ,Ordered Items To Be Billed,Ra lệnh tiêu được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 DocType: Global Defaults,Global Defaults,Mặc định toàn cầu
@@ -1188,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vui lòng nhập Item Code để có được Số lô
 DocType: Stock Settings,Default Item Group,Mặc định mục Nhóm
 DocType: Employee Loan,Partially Disbursed,phần giải ngân
-DocType: Grading Structure,Grading System Name,Hệ thống tên phân loại
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
 DocType: Account,Balance Sheet,Cân đối kế toán
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không được cấu hình. Vui lòng kiểm tra, cho dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên POS hồ sơ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không được cấu hình. Vui lòng kiểm tra, cho dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên POS hồ sơ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Nhân viên kinh doanh của bạn sẽ nhận được một lời nhắc vào ngày này để liên hệ với khách hàng
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Cùng mục không thể được nhập nhiều lần.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Tài khoản có thể tiếp tục được thực hiện theo nhóm, nhưng mục có thể được thực hiện đối với phi Groups"
@@ -1231,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Xong công việc
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Xin vui lòng ghi rõ ít nhất một thuộc tính trong bảng thuộc tính
 DocType: Announcement,All Students,Tất cả học sinh
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Mục {0} phải là mục Không-Tồn kho
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Mục {0} phải là mục Không-Tồn kho
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Xem Ledger
 DocType: Grading Scale,Intervals,khoảng thời gian
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Sinh viên Điện thoại di động số
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Phần còn lại của Thế giới
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} không thể có hàng loạt
@@ -1276,8 +1273,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Không được phép chỉnh sửa tài khoản đông lạnh {0}
 DocType: Journal Entry,Get Outstanding Invoices,Được nổi bật Hoá đơn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,đơn đặt hàng giúp bạn lập kế hoạch và theo dõi mua hàng của bạn
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,đơn đặt hàng giúp bạn lập kế hoạch và theo dõi mua hàng của bạn
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Tổng khối lượng phát hành / Chuyển {0} trong Chất liệu Yêu cầu {1} \ không thể nhiều hơn số lượng yêu cầu {2} cho mục {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Nhỏ
@@ -1301,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Dữ liệu Sync Thạc sĩ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
 DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin publice hoặc URL của trang web
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin publice hoặc URL của trang web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
@@ -1319,7 +1316,7 @@
 DocType: Student Group Student,Group Roll Number,Số cuộn nhóm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Tổng số các trọng số nhiệm vụ cần được 1. Vui lòng điều chỉnh trọng lượng của tất cả các công việc của dự án phù hợp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Thiết bị vốn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Giá Rule là lần đầu tiên được lựa chọn dựa trên 'Áp dụng trên' lĩnh vực, có thể được Item, mục Nhóm hoặc thương hiệu."
@@ -1346,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Tạp chí nhập
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} mục trong tiến trình
 DocType: Workstation,Workstation Name,Tên máy trạm
-DocType: Grade Interval,Grade Code,Mã lớp
+DocType: Grading Scale Interval,Grade Code,Mã lớp
 DocType: POS Item Group,POS Item Group,POS mục Nhóm
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
@@ -1363,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Phần cứng
 DocType: Sales Order,Recurring Upto,Định kỳ Upto
 DocType: Attendance,HR Manager,Trưởng phòng Nhân sự
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Hãy lựa chọn một công ty
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Hãy lựa chọn một công ty
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Để lại đặc quyền
 DocType: Purchase Invoice,Supplier Invoice Date,Nhà cung cấp hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Bạn cần phải kích hoạt module Giỏ hàng
@@ -1379,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Thực phẩm
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Phạm vi Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,Không có các chuyến thăm
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Đánh dấu Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,Đánh dấu Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},Lịch bảo trì {0} tồn tại chống lại {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,sinh viên ghi danh
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Đồng tiền của tài khoản bế phải là {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum điểm cho tất cả các mục tiêu phải 100. Nó là {0}
@@ -1428,13 +1426,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Danh mục tài khoản
 DocType: Material Request,Terms and Conditions Content,Điều khoản và Điều kiện nội dung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Maintenance Visit,Unscheduled,Đột xuất
 DocType: Employee,Owned,Sở hữu
 DocType: Salary Detail,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
 DocType: Pricing Rule,"Higher the number, higher the priority","Số càng cao, càng cao thì ưu tiên"
 ,Purchase Invoice Trends,Mua hóa đơn Xu hướng
 DocType: Employee,Better Prospects,Viễn cảnh tốt hơn
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Hàng # {0}: Hàng {1} chỉ có {2} qty. Vui lòng chọn một lô khác có {3} có sẵn hoặc phân chia hàng thành nhiều hàng, để phân phối / xuất phát từ nhiều đợt"
 DocType: Vehicle,License Plate,Giấy phép mảng
 DocType: Appraisal,Goals,Mục tiêu
 DocType: Warranty Claim,Warranty / AMC Status,Bảo hành /tình trạng AMC
@@ -1453,7 +1452,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Nếu tài khoản bị đóng băng, các mục được phép sử dụng hạn chế."
 DocType: Email Digest,Bank Balance,số dư Ngân hàng
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Hạch toán kế toán cho {0}: {1} chỉ có thể được thực hiện bằng loại tiền tệ: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Hạch toán kế toán cho {0}: {1} chỉ có thể được thực hiện bằng loại tiền tệ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Hồ sơ công việc, trình độ chuyên môn cần thiết vv"
 DocType: Journal Entry Account,Account Balance,Số dư Tài khoản
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Rule thuế cho các giao dịch.
@@ -1464,7 +1463,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Hiện P &amp; L số dư năm tài chính không khép kín
 DocType: Shipping Rule,Shipping Account,Tài khoản vận chuyển
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Tài khoản {2} không hoạt động
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Hãy Đơn đặt hàng bán hàng để giúp bạn có kế hoạch làm việc của bạn và cung cấp đúng thời hạn
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Hãy Đơn đặt hàng bán hàng để giúp bạn có kế hoạch làm việc của bạn và cung cấp đúng thời hạn
 DocType: Quality Inspection,Readings,Đọc
 DocType: Stock Entry,Total Additional Costs,Tổng chi phí bổ sung
 DocType: Course Schedule,SH,SH
@@ -1475,7 +1474,7 @@
 DocType: Shipping Rule Condition,To Value,Để giá trị gia tăng
 DocType: Asset Movement,Stock Manager,Quản lý kho hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kho nguồn là bắt buộc đối với hàng {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Đóng gói trượt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,Đóng gói trượt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Thuê văn phòng
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Nhập khẩu thất bại!
@@ -1501,7 +1500,7 @@
 DocType: Sales Invoice,Source,Nguồn
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Hiện đã đóng
 DocType: Leave Type,Is Leave Without Pay,Nếu không có được Leave Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset loại là bắt buộc cho mục tài sản cố định
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset loại là bắt buộc cho mục tài sản cố định
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Không có hồ sơ được tìm thấy trong bảng thanh toán
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Đây {0} xung đột với {1} cho {2} {3}
 DocType: Student Attendance Tool,Students HTML,Học sinh HTML
@@ -1519,7 +1518,7 @@
 DocType: Student,Date of Leaving,Ngày Rời
 DocType: Pricing Rule,For Price List,Đối với Bảng giá
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,tạo Chào
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,tạo Chào
 DocType: Maintenance Schedule,Schedules,Lịch
 DocType: Purchase Invoice Item,Net Amount,Số tiền Net
 DocType: Purchase Order Item Supplied,BOM Detail No,số hiệu BOM chi tiết
@@ -1547,7 +1546,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,chương trình tuyển sinh
 DocType: Sales Invoice Item,Brand Name,Tên Thương hiệu
 DocType: Purchase Receipt,Transporter Details,Chi tiết Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Mặc định kho là cần thiết cho mục đã chọn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,Mặc định kho là cần thiết cho mục đã chọn
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Nhà cung cấp có thể
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Tổ chức
@@ -1581,7 +1580,7 @@
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM mặc định cho {0} không tìm thấy cho dự án {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Tuyên bố cho chi phí công ty.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Học sinh được ở trung tâm của hệ thống, thêm tất cả học sinh của bạn"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Học sinh được ở trung tâm của hệ thống, thêm tất cả học sinh của bạn"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: ngày giải phóng mặt bằng {1} không được trước ngày Séc {2}
 DocType: Company,Default Holiday List,Mặc định Danh sách khách sạn Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Từ Thời gian và To Time {1} là chồng chéo với {2}
@@ -1593,20 +1592,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ phép là ngày nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gửi lại Email Thanh toán
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nhiệm vụ mới
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Hãy báo giá
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Hãy báo giá
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Báo cáo khác
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Hãy thử lên kế hoạch hoạt động cho ngày X trước.
 DocType: HR Settings,Stop Birthday Reminders,Ngừng sinh Nhắc nhở
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Hãy thiết lập mặc định Account Payable lương tại Công ty {0}
 DocType: SMS Center,Receiver List,Danh sách người nhận
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Tìm hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,Tìm hàng
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Số tiền được tiêu thụ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Thay đổi ròng trong Cash
 DocType: Assessment Plan,Grading Scale,Quy mô phân loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Đã hoàn thành
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Yêu cầu thanh toán đã tồn tại {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
@@ -1644,7 +1643,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sưu tầm
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Gắn với hóa đơn NCC {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,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: Journal Entry,Entry Type,Loại mục
 ,Customer Credit Balance,số dư tín dụng của khách hàng
@@ -1687,8 +1686,6 @@
 DocType: Student Sibling,Studying in Same Institute,Học tập tại Cùng Viện
 DocType: Territory,Territory Manager,Quản lý địa bàn
 DocType: Packed Item,To Warehouse (Optional),đến Kho (Tùy chọn)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
 DocType: Payment Entry,Paid Amount (Company Currency),Số tiền thanh toán (Công ty tiền tệ)
 DocType: Purchase Invoice,Additional Discount,Chiết khấu giảm giá
 DocType: Selling Settings,Selling Settings,thiết lập thông số bán hàng
@@ -1698,9 +1695,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Xem Giỏ hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Chi phí tiếp thị
 ,Item Shortage Report,Thiếu mục Báo cáo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Phiếu NVL sử dụng để làm chứng từ nhập kho
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Tiếp Khấu hao ngày là bắt buộc đối với tài sản mới
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Tiếp Khấu hao ngày là bắt buộc đối với tài sản mới
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Khóa học riêng biệt cho từng nhóm
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Khóa học riêng biệt cho từng nhóm
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Đơn vị duy nhất của một Item.
@@ -1717,9 +1714,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Trung tâm Chi phí là cần thiết đối với tài khoản 'Lãi và Lỗ' {2}. Vui lòng thiết lập một Trung tâm Chi phí mặc định cho Công ty.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng cùng tên đã tồn tại. Hãy thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng cùng tên đã tồn tại. Hãy thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Liên hệ Mới
 DocType: Territory,Parent Territory,địa bàn cấp trên
 DocType: Quality Inspection Reading,Reading 2,Đọc 2
@@ -1746,21 +1741,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Hòa giải JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Quá nhiều cột. Xuất báo cáo và in nó sử dụng một ứng dụng bảng tính.
 DocType: Purchase Invoice Item,Batch No,Số hiệu lô
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Không thể tìm thấy tỷ giá hối đoái cho {0} đến {1} cho ngày trọng {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Cho phép nhiều đơn bán cùng trên 1 đơn mua hàng của khách
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Không
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Chính
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Biến thể
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Chính
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Biến thể
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
 DocType: Employee Attendance Tool,Employees HTML,Nhân viên HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
 DocType: Employee,Leave Encashed?,Để lại Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Cơ hội Từ trường là bắt buộc
 DocType: Email Digest,Annual Expenses,Chi phí hàng năm
 DocType: Item,Variants,Biến thể
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Từ mua hóa đơn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,Từ mua hóa đơn
 DocType: SMS Center,Send To,Để gửi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Rời Loại {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Số lượng phân bổ
@@ -1780,7 +1774,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,đánh giá
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Trùng lặp Serial No nhập cho hàng {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,1 điều kiện cho quy tắc giao hàng
-DocType: Grading Structure,Grading Intervals,Khoảng phân loại
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Vui lòng nhập
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Không thể overbill cho {0} mục trong hàng {1} hơn {2}. Để cho phép quá thanh toán, hãy đặt trong Mua Cài đặt"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Xin hãy thiết lập bộ lọc dựa trên Item hoặc kho
@@ -1793,16 +1786,17 @@
 DocType: Authorization Control,Authorization Control,Cho phép điều khiển
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Bị từ chối Warehouse là bắt buộc chống lại từ chối khoản {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Thanh toán
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Quản lý đơn đặt hàng của bạn
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Quản lý đơn đặt hàng của bạn
 DocType: Production Order Operation,Actual Time and Cost,Thời gian và chi phí thực tế
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Phiếu đặt NVL  {0} có thể được thực hiện cho mục {1} đối với đơn đặt hàng {2}
 DocType: Employee,Salutation,Sự chào
 DocType: Course,Course Abbreviation,Tên viết tắt khóa học
 DocType: Student Leave Application,Student Leave Application,Ứng dụng Để lại Sinh viên
 DocType: Item,Will also apply for variants,Cũng sẽ được áp dụng cho các biến thể
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} vào ngày nửa trên {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Tổng số giờ làm việc không nên lớn hơn so với giờ làm việc max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Bật
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Lô (Bundle) hàng tại thời điểm bán.
 DocType: Quotation Item,Actual Qty,Số lượng thực tế
 DocType: Sales Invoice Item,References,Tài liệu tham khảo
@@ -1812,7 +1806,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Bạn đã nhập các mục trùng lặp. Xin khắc phục và thử lại.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Liên kết
 DocType: Asset Movement,Asset Movement,Phong trào Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Giỏ hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,Giỏ hàng mới
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Mục {0} không phải là một khoản đăng
 DocType: SMS Center,Create Receiver List,Tạo ra nhận Danh sách
 DocType: Vehicle,Wheels,Wheels
@@ -1844,10 +1838,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Vô hiệu hóa việc tạo ra các bản ghi thời gian so với đơn đặt hàng sản xuất. Hoạt động sẽ không được theo dõi chống sản xuất hàng
 DocType: Student,Student Mobile Number,Số di động Sinh viên
 DocType: Item,Has Variants,Có biến thể
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Bạn đã chọn các mục từ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Bạn đã chọn các mục từ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Tên của phân phối hàng tháng
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID hàng loạt là bắt buộc
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID hàng loạt là bắt buộc
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID hàng loạt là bắt buộc
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID hàng loạt là bắt buộc
 DocType: Sales Person,Parent Sales Person,Người bán hàng mẹ
 DocType: Purchase Invoice,Recurring Invoice,Hóa đơn định kỳ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Quản lý dự án
@@ -1855,7 +1849,7 @@
 DocType: Budget,Fiscal Year,Năm tài chính
 DocType: Vehicle Log,Fuel Price,nhiên liệu Giá
 DocType: Budget,Budget,Ngân sách
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset mục phải là một mục không cổ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset mục phải là một mục không cổ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ngân sách không thể được chỉ định đối với {0}, vì nó không phải là một tài khoản thu nhập hoặc chi phí"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Đạt được
 DocType: Student Admission,Application Form Route,Mẫu đơn Route
@@ -1887,7 +1881,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Số tiền {0} {1} giảm trừ {2}
 DocType: Employee,Salary Information,Thông tin tiền lương
 DocType: Sales Person,Name and Employee ID,Tên và nhân viên ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
 DocType: Website Item Group,Website Item Group,Nhóm các mục Website
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Nhiệm vụ và thuế
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vui lòng nhập ngày tham khảo
@@ -1946,7 +1940,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Lặp lại Doanh thu khách hàng
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) phải có vai trò 'Người duyệt b.kê chi phí'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Đôi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
 DocType: Asset,Depreciation Schedule,Kế hoạch khấu hao
 DocType: Bank Reconciliation Detail,Against Account,Đối với tài khoản
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Nửa ngày ngày phải là giữa Từ ngày và Đến ngày
@@ -1963,13 +1957,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
 ,Quotation Trends,Các Xu hướng của báo giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
 DocType: Purchase Order,Delivered,"Nếu được chỉ định, gửi các bản tin sử dụng địa chỉ email này"
 ,Vehicle Expenses,Chi phí xe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
+DocType: Serial No,Invoice Details,Chi tiết hóa đơn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
 DocType: Purchase Receipt,Vehicle Number,Số xe
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Ngày mà hóa đơn định kỳ sẽ được dừng lại
 DocType: Employee Loan,Loan Amount,Số tiền vay
@@ -1993,7 +1988,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho nhiều qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Viết tắt ko được để trống
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Viết tắt ko được để trống
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Nhóm Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Thể thao
 DocType: Loan Type,Loan Name,Tên vay
@@ -2005,6 +2000,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Kho, nơi bạn cất giữ hàng bảo hành của hàng bị từ chối"
 DocType: Production Order,Skip Material Transfer,Bỏ qua chuyển giao vật liệu
 DocType: Production Order,Skip Material Transfer,Bỏ qua chuyển giao vật liệu
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Không thể tìm thấy tỷ giá cho {0} đến {1} cho ngày chính {2}. Vui lòng tạo một bản ghi tiền tệ bằng tay
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Năm tài chính kết thúc vào ngày của bạn
 DocType: POS Profile,Price List,Bảng giá
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} bây giờ là năm tài chính mặc định. Xin vui lòng làm mới trình duyệt của bạn để các thay đổi có hiệu lực.
@@ -2042,9 +2038,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Mục {0} đã được trả lại
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Năm tài chính** đại diện cho một năm tài chính. Tất cả các bút toán và giao dịch chủ yếu khác được theo dõi gắn với **năm tài chính **.
 DocType: Opportunity,Customer / Lead Address,Địa chỉ Khách hàng / Tiềm năng
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Chứng nhận SSL không hợp lệ đối với đính kèm {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Chứng nhận SSL không hợp lệ đối với đính kèm {0}
 DocType: Student Admission,Eligibility,Đủ điều kiện
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Dẫn giúp bạn có được kinh doanh, thêm tất cả các địa chỉ liên lạc của bạn và nhiều hơn nữa như tiềm năng của bạn"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Dẫn giúp bạn có được kinh doanh, thêm tất cả các địa chỉ liên lạc của bạn và nhiều hơn nữa như tiềm năng của bạn"
 DocType: Production Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
@@ -2085,7 +2081,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Chọn Công ty ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Để trống nếu xem xét tất cả các phòng ban
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Loại lao động (thường xuyên, hợp đồng, vv tập)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
 DocType: Process Payroll,Fortnightly,mổi tháng hai lần
 DocType: Currency Exchange,From Currency,Từ tệ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
@@ -2101,7 +2097,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Không có thể chọn loại phí như 'Mở hàng trước Số tiền' hoặc 'On Trước Row Tổng số' cho hàng đầu tiên
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Con hàng không phải là một gói sản phẩm. Hãy loại bỏ mục &#39;{0} `và tiết kiệm
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Thêm timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Thêm timesheets
 DocType: Vehicle Service,Service Item,dịch vụ hàng
 DocType: Bank Guarantee,Bank Guarantee,Bảo lãnh ngân hàng
 DocType: Bank Guarantee,Bank Guarantee,Bảo lãnh ngân hàng
@@ -2151,8 +2147,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Giá sẽ không được hiển thị nếu thực Giá liệt kê không được thiết lập
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Hãy xác định một quốc gia cho Rule Shipping này hoặc kiểm tra vận chuyển trên toàn thế giới
 DocType: Stock Entry,Total Incoming Value,Tổng giá trị Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Nợ Để được yêu cầu
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Nợ Để được yêu cầu
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Danh sách mua Giá
 DocType: Offer Letter Term,Offer Term,Offer hạn
 DocType: Quality Inspection,Quality Manager,Quản lý chất lượng
@@ -2186,14 +2182,14 @@
 DocType: Opportunity,Lost Reason,Lý do bị mất
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Địa chỉ mới
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vui lòng nhập Document Receipt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vui lòng nhập Document Receipt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vui lòng xác định hợp lệ ""Từ trường hợp số '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Further cost centers can be made under Groups but entries can be made against non-Groups
 DocType: Project,External,Bên ngoài
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Người sử dụng và Quyền
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Đơn đặt hàng sản xuất đã tạo: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},Đơn đặt hàng sản xuất đã tạo: {0}
 DocType: Branch,Branch,Chi Nhánh
 DocType: Guardian,Mobile Number,Số điện thoại
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,In ấn và xây dựng thương hiệu
@@ -2202,7 +2198,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Số thứ tự {0} không tìm thấy
 DocType: Scheduling Tool,Student Batch,hàng loạt sinh viên
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Khách hàng của bạn
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Hãy Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Hãy Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Bạn được lời mời cộng tác trong dự án: {0}
 DocType: Leave Block List Date,Block Date,Block Date
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Áp dụng ngay bây giờ
@@ -2226,8 +2222,9 @@
 DocType: SMS Log,Sent To,Gửi Đến
 DocType: Payment Request,Make Sales Invoice,Làm Mua hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,phần mềm
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Ngày Liên hệ Tiếp theo không thể trong quá khứ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Ngày Liên hệ Tiếp theo không thể trong quá khứ
 DocType: Company,For Reference Only.,Chỉ để tham khảo.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,Chọn Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Không hợp lệ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Số tiền ứng trước
@@ -2241,7 +2238,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Trường hợp số không thể là 0
 DocType: Item,Show a slideshow at the top of the page,Hiển thị một slideshow ở trên cùng của trang
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Cửa hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Cửa hàng
 DocType: Serial No,Delivery Time,Thời gian giao hàng
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Người cao tuổi Dựa trên
 DocType: Item,End of Life,Kết thúc của cuộc sống
@@ -2257,8 +2254,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Vật liệu chuyển
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Xác định các hoạt động, chi phí vận hành và cung cấp cho một hoạt động độc đáo không để các hoạt động của bạn."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tài liệu này là qua giới hạn bởi {0} {1} cho mục {4}. bạn đang làm cho một {3} so với cùng {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,tài khoản số lượng Chọn thay đổi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,tài khoản số lượng Chọn thay đổi
 DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
 DocType: Stock Settings,Allow Negative Stock,Cho phép tồn kho âm
@@ -2269,7 +2266,7 @@
 DocType: Budget Account,Budget Account,Tài khoản ngân sách
 DocType: Quality Inspection,Verified By,Xác nhận bởi
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Không thể thay đổi tiền tệ mặc định của công ty, bởi vì có giao dịch hiện có. Giao dịch phải được hủy bỏ để thay đổi tiền tệ mặc định."
-DocType: Grade Interval,Grade Description,lớp Mô tả
+DocType: Grading Scale Interval,Grade Description,lớp Mô tả
 DocType: Stock Entry,Purchase Receipt No,Mua hóa đơn Không
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Tiền một cách nghiêm túc
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
@@ -2307,7 +2304,7 @@
 DocType: Upload Attendance,Attendance To Date,Có mặt đến ngày
 DocType: Warranty Claim,Raised By,Nâng By
 DocType: Payment Gateway Account,Payment Account,Tài khoản thanh toán
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Thay đổi ròng trong tài khoản phải thu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Đền bù Tắt
 DocType: Offer Letter,Accepted,Chấp nhận
@@ -2321,7 +2318,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Diễn đàn người dùng
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Tạp chí nhanh chóng nhập
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu BOM đã được đối ứng với vật tư bất kỳ.
 DocType: Employee,Previous Work Experience,Kinh nghiệm làm việc trước đây
@@ -2335,7 +2332,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Tên của viện mà bạn đang thiết lập hệ thống này.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bút toán hạch toán đã đóng băng đến ngày này, không ai có thể làm / sửa đổi nào ngoại trừ người có vai trò xác định dưới đây."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Xin vui lòng lưu các tài liệu trước khi tạo ra lịch trình bảo trì
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Xin vui lòng lưu các tài liệu trước khi tạo ra lịch trình bảo trì
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Tình trạng dự án
 DocType: UOM,Check this to disallow fractions. (for Nos),Kiểm tra này để không cho phép các phần phân đoạn. (Cho Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Các đơn đặt hàng sản xuất sau đây được tạo ra:
@@ -2358,6 +2355,7 @@
 DocType: Email Digest,How frequently?,Làm thế nào thường xuyên?
 DocType: Purchase Receipt,Get Current Stock,Lấy tồn kho hiện tại
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Cây Bill Vật liệu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
 DocType: Student,Joining Date,Tham gia ngày
 ,Employees working on a holiday,Nhân viên làm việc trên một kỳ nghỉ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Đánh dấu hiện tại
@@ -2439,7 +2437,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Ngày chốt sổ không được đề cập
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Sản xuất
 DocType: Guardian,Occupation,nghề
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Tổng số (SL)
 DocType: Sales Invoice,This Document,Tài liệu này
 DocType: Installation Note Item,Installed Qty,Số lượng cài đặt
@@ -2462,8 +2460,8 @@
 DocType: Notification Control,Sales Order Message,Thông báo đơn đặt hàng
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Thiết lập giá trị mặc định như Công ty, tiền tệ, năm tài chính hiện tại, vv"
 DocType: Payment Entry,Payment Type,Loại thanh toán
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
 DocType: Process Payroll,Select Employees,Chọn nhân viên
 DocType: Opportunity,Potential Sales Deal,Sales tiềm năng Deal
 DocType: Payment Entry,Cheque/Reference Date,Séc / Ngày tham chiếu
@@ -2480,7 +2478,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Hồ sơ điểm bán hàng tiêu chuẩn {0} đã được tạo ra cho công ty {1}
 DocType: Purchase Order,Ref SQ,Tài liệu tham khảo SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Thay thế tiết / BOM trong tất cả BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,tài liệu nhận phải nộp
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,tài liệu nhận phải nộp
 DocType: Purchase Invoice Item,Received Qty,Nhận được lượng
 DocType: Stock Entry Detail,Serial No / Batch,Không nối tiếp / hàng loạt
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Không trả tiền và không Delivered
@@ -2493,7 +2491,7 @@
 ,To Produce,Để sản xuất
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bảng lương
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Đối với hàng {0} trong {1}. Để bao gồm {2} tỷ lệ Item, hàng {3} cũng phải được bao gồm"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Tạo người dùng
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Tạo người dùng
 DocType: Packing Slip,Identification of the package for the delivery (for print),Xác định các gói cho việc cung cấp (đối với in)
 DocType: Bin,Reserved Quantity,Ltd Số lượng
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vui lòng nhập địa chỉ email hợp lệ
@@ -2507,11 +2505,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,mẫu khuyết tật không phải là mẫu mặc định
 DocType: Account,Income Account,Tài khoản thu nhập
 DocType: Payment Request,Amount in customer's currency,Tiền quy đổi theo ngoại tệ của khách
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,Giao hàng
 DocType: Stock Reconciliation Item,Current Qty,Số lượng hiện tại
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Xem ""Tỷ lệ Of Vật liệu Dựa trên"" trong mục Chi phí"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Trước đó
 DocType: Appraisal Goal,Key Responsibility Area,Diện tích Trách nhiệm chính
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Lô Student giúp bạn theo dõi chuyên cần, đánh giá và lệ phí cho sinh viên"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Lô Student giúp bạn theo dõi chuyên cần, đánh giá và lệ phí cho sinh viên"
 DocType: Payment Entry,Total Allocated Amount,Tổng số tiền phân bổ
 DocType: Item Reorder,Material Request Type,Tài liệu theo yêu cầu Loại
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry for lương từ {0} đến {1}
@@ -2534,7 +2533,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Theo dõi Tiềm năng theo Loại Ngành.
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập thông số hàng tồn kho
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
@@ -2544,6 +2543,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Sẽ gửi một email về các sự kiện để nhân viên có tư cách &#39;mở&#39;
 DocType: Task,Depends on Tasks,Phụ thuộc vào nhiệm vụ
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Cây thư mục Quản lý Nhóm khách hàng
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Các tệp đính kèm có thể được hiển thị mà không cần bật giỏ hàng
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Tên Bộ phận Chi phí mới
 DocType: Leave Control Panel,Leave Control Panel,Để lại Control Panel
@@ -2556,12 +2556,10 @@
 DocType: Sales Invoice,Debit To,Để ghi nợ
 DocType: Delivery Note,Required only for sample item.,Yêu cầu chỉ cho mục mẫu.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Số lượng thực tế Sau khi giao dịch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Không trượt lương tìm thấy giữa {0} và {1}
 ,Pending SO Items For Purchase Request,Trong khi chờ SO mục Đối với mua Yêu cầu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Tuyển sinh
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} bị vô hiệu
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} bị vô hiệu
 DocType: Supplier,Billing Currency,Ngoại tệ thanh toán
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Cực lớn
@@ -2578,7 +2576,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Sản phẩm nổi bật trang chủ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tất cả đánh giá Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Mới Tên kho
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Tổng số {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Tổng số {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Địa bàn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
 DocType: Stock Settings,Default Valuation Method,Phương pháp mặc định Định giá
@@ -2596,7 +2594,7 @@
 DocType: Price List,Price List Master,Giá Danh sách Thầy
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tất cả các giao dịch bán hàng đều được gắn tag với nhiều **Nhân viên kd **  vì thế bạn có thể thiết lập và giám sát các mục tiêu kinh doanh
 ,S.O. No.,SO số
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Vui lòng tạo Khách hàng từ Tiềm năng {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Vui lòng tạo Khách hàng từ Tiềm năng {0}
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Chỉ Rời khỏi ứng dụng với tình trạng &#39;Chấp Nhận&#39; và &#39;từ chối&#39; có thể được gửi
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Tên sinh viên Group là bắt buộc trong hàng {0}
@@ -2689,7 +2687,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Hạch toán kế toán cho hàng tồn kho
 DocType: Vehicle Service,Engine Oil,Dầu động cơ
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
 DocType: Employee Loan,Loan Details,Chi tiết vay
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Đã hoàn thành Số lượng phải lớn hơn không.
@@ -2754,7 +2752,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang nhóm.
 DocType: Assessment Result Tool,Result HTML,kết quả HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Hết hạn vào
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Thêm sinh viên
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Thêm sinh viên
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vui lòng chọn {0}
 DocType: C-Form,C-Form No,C-Mẫu Không
 DocType: BOM,Exploded_items,Exploded_items
@@ -2819,7 +2817,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Giới hạn Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Vốn đầu tư mạo hiểm
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Một học kỳ với điều này &quot;Academic Year &#39;{0} và&#39; Tên hạn &#39;{1} đã tồn tại. Hãy thay đổi những mục này và thử lại.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Như có những giao dịch hiện tại chống lại {0} mục, bạn không thể thay đổi giá trị của {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Như có những giao dịch hiện tại chống lại {0} mục, bạn không thể thay đổi giá trị của {1}"
 DocType: UOM,Must be Whole Number,Phải có nguyên số
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lá mới phân bổ (Trong ngày)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Không nối tiếp {0} không tồn tại
@@ -2863,7 +2861,7 @@
 DocType: Supplier,Last Day of the Next Month,Ngày cuối cùng của tháng kế tiếp
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue gần sau 7 ngày
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Để lại không thể được phân bổ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý:  ngày tham chiếu/đến hạn vượt quá số ngày được phép của khách hàng là {0} ngày
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý:  ngày tham chiếu/đến hạn vượt quá số ngày được phép của khách hàng là {0} ngày
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,sinh viên nộp đơn
 DocType: Asset Category Account,Accumulated Depreciation Account,Tài khoản khấu hao lũy kế
 DocType: Stock Settings,Freeze Stock Entries,Đóng băng Cổ Entries
@@ -2891,8 +2889,8 @@
 DocType: Asset,Item Code,Mã hàng
 DocType: Production Planning Tool,Create Production Orders,Tạo đơn đặt hàng sản xuất
 DocType: Serial No,Warranty / AMC Details,Bảo hành /chi tiết AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho nhóm dựa trên hoạt động
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho nhóm dựa trên hoạt động
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
 DocType: Journal Entry,User Remark,Người sử dụng Ghi chú
 DocType: Lead,Market Segment,Phân khúc thị trường
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Số tiền trả không có thể lớn hơn tổng số dư âm {0}
@@ -2911,7 +2909,7 @@
 DocType: Production Planning Tool,Create Material Requests,Các yêu cầu tạo ra vật liệu
 DocType: Employee Education,School/University,Học / Đại học
 DocType: Payment Request,Reference Details,Chi tiết tham khảo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Giá trị dự kiến After Life viết phải nhỏ hơn tổng tiền mua hàng
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Giá trị dự kiến After Life viết phải nhỏ hơn tổng tiền mua hàng
 DocType: Sales Invoice Item,Available Qty at Warehouse,Số lượng có sẵn tại kho
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Số tiền trên Bill
 DocType: Asset,Double Declining Balance,Đôi Balance sụt giảm
@@ -2932,19 +2930,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Số tiền giải ngân không thể lớn hơn Số tiền vay {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Sản xuất theo thứ tự không được tạo ra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,Sản xuất theo thứ tự không được tạo ra
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ Ngày' phải sau 'Đến Ngày'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Không thể thay đổi tình trạng như sinh viên {0} được liên kết với các ứng dụng sinh viên {1}
 DocType: Asset,Fully Depreciated,khấu hao hết
 ,Stock Projected Qty,Dự kiến cổ phiếu Số lượng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Attendance đánh dấu HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Báo giá là đề nghị, giá thầu bạn đã gửi cho khách hàng của bạn"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Báo giá là đề nghị, giá thầu bạn đã gửi cho khách hàng của bạn"
 DocType: Sales Order,Customer's Purchase Order,Đơn Mua hàng của khách hàng
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Số thứ tự và hàng loạt
 DocType: Warranty Claim,From Company,Từ Công ty
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Sum của Điểm của tiêu chí đánh giá cần {0} được.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Hãy thiết lập Số khấu hao Thẻ vàng
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Hãy thiết lập Số khấu hao Thẻ vàng
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Giá trị hoặc lượng
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Đơn đặt hàng sản xuất không thể được nâng lên cho:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Phút
@@ -3075,7 +3073,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Nhóm sinh viên
 DocType: Shopping Cart Settings,Quotation Series,Báo giá seri
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vui lòng chọn của khách hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,Vui lòng chọn của khách hàng
 DocType: C-Form,I,tôi
 DocType: Company,Asset Depreciation Cost Center,Chi phí bộ phận - khấu hao tài sản
 DocType: Sales Order Item,Sales Order Date,Ngày đơn đặt hàng
@@ -3094,19 +3092,18 @@
 DocType: Vehicle,Insurance Details,Chi tiết bảo hiểm
 DocType: Account,Payable,Phải nộp
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vui lòng nhập kỳ hạn trả nợ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Con nợ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Con nợ ({0})
 DocType: Pricing Rule,Margin,Biên
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Khách hàng mới
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Lợi nhuận gộp%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Ngày chốt sổ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Tổng tiền mua hàng là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Tổng tiền mua hàng là bắt buộc
 DocType: Lead,Address Desc,Giải quyết quyết định
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Đảng là bắt buộc
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Tên chủ đề
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Ít nhất bán hàng hoặc mua hàng phải được lựa chọn
-DocType: Grading Structure,Grade Intervals,Khoảng lớp
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Chọn bản chất của doanh nghiệp của bạn.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Trường hợp hoạt động sản xuất được thực hiện.
 DocType: Asset Movement,Source Warehouse,Kho nguồn
@@ -3135,6 +3132,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
 DocType: Territory,Territory Targets,Địa bàn Mục tiêu
 DocType: Delivery Note,Transporter Info,Thông tin vận chuyển
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Hãy thiết lập mặc định {0} trong Công ty {1}
 DocType: Cheque Print Template,Starting position from top edge,Bắt đầu từ vị trí từ cạnh trên
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Cùng nhà cung cấp đã được nhập nhiều lần
@@ -3188,7 +3186,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Sắp xếp lại Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Hiện tại Hở Job
 DocType: Company,Stock Adjustment Account,Tài khoản Điều chỉnh Hàng tồn kho
-DocType: Journal Entry,Write Off,Viết một bài báo
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Viết một bài báo
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Hệ thống người dùng (đăng nhập) ID. Nếu được thiết lập, nó sẽ trở thành mặc định cho tất cả các hình thức nhân sự."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Từ {1}
@@ -3199,8 +3197,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Nhà cung cấp mang đến cho khách hàng
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/vật tư/{0}) đã hết
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Ngày tiếp theo phải lớn hơn gửi bài ngày
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Hiện thuế break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Ngày đến hạn /ngày tham chiếu không được sau {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Ngày đến hạn /ngày tham chiếu không được sau {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Số liệu nhập khẩu và xuất khẩu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","mục chứng khoán tồn tại đối với kho {0}, do đó bạn có thể không giao lại hoặc sửa đổi nó"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Không có học sinh Tìm thấy
@@ -3212,14 +3210,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vui lòng chọn viết bài ngày trước khi lựa chọn Đảng
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Của AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vui lòng chọn Báo giá
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vui lòng chọn Báo giá
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ với người có vai trò Quản lý Bán hàng Chính {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vui lòng chọn Báo giá
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vui lòng chọn Báo giá
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ với người có vai trò Quản lý Bán hàng Chính {0}
 DocType: Company,Default Cash Account,Tài khoản mặc định tiền
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Quản trị Công ty (không phải khách hàng hoặc nhà cung cấp)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Điều này được dựa trên sự tham gia của sinh viên này
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,Không có Sinh viên trong
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Thêm nhiều mặt hàng hoặc hình thức mở đầy đủ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Vui lòng nhập 'ngày dự kiến giao hàng'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Phiếu giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
@@ -3266,9 +3265,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Trước khi reconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Để {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Thuế và Phí bổ xung (tiền tệ công ty)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
 DocType: Sales Order,Partly Billed,Được quảng cáo một phần
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Mục {0} phải là một tài sản cố định mục
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Mục {0} phải là một tài sản cố định mục
 DocType: Item,Default BOM,Mặc định HĐQT
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Hãy gõ lại tên công ty để xác nhận
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Tổng số nợ Amt
@@ -3291,7 +3290,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Danh sách Tỷ giá
 DocType: Purchase Invoice Item,Rate,Đơn giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Tập
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Tên địa chỉ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,Tên địa chỉ
 DocType: Stock Entry,From BOM,Từ BOM
 DocType: Assessment Code,Assessment Code,Mã Đánh giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Cơ bản
@@ -3316,7 +3315,7 @@
 DocType: Purchase Invoice,Print Language,In Ngôn ngữ
 DocType: Salary Slip,Total Working Hours,Tổng số giờ làm việc
 DocType: Stock Entry,Including items for sub assemblies,Bao gồm các mặt hàng cho các tiểu hội
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Nhập giá trị phải được tích cực
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,Nhập giá trị phải được tích cực
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Tất cả các vùng lãnh thổ
 DocType: Purchase Invoice,Items,Khoản mục
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Sinh viên đã được ghi danh.
@@ -3336,17 +3335,15 @@
 DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"""Từ ngày đến ngày"" phải có"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tính toán dựa trên
 DocType: Delivery Note Item,From Warehouse,Từ kho
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Không Items với Tuyên ngôn Nhân Vật liệu để sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,Không Items với Tuyên ngôn Nhân Vật liệu để sản xuất
 DocType: Assessment Plan,Supervisor Name,Tên Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Khóa học ghi danh chương trình
 DocType: Program Enrollment Course,Program Enrollment Course,Khóa học ghi danh chương trình
-DocType: Grading Structure,Grading Structure,cấu trúc phân loại
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
 DocType: Tax Rule,Shipping City,Vận Chuyển Thành phố
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Mục này là một biến thể của {0} (Template). Các thuộc tính sẽ được sao chép từ các mẫu trừ 'Không Copy' được thiết lập
 DocType: Notification Control,Customize the Notification,Tùy chỉnh thông báo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Lưu chuyển tiền tệ từ hoạt động
 DocType: Sales Invoice,Shipping Rule,Quy tắc giao hàng
@@ -3369,6 +3366,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Không có Hội đồng quản trị mặc định tồn tại cho mục {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Khai mạc ngày nên trước ngày kết thúc
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Chi phí bộ phận với các phát sinh hiện có không thể được chuyển đổi sang sổ cái
 DocType: Department,Days for which Holidays are blocked for this department.,Ngày mà ngày lễ sẽ bị chặn cho bộ phận này.
@@ -3397,7 +3395,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Tổng số (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 DocType: Quality Inspection,Item Serial No,Mục Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Tạo nhân viên ghi
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Tạo nhân viên ghi
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Tổng số hiện tại
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Báo cáo kế toán
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Giờ
@@ -3412,8 +3410,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,Hội đồng quản trị mới sau khi thay thế
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Điểm bán hàng
 DocType: Payment Entry,Received Amount,Số tiền nhận được
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Tạo cho số lượng đầy đủ, bỏ qua số lượng đã đặt hàng"
 DocType: Account,Tax,Thuế
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,không đánh dấu
@@ -3426,7 +3422,7 @@
 DocType: Batch,Source Document Name,Tên tài liệu nguồn
 DocType: Batch,Source Document Name,Tên tài liệu nguồn
 DocType: Job Opening,Job Title,Chức vụ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,tạo người dùng
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,tạo người dùng
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Thăm báo cáo cho các cuộc gọi bảo trì.
@@ -3438,8 +3434,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
 DocType: BOM,Website Description,Mô tả Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Thay đổi ròng trong vốn chủ sở hữu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Hãy hủy mua hóa đơn {0} đầu tiên
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Hãy hủy mua hóa đơn {0} đầu tiên
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
 DocType: Serial No,AMC Expiry Date,Ngày hết hạn hợp đồng bảo hành (AMC)
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Biên lai
 ,Sales Register,Đăng ký bán hàng
@@ -3450,16 +3446,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Không có gì phải chỉnh sửa là.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
 DocType: Customer Group,Customer Group Name,Tên Nhóm khách hàng
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Chưa có Khách!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Số tiền cho vay không thể vượt quá Số tiền cho vay tối đa của {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,giấy phép
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
 DocType: GL Entry,Against Voucher Type,Loại chống lại Voucher
 DocType: Item,Attributes,Thuộc tính
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order ngày
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tài khoản {0} không thuộc về công ty {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
 DocType: Student,Guardian Details,Chi tiết người giám hộ
 DocType: C-Form,C-Form,C-Mẫu
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Đánh dấu chấm cho nhiều nhân viên
@@ -3484,14 +3482,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Tài khoản phải được loại &#39;tài sản cố định &quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Số lượng ra
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Quy tắc để tính toán tiền vận chuyển để bán
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series là bắt buộc
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series là bắt buộc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Dịch vụ tài chính
 DocType: Student Sibling,Student ID,thẻ học sinh
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Các loại hoạt động Thời gian Logs
 DocType: Tax Rule,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
 DocType: Training Event,Exam,Thi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
 DocType: Leave Allocation,Unused leaves,Lá chưa sử dụng
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Bang thanh toán
@@ -3524,7 +3522,7 @@
 DocType: Payment Entry,Account Paid From,Tài khoản Trích nợ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nguyên liệu Item Code
 DocType: Journal Entry,Write Off Based On,Viết Tắt Dựa trên
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Hãy Chì
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Hãy Chì
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,In và Văn phòng phẩm
 DocType: Stock Settings,Show Barcode Field,Hiện Dòng mã vạch
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Gửi email Nhà cung cấp
@@ -3540,6 +3538,7 @@
 DocType: Offer Letter,Awaiting Response,Đang chờ Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ở trên
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Đề cập đến tài khoản phải trả phi tiêu chuẩn
 DocType: Salary Slip,Earning & Deduction,Thu nhập và khoản giảm trừ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc xem các giao dịch khác nhau.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Tỷ lệ tiêu cực Định giá không được phép
@@ -3576,7 +3575,7 @@
 DocType: Program Enrollment Tool,Get Students From,Nhận Sinh viên Từ
 DocType: Hub Settings,Seller Country,Người bán Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Xuất bản mục trên Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Nhóm sinh viên của bạn theo lô
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Nhóm sinh viên của bạn theo lô
 DocType: Authorization Rule,Authorization Rule,Quy tắc ủy quyền
 DocType: Sales Invoice,Terms and Conditions Details,Điều khoản và Điều kiện chi tiết
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Thông số kỹ thuật
@@ -3635,7 +3634,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Quản chế
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Linh kiện lương
 DocType: Program Enrollment Tool,New Academic Year,Năm mới học
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Tổng số tiền trả
 DocType: Production Order Item,Transferred Qty,Số lượng chuyển giao
@@ -3676,6 +3675,7 @@
 ,Sales Funnel,Kênh bán hàng
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Tên viết tắt là bắt buộc
 DocType: Project,Task Progress,Tiến độ công việc
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Xe đẩy
 ,Qty to Transfer,Số lượng để chuyển
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Báo giá cho Tiềm năng hoặc Khách hàng.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vai trò được phép chỉnh sửa cổ đông lạnh
@@ -3709,7 +3709,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,thu thập Phí
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
 DocType: Lead,Add to calendar on this date,thêm ngày này vào lịch công tác
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Quy tắc để thêm chi phí vận chuyển.
 DocType: Item,Opening Stock,mở Cổ
@@ -3728,7 +3728,7 @@
 DocType: Customer,From Lead,Từ Tiềm năng
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Đơn đặt hàng phát hành để sản xuất.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Chọn năm tài chính ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Program Enrollment Tool,Enroll Students,Ghi danh học sinh
 DocType: Hub Settings,Name Token,Tên Mã
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Tiêu chuẩn bán hàng
@@ -3739,7 +3739,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} gắn với Hóa đơn bán hàng {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Tên dự án
-DocType: Supplier,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
+DocType: Customer,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
 DocType: Journal Entry Account,If Income or Expense,Nếu thu nhập hoặc chi phí
 DocType: Production Order,Required Items,mục bắt buộc
 DocType: Stock Ledger Entry,Stock Value Difference,Giá trị cổ phiếu khác biệt
@@ -3770,6 +3770,7 @@
 DocType: Item,Taxes,Thuế
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Paid và Không Delivered
 DocType: Project,Default Cost Center,Bộ phận chi phí mặc định
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
 DocType: Bank Guarantee,End Date,Ngày kết thúc
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Giao dịch hàng tồn kho
 DocType: Budget,Budget Accounts,Tài khoản ngân sách
@@ -3834,7 +3835,7 @@
 DocType: Customer,Sales Partner and Commission,Đại lý bán hàng và hoa hồng
 DocType: Employee Loan,Rate of Interest (%) / Year,Tỷ lệ lãi (%) / năm
 ,Project Quantity,Dự án Số lượng
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi &#39;Distribute Phí Dựa On&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi &#39;Distribute Phí Dựa On&#39;"
 DocType: Opportunity,To Discuss,Để thảo luận
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} đơn vị của {1} cần thiết trong {2} để hoàn thành giao dịch này.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tỷ lệ lãi (%) hàng năm
@@ -3857,7 +3858,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Đánh dấu Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Tiền tệ của BOM # {1} phải bằng tiền mà bạn chọn {2}
 DocType: Journal Entry Account,Exchange Rate,Tỷ giá
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
 DocType: Homepage,Tag Line,Dòng Tag
 DocType: Fee Component,Fee Component,phí Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Quản lý đội tàu
@@ -3874,7 +3875,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Kho {0} không tồn tại
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Đăng ký các ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Tỷ lệ phân phối hàng tháng
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tỷ lệ đánh giá không tìm thấy cho {0} Item, được yêu cầu để làm bút toán cho {1} {2}. Nếu mục được giao dịch như là một mục mẫu trong {1}, hãy đề cập rằng trong {1} mục bảng. Nếu không, hãy tạo ra một giao dịch chứng khoán đến cho tỷ lệ định giá mục hoặc đề cập trong hồ sơ Item, và sau đó thử submiting / hủy mục này"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% của NVL đã được giao gắn với BB Giao hàng này
 DocType: Project,Customer Details,Chi tiết khách hàng
@@ -3891,7 +3892,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,đơn đặt hàng gửi không thể bị xóa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tài khoản đang dư Nợ, bạn không được phép thiết lập 'Số Dư TK phải' là 'Có'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Quản lý chất lượng
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Mục {0} đã bị vô hiệu hóa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Mục {0} đã bị vô hiệu hóa
 DocType: Employee Loan,Repay Fixed Amount per Period,Trả cố định Số tiền cho mỗi thời kỳ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
 DocType: Employee External Work History,Employee External Work History,Nhân viên làm việc ngoài Lịch sử
@@ -3918,7 +3919,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Email ID Sinh viên
 DocType: Employee,Notice (days),Thông báo (ngày)
 DocType: Tax Rule,Sales Tax Template,Template Thuế bán hàng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Chọn mục để lưu các hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,Chọn mục để lưu các hoá đơn
 DocType: Employee,Encashment Date,Encashment Date
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Điều chỉnh hàng tồn kho
@@ -3952,6 +3953,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Ban hành
 DocType: Production Order,Warehouses,Kho
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tài sản không thể được chuyển giao
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Mục này là một biến thể của {0} (Bản mẫu).
 DocType: Workstation,per hour,mỗi giờ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Thu mua
 DocType: Announcement,Announcement,Thông báo
@@ -3967,7 +3969,7 @@
 DocType: Account,Receivable,Thu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Không được phép thay đổi Supplier Mua hàng đã tồn tại
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Vai trò được phép trình giao dịch vượt quá hạn mức tín dụng được thiết lập.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Chọn mục để Sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,Chọn mục để Sản xuất
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Thạc sĩ dữ liệu đồng bộ, nó có thể mất một thời gian"
 DocType: Item,Material Issue,Phát hành tài liệu
 DocType: Hub Settings,Seller Description,Người bán Mô tả
@@ -3980,7 +3982,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ra lệnh
 DocType: Salary Detail,Component,Hợp phần
 DocType: Assessment Criteria,Assessment Criteria Group,Các tiêu chí đánh giá Nhóm
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Mở Khấu hao lũy kế phải nhỏ hơn bằng {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Mở Khấu hao lũy kế phải nhỏ hơn bằng {0}
 DocType: Warehouse,Warehouse Name,Tên kho
 DocType: Naming Series,Select Transaction,Chọn giao dịch
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vui lòng nhập Phê duyệt hoặc phê duyệt Vai trò tài
@@ -4015,7 +4017,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Thiết lập năm tài chính này như mặc định, nhấp vào 'Set as Default'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Tham gia
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
 DocType: Employee Loan,Repay from Salary,Trả nợ từ lương
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Yêu cầu thanh toán đối với {0} {1} cho số tiền {2}
@@ -4033,7 +4035,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Đánh giá kết quả chi tiết
 DocType: Employee Education,Employee Education,Giáo dục nhân viên
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,nhóm mục trùng lặp được tìm thấy trong bảng nhóm mục
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
 DocType: Salary Slip,Net Pay,Net phải trả tiền
 DocType: Account,Account,Tài khoản
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Không nối tiếp {0} đã được nhận
@@ -4042,7 +4044,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Kho {0} không liên kết với bất kỳ tài khoản, xin vui lòng tạo / liên kết các tài khoản tương ứng (tài sản) cho các kho hàng."
 DocType: Purchase Invoice,Recurring Id,Id định kỳ
 DocType: Customer,Sales Team Details,Thông tin chi tiết Nhóm bán hàng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Xóa vĩnh viễn?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,Xóa vĩnh viễn?
 DocType: Expense Claim,Total Claimed Amount,Tổng số tiền tuyên bố chủ quyền
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Cơ hội tiềm năng bán hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Không hợp lệ {0}
@@ -4053,13 +4055,14 @@
 DocType: Warehouse,PIN,GHIM
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Thiết lập trường của mình trong ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Thay đổi Số tiền cơ sở (Công ty ngoại tệ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Lưu tài liệu đầu tiên.
 DocType: Account,Chargeable,Buộc tội
 DocType: Company,Change Abbreviation,Thay đổi Tên viết tắt
 DocType: Expense Claim Detail,Expense Date,Ngày Chi phí
 DocType: Item,Max Discount (%),Giảm giá tối đa (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Số tiền Last Order
+DocType: Task,Is Milestone,Là Milestone
 DocType: Daily Work Summary,Email Sent To,Thư điện tử đã được gửi đến
 DocType: Budget,Warn,Cảnh báo
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bất kỳ nhận xét khác, nỗ lực đáng chú ý mà nên đi vào biên bản."
@@ -4092,11 +4095,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'đóng băng hàng tồn kho muộn hơn' nên nhỏ hơn %d ngày
 DocType: Tax Rule,Purchase Tax Template,Mua Template Thuế
 ,Project wise Stock Tracking,Theo dõi biến động vật tư theo dự án
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Lịch trình bảo trì {0} tồn tại đối với {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Số lượng thực tế (at source/target)
 DocType: Item Customer Detail,Ref Code,Tài liệu tham khảo Mã
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Hồ sơ nhân viên.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
 DocType: HR Settings,Payroll Settings,Thiết lập bảng lương
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Phù hợp với hoá đơn không liên kết và Thanh toán.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Đặt hàng
@@ -4119,7 +4121,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Chi phiếu và tiền gửi không đúng xóa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Tài khoản {0}: Bạn không thể chỉ định chính nó làm tài khoản mẹ
 DocType: Purchase Invoice Item,Price List Rate,bảng báo giá
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Tạo dấu ngoặc kép của khách hàng
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Tạo dấu ngoặc kép của khách hàng
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Hiển thị ""hàng"" hoặc ""Không trong kho"" dựa trên cổ phiếu có sẵn trong kho này."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Thời gian trung bình thực hiện bởi các nhà cung cấp để cung cấp
@@ -4141,7 +4143,7 @@
 DocType: Asset,Disposal Date,Xử ngày
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email sẽ được gửi đến tất cả các nhân viên tích cực của công ty tại các giờ nhất định, nếu họ không có ngày nghỉ. Tóm tắt phản hồi sẽ được gửi vào lúc nửa đêm."
 DocType: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo mất, bởi vì báo giá đã được thực hiện."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Đào tạo phản hồi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
@@ -4149,7 +4151,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tất nhiên là bắt buộc trong hàng {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Cho đến nay không có thể trước khi từ ngày
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Thêm / Sửa giá
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Cheque Print Template,Cheque Print Template,Mẫu In Séc
@@ -4194,7 +4196,7 @@
 DocType: Item,Variant Based On,Ngôn ngữ địa phương dựa trên
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Tổng số weightage giao nên được 100%. Nó là {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Các nhà cung cấp của bạn
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Không thể thiết lập là ""thất bại"" vì đơn đặt hàng đã được tạo"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Không thể thiết lập là ""thất bại"" vì đơn đặt hàng đã được tạo"
 DocType: Request for Quotation Item,Supplier Part No,Nhà cung cấp Phần Không
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',không thể trừ khi mục là cho &#39;định giá&#39; hoặc &#39;Vaulation và Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Nhận được từ
@@ -4204,7 +4206,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Từ {0} cho {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Giờ giá trị phải lớn hơn không.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
 DocType: Issue,Content Type,Loại nội dung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
@@ -4213,20 +4215,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đóng băng
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,Từ Invoice ngày
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,tiền tệ thanh toán phải bằng tiền tệ hoặc tài khoản bên tệ hoặc là mặc định của comapany
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,tiền tệ thanh toán phải bằng tiền tệ hoặc tài khoản bên tệ hoặc là mặc định của comapany
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Nhận chi phiếu
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Nó làm gì?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,đến kho
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tất cả Tuyển sinh Sinh viên
 ,Average Commission Rate,Ủy ban trung bình Tỷ giá
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Có Số Serial' không thể là 'Có' cho hàng hóa không nhập kho
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Có Số Serial' không thể là 'Có' cho hàng hóa không nhập kho
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Không thể Chấm công cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
 DocType: School House,House Name,Tên nhà
 DocType: Purchase Taxes and Charges,Account Head,Tài khoản chính
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Cập nhật chi phí bổ sung để tính toán chi phí hạ cánh của các mặt hàng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Hệ thống điện
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Thêm phần còn lại của tổ chức của bạn như người dùng của bạn. Bạn cũng có thể thêm mời khách hàng đến cổng thông tin của bạn bằng cách thêm chúng từ Danh bạ
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Thêm phần còn lại của tổ chức của bạn như người dùng của bạn. Bạn cũng có thể thêm mời khách hàng đến cổng thông tin của bạn bằng cách thêm chúng từ Danh bạ
 DocType: Stock Entry,Total Value Difference (Out - In),Tổng giá trị khác biệt (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Hàng {0}: Tỷ giá là bắt buộc
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID người dùng không thiết lập cho nhân viên {0}
@@ -4235,7 +4237,7 @@
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Nhắc ngày sinh nhật cho {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Kể từ ngày thứ tự cuối
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
 DocType: Buying Settings,Naming Series,Đặt tên dòng
 DocType: Leave Block List,Leave Block List Name,Để lại Block List Tên
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ngày Bảo hiểm bắt đầu phải ít hơn ngày Bảo hiểm End
@@ -4250,7 +4252,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Mức lương Slip của nhân viên {0} đã được tạo ra cho bảng thời gian {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Mục {0} bị vô hiệu hóa
 DocType: Stock Settings,Stock Frozen Upto,"Cổ đông lạnh HCM,"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM không chứa bất kỳ mục chứng khoán
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Từ giai đoạn và thời gian Để ngày bắt buộc cho kỳ {0}
@@ -4263,7 +4265,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Công ty tiền tệ)
 DocType: Sales Invoice Timesheet,Billing Hours,Giờ Thanh toán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM mặc định cho {0} không tìm thấy
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Chạm vào mục để thêm chúng vào đây
 DocType: Fees,Program Enrollment,chương trình tuyển sinh
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Chi phí hạ cánh
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Hãy đặt {0}
@@ -4365,7 +4368,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
 DocType: Issue,First Responded On,Đã trả lời đầu tiên On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Hội Chữ thập Danh bạ nhà hàng ở nhiều nhóm
-DocType: Grade Interval,Grade Interval,lớp Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ngày bắt đầu năm tài chính và ngày kết thúc năm tài chính đã được thiết lập trong năm tài chính {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Ngày cập nhật
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Phân chia
@@ -4374,6 +4376,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Tải về PDF
 DocType: Production Order,Planned End Date,Kế hoạch End ngày
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Nơi các mặt hàng được lưu trữ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 DocType: Request for Quotation,Supplier Detail,Nhà cung cấp chi tiết
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Lỗi trong công thức hoặc điều kiện: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Số tiền ghi trên hoá đơn
@@ -4419,7 +4422,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Thiết lập một trang web đơn giản cho tổ chức của tôi
 DocType: Payment Reconciliation,Receivable / Payable Account,Thu / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Theo hàng hóa được đặt mua
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ngân sách không thể được chỉ định đối với tài khoản Nhóm {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vui lòng nhập trung tâm chi phí cha mẹ
@@ -4479,7 +4482,7 @@
 ,Items To Be Requested,Các mục được yêu cầu
 DocType: Purchase Order,Get Last Purchase Rate,Nhận cuối Rate
 DocType: Company,Company Info,Thông tin công ty
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Chọn hoặc thêm khách hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,Chọn hoặc thêm khách hàng mới
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,trung tâm chi phí là cần thiết để đặt yêu cầu bồi thường chi phí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Điều này được dựa trên sự tham gia của nhân viên này
@@ -4492,13 +4495,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Ngăn chặn người dùng từ việc ứng dụng Để lại vào những ngày sau.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Chi phí mua hàng
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Nhà cung cấp bảng báo giá {0} đã tạo
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Lợi ích của nhân viên
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Production Order,Manufactured Qty,Số lượng sản xuất
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Hãy thiết lập mặc định Tốt Danh sách nhân viên với {0} hoặc Công ty {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} không tồn tại
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} không tồn tại
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Hóa đơn đã đưa khách hàng
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
@@ -4507,15 +4510,17 @@
 DocType: Quality Inspection Reading,Reading 3,Đọc 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Loại chứng từ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
 DocType: Employee Loan Application,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
 DocType: Guardian,Guardian,người bảo vệ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Đánh giá {0} được tạo ra cho nhân viên {1} trong phạm vi ngày nhất định
 DocType: Employee,Education,Đào tạo
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Đặt tên chiến dịch theo
 DocType: Employee,Current Address Is,Địa chỉ hiện tại là
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Sửa đổi
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Không bắt buộc. Thiết lập tiền tệ mặc định của công ty, nếu không quy định."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Sổ nhật ký kế toán.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Số lượng có sẵn tại Từ kho
@@ -4552,7 +4557,7 @@
 DocType: Hub Settings,Hub Settings,Thiết lập Hub
 DocType: Project,Gross Margin %,Lợi nhuận gộp%
 DocType: BOM,With Operations,Với hoạt động
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng loại tiền tệ {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả với loại tiền tệ{0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng loại tiền tệ {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả với loại tiền tệ{0}.
 DocType: Asset,Is Existing Asset,Là hiện tại tài sản
 DocType: Salary Detail,Statistical Component,Hợp phần Thống kê
 DocType: Salary Detail,Statistical Component,Hợp phần Thống kê
@@ -4608,7 +4613,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo đính kèm
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Mức cổ phiếu
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Hãy Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Hãy Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block leave applications by department.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Loại thanh toán phải là một trong những nhận, phải trả tiền và chuyển giao nội bộ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,phân tích
@@ -4621,6 +4626,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Cho phép sản xuất vào ngày lễ
 DocType: Sales Order,Customer's Purchase Order Date,Ngày của đơn mua hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Tồn kho ban đầu
+DocType: Shopping Cart Settings,Show Public Attachments,Hiển thị các tệp đính kèm công khai
 DocType: Packing Slip,Package Weight Details,Gói Trọng lượng chi tiết
 DocType: Payment Gateway Account,Payment Gateway Account,Tài khoản của Cổng thanh toán
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Sau khi hoàn thành thanh toán chuyển hướng người dùng đến trang lựa chọn.
@@ -4645,7 +4651,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Không hiển thị bất kỳ biểu tượng như $ vv bên cạnh tiền tệ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Hãy học sinh hàng loạt
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Hãy học sinh hàng loạt
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Được mục từ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Các ngày Thời gian Tiềm năng
@@ -4664,8 +4670,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Số tiền xử phạt
 DocType: GL Entry,Is Opening,Được mở cửa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Tài khoản {0} không tồn tại
 DocType: Account,Cash,Tiền mặt
 DocType: Employee,Short biography for website and other publications.,Tiểu sử ngắn cho trang web và các ấn phẩm khác.
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index f65956e..e041e26 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -1,177 +1,227 @@
-DocType: Employee,Salary Mode,薪酬模式
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +84,Warning: Same item has been entered multiple times.,警告：相同項目已經輸入多次。
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,項目已同步
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允許項目在一個交易中被多次新增
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費類產品
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,請選擇黨第一型
 DocType: Item,Customer Items,客戶項目
 DocType: Project,Costing and Billing,成本核算和計費
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,帳戶{0}：父帳戶{1}不能是總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,帳戶{0}：父帳戶{1}不能是總帳
 DocType: Item,Publish Item to hub.erpnext.com,發布項目hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,電子郵件通知
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,評估
 DocType: Item,Default Unit of Measure,預設的計量單位
 DocType: SMS Center,All Sales Partner Contact,所有的銷售合作夥伴聯絡
 DocType: Employee,Leave Approvers,休假審批人
 DocType: Sales Partner,Dealer,零售商
-DocType: Employee,Rented,租
 DocType: POS Profile,Applicable for User,適用於用戶
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},價格表{0}需填入貨幣種類
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,難道你真的想放棄這項資產？
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,選擇默認供應商
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},價格表{0}需填入貨幣種類
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
 DocType: Purchase Order,Customer Contact,客戶聯絡
 DocType: Job Applicant,Job Applicant,求職者
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,這是基於對這種供應商的交易。詳情請參閱以下時間表
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
-DocType: C-Form,Customer,客戶
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
+DocType: Bank Guarantee,Customer,客戶
 DocType: Purchase Receipt Item,Required By,需求來自
 DocType: Delivery Note,Return Against Delivery Note,射向送貨單
-DocType: Department,Department,部門
 DocType: Purchase Order,% Billed,％已開立帳單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),匯率必須一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客戶名稱
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
+DocType: Vehicle,Natural Gas,天然氣
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
 DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
 DocType: Leave Type,Leave Type Name,休假類型名稱
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
+apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,公開顯示
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural日記帳分錄提交
 DocType: Pricing Rule,Apply On,適用於
 DocType: Item Price,Multiple Item prices.,多個項目的價格。
 ,Purchase Order Items To Be Received,未到貨的採購訂單項目
 DocType: SMS Center,All Supplier Contact,所有供應商聯絡
-DocType: Quality Inspection Reading,Parameter,參數
-apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,新假期申請
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,銀行匯票
+DocType: Support Settings,Support Settings,支持設置
+DocType: SMS Parameter,Parameter,參數
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
+apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,新假期申請
+,Batch Item Expiry Status,批處理項到期狀態
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,銀行匯票
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,顯示變體
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,數量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),借款（負債）
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,顯示變體
+DocType: Academic Term,Academic Term,學期
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,賬表不能為空。
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),借款（負債）
 DocType: Employee Education,Year of Passing,路過的一年
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,庫存
-DocType: Designation,Designation,指定
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",參考文獻：％S，項目代碼：％s和客戶：％s的
+DocType: Item,Country of Origin,出生國家
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,庫存
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,開放式問題
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
-DocType: Purchase Invoice,Monthly,每月一次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延遲支付（天）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,發票
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,預計交貨日期是之前銷售訂單日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Salary Component,Abbr,縮寫
-DocType: Appraisal Goal,Score (0-5),得分（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行＃{0}：
+DocType: Timesheet,Total Costing Amount,總成本計算金額
 DocType: Delivery Note,Vehicle No,車輛牌照號碼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款單據才能完成trasaction
 DocType: Production Order Operation,Work In Progress,在製品
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,請選擇日期
 DocType: Employee,Holiday List,假日列表
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,會計人員
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,會計人員
 DocType: Cost Center,Stock User,庫存用戶
 DocType: Company,Phone No,電話號碼
-apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},新{0}：＃{1}
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,課程表創建：
+apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},新{0}：＃{1}
 ,Sales Partners Commission,銷售合作夥伴佣金
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
 DocType: Payment Request,Payment Request,付錢請求
+DocType: Asset,Value After Depreciation,折舊後
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,有關
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,考勤日期不得少於員工的加盟日期
+DocType: Grading Scale,Grading Scale Name,分級標準名稱
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,這是一個 root 帳戶，不能被編輯。
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能在折扣的基礎上設置授權{0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列，一為舊名稱，一個用於新名稱
+apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}不以任何活性會計年度。
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,公斤
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,公斤
+DocType: Student Log,Log,日誌
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,開放的工作。
-DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,選擇倉庫...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,廣告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
-DocType: Employee,Married,已婚
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,取得項目來源
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允許{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,取得項目來源
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,沒有列出項目
 DocType: Payment Reconciliation,Reconcile,調和
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
 DocType: Process Payroll,Make Bank Entry,使銀行進入
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下來折舊日期不能購買日期之前
 DocType: SMS Center,All Sales Person,所有的銷售人員
-DocType: Lead,Person Name,人姓名
+DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**幫助你分配預算/目標跨越幾個月，如果你在你的業務有季節性。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,未找到項目
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,薪酬結構缺失
 DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
 DocType: Account,Credit,信用
 DocType: POS Profile,Write Off Cost Center,沖銷成本中心
+apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",如“小學”或“大學”
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,庫存報告
 DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,該期限結束日期不能晚於學年年終日期到這個詞聯繫在一起（學年{}）。請更正日期，然後再試一次。
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
+DocType: Vehicle Service,Brake Oil,剎車油
 DocType: Tax Rule,Tax Type,稅收類型
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
-DocType: Item,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
+DocType: BOM,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,一個客戶存在具有相同名稱
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,選擇BOM
 DocType: SMS Log,SMS Log,短信日誌
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付項目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
+DocType: Student Log,Student Log,學生登錄
 DocType: Quality Inspection,Get Specification Details,獲取詳細規格
 DocType: Lead,Interested,有興趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,開盤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},從{0} {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +171,Opening,開盤
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},從{0} {1}
 DocType: Item,Copy From Item Group,從項目群組複製
 DocType: Journal Entry,Opening Entry,開放報名
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,賬戶只需支付
+DocType: Employee Loan,Repay Over Number of Periods,償還期的超過數
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0}  -  {1}不會在給定的{2}中註冊
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0}  -  {1}不會在給定的{2}中註冊
 DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
+DocType: Academic Term,Schools,學校
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,請先輸入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,請首先選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,請首先選擇公司
 DocType: Employee Education,Under Graduate,根據研究生
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目標在
 DocType: BOM,Total Cost,總成本
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活動日誌：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+DocType: Journal Entry Account,Employee Loan,員工貸款
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,活動日誌：
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地產
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,帳戶狀態
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +7,Statement of Account,帳戶狀態
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
+DocType: Purchase Invoice Item,Is Fixed Asset,是固定的資產
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,"Available qty is {0}, you need {1}",可用數量是{0}，則需要{1}
 DocType: Expense Claim Detail,Claim Amount,索賠金額
-DocType: Employee,Mr,先生
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,在CUTOMER組表中找到重複的客戶群
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供應商類型/供應商
-DocType: Naming Series,Prefix,字首
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,耗材
 DocType: Upload Attendance,Import Log,導入日誌
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,拉根據上述標準型的製造材料要求
+DocType: Training Result Employee,Grade,年級
 DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
 DocType: SMS Center,All Contact,所有聯絡
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,年薪
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,生產訂單已經與BOM的所有項目創建
+DocType: Daily Work Summary,Daily Work Summary,每日工作總結
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1}被凍結
+apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,庫存費用
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,選擇目標倉庫
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,選擇目標倉庫
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,請輸入首選電子郵件聯繫
 DocType: Journal Entry,Contra Entry,魂斗羅進入
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司貨幣
 DocType: Delivery Note,Installation Status,安裝狀態
-apps/erpnext/erpnext/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",你想更新考勤？ <br>現任：{0} \ <br>缺席：{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
 DocType: Item,Supply Raw Materials for Purchase,供應原料採購
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
+DocType: Products Settings,Show Products as a List,產品展示作為一個列表
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","下載模板，填寫相應的數據，並附加了修改過的文件。
 在選定時間段內所有時間和員工的組合會在模板中，與現有的考勤記錄"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
-apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,設定人力資源模塊
-DocType: SMS Center,SMS Center,短信中心
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +481,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,例如：基礎數學
+apps/erpnext/erpnext/controllers/accounts_controller.py +667,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,設定人力資源模塊
+DocType: Sales Invoice,Change Amount,漲跌額
 DocType: BOM Replace Tool,New BOM,新的物料清單
-DocType: Timesheet,Batch Time Logs for billing.,批處理的時間記錄進行計費。
+DocType: Depreciation Schedule,Make Depreciation Entry,計提折舊進入
 DocType: Lead,Request Type,請求類型
-DocType: Leave Application,Reason,原因
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使員工
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,使員工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,廣播
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Execution,執行
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,執行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要對供應商應付賬款{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,項目和定價
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},總時間：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期＝{0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},成本中心{0}不屬於公司{1}
 DocType: Customer,Individual,個人
+DocType: Interest,Academics User,學術界用戶
+DocType: Cheque Print Template,Amount In Figure,量圖
+DocType: Employee Loan Application,Loan Info,貸款信息
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,規劃維護訪問。
 DocType: SMS Settings,Enter url parameter for message,輸入url參數的訊息
+DocType: POS Profile,Customer Groups,客戶群
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,財務報表
+DocType: Guardian,Students,學生們
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,規則適用的定價和折扣。
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
@@ -181,397 +231,505 @@
 DocType: Production Planning Tool,Sales Orders,銷售訂單
 DocType: Purchase Taxes and Charges,Valuation,計價
 ,Purchase Order Trends,採購訂單趨勢
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,報價請求可以通過點擊以下鏈接進行訪問
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,離開一年。
+DocType: SG Creation Tool Course,SG Creation Tool Course,SG創建工具課程
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +235,Insufficient Stock,庫存不足
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用產能規劃和時間跟踪
-DocType: Bank Reconciliation,Bank Account,銀行帳戶
+DocType: Email Digest,New Sales Orders,新的銷售訂單
+DocType: Bank Guarantee,Bank Account,銀行帳戶
 DocType: Leave Type,Allow Negative Balance,允許負平衡
+DocType: Employee,Create User,創建用戶
 DocType: Selling Settings,Default Territory,預設地域
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,電視
 DocType: Production Order Operation,Updated via 'Time Log',經由“時間日誌”更新
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} does not belong to Company {1},帳戶{0}不屬於公司{1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
+DocType: Company,Default Payroll Payable Account,默認情況下，應付職工薪酬帳戶
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,更新電子郵件組
 DocType: Sales Invoice,Is Opening Entry,是開放登錄
 DocType: Customer Group,Mention if non-standard receivable account applicable,何況，如果不規範應收賬款適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,對於倉庫之前，需要提交
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
+DocType: Course Schedule,Instructor Name,導師姓名
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,對於倉庫之前，需要提交
 DocType: Sales Partner,Reseller,經銷商
+DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果選中，將包括材料要求非庫存物品。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,請輸入公司名稱
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
 ,Production Orders in Progress,進行中生產訂單
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,從融資淨現金
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,從融資淨現金
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",localStorage的滿了，沒救
 DocType: Lead,Address & Contact,地址及聯絡方式
-DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
+DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
+apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
+DocType: Sales Partner,Partner website,合作夥伴網站
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,新增項目
 ,Contact Name,聯絡人姓名
+DocType: Course Assessment Criteria,Course Assessment Criteria,課程評價標準
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
-apps/erpnext/erpnext/templates/generators/item.html +78,No description given,未提供描述
+DocType: POS Customer Group,POS Customer Group,POS客戶群
+DocType: Vehicle,Additional Details,額外細節
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,請求您的報價。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,每年葉
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,淨工資不能低於0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,每年葉
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
+DocType: Email Digest,Profit & Loss,利潤損失
+DocType: Task,Total Costing Amount (via Time Sheet),總成本計算量（通過時間表）
 DocType: Item Website Specification,Item Website Specification,項目網站規格
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,銀行條目
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,全年
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,銀行條目
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
 DocType: Material Request Item,Min Order Qty,最小訂貨量
+DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,學生組創建工具課程
 DocType: Lead,Do Not Contact,不要聯絡
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,誰在您的組織教人
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,唯一ID來跟踪所有的經常性發票。它是在提交生成的。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,軟件開發人員
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,軟件開發人員
 DocType: Item,Minimum Order Qty,最低起訂量
 DocType: Pricing Rule,Supplier Type,供應商類型
+DocType: Course Scheduling Tool,Course Start Date,課程開始日期
+,Student Batch-Wise Attendance,學生分批出席
+DocType: POS Profile,Allow user to edit Rate,允許用戶編輯率
 DocType: Item,Publish in Hub,在發布中心
+DocType: Student Admission,Student Admission,學生入學
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
 DocType: Employee,Relation,關係
 DocType: Shipping Rule,Worldwide Shipping,全球航運
+DocType: Student Guardian,Mother,母親
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,確認客戶的訂單。
 DocType: Purchase Receipt Item,Rejected Quantity,拒絕數量
 DocType: SMS Settings,SMS Sender Name,短信發送者名稱
-DocType: Contact,Is Primary Contact,是主要聯絡人
-DocType: Notification Control,Notification Control,通知控制
 DocType: Lead,Suggestions,建議
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,在此地域設定跨群組項目間的預算。您還可以通過設定分配來包含季節性。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
-DocType: Supplier,Address HTML,地址HTML
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +276,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
 DocType: Lead,Mobile No.,手機號碼
 DocType: Maintenance Schedule,Generate Schedule,生成時間表
 DocType: Purchase Invoice Item,Expense Head,總支出
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,請先選擇付款類別
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,請先選擇付款類別
+DocType: Student Group Student,Student Group Student,學生組學生
+DocType: Vehicle Service,Inspection,檢查
+DocType: Email Digest,New Quotations,新報價
+DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,電子郵件工資單員工根據員工選擇首選的電子郵件
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
+DocType: Tax Rule,Shipping County,航運縣
 apps/erpnext/erpnext/config/desktop.py +158,Learn,學習
+DocType: Asset,Next Depreciation Date,接下來折舊日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每個員工活動費用
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理銷售人員樹。
 DocType: Job Applicant,Cover Letter,求職信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
 DocType: Item,Synced With Hub,同步轂
-apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密碼錯誤
+DocType: Vehicle,Fleet Manager,車隊經理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能為負值對項{2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,密碼錯誤
 DocType: Item,Variant Of,變種
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環引用錯誤
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環引用錯誤
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,Guardian1名稱
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
+DocType: Cheque Print Template,Distance from left edge,從左側邊緣的距離
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的單位（＃窗體/項目/ {1}）在[{2}]研究發現（＃窗體/倉儲/ {2}）
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,送貨單
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立稅
-apps/erpnext/erpnext/accounts/utils.py +233,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0}輸入兩次項目稅
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,本週和待活動總結
-DocType: Workstation,Rent Cost,租金成本
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,請選擇年份和月份
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",輸入電子郵件ID用逗號隔開，發票會自動在特定的日期郵寄
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,送貨單
+apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立稅
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售資產的成本
+apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本週和待活動總結
+DocType: Student Applicant,Admitted,錄取
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,折舊金額後
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,即將到來的日曆事件
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,請選擇年份和月份
 DocType: Employee,Company Email,企業郵箱
 DocType: GL Entry,Debit Amount in Account Currency,在賬戶幣種借記金額
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,訂單價值
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,訂單價值
+apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,銀行/現金對一方或內部轉讓交易
 DocType: Shipping Rule,Valid for Countries,有效的國家
-apps/erpnext/erpnext/stock/doctype/item/item.js +51,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,總訂貨考慮
-apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
-apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
+apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
+apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
+DocType: Course Scheduling Tool,Course Scheduling Tool,排課工具
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
 DocType: Item Tax,Tax Rate,稅率
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,選擇項目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry","項目：{0}管理分批，不能使用\
-庫存調整，而是使用庫存分錄。"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,選擇項目
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,轉換為非集團
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,一批該產品的（很多）。
+apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,一批該產品的（很多）。
 DocType: C-Form Invoice Detail,Invoice Date,發票日期
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,您的電子郵件地址
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,請參閱附件
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,安裝已經完成！
-,Finished Goods,成品
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,創建挺起胸
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安裝已經完成！
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
 DocType: Maintenance Visit,Maintenance Type,維護類型
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
+apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,添加項目
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,產品質量檢驗參數
 DocType: Leave Application,Leave Approver Name,離開批准人姓名
 DocType: Depreciation Schedule,Schedule Date,排定日期
+apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",收入，扣減等工資組成部分
 DocType: Packed Item,Packed Item,盒裝產品
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,採購交易的預設設定。
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},存在活動費用為員工{0}對活動類型 -  {1}
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,強制性領域 - 獲得學生
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,強制性領域 - 獲得學生
+DocType: Program Enrollment,Enrolled courses,入學課程
+DocType: Program Enrollment,Enrolled courses,入學課程
 DocType: Currency Exchange,Currency Exchange,外幣兌換
-DocType: Purchase Invoice Item,Item Name,項目名稱
+DocType: Asset,Item Name,項目名稱
 DocType: Authorization Rule,Approving User  (above authorized value),批准的用戶（上述授權值）
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,貸方餘額
+DocType: Email Digest,Credit Balance,貸方餘額
 DocType: Employee,Widowed,寡
+DocType: Request for Quotation,Request for Quotation,詢價
 DocType: Salary Slip Timesheet,Working Hours,工作時間
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改現有系列的開始/當前的序列號。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,創建一個新的客戶
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果有多個定價規則繼續有效，用戶將被要求手動設定優先順序來解決衝突。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,採購退貨
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,創建採購訂單
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
-DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) 必須有""假期審批“權限"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) 必須有""假期審批“權限"
 DocType: Purchase Receipt,Vehicle Date,車日期
 DocType: Student Log,Medical,醫療
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丟失
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,原因丟失
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,鉛所有者不能等同於鉛
+apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,分配的金額不能超過未調整的量更大
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,機會
 DocType: Employee,Single,單
+DocType: Salary Slip,Total Loan Repayment,總貸款還款
 DocType: Account,Cost of Goods Sold,銷貨成本
-DocType: Purchase Invoice,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,請輸入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,請輸入成本中心
 DocType: Journal Entry Account,Sales Order,銷售訂單
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,平均。賣出價
-apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},於{0}列的數量不能是分數
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,平均。賣出價
+DocType: Assessment Plan,Examiner Name,考官名稱
 DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
 DocType: Delivery Note,% Installed,％已安裝
+apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,請先輸入公司名稱
-DocType: BOM,Item Desription,項目Desription
 DocType: Purchase Invoice,Supplier Name,供應商名稱
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,閱讀ERPNext手冊
 DocType: Account,Is Group,是集團
+DocType: Email Digest,Pending Purchase Orders,待採購訂單
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性
+DocType: Vehicle Service,Oil Change,換油
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,非營利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,非營利
 DocType: Production Order,Not Started,未啟動
 DocType: Lead,Channel Partner,渠道合作夥伴
 DocType: Account,Old Parent,老家長
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修課 - 學年
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修課 - 學年
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-DocType: Stock Reconciliation Item,Do not include symbols (ex. $),不包括符號（例如$）
-DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售主檔經理
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +638,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假日高手。
 DocType: Request for Quotation Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,請輸入產品編號。
-DocType: BOM,Costing,成本核算
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,請輸入產品編號。
+DocType: Tax Rule,Billing County,開票縣
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，稅額將被視為已包含在列印速率/列印數量
+DocType: Request for Quotation,Message for Supplier,消息供應商
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2電子郵件ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2電子郵件ID
+DocType: Item,Show in Website (Variant),展網站（變體）
 DocType: Employee,Health Concerns,健康問題
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,未付
+DocType: Process Payroll,Select Payroll Period,選擇工資期
 DocType: Packing Slip,From Package No.,從包裹編號
 DocType: Item Attribute,To Range,為了範圍
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,證券及存款
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,總葉分配是必須的
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法，因為有一些項目沒有自己的估值方法的交易
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,總葉分配是必須的
 DocType: Job Opening,Description of a Job Opening,一個空缺職位的說明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,今天待定活動
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今天待定活動
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤記錄。
+DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基於時間表工資。
 DocType: Sales Order Item,Used for Production Plan,用於生產計劃
+DocType: Employee Loan,Total Payment,總付款
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間（以分鐘計）
 DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
 DocType: Journal Entry,Accounts Payable,應付帳款
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,所選的材料清單並不同樣項目
 DocType: Pricing Rule,Valid Upto,到...為止有效
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+,Enough Parts to Build,足夠的配件組裝
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,直接收入
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Administrative Officer,政務主任
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,請選擇公司
-DocType: Stock Entry,Difference Account,差異帳戶
-apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,政務主任
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,請選擇課程
+DocType: Timesheet Detail,Hrs,小時
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,請選擇公司
+DocType: Stock Entry Detail,Difference Account,差異帳戶
+apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
 DocType: Production Order,Additional Operating Cost,額外的運營成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妝品
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,購買
 ,Serial No Warranty Expiry,序列號保修到期
+DocType: Sales Invoice,Offline POS Name,離線POS名稱
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
 DocType: Sales Order,To Deliver,為了提供
 DocType: Purchase Invoice Item,Item,項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,序號項目不能是一個分數
 DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,管理轉包
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,管理轉包
+DocType: Project,Project will be accessible on the website to these users,項目將在網站向這些用戶上訪問
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
-apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,縮寫已用在另一家公司
+apps/erpnext/erpnext/setup/doctype/company/company.py +59,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation already used for another company,縮寫已用在另一家公司
 DocType: Selling Settings,Default Customer Group,預設客戶群組
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圓角總計”字段將不可見的任何交易
 DocType: BOM,Operating Cost,營業成本
-DocType: Sales Order Item,Gross Profit,毛利
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,增量不能為0
-DocType: Production Planning Tool,Material Requirement,物料需求
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能為0
 DocType: Company,Delete Company Transactions,刪除公司事務
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增 / 編輯稅金及費用
 DocType: Purchase Invoice,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0}，因為它採用的是現貨交易
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +240,Closing (Cr),關閉（Cr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),關閉（Cr）
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,移動項目
 DocType: Serial No,Warranty Period (Days),保修期限（天數）
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 DocType: Production Plan Item,Pending Qty,待定數量
-DocType: Budget,Ignore,忽略
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
-DocType: Pricing Rule,Valid From,有效期自
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1}是不活動
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
+apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,設置檢查尺寸打印
+DocType: Salary Slip,Salary Slip Timesheet,工資單時間表
+apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
 DocType: Sales Invoice,Total Commission,佣金總計
 DocType: Pricing Rule,Sales Partner,銷售合作夥伴
 DocType: Buying Settings,Purchase Receipt Required,需要採購入庫單
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的，如果打開股票進入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,沒有在發票表中找到記錄
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,請選擇公司和黨的第一型
-apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,財務／會計年度。
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累積值
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,請選擇公司和黨的第一型
+apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,財務／會計年度。
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累積值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,製作銷售訂單
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,製作銷售訂單
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
 DocType: C-Form Invoice Detail,Grand Total,累計
+DocType: Training Event,Course,課程
+DocType: Timesheet,Payslip,工資單
+apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,項目車
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
 DocType: Issue,Resolution,決議
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},交貨：{0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,應付帳款
+DocType: Expense Claim,Payable Account,應付帳款
+DocType: Payment Entry,Type of Payment,付款類型
 DocType: Sales Order,Billing and Delivery Status,結算和交貨狀態
 DocType: Job Applicant,Resume Attachment,簡歷附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
 DocType: Leave Control Panel,Allocate,分配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,銷貨退回
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,銷貨退回
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：總分配葉{0}應不低於已核定葉{1}期間
+DocType: Announcement,Posted By,發布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
 DocType: Authorization Rule,Customer or Item,客戶或項目
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
-DocType: Lead,Middle Income,中等收入
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),開啟（Cr ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
-apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,分配金額不能為負
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),開啟（Cr ）
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
+apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,分配金額不能為負
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,請設定公司
 DocType: Purchase Order Item,Billed Amt,已結算額
+DocType: Training Result Employee,Training Result Employee,訓練結果員工
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
-DocType: Sales Invoice,Customer's Vendor,客戶的供應商
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,提案寫作
+DocType: Employee Loan Application,Total Payable Interest,合計應付利息
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,銷售發票時間表
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
+DocType: Process Payroll,Select Payment Account to make Bank Entry,選擇付款賬戶，使銀行進入
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉，報銷和工資
+apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,添加到知識庫
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,提案寫作
+DocType: Payment Entry Deduction,Payment Entry Deduction,輸入付款扣除
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
+DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",如果選中，原料是分包的將被納入材料要求項
 apps/erpnext/erpnext/config/accounts.py +80,Masters,資料主檔
+DocType: Assessment Plan,Maximum Assessment Score,最大考核評分
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,更新銀行交易日期
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,時間跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
 DocType: Packing Slip Item,DN Detail,DN詳細
+DocType: Training Event,Conference,會議
 DocType: Timesheet,Billed,計費
 DocType: Batch,Batch Description,批次說明
-DocType: Delivery Note,Time at which items were delivered from warehouse,時間在哪個項目是從倉庫運送
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
+apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",支付網關帳戶沒有創建，請手動創建一個。
 DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
 DocType: Employee,Organization Profile,組織簡介
+DocType: Student,Sibling Details,兄弟姐妹詳情
+DocType: Vehicle Service,Vehicle Service,汽車服務
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,自動觸發基於條件的反饋請求。
 DocType: Employee,Reason for Resignation,辭退原因
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,模板的績效考核。
+DocType: Sales Invoice,Credit Note Issued,信用票據發行
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,發票/日記帳分錄詳細資訊
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不在財政年度{2}
+apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不在財政年度{2}
 DocType: Buying Settings,Settings for Buying Module,設置購買模塊
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},資產{0}不屬於公司{1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,請先輸入採購入庫單
 DocType: Buying Settings,Supplier Naming By,供應商命名
 DocType: Activity Type,Default Costing Rate,默認成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,維護計劃
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶，客戶群組，領地，供應商，供應商類型，活動，銷售合作夥伴等。
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,在庫存淨變動
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,在庫存淨變動
+apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,員工貸款管理
 DocType: Employee,Passport Number,護照號碼
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,經理
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,相同的項目已被輸入多次。
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,與關係Guardian2
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,經理
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用額度小於當前餘額為客戶著想。信用額度是ATLEAST {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,相同的項目已被輸入多次。
 DocType: SMS Settings,Receiver Parameter,收受方參數
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
 DocType: Sales Person,Sales Person Targets,銷售人員目標
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,請輸入您的電子郵件地址
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,創建時間表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,註冊
 DocType: Selling Settings,Customer Naming By,客戶命名由
+DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,將顯示學生每月學生出勤記錄報告為存在
+DocType: Depreciation Schedule,Depreciation Amount,折舊額
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,轉換為集團
 DocType: Activity Cost,Activity Type,活動類型
+DocType: Request for Quotation,For individual supplier,對於個別供應商
+DocType: BOM Operation,Base Hour Rate(Company Currency),基數小時率（公司貨幣）
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,交付金額
-DocType: Supplier,Fixed Days,固定天
 DocType: Quotation Item,Item Balance,項目平衡
 DocType: Sales Invoice,Packing List,包裝清單
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,購買給供應商的訂單。
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,出版
 DocType: Activity Cost,Projects User,項目用戶
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
 DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 DocType: Item,Material Transfer,物料轉倉
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),開啟（Dr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),開啟（Dr）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
+DocType: Employee Loan,Total Interest Payable,合計應付利息
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
 DocType: Production Order Operation,Actual Start Time,實際開始時間
 DocType: BOM Operation,Operation Time,操作時間
-DocType: Pricing Rule,Sales Manager,銷售經理
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,基礎
+DocType: Timesheet,Total Billed Hours,帳單總時間
 DocType: Journal Entry,Write Off Amount,核銷金額
 DocType: Journal Entry,Bill No,帳單號碼
+DocType: Company,Gain/Loss Account on Asset Disposal,在資產處置收益/損失帳戶
+DocType: Vehicle Log,Service Details,服務細節
+DocType: Vehicle Log,Service Details,服務細節
 DocType: Purchase Invoice,Quarterly,每季
 DocType: Selling Settings,Delivery Note Required,要求送貨單
-DocType: Sales Order Item,Basic Rate (Company Currency),基礎匯率（公司貨幣）
+DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
+DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
+DocType: Assessment Criteria,Assessment Criteria,評估標準
+DocType: BOM Item,Basic Rate (Company Currency),基礎匯率（公司貨幣）
+DocType: Student Attendance,Student Attendance,學生出勤
+DocType: Sales Invoice Timesheet,Time Sheet,時間表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,請輸入項目細節
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,請輸入項目細節
 DocType: Purchase Receipt,Other Details,其他詳細資訊
 DocType: Account,Accounts,會計
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,市場營銷
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,已創建付款輸入
+DocType: Vehicle,Odometer Value (Last),里程表值（最後）
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,市場營銷
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,已創建付款輸入
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
+apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,預覽工資單
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帳戶{0}已多次輸入
 DocType: Account,Expenses Included In Valuation,支出計入估值
-DocType: Employee,Provide email id registered in company,提供在公司註冊的電子郵件ID
 DocType: Hub Settings,Seller City,賣家市
+,Absent Student Report,缺席學生報告
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送：
 DocType: Offer Letter Term,Offer Letter Term,報價函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +617,Item has variants.,項目已變種。
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,項{0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,樹類型
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,樹類型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,數量消耗每單位
 DocType: Serial No,Warranty Expiry Date,保證期到期日
 DocType: Material Request Item,Quantity and Warehouse,數量和倉庫
 DocType: Sales Invoice,Commission Rate (%),佣金比率（％）
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
 DocType: Project,Estimated Cost,估計成本
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
+DocType: Purchase Order,Link to material requests,鏈接到材料請求
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,公司與賬戶
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,從供應商收貨。
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在數值
 DocType: Lead,Campaign Name,活動名稱
-,Reserved,保留的
+DocType: Selling Settings,Close Opportunity After Days,關閉機會後日
 DocType: Purchase Order,Supply Raw Materials,供應原料
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,在這接下來的發票將生成的日期。它在提交生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資產
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0}不是庫存項目
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}不是庫存項目
 DocType: Mode of Payment Account,Default Account,預設帳戶
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
+DocType: Payment Entry,Received Amount (Company Currency),收到的款項（公司幣種）
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,請選擇每週休息日
 DocType: Production Order Operation,Planned End Time,計劃結束時間
 ,Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
+DocType: Budget,Budget Against,反對財政預算案
 DocType: Employee,Cell Number,手機號碼
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
 DocType: Opportunity,Opportunity From,機會從
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月薪聲明。
-DocType: Item Group,Website Specifications,網站規格
-apps/erpnext/erpnext/utilities/doctype/address/address.py +104,There is an error in your Address Template {0},有一個在你的地址模板錯誤{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：從{0}類型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +369,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+DocType: BOM,Website Specifications,網站規格
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：從{0}類型{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +325,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +434,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +206,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +214,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,銷售活動。
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,銷售活動。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +48,Make Timesheet,製作時間表
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -612,109 +770,135 @@
  8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
  9。這是含稅的基本速率？：如果你檢查這一點，就意味著這個稅不會顯示在項目表中，但在你的主項表將被納入基本速率。你想要給一個單位的價格（包括所有稅費）的價格為顧客這是非常有用的。"
 DocType: Employee,Bank A/C No.,銀行A/C No.
-DocType: GL Entry,Project,專案
+DocType: Bank Guarantee,Project,專案
 DocType: Quality Inspection Reading,Reading 7,7閱讀
-DocType: Address,Personal,個人
 DocType: Expense Claim Detail,Expense Claim Type,費用報銷型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,對購物車的預設設定
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},通過資產日記帳分錄報廢{0}
+DocType: Employee Loan,Interest Income Account,利息收入賬戶
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,生物技術
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Office維護費用
+apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,設置電子郵件帳戶
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,請先輸入品項
 DocType: Account,Liability,責任
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
 DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,未選擇價格列表
-DocType: Employee,Family Background,家庭背景
+apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,未選擇價格列表
 DocType: Request for Quotation Supplier,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},警告：無效的附件{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +709,No Permission,無權限
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},警告：無效的附件{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,無權限
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存'，因為項目未交付{0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,NOS
+DocType: Vehicle,Acquisition Date,採集日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,無發現任何員工
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,學生組已經更新。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,學生組已經更新。
 DocType: SMS Center,All Customer Contact,所有的客戶聯絡
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,通過CSV上傳庫存餘額。
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即發送
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,通過CSV上傳庫存餘額。
+DocType: Warehouse,Tree Details,樹詳細信息
+DocType: Training Event,Event Status,事件狀態
 ,Support Analytics,支援分析
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +344,"If you have any questions, please get back to us.",如果您有任何疑問，請再次與我們聯繫。
 DocType: Item,Website Warehouse,網站倉庫
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小發票金額
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不屬於公司{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帳戶{2}不能是一個組
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,項目行的{idx} {文檔類型} {} DOCNAME上面不存在&#39;{}的文檔類型“表
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
+apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天，在這汽車的發票將產生如05，28等
+DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必須小於或等於5
-apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-往績紀錄
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,客戶和供應商
+DocType: Program Enrollment Tool,Program Enrollment Tool,計劃註冊工具
+apps/erpnext/erpnext/config/accounts.py +299,C-Form records,C-往績紀錄
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,客戶和供應商
 DocType: Email Digest,Email Digest Settings,電子郵件摘要設定
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +346,Thank you for your business!,感謝您的業務！
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,客戶支持查詢。
+,Production Order Stock Report,生產訂單庫存報告
+DocType: HR Settings,Retirement Age,退休年齡
 DocType: Bin,Moving Average Rate,移動平均房價
 DocType: Production Planning Tool,Select Items,選擇項目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,課程表
 DocType: Maintenance Visit,Completion Status,完成狀態
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,目標倉庫
+DocType: HR Settings,Enter retirement age in years,在年內進入退休年齡
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,目標倉庫
+DocType: Cheque Print Template,Starting location from left edge,從左邊起始位置
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,預計交貨日期不能早於銷售訂單日期
 DocType: Upload Attendance,Import Attendance,進口出席
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有項目群組
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,所有項目群組
 DocType: Process Payroll,Activity Log,活動日誌
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,淨利／虧損
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,淨利／虧損
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Production Order,Item To Manufacture,產品製造
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1}的狀態為{2}
+apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}的狀態為{2}
+DocType: Employee,Provide Email Address registered in company,提供公司註冊郵箱地址
 DocType: Shopping Cart Settings,Enable Checkout,啟用結帳
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,採購訂單到付款
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,預計數量
-DocType: Sales Invoice,Payment Due Date,付款到期日
-apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“開放”
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,採購訂單到付款
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,預計數量
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',“開放”
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
 DocType: Notification Control,Delivery Note Message,送貨單留言
 DocType: Expense Claim,Expenses,開支
 DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
 ,Purchase Receipt Trends,採購入庫趨勢
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,研究與發展
-,Amount to Bill,帳單數額
+DocType: Vehicle Service,Brake Pad,剎車片
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,研究與發展
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,帳單數額
 DocType: Company,Registration Details,註冊細節
+DocType: Timesheet,Total Billed Amount,總開單金額
 DocType: Item Reorder,Re-Order Qty,重新排序數量
 DocType: Leave Block List Date,Leave Block List Date,休假區塊清單日期表
 DocType: Pricing Rule,Price or Discount,價格或折扣
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外購入庫單項目表總的相關費用必須是相同的總稅費
 DocType: Sales Team,Incentives,獎勵
 DocType: SMS Log,Requested Numbers,請求號碼
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,績效考核。
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
+apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款輸入{0}對訂單{1}，檢查它是否應該被拉到作為預先在該發票聯。
 DocType: Sales Invoice Item,Stock Details,庫存詳細訊息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,銷售點
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶，不允許設為借方帳戶
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,銷售點
+DocType: Vehicle Log,Odometer Reading,里程表讀數
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶，不允許設為借方帳戶
 DocType: Account,Balance must be,餘額必須
 DocType: Hub Settings,Publish Pricing,發布定價
 DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
 ,Available Qty,可用數量
 DocType: Purchase Taxes and Charges,On Previous Row Total,在上一行共
-DocType: Salary Slip,Working Days,工作日
+DocType: Purchase Invoice Item,Rejected Qty,被拒絕的數量
 DocType: Serial No,Incoming Rate,傳入速率
-DocType: Packing Slip,Gross Weight,毛重
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
 DocType: HR Settings,Include holidays in Total no. of Working Days,包括節假日的總數。工作日
-DocType: Job Applicant,Hold,持有
 DocType: Employee,Date of Joining,加入日期
-DocType: Naming Series,Update Series,更新系列
 DocType: Supplier Quotation,Is Subcontracted,轉包
 DocType: Item Attribute,Item Attribute Values,項目屬性值
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,採購入庫單
+DocType: Examination Result,Examination Result,考試成績
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
-DocType: Employee,Ms,女士
-apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,貨幣匯率的主人。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,提交工資單
+apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,貨幣匯率的主人。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,由於已有庫存餘額的帳戶無法自動創建帳戶。您必須創建一個匹配的帳戶，然後才能在這個倉庫中的條目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,BOM {0}必須是積極的
+DocType: Journal Entry,Depreciation Entry,折舊分錄
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
-apps/erpnext/erpnext/templates/generators/item.html +68,Goto Cart,轉到車
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
-DocType: Salary Slip,Leave Encashment Amount,假期兌現金額
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需數量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +223,Warehouses with existing transaction can not be converted to ledger.,與現有的交易倉庫不能轉換到總帳。
 DocType: Bank Reconciliation,Total Amount,總金額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
 DocType: Production Planning Tool,Production Orders,生產訂單
@@ -722,71 +906,91 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
 DocType: Bank Reconciliation,Account Currency,賬戶幣種
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,請註明舍入賬戶的公司
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,請註明舍入賬戶的公司
 DocType: Purchase Receipt,Range,範圍
 DocType: Supplier,Default Payable Accounts,預設應付帳款
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
+DocType: Fee Structure,Components,組件
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
 DocType: Quality Inspection Reading,Reading 6,6閱讀
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
-DocType: Address,Shop,店
-DocType: Hub Settings,Sync Now,立即同步
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
+apps/erpnext/erpnext/config/accounts.py +215,Define budget for a financial year.,定義預算財政年度。
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,預設銀行/現金帳戶將被在POS機開發票，且選擇此模式時自動更新。
-DocType: Employee,Permanent Address Is,永久地址
-DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,品牌
+DocType: Lead,LEAD-,鉛-
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,品牌
 DocType: Employee,Exit Interview Details,退出面試細節
 DocType: Item,Is Purchase Item,是購買項目
 DocType: Asset,Purchase Invoice,採購發票
 DocType: Stock Ledger Entry,Voucher Detail No,券詳細說明暫無
+apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,新的銷售發票
 DocType: Stock Entry,Total Outgoing Value,出貨總計值
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,開幕日期和截止日期應在同一會計年度
 DocType: Lead,Request for Information,索取資料
+apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,同步離線發票
 DocType: Payment Request,Paid,付費
+DocType: Program Fee,Program Fee,課程費用
 DocType: Salary Slip,Total in words,總計大寫
 DocType: Material Request Item,Lead Time Date,交貨時間日期
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
+DocType: Guardian,Guardian Name,監護人姓名
+DocType: Cheque Print Template,Has Print Format,擁有打印格式
+apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
 DocType: Job Opening,Publish on website,發布在網站上
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,發貨給客戶。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,間接收入
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,方差
+DocType: Student Attendance Tool,Student Attendance Tool,學生考勤工具
+DocType: Cheque Print Template,Date Settings,日期設定
 ,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,對於轉讓項目選擇
 DocType: Purchase Invoice,Additional Discount Percentage,額外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
 DocType: Pricing Rule,Max Qty,最大數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice",行{0}：發票{1}是無效的，它可能會被取消/不存在。 \請輸入有效的發票
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化學藥品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
-DocType: Process Payroll,Select Payroll Year and Month,選擇薪資年和月
+DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默認銀行/現金帳戶時，會選擇此模式可以自動在工資日記條目更新。
+DocType: BOM,Raw Material Cost(Company Currency),原料成本（公司貨幣）
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,儀表
 DocType: Workstation,Electricity Cost,電力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
-DocType: Opportunity,Walk In,走在
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock條目
 DocType: Item,Inspection Criteria,檢驗標準
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,轉移
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,白
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,轉移
+DocType: BOM Website Item,BOM Website Item,BOM網站項目
+apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下來折舊日期輸入為過去的日期
 DocType: SMS Center,All Lead (Open),所有鉛（開放）
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：數量不適用於{4}在倉庫{1}在發布條目的時間（{2} {3}）
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,使
+DocType: Item,Automatically Create New Batch,自動創建新批
+DocType: Item,Automatically Create New Batch,自動創建新批
+DocType: Student Admission,Admission Start Date,入學開始日期
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的購物車
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},訂單類型必須是一個{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},訂單類型必須是一個{0}
 DocType: Lead,Next Contact Date,下次聯絡日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,開放數量
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,對於漲跌額請輸入帳號
+DocType: Student Batch Name,Student Batch Name,學生批名
 DocType: Holiday List,Holiday List Name,假日列表名稱
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,股票期權
+DocType: Repayment Schedule,Balance Loan Amount,平衡貸款額
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,課程時間表
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,股票期權
 DocType: Journal Entry Account,Expense Claim,報銷
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},數量為{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},數量為{0}
 DocType: Leave Application,Leave Application,休假申請
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,排假工具
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
@@ -795,413 +999,503 @@
 DocType: Company,Default Terms,默認條款
 DocType: Packing Slip Item,Packing Slip Item,包裝單項目
 DocType: Purchase Invoice,Cash/Bank Account,現金／銀行帳戶
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
+apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},請指定{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能為負數
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,折扣
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}不能為負數
+DocType: Asset,Total Number of Depreciations,折舊總數
+DocType: Sales Invoice Item,Rate With Margin,利率保證金
+DocType: Sales Invoice Item,Rate With Margin,利率保證金
 DocType: Workstation,Wages,工資
 DocType: Project,Internal,內部
 DocType: Task,Urgent,緊急
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,轉到桌面和開始使用ERPNext
 DocType: Item,Manufacturer,生產廠家
 DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
+DocType: POS Profile,Sales Invoice Payment,銷售發票付款
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,銷售金額
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,銷售金額
+DocType: Repayment Schedule,Interest Amount,利息金額
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
 DocType: Serial No,Creation Document No,文檔創建編號
 DocType: Issue,Issue,問題
+DocType: Asset,Scrapped,報廢
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客戶不與公司匹配
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小，顏色等。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP倉庫
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
-apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
-DocType: BOM Operation,Operation,作業
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小，顏色等。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP倉庫
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
 DocType: Lead,Organization Name,組織名稱
 DocType: Tax Rule,Shipping State,運輸狀態
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
+,Projected Quantity as Source,預計庫存量的來源
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
+DocType: Employee,A-,一個-
+DocType: Production Planning Tool,Include non-stock items,包括非股票項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,銷售費用
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},銷售訂單{0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,郵政編碼
+apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},銷售訂單{0} {1}
 DocType: Opportunity,Contact Info,聯絡方式
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,製作Stock條目
+apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0}結果
 DocType: Item,Default Supplier,預設的供應商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,過度生產容許比例
+DocType: Employee Loan,Repayment Schedule,還款計劃
 DocType: Shipping Rule Condition,Shipping Rule Condition,送貨規則條件
 DocType: Holiday List,Get Weekly Off Dates,獲取每週關閉日期
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,結束日期不能小於開始日期
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,結束日期不能小於開始日期
 DocType: Sales Person,Select company name first.,先選擇公司名稱。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,博士
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,博士
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
-apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齡
+DocType: School Settings,Attendance Freeze Date,出勤凍結日期
+DocType: School Settings,Attendance Freeze Date,出勤凍結日期
 DocType: Opportunity,Your sales person who will contact the customer in future,你的銷售人員會在未來聯絡客戶
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,查看所有產品
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,所有的材料明細表
 DocType: Company,Default Currency,預設貨幣
-DocType: Contact,Enter designation of this Contact,輸入指定聯絡人
 DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +417,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
-DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,運輸
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1}必須提交
-DocType: Email Digest,Annual Expense,年費用
+apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,無效屬性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1}必須提交
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},量必須小於或等於{0}
 DocType: SMS Center,Total Characters,總字元數
-apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,貢獻％
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼，供大家參考。稅務號碼等
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
 ,Ordered Items To Be Billed,預付款的訂購物品
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,從範圍必須小於要範圍
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,從範圍必須小於要範圍
 DocType: Global Defaults,Global Defaults,全域預設值
+apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,項目合作邀請
 DocType: Salary Slip,Deductions,扣除
+apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,開始年份
 DocType: Purchase Invoice,Start date of current invoice's period,當前發票期間內的開始日期
 DocType: Salary Slip,Leave Without Pay,無薪假
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,產能規劃錯誤
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,產能規劃錯誤
 ,Trial Balance for Party,試算表的派對
 DocType: Lead,Consultant,顧問
 DocType: Salary Slip,Earnings,收益
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打開會計平衡
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +390,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,打開會計平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,無需求
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,管理
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},無論是借方或貸方金額是必需的{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,無需求
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一個預算記錄“{0}”已存在對{1}“{2}”為年度{3}
+apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,管理
+DocType: Cheque Print Template,Payer Settings,付款人設置
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如，如果你的英文縮寫為“SM”，而該項目的代碼是“T-SHIRT”，該變種的項目代碼將是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存，淨付款就會被顯示出來。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,藍色
 DocType: Purchase Invoice,Is Return,退貨
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,返回/借記注
 DocType: Price List Country,Price List Country,價目表國家
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,請設定電子郵件ID
 DocType: Item,UOMs,計量單位
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS簡介{0}已經為用戶創建：{1}和公司{2}
-DocType: Purchase Order Item,UOM Conversion Factor,計量單位換算係數
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS簡介{0}已經為用戶創建：{1}和公司{2}
+DocType: Sales Invoice Item,UOM Conversion Factor,計量單位換算係數
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,請輸入產品代碼來獲得批號
 DocType: Stock Settings,Default Item Group,預設項目群組
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供應商數據庫。
 DocType: Account,Balance Sheet,資產負債表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +685,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的銷售人員將在此日期被提醒去聯絡客戶
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
+apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一項目不能輸入多次。
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
 DocType: Lead,Lead,潛在客戶
 DocType: Email Digest,Payables,應付賬款
-DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
+DocType: Course,Course Intro,課程介紹
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,股票輸入{0}創建
+apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
 DocType: Purchase Invoice Item,Net Rate,淨費率
 DocType: Purchase Invoice Item,Purchase Invoice Item,採購發票項目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,針對所選的採購入庫單，存貨帳分錄和總帳分錄已經重新登錄。
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,項目1
 DocType: Holiday,Holiday,節日
+DocType: Support Settings,Close Issue After Days,關閉問題天后
 DocType: Leave Control Panel,Leave blank if considered for all branches,保持空白如果考慮到全部分支機構
+DocType: Bank Guarantee,Validity in Days,天數有效
+DocType: Bank Guarantee,Validity in Days,天數有效
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-形式不適用發票：{0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,未核銷付款明細
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,訂單數量
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,訂單數量
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
+DocType: Purchase Order,Group same items,組相同的項目
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
-DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,“分錄”不能是空的
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
+DocType: Employee Loan Application,Repayment Info,還款信息
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
-apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,建立職工
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,請先選擇前綴稱號
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,研究
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +416,Fiscal Year {0} not found,會計年度{0}未找到
+apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,建立職工
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +157,Please select prefix first,請先選擇前綴稱號
 DocType: Maintenance Visit Purpose,Work Done,工作完成
-apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
-DocType: Contact,User ID,使用者 ID
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,世界其他地區
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,該項目{0}不能有批
+apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
+DocType: Announcement,All Students,所有學生
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,項{0}必須是一個非庫存項目
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看總帳
+DocType: Grading Scale,Intervals,間隔
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,學生手機號碼
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,股利支付
-apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,會計總帳
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,會計總帳
 DocType: Stock Reconciliation,Difference Amount,差額
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,留存收益
-DocType: BOM Item,Item Description,項目說明
+DocType: Vehicle Log,Service Detail,服務細節
+DocType: BOM,Item Description,項目說明
+DocType: Student Sibling,Student Sibling,學生兄弟
 DocType: Purchase Invoice,Is Recurring,是經常性
 DocType: Purchase Invoice,Supplied Items,提供的物品
 DocType: Production Order,Qty To Manufacture,製造數量
+DocType: School Settings,School Settings,學校設置
+DocType: School Settings,School Settings,學校設置
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整個採購週期價格保持一致
 DocType: Opportunity Item,Opportunity Item,項目的機會
+,Student and Guardian Contact Details,學生和監護人聯繫方式
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,行{0}：對於供應商{0}的電郵地址發送電子郵件
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,臨時開通
 ,Employee Leave Balance,員工休假餘額
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
-DocType: Address,Address Type,地址類型
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +178,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,舉例：碩士計算機科學
 DocType: Purchase Invoice,Rejected Warehouse,拒絕倉庫
 DocType: GL Entry,Against Voucher,對傳票
 DocType: Item,Default Buying Cost Center,預設採購成本中心
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為得到最好的 ERPNext 教學，我們建議您花一些時間和觀看這些說明影片。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,到
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,到
 DocType: Item,Lead Time in days,在天交貨期
-,Accounts Payable Summary,應付帳款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,應付帳款摘要
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},從{0}工資支付{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
 DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,銷售訂單{0}無效
-apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",對不起，企業不能合併
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,銷售訂單{0}無效
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,採購訂單幫助您規劃和跟進您的購買
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",對不起，企業不能合併
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,小
 DocType: Employee,Employee Number,員工人數
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
+DocType: Project,% Completed,％已完成
 ,Invoiced Amount (Exculsive Tax),發票金額（Exculsive稅）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,項目2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,帳戶頭{0}創建
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,綠
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,帳戶頭{0}創建
+DocType: Training Event,Training Event,培訓活動
 DocType: Item,Auto re-order,自動重新排序
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,實現總計
 DocType: Employee,Place of Issue,簽發地點
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,合同
 DocType: Email Digest,Add Quote,添加報價
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,間接費用
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,您的產品或服務
-DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,同步主數據
+apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,您的產品或服務
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+DocType: Student Applicant,AP,美聯社
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
 DocType: Journal Entry Account,Purchase Order,採購訂單
+DocType: Vehicle,Fuel UOM,燃油計量單位
 DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
+DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
 DocType: Purchase Invoice,Recurring Type,經常性類型
-DocType: Address,City/Town,市/鎮
-DocType: Address,Is Your Company Address,是你的公司地址
-DocType: Email Digest,Annual Income,年收入
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +394,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
+DocType: Item,Foreign Trade Details,外貿詳細
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,送貨單{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
+DocType: Student Group Student,Group Roll Number,組卷編號
+DocType: Student Group Student,Group Roll Number,組卷編號
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
 DocType: Hub Settings,Seller Website,賣家網站
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},生產訂單狀態為{0}
+DocType: Item,ITEM-,項目-
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},生產訂單狀態為{0}
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,對供應商
+,Team Updates,團隊更新
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計（公司貨幣）
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,創建打印格式
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},沒有找到所謂的任何項目{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出貨總計
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",只能有一個運輸規則條件為0或空值“ To值”
-DocType: Authorization Rule,Transaction,交易
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",只能有一個運輸規則條件為0或空值“ To值”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：該成本中心是一個集團。不能讓反對團體的會計分錄。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,兒童倉庫存在這個倉庫。您不能刪除這個倉庫。
 DocType: Item,Website Item Groups,網站項目群組
 DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,序號{0}多次輸入
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,序號{0}多次輸入
 DocType: Depreciation Schedule,Journal Entry,日記帳分錄
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,正在進行{0}項目
 DocType: Workstation,Workstation Name,工作站名稱
+DocType: Grading Scale Interval,Grade Code,等級代碼
+DocType: POS Item Group,POS Item Group,POS項目組
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
 DocType: Sales Partner,Target Distribution,目標分佈
 DocType: Salary Slip,Bank Account No.,銀行賬號
 DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
 DocType: Quality Inspection Reading,Reading 8,閱讀8
-DocType: Sales Partner,Agent,代理人
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能你應該改變“基於分佈式費”
 DocType: Purchase Invoice,Taxes and Charges Calculation,稅費計算
-DocType: BOM Operation,Workstation,工作站
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,硬件
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,詢價供應商
 DocType: Sales Order,Recurring Upto,經常性高達
 DocType: Attendance,HR Manager,人力資源經理
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,請選擇一個公司
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,特權休假
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,請選擇一個公司
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,特權休假
 DocType: Purchase Invoice,Supplier Invoice Date,供應商發票日期
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要啟用購物車
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,您需要啟用購物車
+DocType: Payment Entry,Writeoff,註銷
 DocType: Appraisal Template Goal,Appraisal Template Goal,考核目標模板
-DocType: Salary Slip,Earning,盈利
+DocType: Salary Component,Earning,盈利
 DocType: Purchase Invoice,Party Account Currency,黨的賬戶幣種
 ,BOM Browser,BOM瀏覽器
-DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,存在重疊的條件：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +80,Overlapping conditions found between:,存在重疊的條件：
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,總訂單價值
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,食物
+apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,老齡範圍3
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,馬克考勤
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},針對{1}存在維護計劃{0}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,招生學生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在關閉帳戶的貨幣必須是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
 DocType: Project,Start and End Dates,開始和結束日期
 ,Delivered Items To Be Billed,交付項目要被收取
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},開放BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
-DocType: Authorization Rule,Average Discount,平均折扣
-DocType: Address,Utilities,公用事業
+DocType: Rename Tool,Utilities,公用事業
 DocType: Purchase Invoice Item,Accounting,會計
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
+DocType: Asset,Depreciation Schedules,折舊計劃
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 DocType: Payment Request,Transaction Currency,交易貨幣
-apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},從{0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +25,From {0} | {1} {2},從{0} | {1} {2}
 DocType: Production Order Operation,Operation Description,操作說明
 DocType: Item,Will also apply to variants,也將適用於變種
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,不能更改財政年度開始日期和財政年度結束日期，一旦會計年度被保存。
 DocType: Quotation,Shopping Cart,購物車
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日傳出
 DocType: POS Profile,Campaign,競賽
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
+DocType: Supplier,Name and Type,名稱和類型
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
 DocType: Purchase Invoice,Contact Person,聯絡人
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
-DocType: Holiday List,Holidays,假期
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
+DocType: Course Scheduling Tool,Course End Date,課程結束日期
 DocType: Sales Order Item,Planned Quantity,計劃數量
 DocType: Purchase Invoice Item,Item Tax Amount,項目稅額
 DocType: Item,Maintain Stock,維護庫存資料
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,在固定資產淨變動
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
+DocType: Employee,Prefered Email,首選電子郵件
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,在固定資產淨變動
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},最大數量：{0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,從日期時間
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,倉庫是強制性的類型股票的非組帳戶
+apps/erpnext/erpnext/controllers/accounts_controller.py +673,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +260,Max: {0},最大數量：{0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,購買金額
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +151,"Request for Quotation is disabled to access from portal, for more check portal settings.",詢價被禁止訪問門脈，為更多的檢查門戶設置。
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Buying Amount,購買金額
 DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
-apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,不能大於100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Detail,Depends on Leave Without Pay,依賴於無薪休假
 DocType: Pricing Rule,"Higher the number, higher the priority",數字越大，優先級越高
 ,Purchase Invoice Trends,購買發票趨勢
-DocType: Employee,Better Prospects,更好的前景
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}數量。請選擇具有{3}數量的其他批次，或將該行拆分成多個行，以便從多個批次中傳遞/發布
 DocType: Appraisal,Goals,目標
 DocType: Warranty Claim,Warranty / AMC Status,保修/ AMC狀態
 ,Accounts Browser,帳戶瀏覽器
+DocType: Payment Entry Reference,Payment Entry Reference,付款輸入參考
 DocType: GL Entry,GL Entry,GL報名
 DocType: HR Settings,Employee Settings,員工設置
 ,Batch-Wise Balance History,間歇式平衡歷史
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待辦事項列表
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Apprentice,學徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,負數量是不允許
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印設置在相應的打印格式更新
+DocType: Package Code,Package Code,封裝代碼
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,學徒
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,負數量是不允許
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",從項目主檔獲取的稅務詳細資訊表，成為字串並存儲在這欄位。用於稅賦及費用
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,員工不能報告自己。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,員工不能報告自己。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結，條目被允許受限制的用戶。
 DocType: Email Digest,Bank Balance,銀行結餘
-apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
 DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況，學歷等。
 DocType: Journal Entry Account,Account Balance,帳戶餘額
-apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,稅收規則進行的交易。
+apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,稅收規則進行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,我們買這個項目
-DocType: Address,Billing,計費
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,我們買這個項目
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客戶對應收賬款{2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,顯示未關閉的會計年度的盈虧平衡
 DocType: Shipping Rule,Shipping Account,送貨帳戶
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}帳戶{2}無效
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,製作銷售訂單，以幫助你計劃你的工作和按時交付
 DocType: Quality Inspection,Readings,閱讀
 DocType: Stock Entry,Total Additional Costs,總額外費用
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,子組件
-DocType: Shipping Rule Condition,To Value,To值
+DocType: BOM,Scrap Material Cost(Company Currency),廢料成本（公司貨幣）
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,子組件
+DocType: Asset,Asset Name,資產名稱
+DocType: Project,Task Weight,任務重
 DocType: Asset Movement,Stock Manager,庫存管理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,包裝單
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,包裝單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,辦公室租金
-apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,設置短信閘道設置
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,設置短信閘道設置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,導入失敗！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,尚未新增地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,分析人士
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,分析人士
 DocType: Item,Inventory,庫存
 DocType: Item,Sales Details,銷售詳細資訊
 DocType: Opportunity,With Items,隨著項目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在數量
 DocType: Notification Control,Expense Claim Rejected,費用索賠被拒絕
-DocType: Item Attribute,Item Attribute,項目屬性
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,政府
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,項目變體
+DocType: Item,Item Attribute,項目屬性
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,報銷{0}已經存在車輛日誌
+apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,學院名稱
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,請輸入還款金額
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,項目變體
 DocType: Company,Services,服務
-DocType: Cost Center,Parent Cost Center,父成本中心
-DocType: Sales Invoice,Source,源
+DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,選擇潛在供應商
+apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,顯示關閉
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,沒有在支付表中找到記錄
+apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}衝突{1}在{2} {3}
+DocType: Student Attendance Tool,Students HTML,學生HTML
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,財政年度開始日期
+DocType: POS Profile,Apply Discount,應用折扣
 DocType: Employee External Work History,Total Experience,總經驗
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,包裝單（ S）已取消
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,從投資現金流
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打開項目
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,包裝單（ S）已取消
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,從投資現金流
+DocType: Program Course,Program Course,課程計劃
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,貨運代理費
+DocType: Homepage,Company Tagline for website homepage,公司標語的網站主頁
 DocType: Item Group,Item Group Name,項目群組名稱
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝
+DocType: Student,Date of Leaving,離開日期
 DocType: Pricing Rule,For Price List,對於價格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,獵頭
-apps/erpnext/erpnext/stock/stock_ledger.py +426,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",購買率的項目：{0}沒有找到，這是需要預訂會計分錄（費用）。請註明項目價格對買入價格表。
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,建立潛在客戶
 DocType: Maintenance Schedule,Schedules,時間表
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
+DocType: Landed Cost Voucher,Additional Charges,附加費用
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
+DocType: Student,Leaving Certificate Number,畢業證書號碼
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次數量在倉庫
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
 DocType: Purchase Invoice,Select Shipping Address,選擇送貨地址
 DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
-,Accounts Receivable Summary,應收賬款匯總
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,應收賬款匯總
+DocType: Employee Loan,Monthly Repayment Amount,每月還款額
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,貢獻金額
 DocType: Purchase Invoice,Shipping Address,送貨地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存，就會顯示出來。
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,品牌主檔。
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,品牌主檔。
+apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},學生{0}  -  {1}出現連續中多次{2}和{3}
+DocType: Program Enrollment Tool,Program Enrollments,計劃擴招
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,箱
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,默認倉庫需要選中的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,可能的供應商
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,本組織
 DocType: Budget,Monthly Distribution,月度分佈
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生產計劃銷售訂單
 DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +110,Accounting Entry for {0} can only be made in currency: {1},會計分錄為{0}只能在貨幣進行：{1}
+DocType: Loan Type,Maximum Loan Amount,最高貸款額度
 DocType: Pricing Rule,Pricing Rule,定價規則
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,材料要求採購訂單
-DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},學生{0}的重複卷號
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},學生{0}的重複卷號
+DocType: Budget,Action if Annual Budget Exceeded,如果行動年度預算超標
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求採購訂單
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行帳戶
 ,Bank Reconciliation Statement,銀行對帳表
-DocType: Address,Lead Name,鉛名稱
-,POS,POS
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,期初存貨餘額
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0}必須只出現一次
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
+,Lead Name,鉛名稱
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,期初存貨餘額
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0}必須只出現一次
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0}的排假成功
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,生產數量是必填的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,生產數量是必填的
+DocType: Employee Loan,Repayment Method,還款方式
+DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果選中，主頁將是網站的默認項目組
 DocType: Quality Inspection Reading,Reading 4,4閱讀
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},默認BOM {0}未找到項目{1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,索賠費用由公司負責。
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",學生在系統的心臟，添加所有的學生
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}無法支票日期前{2}
 DocType: Company,Default Holiday List,預設假日表列
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,現貨負債
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：從時間和結束時間{1}是具有重疊{2}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,現貨負債
 DocType: Purchase Invoice,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯絡手機號碼
 ,Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
+DocType: Student Group,Set 0 for no limit,為不限制設為0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新發送付款電子郵件
-apps/erpnext/erpnext/config/selling.py +206,Other Reports,其他報告
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任務
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,請報價
+apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他報告
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
-DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
 DocType: SMS Center,Receiver List,收受方列表
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +97,Net Change in Cash,現金淨變動
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},付款申請已經存在{0}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,搜索項目
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金淨變動
+DocType: Assessment Plan,Grading Scale,分級量表
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,已經完成
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},付款申請已經存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +241,Quantity must not be more than {0},數量必須不超過{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},數量必須不超過{0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,上一財政年度未關閉
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),時間（天）
 DocType: Quotation Item,Quotation Item,產品報價
 DocType: Account,Account Name,帳戶名稱
@@ -1209,89 +1503,113 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Conversion rate cannot be 0 or 1,轉化率不能為0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,轉化率不能為0或1
 DocType: Sales Invoice,Reference Document,參考文獻
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制器
 DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",設定線上購物車，如航運規則，價格表等
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}％已開立帳單
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}％已開立帳單
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留數量
 DocType: Party Account,Party Account,黨的帳戶
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力資源
-DocType: Lead,Upper Income,高收入
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力資源
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,拒絕
 DocType: Journal Entry Account,Debit in Company Currency,借記卡在公司貨幣
 DocType: BOM Item,BOM Item,BOM項目
 DocType: Appraisal,For Employee,對於員工
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,請輸入支付
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
 DocType: Company,Default Values,默認值
 DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,這是基於對本車輛的日誌。詳情請參閱以下時間表
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,蒐集
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
-DocType: Payment Reconciliation,Payments,付款
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,資產運動記錄{0}創建
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
 DocType: Journal Entry,Entry Type,條目類型
 ,Customer Credit Balance,客戶信用平衡
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,應付賬款淨額變化
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,應付賬款淨額變化
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,價錢
 DocType: Quotation,Term Details,長期詳情
+DocType: Project,Total Sales Cost (via Sales Order),總銷售成本（通過銷售訂單）
+DocType: Project,Total Sales Cost (via Sales Order),總銷售成本（通過銷售訂單）
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必須大於0
 DocType: Manufacturing Settings,Capacity Planning For (Days),產能規劃的範圍（天）
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,保修索賠
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,採購
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,強制性領域 - 計劃
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,強制性領域 - 計劃
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,保修索賠
 ,Lead Details,潛在客戶詳情
+DocType: Salary Slip,Loan repayment,償還借款
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
 DocType: Pricing Rule,Applicable For,適用
-DocType: Bank Reconciliation,From Date,從日期
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},進入當前的里程表讀數應該比最初的車輛里程表更大的{0}
 DocType: Shipping Rule Country,Shipping Rule Country,航運規則國家
-DocType: Maintenance Visit,Partially Completed,部分完成
-DocType: Leave Type,Include holidays within leaves as leaves,葉葉子中包括節假日
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,離開和考勤
+DocType: Leave Type,Include holidays within leaves as leaves,休假中包含節日做休假
 DocType: Sales Invoice,Packed Items,盒裝項目
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,針對序列號保修索賠
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM",在它使用的所有其他材料明細表替換特定的BOM。它將取代舊的BOM鏈接，更新成本和再生“BOM展開項目”表按照新的BOM
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;總&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total','總數'
 DocType: Shopping Cart Settings,Enable Shopping Cart,啟用購物車
-DocType: Employee,Permanent Address,永久地址
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推動打擊{0} {1}不能大於付出\超過總計{2}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,請選擇商品代碼
+DocType: Student Sibling,Studying in Same Institute,就讀於同一研究所
 DocType: Territory,Territory Manager,區域經理
 DocType: Packed Item,To Warehouse (Optional),倉庫（可選）
 DocType: Payment Entry,Paid Amount (Company Currency),支付的金額（公司貨幣）
 DocType: Purchase Invoice,Additional Discount,更多優惠
 DocType: Selling Settings,Selling Settings,銷售設置
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,網上拍賣
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司、月分與財務年度是必填的
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
+apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,查看你的購物車
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/stock/doctype/item/item.js +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,接下來折舊日期是強制性的新資產
+DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
+DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,該產品的一個單元。
+DocType: Fee Category,Fee Category,收費類別
+,Student Fee Collection,學生費徵收
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +154,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},在第{0}行需要倉庫
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
-DocType: Address,Postal,郵政
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext設定完成！
-DocType: Item,Weightage,權重
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
+DocType: Vehicle,Doors,門
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext設定完成！
+DocType: Course Assessment Criteria,Weightage,權重
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的損益“賬戶成本中心{2}。請設置為公司默認的成本中心。
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新建聯絡人
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
 DocType: Stock Entry,Material Receipt,收料
 DocType: Homepage,Products,產品
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},黨的類型和黨的需要應收/應付帳戶{0}
+DocType: Announcement,Instructor,講師
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種，那麼它不能在銷售訂單等選擇
 DocType: Lead,Next Contact By,下一個聯絡人由
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +223,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
 DocType: Quotation,Order Type,訂單類型
 DocType: Purchase Invoice,Notification Email Address,通知電子郵件地址
 ,Item-wise Sales Register,項目明智的銷售登記
+DocType: Asset,Gross Purchase Amount,總購買金額
+DocType: Asset,Depreciation Method,折舊方法
+apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,離線
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,總目標
 DocType: Job Applicant,Applicant for a Job,申請人作業
@@ -1301,58 +1619,75 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
 DocType: Purchase Invoice Item,Batch No,批號
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
-apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,主頁
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,變種
+DocType: Student Group Instructor,Student Group Instructor,學生組教練
+DocType: Student Group Instructor,Student Group Instructor,學生組教練
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2手機號碼
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,主頁
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,變種
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +858,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
-DocType: Payment Reconciliation Payment,Allocated amount,分配量
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Sales Team,Contribution to Net Total,貢獻淨合計
 DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
 DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
 DocType: Territory,Territory Name,地區名稱
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,申請職位
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
-apps/erpnext/erpnext/hooks.py +88,Addresses,地址
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
+DocType: Item,Serial Nos and Batches,序列號和批號
+DocType: Item,Serial Nos and Batches,序列號和批號
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,學生群體力量
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,學生群體力量
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,估價
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,請輸入
+apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill為項目{0} {1}超過{2}。要允許對帳單，請在購買設置中設置
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,請創建此倉庫的帳戶，並將其鏈接。這不能與名稱的帳戶自動完成{0}已存在
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
+DocType: Student Group,Instructors,教師
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
-apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,付款
+apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,管理您的訂單
 DocType: Production Order Operation,Actual Time and Cost,實際時間和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1}，最多可以有 {0} 被完成。
 DocType: Employee,Salutation,招呼
-DocType: Pricing Rule,Brand,品牌
+DocType: Course,Course Abbreviation,當然縮寫
+DocType: Student Leave Application,Student Leave Application,學生請假申請
 DocType: Item,Will also apply for variants,同時將申請變種
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},員工{0}上半天{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,開啟
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在銷售時捆綁項目。
 DocType: Quotation Item,Actual Qty,實際數量
 DocType: Sales Invoice Item,References,參考
 DocType: Quality Inspection Reading,Reading 10,閱讀10
-apps/erpnext/erpnext/public/js/setup_wizard.js +284,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
 DocType: Hub Settings,Hub Node,樞紐節點
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正，然後再試一次。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,關聯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,關聯
+DocType: Asset Movement,Asset Movement,資產運動
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,新的車
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
 DocType: SMS Center,Create Receiver List,創建接收器列表
+DocType: Vehicle,Wheels,車輪
 DocType: Packing Slip,To Package No.,以包號
-DocType: Production Planning Tool,Material Requests,材料要求
 DocType: Warranty Claim,Issue Date,發行日期
 DocType: Activity Cost,Activity Cost,項目成本
+DocType: Sales Invoice Timesheet,Timesheet Detail,詳細時間表
 DocType: Purchase Receipt Item Supplied,Consumed Qty,消耗的數量
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,電信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
@@ -1361,238 +1696,308 @@
 ,Sales Invoice Trends,銷售發票趨勢
 DocType: Leave Application,Apply / Approve Leaves,申請/審批葉
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,對於
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +134,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
 DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
-DocType: Stock Settings,Allowance Percent,津貼百分比
 DocType: SMS Settings,Message Parameter,訊息參數
-apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,財務成本中心的樹。
+apps/erpnext/erpnext/config/accounts.py +210,Tree of financial Cost Centers.,財務成本中心的樹。
 DocType: Serial No,Delivery Document No,交貨證明文件號碼
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +184,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},請公司制定“關於資產處置收益/損失帳戶”{0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,從採購入庫單取得項目
 DocType: Serial No,Creation Date,創建日期
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},項{0}中多次出現價格表{1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
 DocType: Production Plan Material Request,Material Request Date,材料申請日期
 DocType: Purchase Order Item,Supplier Quotation Item,供應商報價項目
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,禁止建立生產訂單的時間日誌。不得對生產訂單追踪作業
+DocType: Student,Student Mobile Number,學生手機號碼
 DocType: Item,Has Variants,有變種
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批號是必需的
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批號是必需的
 DocType: Sales Person,Parent Sales Person,母公司銷售人員
-apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,請在公司主檔及全域性預設值指定預設貨幣
 DocType: Purchase Invoice,Recurring Invoice,經常性發票
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,項目管理
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,項目管理
 DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
 DocType: Budget,Fiscal Year,財政年度
+DocType: Vehicle Log,Fuel Price,燃油價格
 DocType: Budget,Budget,預算
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已實現
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,區域/客戶
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,例如5
+DocType: Student Admission,Application Form Route,申請表路線
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,區域/客戶
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,休假類型{0}，因為它是停薪留職無法分配
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,銷售發票一被儲存，就會顯示出來。
 DocType: Item,Is Sales Item,是銷售項目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,項目群組的樹狀結構
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定，請檢查項目主檔
 DocType: Maintenance Visit,Maintenance Time,維護時間
-,Amount to Deliver,量交付
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,產品或服務
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,產品或服務
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早（學年{}）。請更正日期，然後再試一次。
+DocType: Guardian,Guardian Interests,守護興趣
 DocType: Naming Series,Current Value,當前值
+apps/erpnext/erpnext/controllers/accounts_controller.py +252,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
 ,Serial No Status,序列號狀態
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,項目表不能為空
+DocType: Payment Entry Reference,Outstanding,優秀
+,Daily Timesheet Summary,每日時間表摘要
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}：設置{1}的週期性，從和到日期\
 之間差必須大於或等於{2}"
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,這是基於庫存移動。見{0}詳情
 DocType: Pricing Rule,Selling,銷售
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},金額{0} {1}抵扣{2}
 DocType: Employee,Salary Information,薪資資訊
 DocType: Sales Person,Name and Employee ID,姓名和僱員ID
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,關稅和稅款
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,參考日期請輸入
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,關稅和稅款
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,參考日期請輸入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項，將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
 DocType: Purchase Order Item,Material Request Item,物料需求項目
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,項目群組樹。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
 ,Item-wise Purchase History,全部項目的購買歷史
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,紅
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
 ,Open Production Orders,開放狀態的生產訂單
+DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金額（公司幣種）
 DocType: Installation Note,Installation Time,安裝時間
 DocType: Sales Invoice,Accounting Details,會計細節
-apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,刪除所有交易本公司
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生產數量訂單{3}。請經由時間日誌更新運行狀態
+apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,刪除所有交易本公司
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生產數量訂單{3}。請經由時間日誌更新運行狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
-apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
-DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
+DocType: Item Quality Inspection Parameter,Acceptance Criteria,驗收標準
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,請輸入在上表請求材料
 DocType: Item Attribute,Attribute Name,屬性名稱
-DocType: Item Group,Show In Website,顯示在網站
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,組
+DocType: BOM,Show In Website,顯示在網站
+DocType: Shopping Cart Settings,Show Quantity in Website,顯示在網站數量
+DocType: Employee Loan Application,Total Payable Amount,合計應付額
 DocType: Task,Expected Time (in hours),預期時間（以小時計）
+DocType: Item Reorder,Check in (group),檢查（組）
 ,Qty to Order,訂購數量
+DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",負債或權益下的帳戶頭，其中利潤/虧損將被黃牌警告
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,所有任務的甘特圖。
+DocType: Opportunity,Mins to First Response,分鐘為第一個反應
+DocType: Pricing Rule,Margin Type,保證金類型
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}小時
+DocType: Course,Default Grading Scale,默認等級規模
 DocType: Appraisal,For Employee Name,對於員工姓名
-DocType: Holiday List,Clear Table,清除表格
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
-DocType: Activity Cost,Costing Rate,成本率
+DocType: Room,Room Name,房間名稱
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
 ,Customer Addresses And Contacts,客戶的地址和聯絡方式
+,Campaign Efficiency,運動效率
+,Campaign Efficiency,運動效率
+DocType: Discussion,Discussion,討論
+DocType: Payment Entry,Transaction ID,事務ID
 DocType: Employee,Resignation Letter Date,辭退信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+DocType: Task,Total Billing Amount (via Time Sheet),總開票金額（通過時間表）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有“支出審批”權限
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,對
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有“支出審批”權限
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,對
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,選擇BOM和數量生產
+DocType: Asset,Depreciation Schedule,折舊計劃
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
 DocType: Item,Has Batch No,有批號
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},年度結算：{0}
 DocType: Delivery Note,Excise Page Number,消費頁碼
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory",公司，從日期和結束日期是必須
+DocType: Asset,Purchase Date,購買日期
 DocType: Employee,Personal Details,個人資料
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
 ,Maintenance Schedules,保養時間表
+DocType: Task,Actual End Date (via Time Sheet),實際結束日期（通過時間表）
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
 ,Quotation Trends,報價趨勢
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
 DocType: Shipping Rule Condition,Shipping Amount,航運量
-,Pending Amount,待審核金額
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
 DocType: Purchase Order,Delivered,交付
+,Vehicle Expenses,車輛費用
+DocType: Serial No,Invoice Details,發票明細
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},使用壽命後預期值必須大於或等於{0}
 DocType: Purchase Receipt,Vehicle Number,車號
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,在其經常性發票將被停止日期
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
+DocType: Employee Loan,Loan Amount,貸款額度
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清單未找到項目{1}
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
-DocType: Address Template,This format is used if country specific format is not found,此格式用於如果找不到特定國家的格式
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,輸入支付的金額
+DocType: Salary Structure,Select employees for current Salary Structure,當前薪酬結構中選擇員工
 DocType: Production Order,Use Multi-Level BOM,採用多級物料清單
 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
 DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
+apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,時間表
 DocType: HR Settings,HR Settings,人力資源設置
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
+DocType: Salary Slip,net pay info,淨工資信息
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
+DocType: Email Digest,New Expenses,新的費用
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
-apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,縮寫不能為空或空間
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,縮寫不能為空或空間
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,集團以非組
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
+DocType: Loan Type,Loan Name,貸款名稱
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,實際總計
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,單位
-apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,請註明公司
+DocType: Student Siblings,Student Siblings,學生兄弟姐妹
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,單位
+apps/erpnext/erpnext/stock/get_item_details.py +131,Please specify Company,請註明公司
 ,Customer Acquisition and Loyalty,客戶取得和忠誠度
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
+DocType: Production Order,Skip Material Transfer,跳過材料轉移
+DocType: Production Order,Skip Material Transfer,跳過材料轉移
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,無法為關鍵日期{2}查找{0}到{1}的匯率。請手動創建貨幣兌換記錄
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,您的財政年度結束於
 DocType: POS Profile,Price List,價格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
-apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,報銷
-DocType: Issue,Support,支持
-,BOM Search,BOM搜索
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),截止（開標+總計）
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,請公司指定的貨幣
+apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,報銷
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),截止（開標+總計）
+DocType: Vehicle,Fuel Type,燃料類型
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,請公司指定的貨幣
 DocType: Workstation,Wages per hour,時薪
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
-DocType: Production Plan Item,material_request_item,material_request_item
-DocType: Salary Slip,Deduction,扣除
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
-DocType: Address Template,Address Template,地址模板
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
+DocType: Email Digest,Pending Sales Orders,待完成銷售訂單
+apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：參考文件類型必須是銷售訂單之一，銷售發票或日記帳分錄
+DocType: Salary Component,Deduction,扣除
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
+DocType: Stock Reconciliation Item,Amount Difference,金額差異
+apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
 DocType: Territory,Classification of Customers by region,客戶按區域分類
-DocType: Project,% Tasks Completed,％ 任務已完成
-DocType: Project,Gross Margin,毛利
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,請先輸入生產項目
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,差量必須是零
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,請先輸入生產項目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算的銀行對賬單餘額
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,報價
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,報價
 DocType: Salary Slip,Total Deduction,扣除總額
-DocType: Maintenance Visit,Maintenance User,維護用戶
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,成本更新
-DocType: Employee,Date of Birth,出生日期
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,項{0}已被退回
+,Production Analytics,生產Analytics（分析）
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,項{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
 DocType: Opportunity,Customer / Lead Address,客戶/鉛地址
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",信息幫助你的業務，你所有的聯繫人和更添加為您的線索
 DocType: Production Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於（用戶）
 DocType: Purchase Taxes and Charges,Deduct,扣除
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Job Description,職位描述
-DocType: Purchase Order Item,Qty as per Stock UOM,數量按庫存計量單位
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,職位描述
+DocType: Student Applicant,Applied,應用的
+DocType: Sales Invoice Item,Qty as per Stock UOM,數量按庫存計量單位
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian2 Name,Guardian2名稱
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +131,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息，報價，銷售訂單等，從競賽來衡量投資報酬。
 DocType: Expense Claim,Approver,審批人
 ,SO Qty,SO數量
 DocType: Appraisal,Calculate Total Score,計算總分
 DocType: Request for Quotation,Manufacturing Manager,生產經理
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
-apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,拆分送貨單成數個包裝。
-apps/erpnext/erpnext/hooks.py +74,Shipments,發貨
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,拆分送貨單成數個包裝。
+apps/erpnext/erpnext/hooks.py +87,Shipments,發貨
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,倉庫{3}的{1}和庫存值（{2}）的帳戶餘額（{0}）必須相同
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,倉庫{3}的{1}和庫存值（{2}）的帳戶餘額（{0}）必須相同
+DocType: Payment Entry,Total Allocated Amount (Company Currency),總撥款額（公司幣種）
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
+DocType: BOM,Scrap Material Cost,廢料成本
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大寫（Company Currency）
 DocType: Asset,Supplier,供應商
-apps/erpnext/erpnext/public/js/utils.js +156,Get From,得到
-DocType: C-Form,Quarter,季
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
-apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異帳戶是強制必填的，因為它影響整個庫存總值。
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費，請在「股票設定」設定
+apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異帳戶是強制必填的，因為它影響整個庫存總值。
 DocType: Cheque Print Template,Bank Name,銀行名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,用戶{0}被禁用
+DocType: Employee Loan,Employee Loan Account,員工貸款賬戶
 DocType: Leave Application,Total Leave Days,總休假天數
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：電子郵件將不會被發送到被禁用的用戶
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,選擇公司...
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次數
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次數
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
-apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,新的採購成本
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},所需的{0}項目銷售訂單
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司貨幣）
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,他人
-apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
+DocType: Payment Entry,Unallocated Amount,未分配金額
+apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
 DocType: POS Profile,Taxes and Charges,稅收和收費
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買，出售或持有的股票。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
+apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,沒有更多的更新
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,添加時間表
+DocType: Vehicle Service,Service Item,服務項目
+DocType: Bank Guarantee,Bank Guarantee,銀行擔保
+DocType: Bank Guarantee,Bank Guarantee,銀行擔保
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,有錯誤，同時刪除以下時間表：
 DocType: Bin,Ordered Quantity,訂購數量
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",例如「建設建設者工具“
-DocType: Quality Inspection,In Process,在過程
+DocType: Grading Scale,Grading Scale Intervals,分級刻度間隔
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}會計分錄只能在貨幣言：{3}
+DocType: Production Order,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,財務賬目的樹。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0}針對銷售訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,序列化庫存
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,序列化庫存
+DocType: Employee Loan,Account Info,帳戶信息
 DocType: Activity Type,Default Billing Rate,默認計費率
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0}創建學生組。
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0}創建學生組。
 DocType: Sales Invoice,Total Billing Amount,總結算金額
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,應收賬款
+apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,必須有這個工作，啟用默認進入的電子郵件帳戶。請設置一個默認的傳入電子郵件帳戶（POP / IMAP），然後再試一次。
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,應收賬款
+apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
 DocType: Quotation Item,Stock Balance,庫存餘額
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,銷售訂單到付款
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,請選擇正確的帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
-DocType: Employee,Blood Group,血型
-DocType: Purchase Invoice Item,Page Break,分頁符
+DocType: Salary Structure Employee,Salary Structure Employee,薪資結構員工
 DocType: Production Order Operation,Pending,擱置
+DocType: Course,Course Name,課程名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,辦公設備
 DocType: Purchase Invoice Item,Qty,數量
 DocType: Fiscal Year,Companies,企業
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,電子
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,全日制
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,全日制
+DocType: Salary Structure,Employees,僱員
 DocType: Employee,Contact Details,聯絡方式
 DocType: C-Form,Received Date,接收日期
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已經創建了銷售稅和費模板標準模板，選擇一個，然後點擊下面的按鈕。
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,請指定一個國家的這種運輸規則或檢查全世界運輸
+DocType: BOM Scrap Item,Basic Amount (Company Currency),基本金額（公司幣種）
+DocType: Student,Guardians,守護者
+DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,價格將不會顯示如果沒有設置價格
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,請指定一個國家的這種運輸規則或檢查全世界運輸
 DocType: Stock Entry,Total Incoming Value,總收入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,借方是必填項
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間，費用和結算由你的團隊做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,採購價格表
 DocType: Offer Letter Term,Offer Term,要約期限
 DocType: Quality Inspection,Quality Manager,質量經理
@@ -1600,179 +2005,217 @@
 DocType: Payment Reconciliation,Payment Reconciliation,付款對帳
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,請選擇Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},總未付：{0}
+DocType: BOM Website Operation,BOM Website Operation,BOM網站運營
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,報價函
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,產生物料需求（MRP）和生產訂單。
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,總開票金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,總開票金額
+DocType: BOM,Conversion Rate,兌換率
+apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,產品搜索
 DocType: Timesheet Detail,To Time,要時間
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授權值）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,信用帳戶必須是應付賬款
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
 DocType: Production Order Operation,Completed Qty,完成數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,價格表{0}被禁用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,價格表{0}被禁用
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的數量不能超過{1}操作{2}
 DocType: Manufacturing Settings,Allow Overtime,允許加班
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
+DocType: Training Event Employee,Training Event Employee,培訓活動的員工
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
 DocType: Item,Customer Item Codes,客戶項目代碼
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,兌換收益/損失
 DocType: Opportunity,Lost Reason,失落的原因
-apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,樣本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +378,All items have already been invoiced,所有項目已開具發票
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,請輸入收據憑證
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,所有項目已開具發票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
-DocType: Project,External,外部
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},生產訂單創建：{0}
 DocType: Branch,Branch,分支機構
-apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,沒有工資單找到了一個月：
+DocType: Guardian,Mobile Number,手機號碼
 DocType: Bin,Actual Quantity,實際數量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列號{0}未找到
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,您的客戶
+DocType: Scheduling Tool,Student Batch,學生批
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客戶
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,使學生
+apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作：{0}
 DocType: Leave Block List Date,Block Date,封鎖日期
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,現在申請
-DocType: Sales Order,Not Delivered,未交付
+apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,現在申請
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
 ,Bank Clearance Summary,銀行結算摘要
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
 DocType: Appraisal Goal,Appraisal Goal,考核目標
+DocType: Stock Reconciliation Item,Current Amount,電流量
+DocType: Fee Structure,Fee Structure,費用結構
 DocType: Timesheet Detail,Costing Amount,成本核算金額
+DocType: Student Admission,Application Fee,報名費
 DocType: Process Payroll,Submit Salary Slip,提交工資單
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,品項{0}的最大折扣：{1}％
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,品項{0}的最大折扣：{1}％
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,進口散裝
 DocType: Sales Partner,Address & Contacts,地址及聯絡方式
 DocType: SMS Log,Sender Name,發件人名稱
 DocType: POS Profile,[Select],[選擇]
 DocType: SMS Log,Sent To,發給
 DocType: Payment Request,Make Sales Invoice,做銷售發票
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,軟件
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下來跟日期不能過去
 DocType: Company,For Reference Only.,僅供參考。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,選擇批號
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無效的{0}：{1}
 DocType: Sales Invoice Advance,Advance Amount,提前量
 DocType: Manufacturing Settings,Capacity Planning,產能規劃
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,“起始日期”是必需的
 DocType: Journal Entry,Reference Number,參考號碼
 DocType: Employee,Employment Details,就業資訊
 DocType: Employee,New Workplace,新工作空間
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,設置為關閉
-apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},沒有條碼{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},沒有條碼{0}的品項
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,案號不能為0
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
-apps/erpnext/erpnext/stock/doctype/item/item.py +134,Stores,商店
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,物料清單
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,商店
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,老齡化基於
 DocType: Item,End of Life,壽命結束
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,旅遊
+apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,旅遊
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
 DocType: Leave Block List,Allow Users,允許用戶
 DocType: Purchase Order,Customer Mobile No,客戶手機號碼
-DocType: Sales Invoice,Recurring,經常性
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
-DocType: Rename Tool,Rename Tool,重命名工具
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,轉印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,顯示工資單
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,轉印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
-apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制，通過{0} {1}項{4}。你在做另一個{3}對同一{2}？
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
 DocType: Installation Note,Installation Note,安裝注意事項
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,添加稅賦
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,從融資現金流
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,添加稅賦
+DocType: Topic,Topic,話題
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,從融資現金流
+DocType: Budget Account,Budget Account,預算科目
 DocType: Quality Inspection,Verified By,認證機構
-DocType: Address,Subsidiary,副
-apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
-DocType: Quality Inspection,Purchase Receipt No,採購入庫單編號
+apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
+DocType: Grading Scale Interval,Grade Description,等級說明
+DocType: Stock Entry,Purchase Receipt No,採購入庫單編號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保證金
 DocType: Process Payroll,Create Salary Slip,建立工資單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),資金來源（負債）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +380,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
 DocType: Appraisal,Employee,僱員
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,邀請成為用戶
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1}}已開票
-DocType: Workstation Working Hour,End Time,結束時間
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1}}已開票
+DocType: Training Event,End Time,結束時間
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,主動薪酬結構找到{0}員工{1}對於給定的日期
+DocType: Payment Entry,Payment Deductions or Loss,付款扣除或損失
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,集團透過券
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,集團透過券
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
-DocType: Sales Invoice,Mass Mailing,郵件群發
-DocType: Rename Tool,File to Rename,文件重命名
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchse Order number required for Item {0},項目{0}需要採購訂單號
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+apps/erpnext/erpnext/controllers/buying_controller.py +263,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
 DocType: Notification Control,Expense Claim Approved,報銷批准
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,製藥
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,製藥
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
 DocType: Purchase Invoice,Credit To,信貸
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,有效訊息/客戶
-DocType: Employee Education,Post Graduate,研究生
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
 DocType: Quality Inspection Reading,Reading 9,9閱讀
 DocType: Supplier,Is Frozen,就是冰凍
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,組節點倉庫不允許選擇用於交易
 DocType: Buying Settings,Buying Settings,採購設定
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM編號為成品產品
 DocType: Upload Attendance,Attendance To Date,出席會議日期
-DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,請註明公司以處理
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,應收賬款淨額變化
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,補假
-DocType: Quality Inspection Reading,Accepted,接受的
-apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
-apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},無效的參考{0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1})不能大於計劃數量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,應收賬款淨額變化
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,補假
+DocType: Offer Letter,Accepted,接受的
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,組織
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,組織
+DocType: SG Creation Tool Course,Student Group Name,學生組名稱
+apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
+DocType: Room,Room Number,房間號
+apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},無效的參考{0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1})不能大於計劃數量
 ({2})生產訂單的 {3}"
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,快速日記帳分錄
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
+apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,快速日記帳分錄
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
 DocType: Employee,Previous Work Experience,以前的工作經驗
 DocType: Stock Entry,For Quantity,對於數量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,需求的項目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目建立獨立的生產訂單。
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0}必須返回文檔中負
+,Minutes to First Response for Issues,分鐘的問題第一個反應
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
+apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,該機構的名稱要為其建立這個系統。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期，除以下指定職位權限外，他人無法修改。
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,項目狀態
 DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,創建以下生產訂單：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,創建以下生產訂單：
+DocType: Student Admission,Naming Series (for Student Applicant),命名系列（面向學生申請人）
 DocType: Delivery Note,Transporter Name,貨運公司名稱
 DocType: Authorization Rule,Authorized Value,授權值
-DocType: Contact,Enter department to which this Contact belongs,輸入聯絡人所屬部門
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +739,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,計量單位
+DocType: BOM,Show Operations,顯示操作
+,Minutes to First Response for Opportunity,分鐘的機會第一個反應
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結結束日期
 DocType: Task Depends On,Task Depends On,任務取決於
-DocType: Lead,Opportunity,機會
+DocType: Supplier Quotation,Opportunity,機會
 ,Completed Production Orders,已完成生產訂單
 DocType: Operation,Default Workstation,預設工作站
 DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1}關閉
+DocType: Payment Entry,Deductions or Loss,扣除或損失
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1}關閉
 DocType: Email Digest,How frequently?,多久？
 DocType: Purchase Receipt,Get Current Stock,取得當前庫存資料
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清單樹狀圖
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,馬克現在
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品編號&gt;商品組&gt;品牌
+DocType: Student,Joining Date,入職日期
+,Employees working on a holiday,員工在假期工作
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,馬克現在
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
 DocType: Production Order,Actual End Date,實際結束日期
+DocType: BOM,Operating Cost (Company Currency),營業成本（公司貨幣）
 DocType: Authorization Rule,Applicable To (Role),適用於（角色）
-DocType: Stock Entry,Purpose,目的
+DocType: Company,Fixed Asset Depreciation Settings,固定資產折舊設置
 DocType: Item,Will also apply for variants unless overrridden,同時將申請變種，除非overrridden
 DocType: Purchase Invoice,Advances,進展
 DocType: Production Order,Manufacture against Material Request,對製造材料要求
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,批准用戶作為用戶的規則適用於不能相同
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率（按庫存計量單位）
 DocType: SMS Log,No of Requested SMS,無的請求短信
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
 DocType: Campaign,Campaign-.####,運動 - ＃＃ ＃ ＃
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
+apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,結束年份
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{0} against Purchase Order {1},{0}針對採購訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0}針對採購訂單{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",在這裡輸入靜態URL參數（如稱發件人= ERPNext，用戶名= ERPNext，密碼= 1234等）
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不在任何現有的會計年度。詳情查看{2}。
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +14,This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
+DocType: Task,Actual Start Date (via Time Sheet),實際開始日期（通過時間表）
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,老齡範圍1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -1815,142 +2258,187 @@
  8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
  9。考慮稅收或收費為：在本節中，你可以指定是否稅/費僅用於評估（總不是部分），或只為總（不增加價值的項目），或兩者兼有。
  10。添加或扣除：無論你是想增加或扣除的稅。"
+DocType: Homepage,Homepage,主頁
 DocType: Purchase Receipt Item,Recd Quantity,到貨數量
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},費紀錄創造 -  {0}
+DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,接著聯繫到不能相同鉛郵箱地址
 DocType: Tax Rule,Billing City,結算城市
+DocType: Asset,Manual,手冊
+DocType: Salary Component Account,Salary Component Account,薪金部分賬戶
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
-apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
+apps/erpnext/erpnext/config/accounts.py +294,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
+DocType: Lead Source,Source Name,源名稱
 DocType: Journal Entry,Credit Note,信用票據
 DocType: Warranty Claim,Service Address,服務地址
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,家具及固定裝置
 DocType: Item,Manufacture,製造
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,請送貨單第一
+DocType: Student Applicant,Application Date,申請日期
+DocType: Salary Detail,Amount based on formula,量基於式
 DocType: Purchase Invoice,Currency and Price List,貨幣和價格表
 DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生產
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +62,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
+DocType: Guardian,Occupation,佔用
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計（數量）
 DocType: Sales Invoice,This Document,本文檔
 DocType: Installation Note Item,Installed Qty,安裝數量
-DocType: Lead,Fax,傳真
-DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,訓練結果
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
-apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,組織分支主檔。
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,或
+apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,組織分支主檔。
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,報告問題
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,公用事業費用
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日記條目{1}沒有帳戶{2}或已經對另一憑證匹配
 DocType: Buying Settings,Default Buying Price List,預設採購價格表
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
+DocType: Process Payroll,Salary Slip Based on Timesheet,基於時間表工資單
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
 DocType: Notification Control,Sales Order Message,銷售訂單訊息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司，貨幣，當前財政年度等
 DocType: Payment Entry,Payment Type,付款類型
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
 DocType: Process Payroll,Select Employees,選擇僱員
-DocType: Bank Reconciliation,To Date,至今
 DocType: Opportunity,Potential Sales Deal,潛在的銷售交易
+DocType: Payment Entry,Cheque/Reference Date,支票/參考日期
 DocType: Purchase Invoice,Total Taxes and Charges,總營業稅金及費用
 DocType: Employee,Emergency Contact,緊急聯絡人
+DocType: Bank Reconciliation Detail,Payment Entry,付款輸入
 DocType: Item,Quality Parameters,質量參數
+,sales-browser,銷售瀏覽器
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,分類帳
 DocType: Target Detail,Target  Amount,目標金額
 DocType: Shopping Cart Settings,Shopping Cart Settings,購物車設定
 DocType: Journal Entry,Accounting Entries,會計分錄
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},重複的條目。請檢查授權規則{0}
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,Global POS Profile {0} already created for company {1},全球POS檔案{0}的公司已經創建{1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},全球POS檔案{0}的公司已經創建{1}
 DocType: Purchase Order,Ref SQ,參考SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,更換項目/物料清單中的所有材料明細表
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,收到文件必須提交
 DocType: Purchase Invoice Item,Received Qty,到貨數量
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,沒有支付，未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,沒有支付，未送達
 DocType: Product Bundle,Parent Item,父項目
 DocType: Account,Account Type,帳戶類型
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
+apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,沒有考勤表
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工資表
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,使用戶
 DocType: Packing Slip,Identification of the package for the delivery (for print),寄送包裹的識別碼（用於列印）
 DocType: Bin,Reserved Quantity,保留數量
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,請輸入有效的電子郵件地址
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,請輸入有效的電子郵件地址
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},程序{0}沒有強制性課程
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},程序{0}沒有強制性課程
 DocType: Landed Cost Voucher,Purchase Receipt Items,採購入庫項目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,期間折舊額
+apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,殘疾人模板必須不能默認模板
 DocType: Account,Income Account,收入帳戶
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",請見“材料成本基於”在成本核算章節
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一頁
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",學生批幫助您跟踪學生的出勤，評估和費用
+DocType: Payment Entry,Total Allocated Amount,總撥款額
 DocType: Item Reorder,Material Request Type,材料需求類型
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,參考
-DocType: Budget,Cost Center,成本中心
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural日記條目從{0}薪金{1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",localStorage的是滿的，沒救
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,參考
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,憑證＃
 DocType: Notification Control,Purchase Order Message,採購訂單的訊息
 DocType: Tax Rule,Shipping Country,航運國家
+DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,從銷售交易隱藏客戶的稅號
 DocType: Upload Attendance,Upload HTML,上傳HTML
-DocType: Employee,Relieving Date,解除日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比，基於某些條件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫只能通過存貨分錄/送貨單/採購入庫單來改變
 DocType: Employee Education,Class / Percentage,類／百分比
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Head of Marketing and Sales,營銷和銷售主管
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得稅
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,營銷和銷售主管
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,所得稅
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果選擇的定價規則是由為'價格'，它將覆蓋價目表。定價規則價格是最終價格，所以沒有進一步的折扣應適用。因此，在像銷售訂單，採購訂單等交易，這將是“速度”字段進賬，而不是“價格單率”字段。
-apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,以行業類型追蹤訊息。
+apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,以行業類型追蹤訊息。
 DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
-apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
 DocType: Company,Stock Settings,庫存設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
+DocType: Vehicle,Electric,電動
+DocType: Task,% Progress,％進展
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,在資產處置收益/損失
+DocType: Training Event,Will send an email about the event to employees with status 'Open',會發郵件有關該事件員工狀態“打開”
+DocType: Task,Depends on Tasks,取決於任務
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客戶群組樹。
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,可以顯示附件，而不啟用購物車
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
+DocType: Project,Task Completion,任務完成
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,沒存貨
 DocType: Appraisal,HR User,HR用戶
 DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
-apps/erpnext/erpnext/hooks.py +100,Issues,問題
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},狀態必須是一個{0}
+apps/erpnext/erpnext/hooks.py +116,Issues,問題
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},狀態必須是一個{0}
 DocType: Sales Invoice,Debit To,借方
 DocType: Delivery Note,Required only for sample item.,只對樣品項目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},沒有找到之間的工資單{0}和{1}
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,學生入學
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1}被禁用
 DocType: Supplier,Billing Currency,結算貨幣
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,特大號
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,特大號
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,葉總
 ,Profit and Loss Statement,損益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票號碼
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對庫存分錄{2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對庫存分錄{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,當地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),貸款及墊款（資產）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務人
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,大
+DocType: Homepage Featured Product,Homepage Featured Product,首頁推薦產品
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,所有評估組
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名稱
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),總{0}（{1}）
 DocType: C-Form Invoice Detail,Territory,領土
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,請註明無需訪問
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
+DocType: Vehicle Log,Fuel Qty,燃油數量
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
+DocType: Course,Assessment,評定
 DocType: Payment Entry Reference,Allocated,分配
-apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
+apps/erpnext/erpnext/config/accounts.py +236,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
+DocType: Student Applicant,Application Status,應用現狀
+DocType: Fees,Fees,費用
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,{0}報價被取消
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,員工{0}於{1}休假。不能標記考勤。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Quotation {0} is cancelled,{0}報價被取消
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +29,Total Outstanding Amount,未償還總額
 DocType: Sales Partner,Targets,目標
 DocType: Price List,Price List Master,價格表主檔
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
 ,S.O. No.,SO號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +150,Please create Customer from Lead {0},請牽頭建立客戶{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},請牽頭建立客戶{0}
 DocType: Price List,Applicable for Countries,適用於國家
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申請“已批准”和“拒絕”，就可以提交
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},學生組名稱是強制性的行{0}
+DocType: Homepage,Products to be shown on website homepage,在網站首頁中顯示的產品
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
 DocType: POS Profile,Ignore Pricing Rule,忽略定價規則
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,從薪酬結構日期不能高於員工加入日期較小。
 DocType: Employee Education,Graduate,畢業生
 DocType: Leave Block List,Block Days,封鎖天數
 DocType: Journal Entry,Excise Entry,海關入境
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +66,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +69,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -1977,68 +2465,84 @@
  1。的解決糾紛，賠償，法律責任等
  1的方式。地址和公司聯繫。"
 DocType: Attendance,Leave Type,休假類型
-apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
-DocType: Account,Accounts User,會計人員
+DocType: Purchase Invoice,Supplier Invoice Details,供應商發票明細
+apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
+DocType: Project,Copied From,複製自
+DocType: Project,Copied From,複製自
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},名稱錯誤：{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1}不關聯{2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,員工{0}的考勤已標記
 DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹（用於列印）
+,Salary Register,薪酬註冊
+DocType: Warehouse,Parent Warehouse,家長倉庫
 DocType: C-Form Invoice Detail,Net Total,總淨值
-DocType: Bin,FCFS Rate,FCFS率
+apps/erpnext/erpnext/config/hr.py +163,Define various loan types,定義不同的貸款類型
 DocType: Payment Reconciliation Invoice,Outstanding Amount,未償還的金額
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),時間（分鐘）
 DocType: Project Task,Working,工作的
 DocType: Stock Ledger Entry,Stock Queue (FIFO),庫存序列（先進先出）
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{0} does not belong to Company {1},{0}不屬於公司{1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0}不屬於公司{1}
 DocType: Account,Round Off,四捨五入
 ,Requested Qty,要求數量
 DocType: Tax Rule,Use for Shopping Cart,使用的購物車
+apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的屬性{1}不在有效的項目列表中存在的屬性值項{2}
 DocType: BOM Item,Scrap %,廢鋼％
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",費用將被分配比例根據項目數量或金額，按您的選擇
-DocType: Maintenance Visit,Purposes,用途
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
-,Requested,要求
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,暫無產品說明
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,過期的
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,暫無產品說明
+DocType: Purchase Invoice,Overdue,過期的
 DocType: Account,Stock Received But Not Billed,庫存接收，但不付款
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,根帳戶必須是一組
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費金額+兌現金額 - 扣除項目金額
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,根帳戶必須是一組
+DocType: Fees,FEE.,費用。
+DocType: Employee Loan,Repaid/Closed,償還/關閉
+DocType: Item,Total Projected Qty,預計總數量
 DocType: Monthly Distribution,Distribution Name,分配名稱
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},項目{0}需要品質檢驗
+DocType: Course,Course Code,課程代碼
+apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},項目{0}需要品質檢驗
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客戶貨幣被換算成公司基礎貨幣的匯率
 DocType: Purchase Invoice Item,Net Rate (Company Currency),淨利率（公司貨幣）
+DocType: Salary Detail,Condition and Formula Help,條件和公式幫助
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理領地樹。
 DocType: Journal Entry Account,Sales Invoice,銷售發票
 DocType: Journal Entry Account,Party Balance,黨平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,請選擇適用的折扣
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,工資單創建
+apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,請選擇適用的折扣
 DocType: Company,Default Receivable Account,預設應收帳款
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
 DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
 DocType: Purchase Invoice,Half-yearly,每半年一次
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,存貨的會計分錄
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,存貨的會計分錄
+DocType: Vehicle Service,Engine Oil,機油
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
+DocType: Employee Loan,Loan Details,貸款詳情
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成數量必須大於零。
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
 DocType: Account,Root Type,root類型
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +88,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,情節
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,情節
 DocType: Item Group,Show this slideshow at the top of the page,這顯示在幻燈片頁面頂部
 DocType: BOM,Item UOM,項目計量單位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),稅額後，優惠金額（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +147,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+DocType: Cheque Print Template,Primary Settings,主要設置
 DocType: Purchase Invoice,Select Supplier Address,選擇供應商地址
-DocType: Quality Inspection,Quality Inspection,品質檢驗
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,帳戶{0}被凍結
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,添加員工
+DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
+DocType: Company,Standard Template,標準模板
+DocType: Training Event,Theory,理論
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},只能使支付對未付款的{0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,佣金比率不能大於100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},只能使支付對未付款的{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,佣金比率不能大於100
 DocType: Stock Entry,Subcontract,轉包
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,請輸入{0}第一
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,請輸入{0}第一
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,從沒有回复
 DocType: Production Order Operation,Actual End Time,實際結束時間
 DocType: Production Planning Tool,Download Materials Required,下載所需材料
 DocType: Item,Manufacturer Part Number,製造商零件編號
@@ -2047,187 +2551,244 @@
 DocType: SMS Log,No of Sent SMS,沒有發送短信
 DocType: Account,Expense Account,費用帳戶
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,軟件
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,顏色
-DocType: Maintenance Visit,Scheduled,預定
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,顏色
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,評估計劃標準
+DocType: Training Event,Scheduled,預定
+apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,詢價。
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
+DocType: Student Log,Academic,學術的
+apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
-DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,尚未選擇價格表之貨幣
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
+DocType: Vehicle,Diesel,柴油機
+apps/erpnext/erpnext/stock/get_item_details.py +318,Price List Currency not selected,尚未選擇價格表之貨幣
+,Student Monthly Attendance Sheet,學生每月考勤表
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,專案開始日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日誌
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,維護發票時間和工作時間的時間表相同
 DocType: Maintenance Visit Purpose,Against Document No,對文件編號
+DocType: BOM,Scrap,廢料
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理銷售合作夥伴。
 DocType: Quality Inspection,Inspection Type,檢驗類型
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},請選擇{0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
+DocType: Assessment Result Tool,Result HTML,結果HTML
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,新增學生
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,研究員
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,研究員
+DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,計劃註冊學生工具
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或電子郵件是強制性
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,進料品質檢驗
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,進料品質檢驗
 DocType: Purchase Order Item,Returned Qty,返回的數量
 DocType: Employee,Exit,出口
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,root類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,root類型是強制性的
+DocType: BOM,Total Cost(Company Currency),總成本（公司貨幣）
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列號{0}創建
+DocType: Homepage,Company Description for website homepage,公司介紹了網站的首頁
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名稱
+DocType: Sales Invoice,Time Sheet List,時間表列表
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
-DocType: Sales Invoice,Advertisement,廣告
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,試用期
+DocType: Asset Category Account,Depreciation Expense Account,折舊費用帳戶
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,試用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有葉節點中允許交易
 DocType: Expense Claim,Expense Approver,費用審批
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
+apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,非集團集團
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},在{0}行中必須使用批處理
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},在{0}行中必須使用批處理
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
-DocType: Payment Entry,Pay,付
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +16,To Datetime,以日期時間
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期時間
 DocType: SMS Settings,SMS Gateway URL,短信閘道的URL
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,日誌維護短信發送狀態
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活動
-DocType: Payment Gateway,Gateway,網關
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,請輸入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
-apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,地址標題是強制性的。
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,課程表刪除：
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,日誌維護短信發送狀態
+DocType: Accounts Settings,Make Payment via Journal Entry,通過日記帳分錄進行付款
+DocType: Item,Inspection Required before Delivery,分娩前檢查所需
+DocType: Item,Inspection Required before Purchase,購買前檢查所需
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活動
+DocType: Fee Component,Fees Category,費用類別
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,請輸入解除日期。
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,報紙出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,選擇財政年度
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
-DocType: Attendance,Attendance Date,考勤日期
+DocType: Company,Chart Of Accounts Template,圖表帳戶模板
+apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
-DocType: Address,Preferred Shipping Address,偏好的送貨地址
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Purchase Invoice Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
-DocType: Item,Valuation Method,估值方法
-apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},找不到匯率{0} {1}
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,馬克半天
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,馬克半天
 DocType: Sales Invoice,Sales Team,銷售團隊
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,重複的條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,重複的條目
+DocType: Program Enrollment Tool,Get Students,讓學生
 DocType: Serial No,Under Warranty,在保修期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[錯誤]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[錯誤]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存，就會顯示出來。
 ,Employee Birthday,員工生日
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,學生考勤批處理工具
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,創業投資
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,這個“學年”一個學期{0}和“術語名稱”{1}已經存在。請修改這些條目，然後再試一次。
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",由於有對項目{0}現有的交易，你不能改變的值{1}
 DocType: UOM,Must be Whole Number,必須是整數
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新的排假（天）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,序列號{0}不存在
 DocType: Sales Invoice Item,Customer Warehouse (Optional),客戶倉庫（可選）
-DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
 DocType: Shopping Cart Settings,Orders,訂單
 DocType: Employee Leave Approver,Leave Approver,休假審批人
+DocType: Assessment Group,Assessment Group Name,評估小組名稱
 DocType: Manufacturing Settings,Material Transferred for Manufacture,轉移至製造的物料
 DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審批人”角色的用戶
+DocType: Landed Cost Item,Receipt Document Type,收據憑證類型
+DocType: Daily Work Summary Settings,Select Companies,選擇公司
 ,Issued Items Against Production Order,生產訂單的已發物料
-DocType: Pricing Rule,Purchase Manager,採購經理
 DocType: Target Detail,Target Detail,目標詳細資訊
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,所有職位
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,所有職位
 DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已開立帳單的百分比(%)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末進入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},金額{0} {1} {2} {3}
 DocType: Account,Depreciation,折舊
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供應商（S）
 DocType: Employee Attendance Tool,Employee Attendance Tool,員工考勤工具
+DocType: Guardian Student,Guardian Student,學生監護人
 DocType: Supplier,Credit Limit,信用額度
 DocType: Production Plan Sales Order,Salse Order Date,Salse訂單日期
+apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,付款項{0}是聯合國聯
 DocType: GL Entry,Voucher No,憑證編號
+,Lead Owner Efficiency,主導效率
+,Lead Owner Efficiency,主導效率
 DocType: Leave Allocation,Leave Allocation,排假
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,{0}物料需求已建立
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,模板條款或合同。
+DocType: Payment Request,Recipient Message And Payment Details,收件人郵件和付款細節
+DocType: Training Event,Trainer Email,教練電子郵件
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,{0}物料需求已建立
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,模板條款或合同。
 DocType: Purchase Invoice,Address and Contact,地址和聯絡方式
+DocType: Cheque Print Template,Is Account Payable,為應付賬款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},股票不能對外購入庫單進行更新{0}
 DocType: Supplier,Last Day of the Next Month,下個月的最後一天
-DocType: Employee,Feedback,反饋
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
-apps/erpnext/erpnext/accounts/party.py +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+DocType: Support Settings,Auto close Issue after 7 days,7天之後自動關閉問題
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,學生申請
+DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
+DocType: Asset,Expected Value After Useful Life,期望值使用壽命結束後
 DocType: Item,Reorder level based on Warehouse,根據倉庫訂貨點水平
 DocType: Activity Cost,Billing Rate,結算利率
 ,Qty to Deliver,數量交付
-DocType: Monthly Distribution Percentage,Month,月
 ,Stock Analytics,庫存分析
 DocType: Maintenance Visit Purpose,Against Document Detail No,對文件詳細編號
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,黨的類型是強制性
 DocType: Quality Inspection,Outgoing,發送
 DocType: Material Request,Requested For,要求
 DocType: Quotation Item,Against Doctype,針對文檔類型
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1}被取消或關閉
+apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1}被取消或關閉
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,從投資淨現金
-,Is Primary Address,是主地址
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,從投資淨現金
 DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},參考＃ {0}於{1}
-apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,管理地址
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,資產{0}必須提交
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +58,Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},參考＃ {0}於{1}
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,折舊淘汰因處置資產
 DocType: Asset,Item Code,產品編號
 DocType: Production Planning Tool,Create Production Orders,建立生產訂單
 DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
 DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),關閉（Dr）
-DocType: Contact,Passive,被動
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),關閉（Dr）
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列號{0}無貨
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,稅務模板賣出的交易。
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,稅務模板賣出的交易。
 DocType: Sales Invoice,Write Off Outstanding Amount,核銷額（億元）
-DocType: Account,Accounts Manager,會計經理
+DocType: School Settings,Current Academic Year,當前學年
+DocType: School Settings,Current Academic Year,當前學年
 DocType: Stock Settings,Default Stock UOM,預設庫存計量單位
+DocType: Asset,Number of Depreciations Booked,預訂折舊數
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},對員工貸款：{0}
 DocType: Production Planning Tool,Create Material Requests,建立物料需求
 DocType: Employee Education,School/University,學校/大學
 DocType: Payment Request,Reference Details,詳細參考訊息
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用壽命結束後必須小於總消費金額
 DocType: Sales Invoice Item,Available Qty at Warehouse,有貨數量在倉庫
-,Billed Amount,帳單金額
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,帳單金額
+DocType: Asset,Double Declining Balance,雙倍餘額遞減
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +170,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+DocType: Student Guardian,Father,父親
+apps/erpnext/erpnext/controllers/accounts_controller.py +572,'Update Stock' cannot be checked for fixed asset sale,“更新股票&#39;不能檢查固定資產出售
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,增加了一些樣本記錄
-apps/erpnext/erpnext/config/hr.py +243,Leave Management,離開管理
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
-DocType: Sales Order,Fully Delivered,完全交付
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,增加了一些樣本記錄
+apps/erpnext/erpnext/config/hr.py +301,Leave Management,離開管理
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,以帳戶分群組
 DocType: Lead,Lower Income,較低的收入
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",根據責任帳號頭，其中利潤/虧損將被黃牌警告
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,生產訂單未創建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
+DocType: Asset,Fully Depreciated,已提足折舊
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,顯著的考勤HTML
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",語錄是建議，你已經發送到你的客戶提高出價
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,序列號和批次
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列號和批次
 DocType: Warranty Claim,From Company,從公司
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,Productions Orders cannot be raised for:,製作訂單不能上調：
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,分鐘
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,評估標準的得分之和必須是{0}。
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,請設置折舊數預訂
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,價值或數量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,製作訂單不能上調：
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,分鐘
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 ,Qty to Receive,未到貨量
 DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
-DocType: Sales Partner,Retailer,零售商
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供應商類型
+DocType: Grading Scale Interval,Grading Scale Interval,分級分度值
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},報銷車輛登錄{0}
+DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
+DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
+apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,所有倉庫
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,所有供應商類型
 DocType: Global Defaults,Disable In Words,禁用詞
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},報價{0}非為{1}類型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,％交付
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,銀行透支戶口
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,銀行透支戶口
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,製作工資單
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,瀏覽BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,抵押貸款
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,期初餘額權益
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,瀏覽BOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,抵押貸款
+DocType: Purchase Invoice,Edit Posting Date and Time,編輯投稿時間
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +98,Please set Depreciation related Accounts in Asset Category {0} or Company {1},請設置在資產類別{0}或公司折舊相關帳戶{1}
+DocType: Academic Term,Academic Year,學年
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,期初餘額權益
 DocType: Appraisal,Appraisal,評價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +134,Email sent to supplier {0},電子郵件發送到供應商{0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave approver must be one of {0},休假審批人必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},休假審批人必須是一個{0}
 DocType: Hub Settings,Seller Email,賣家電子郵件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
-DocType: Workstation Working Hour,Start Time,開始時間
-DocType: Item Price,Bulk Import Help,批量導入幫助
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +256,Select Quantity,選擇數量
+DocType: Training Event,Start Time,開始時間
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +278,Select Quantity,選擇數量
+DocType: Customs Tariff Number,Customs Tariff Number,海關稅則號
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,發送訊息
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,價目表貨幣被換算成客戶基礎貨幣的匯率
 DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額（公司貨幣）
 DocType: Salary Slip,Hour Rate,小時率
@@ -2238,110 +2799,148 @@
 DocType: Project,Project Type,專案類型
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,各種活動的費用
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
-DocType: Item,Inspection Required,需要檢驗
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",設置活動為{0}，因為附連到下面的銷售者的僱員不具有用戶ID {1}
+DocType: Timesheet,Billing Details,結算明細
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,源和目標倉庫必須是不同的
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
 DocType: Sales Order,Fully Billed,完全開票
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},請員工支付設置的默認帳戶{0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手頭現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +123,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 （用於列印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶，並新增/修改對凍結帳戶的會計分錄
 DocType: Serial No,Is Cancelled,被註銷
+DocType: Student Group,Group Based On,基於組
+DocType: Student Group,Group Based On,基於組
 DocType: Journal Entry,Bill Date,帳單日期
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服務項目，類型，頻率和消費金額要求
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},難道你真的想從提交{0}所有的工資單{1}
 DocType: Supplier,Supplier Details,供應商詳細資訊
 DocType: Expense Claim,Approval Status,審批狀態
 DocType: Hub Settings,Publish Items to Hub,發布項目到集線器
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},來源值必須小於列{0}的值
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,電匯
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,全面檢查
-DocType: Sales Order,Recurring Order,經常訂購
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},來源值必須小於列{0}的值
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,電匯
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,全面檢查
+DocType: Vehicle Log,Invoice Ref,發票編號
+DocType: Purchase Order,Recurring Order,經常訂購
 DocType: Company,Default Income Account,預設之收入帳戶
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客戶群組／客戶
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未關閉的財年利潤/損失（信用）
 DocType: Payment Gateway Account,Default Payment Request Message,預設的付款請求訊息
 DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,銀行和支付
 ,Welcome to ERPNext,歡迎來到ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,導致報價
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,導致報價
 DocType: Lead,From Customer,從客戶
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,電話
+apps/erpnext/erpnext/demo/setup/setup_data.py +321,Calls,電話
 DocType: Project,Total Costing Amount (via Time Logs),總成本核算金額（經由時間日誌）
 DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,採購訂單{0}未提交
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,預計
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,採購訂單{0}未提交
+DocType: Customs Tariff Number,Tariff Number,稅則號
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,預計
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
-apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
+apps/erpnext/erpnext/controllers/status_updater.py +163,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
 DocType: Notification Control,Quotation Message,報價訊息
+DocType: Employee Loan,Employee Loan Application,職工貸款申請
 DocType: Issue,Opening Date,開幕日期
+apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,出席已成功標記。
 DocType: Journal Entry,Remark,備註
 DocType: Purchase Receipt Item,Rate and Amount,率及金額
-apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,葉子度假
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},帳戶類型為{0}必須{1}
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,休假及假日
+DocType: School Settings,Current Academic Term,當前學術期限
+DocType: School Settings,Current Academic Term,當前學術期限
 DocType: Sales Order,Not Billed,不發單
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,尚未新增聯絡人。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,尚未新增聯絡人。
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本憑證金額
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,由供應商提出的帳單。
 DocType: POS Profile,Write Off Account,核銷帳戶
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限（天數）
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,從運營的淨現金
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,例如增值稅
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Relation with Guardian1,與關係Guardian1
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,從運營的淨現金
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,例如增值稅
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
+DocType: Student Admission,Admission End Date,錄取結束日期
 DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
+apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,學生組
 DocType: Shopping Cart Settings,Quotation Series,報價系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,請選擇客戶
+DocType: C-Form,I,一世
+DocType: Company,Asset Depreciation Cost Center,資產折舊成本中心
 DocType: Sales Order Item,Sales Order Date,銷售訂單日期
 DocType: Sales Invoice Item,Delivered Qty,交付數量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果選中，各個生產項目的所有孩子將被列入材料請求。
+DocType: Assessment Plan,Assessment Plan,評估計劃
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
 ,Payment Period Based On Invoice Date,基於發票日的付款期
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
+DocType: Assessment Plan,Examiner,檢查員
 DocType: Journal Entry,Stock Entry,存貨分錄
-DocType: Account,Payable,支付
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),債務人（{0}）
+DocType: Payment Entry,Payment References,付款參考
+DocType: Vehicle,Insurance Details,保險詳情
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,請輸入還款期
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),債務人（{0}）
 DocType: Pricing Rule,Margin,餘量
-DocType: Salary Slip,Arrear Amount,欠款金額
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客戶
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Gross Profit %,毛利％
 DocType: Appraisal Goal,Weightage (%),權重（％）
-DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
-DocType: Lead,Address Desc,地址倒序
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,總消費金額是強制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,黨是強制性
+DocType: Journal Entry,JV-,將N-
+DocType: Topic,Topic Name,主題名稱
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
+apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,選擇您的業務的性質。
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生產作業於此進行。
 DocType: Asset Movement,Source Warehouse,來源倉庫
 DocType: Installation Note,Installation Date,安裝日期
+apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
 DocType: Employee,Confirmation Date,確認日期
 DocType: C-Form,Total Invoiced Amount,發票總金額
-DocType: Account,Sales User,銷售用戶
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
+DocType: Account,Accumulated Depreciation,累計折舊
 DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細訊息
 DocType: Lead,Lead Owner,鉛所有者
 DocType: Bin,Requested Quantity,要求的數量
 DocType: Employee,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,工資單編號
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,有錯誤，同時在調度過程：
 DocType: Sales Invoice,Against Income Account,對收入帳戶
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{0}% Delivered,{0}％交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
 DocType: Territory,Territory Targets,境內目標
 DocType: Delivery Note,Transporter Info,貨運公司資訊
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;領土
+apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},請設置在默認情況下公司{0} {1}
+DocType: Cheque Print Template,Starting position from top edge,起價頂邊位置
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,同一個供應商已多次輸入
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,總利潤/虧損
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,採購訂單項目供應商
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,公司名稱不能為公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,信頭的列印模板。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
+DocType: Student Guardian,Student Guardian,學生家長
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
 DocType: POS Profile,Update Stock,庫存更新
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
+DocType: Asset,Journal Entry for Scrap,日記帳分錄報廢
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,請送貨單拉項目
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,日記條目{0}都是非聯
-apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
+apps/erpnext/erpnext/accounts/utils.py +470,Journal Entries {0} are un-linked,日記條目{0}都是非聯
+apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
 DocType: Manufacturer,Manufacturers used in Items,在項目中使用製造商
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,條款
+DocType: Academic Term,Term Name,術語名稱
 DocType: Buying Settings,Purchase Order Required,採購訂單為必要項
 ,Item-wise Sales History,項目明智的銷售歷史
 DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
@@ -2349,244 +2948,328 @@
 DocType: Sales Invoice Item,Delivery Note Item,送貨單項目
 DocType: Expense Claim,Task,任務
 DocType: Purchase Taxes and Charges,Reference Row #,參考列#
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},批號是強制性的項目{0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
+DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
+DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
 ,Stock Ledger,庫存總帳
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},價格：{0}
+DocType: Company,Exchange Gain / Loss Account,兌換收益/損失帳戶
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,員工考勤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},目的必須是一個{0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +79,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",刪除客戶，供應商，銷售夥伴和鉛的參考，因為它是你的公司地址
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Fill the form and save it,填寫表格，並將其保存
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},目的必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,填寫表格，並將其保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下載包含所有物料與其最新庫存狀態的報告，
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社區論壇
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,實際庫存數量
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,實際庫存數量
+DocType: Homepage,"URL for ""All Products""",網址“所有產品”
 DocType: Leave Application,Leave Balance Before Application,離開平衡應用前
 DocType: SMS Center,Send SMS,發送短信
+DocType: Cheque Print Template,Width of amount in word,在字量的寬度
 DocType: Company,Default Letter Head,預設信頭
 DocType: Purchase Order,Get Items from Open Material Requests,從開放狀態的物料需求取得項目
+DocType: Item,Standard Selling Rate,標準銷售率
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,再訂購數量
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +29,Current Job Openings,當前職位空缺
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,當前職位空缺
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
-DocType: Journal Entry,Write Off,註銷項款
-DocType: Timesheet Detail,Operation ID,操作ID
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,註銷項款
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設定，這將成為的所有人力資源的預設形式。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：從{1}
-DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +24,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替換工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
-apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Show tax break-up,展會稅分手
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃窗體/項目/ {0}）缺貨
+apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,資料輸入和輸出
+apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",Stock條目存在對倉庫{0}，因此你不能重新分配或修改
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,沒有發現學生
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,發票發布日期
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,賣
 DocType: Sales Invoice,Rounded Total,整數總計
 DocType: Product Bundle,List items that form the package.,形成包列表項。
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
+DocType: Program Enrollment,School House,學校議院
 DocType: Serial No,Out of AMC,出資產管理公司
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,使維護訪問
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +162,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,請選擇報價
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,請選擇報價
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,使維護訪問
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
 DocType: Company,Default Cash Account,預設的現金帳戶
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',請輸入「預定交付日」
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,沒有學生
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多項目或全開放形式
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',請輸入「預定交付日」
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +77,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+DocType: Training Event,Seminar,研討會
+DocType: Program Enrollment Fee,Program Enrollment Fee,計劃註冊費
 DocType: Item,Supplier Items,供應商項目
 DocType: Opportunity,Opportunity Type,機會型
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,新公司
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},成本中心是必需的“損益”帳戶{0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,交易只能由公司的創建者被刪除
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,不正確的數字總帳條目中找到。你可能會在交易中選擇了錯誤的帳戶。
+DocType: Employee,Prefered Contact Email,首選聯繫郵箱
+DocType: Cheque Print Template,Cheque Width,支票寬度
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,驗證售價反對預訂價或估價RATE項目
+DocType: Program,Fee Schedule,收費表
 DocType: Hub Settings,Publish Availability,發布房源
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,出生日期不能大於今天。
+DocType: Company,Create Chart Of Accounts Based On,創建圖表的帳戶根據
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},學生{0}存在針對學生申請{1}
+apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,時間表
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
+DocType: Cheque Print Template,Scanned Cheque,支票掃描
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,對提交的交易，自動發送電子郵件給聯絡人。
+DocType: Timesheet,Total Billable Amount,總結算金額
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
 DocType: Purchase Order,Customer Contact Email,客戶聯絡電子郵件
 DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
 DocType: Sales Team,Contribution (%),貢獻（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,職責
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,模板
+apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,選擇程序以獲取強制性課程。
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,選擇程序以獲取強制性課程。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,職責
+DocType: Expense Claim Account,Expense Claim Account,報銷賬戶
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,添加用戶
-DocType: Pricing Rule,Item Group,項目群組
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,添加用戶
+DocType: POS Item Group,Item Group,項目群組
+DocType: Item,Safety Stock,安全庫存
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,項{0}必須是固定資產項目
 DocType: Item,Default BOM,預設的BOM
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,請確認重新輸入公司名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,總街貨量金額
-DocType: Timesheet,Total Hours,總時數
+apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,請確認重新輸入公司名稱
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,總街貨量金額
 DocType: Journal Entry,Printing Settings,列印設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽車
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,從送貨單
+DocType: Vehicle,Insurance Company,保險公司
+DocType: Asset Category Account,Fixed Asset Account,固定資產帳戶
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,變量
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,從送貨單
+DocType: Student,Student Email Address,學生的電子郵件地址
 DocType: Timesheet Detail,From Time,從時間
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有現貨：
 DocType: Notification Control,Custom Message,自定義訊息
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行業務
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,學生地址
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,學生地址
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
 DocType: Purchase Invoice Item,Rate,單價
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,實習生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,實習生
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,地址名稱
 DocType: Stock Entry,From BOM,從BOM
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,基本的
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +97,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',請點擊“生成表”
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
+DocType: Assessment Code,Assessment Code,評估準則
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,基本的
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',請點擊“生成表”
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
+DocType: Bank Reconciliation Detail,Payment Document,付款單據
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Slip,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,語錄
-DocType: Hub Settings,Access Token,存取 Token
+apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,沒有學生團體創建的。
 DocType: Purchase Invoice Item,Serial No,序列號
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,請先輸入維護細節
 DocType: Purchase Invoice,Print Language,打印語言
+DocType: Salary Slip,Total Working Hours,總的工作時間
 DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,所有的領土
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,輸入值必須為正
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,所有的領土
 DocType: Purchase Invoice,Items,項目
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,學生已經註冊。
 DocType: Fiscal Year,Year Name,年結名稱
 DocType: Process Payroll,Process Payroll,處理工資
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +234,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 DocType: Product Bundle Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
+apps/erpnext/erpnext/hooks.py +111,Request for Quotations,索取報價
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
+DocType: Student Language,Student Language,學生語言
 apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,訂單/報價％
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,訂單/報價％
+DocType: Student Sibling,Institution,機構
+DocType: Asset,Partially Depreciated,部分貶抑
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
+DocType: Assessment Plan,Supervisor Name,主管名稱
+DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
+DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
 DocType: Tax Rule,Shipping City,航運市
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,該項目是{0}（模板）的變體。屬性將被複製的模板，除非“不複製”設置
-DocType: Account,Purchase User,購買用戶
 DocType: Notification Control,Customize the Notification,自定義通知
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,運營現金流
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,預設地址模板不能被刪除
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,運營現金流
 DocType: Sales Invoice,Shipping Rule,送貨規則
 DocType: Manufacturer,Limited to 12 characters,限12個字符
 DocType: Journal Entry,Print Heading,列印標題
-DocType: Maintenance Schedule,Maintenance Manager,維護經理
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,總計不能為零
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,總計不能為零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
+DocType: Process Payroll,Payroll Frequency,工資頻率
 DocType: Asset,Amended From,從修訂
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,原料
 DocType: Leave Application,Follow via Email,透過電子郵件追蹤
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,廠房和機械設備
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
+DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},價格表{0}的貨幣不與所選貨幣類似{1}
+DocType: Payment Entry,Internal Transfer,內部轉賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
-apps/erpnext/erpnext/stock/get_item_details.py +485,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,請選擇發布日期第一
+apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,請選擇發布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出勤編號系列
 DocType: Leave Control Panel,Carry Forward,發揚
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,與現有的交易成本中心，不能轉換為總賬
 DocType: Department,Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
 ,Produced,生產
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,創建工資單
 DocType: Item,Item Code for Suppliers,對於供應商產品編號
 DocType: Issue,Raised By (Email),由（電子郵件）提出
-DocType: Mode of Payment,General,一般
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,附加信
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
-apps/erpnext/erpnext/public/js/setup_wizard.js +217,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的租稅名稱（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將建立一個可以編輯和增加的標準模板。
+DocType: Training Event,Trainer Name,培訓師姓名
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,附加信
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
+apps/erpnext/erpnext/public/js/setup_wizard.js +222,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的租稅名稱（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將建立一個可以編輯和增加的標準模板。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,匹配付款與發票
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,添加到購物車
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,集團通過
-apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,啟用／禁用的貨幣。
+DocType: Guardian,Interests,興趣
+apps/erpnext/erpnext/config/accounts.py +267,Enable / disable currencies.,啟用／禁用的貨幣。
 DocType: Production Planning Tool,Get Material Request,獲取材質要求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,郵政費用
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 DocType: Quality Inspection,Item Serial No,產品序列號
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,總現
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,建立員工檔案
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,總現
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,會計報表
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,小時
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +141,"Serialized Item {0} cannot be updated \
-					using Stock Reconciliation","系列化項目{0}不能被更新\
-使用庫存調整"
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,小時
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,引線型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,在限制的日期，您無權批准休假
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +380,All these items have already been invoiced,所有這些項目已開具發票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
+DocType: Item,Default Material Request Type,默認材料請求類型
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
 DocType: BOM Replace Tool,The new BOM after replacement,更換後的新物料清單
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,銷售點
+apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,銷售點
+DocType: Payment Entry,Received Amount,收金額
+DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",創建全量，訂單已經忽略數量
 DocType: Account,Tax,稅
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,未標記
 DocType: Production Planning Tool,Production Planning Tool,生產規劃工具
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
 DocType: Quality Inspection,Report Date,報告日期
+DocType: Student,Middle Name,中間名字
 DocType: C-Form,Invoices,發票
+DocType: Batch,Source Document Name,源文檔名稱
 DocType: Job Opening,Job Title,職位
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +373,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,創建用戶
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,訪問報告維修電話。
-DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如：如果你下定100個單位量，而你的許可額度是10%，那麼你可以收到最多110個單位量。
-DocType: POS Profile,Customer Group,客戶群組
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},交際費是強制性的項目{0}
-DocType: Item,Website Description,網站簡介
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,在淨資產收益變化
+DocType: POS Customer Group,Customer Group,客戶群組
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批號（可選）
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批號（可選）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},交際費是強制性的項目{0}
+DocType: BOM,Website Description,網站簡介
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在淨資產收益變化
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的，已經存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期時間
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,收據
 ,Sales Register,銷售登記
+DocType: Daily Work Summary Settings Company,Send Emails At,發送電子郵件在
 DocType: Quotation,Quotation Lost Reason,報價遺失原因
-DocType: Address,Plant,廠
+apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,選擇您的域名
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},交易參考編號{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,無內容可供編輯
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,本月和待活動總結
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活動總結
 DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,還沒有客戶！
+apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,現金流量表
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,執照
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉，如果你還需要包括上一會計年度的資產負債葉本財年
 DocType: GL Entry,Against Voucher Type,對憑證類型
 DocType: Item,Attributes,屬性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,找項目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
-DocType: C-Form,C-Form,C-表
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+DocType: Student,Guardian Details,衛詳細
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,馬克出席了多個員工
+DocType: Vehicle,Chassis No,底盤無
 DocType: Payment Request,Initiated,啟動
 DocType: Production Order,Planned Start Date,計劃開始日期
 DocType: Serial No,Creation Document Type,創建文件類型
 DocType: Leave Type,Is Encash,為兌現
-DocType: Purchase Invoice,Mobile No,手機號碼
 DocType: Leave Allocation,New Leaves Allocated,新的排假
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
+DocType: Budget Account,Budget Amount,預算額
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,商業
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},從日期{0}為僱員{1}不能僱員的接合日期之前{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,商業
+DocType: Payment Entry,Account Paid To,賬戶付至
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的產品或服務。
+DocType: Expense Claim,More Details,更多詳情
 DocType: Supplier Quotation,Supplier Address,供應商地址
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}預算帳戶{1}對{2} {3}是{4}。這將超過{5}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',行{0}＃賬戶的類型必須是&#39;固定資產&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,輸出數量
-apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,系列是強制性的
+apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,系列是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服務
+DocType: Student Sibling,Student ID,學生卡
+apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,活動類型的時間記錄
 DocType: Tax Rule,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
-DocType: Leave Allocation,Unused leaves,未使用的葉子
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,鉻
+DocType: Training Event,Exam,考試
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+DocType: Leave Allocation,Unused leaves,未使用的休假
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,鉻
 DocType: Tax Rule,Billing State,計費狀態
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,轉讓
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1}未連結夥伴帳戶{2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,截止日期是強制性的
-apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
+apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,截止日期是強制性的
+apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
 DocType: Naming Series,Setup Series,設置系列
 DocType: Payment Reconciliation,To Invoice Date,要發票日期
@@ -2594,50 +3277,70 @@
 ,Inactive Customers,不活躍的客戶
 DocType: Landed Cost Voucher,Purchase Receipts,採購入庫
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定價規則被如何應用？
-DocType: Quality Inspection,Delivery Note No,送貨單號
-DocType: Company,Retail,零售
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,客戶{0}不存在
-DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,產品包
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},行{0}：無效參考{1}
+DocType: Stock Entry,Delivery Note No,送貨單號
+DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",如果選中，只有購買最終的原料材料的請求將被包含在材料的要求。否則，父件材料的要求將被創建
+DocType: Cheque Print Template,Message to show,信息顯示
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}：無效參考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,採購稅負和費用模板
 DocType: Upload Attendance,Download Template,下載模板
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：無論是借方或貸方金額需要{2}
 DocType: GL Entry,Remarks,備註
+DocType: Payment Entry,Account Paid From,帳戶支付從
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料產品編號
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
-apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,對於一個序列號安裝記錄
-apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,請指定一個
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,使鉛
+DocType: Stock Settings,Show Barcode Field,顯示條形碼域
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,發送電子郵件供應商
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1}，留下申請期之間不能在此日期範圍內的時期。
+apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,對於一個序列號安裝記錄
+DocType: Guardian Interest,Guardian Interest,衛利息
+apps/erpnext/erpnext/config/hr.py +177,Training,訓練
+DocType: Timesheet,Employee Detail,員工詳細信息
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1電子郵件ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1電子郵件ID
+apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
+apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,對網站的主頁設置
 DocType: Offer Letter,Awaiting Response,正在等待回應
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,以上
+apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},無效的屬性{0} {1}
+DocType: Supplier,Mention if non-standard payable account,如果非標準應付賬款提到
 DocType: Salary Slip,Earning & Deduction,收入及扣除
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,帳戶{0}不能為集團
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,負面評價率是不允許的
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
 DocType: Sales Invoice,Return Against Sales Invoice,射向銷售發票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,項目5
 DocType: Serial No,Creation Time,創作時間
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,總收入
 DocType: Sales Invoice,Product Bundle Help,產品包幫助
-,Monthly Attendance Sheet,每月考勤表
+DocType: Production Order Item,Production Order Item,生產訂單項目
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,沒有資料
-apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,從產品包取得項目
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,帳戶{0}為未啟用
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,報廢資產成本
+apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,從產品包取得項目
+DocType: Asset,Straight Line,直線
+DocType: Project User,Project User,項目用戶
 DocType: GL Entry,Is Advance,為進
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期，是強制性的
-apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +146,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
 DocType: Sales Team,Contact No.,聯絡電話
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”帳戶類型{0}不開放允許入境
+DocType: Bank Reconciliation,Payment Entries,付款項
+DocType: Production Order,Scrap Warehouse,廢料倉庫
+DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
+DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
+DocType: Program Enrollment Tool,Get Students From,讓學生從
 DocType: Hub Settings,Seller Country,賣家國家
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,公佈於網頁上的項目
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公佈於網頁上的項目
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,一群學生在分批
 DocType: Authorization Rule,Authorization Rule,授權規則
 DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
-apps/erpnext/erpnext/templates/generators/item.html +86,Specifications,產品規格
+apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,產品規格
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),總（信用）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服裝及配飾
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,訂購數量
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML／橫幅，將顯示在產品列表的頂部。
@@ -2648,255 +3351,309 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,銷售佣金
 DocType: Offer Letter Term,Value / Description,值/說明
+apps/erpnext/erpnext/controllers/accounts_controller.py +575,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
 DocType: Tax Rule,Billing Country,結算國家
-DocType: Production Order,Expected Delivery Date,預計交貨日期
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
+DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,娛樂費用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,製作材料要求
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打開項目{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,年齡
 DocType: Sales Invoice Timesheet,Billing Amount,開票金額
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,為項目指定了無效的數量{0} 。量應大於0 。
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,申請許可。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+DocType: Vehicle,Last Carbon Check,最後檢查炭
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,法律費用
 DocType: Purchase Invoice,Posting Time,登錄時間
-DocType: Sales Order,% Amount Billed,（％）金額已開立帳單
+DocType: Timesheet,% Amount Billed,（％）金額已開立帳單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,電話費
 DocType: Sales Partner,Logo,標誌
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列，則勾選此項。如果您勾選此項，則將沒有預設值。
-apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},沒有序號{0}的品項
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打開通知
+apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Serial No {0},沒有序號{0}的品項
+DocType: Email Digest,Open Notifications,打開通知
+DocType: Payment Entry,Difference Amount (Company Currency),差異金額（公司幣種）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,直接費用
-apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",在“通知\電子郵件地址”中，{0}是無效的電子郵件地址
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
-DocType: Bank Reconciliation Detail,Cheque Date,支票日期
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
+apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
+DocType: Program Enrollment Tool,Student Applicants,學生申請
+apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,隨著對日
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Probation,緩刑
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
+DocType: Program Enrollment,Enrollment Date,報名日期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,緩刑
+apps/erpnext/erpnext/config/hr.py +115,Salary Components,工資組件
+DocType: Program Enrollment Tool,New Academic Year,新學年
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,返回/信用票據
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率，如果丟失
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,總支付金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,總支付金額
 DocType: Production Order Item,Transferred Qty,轉讓數量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,導航
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,規劃
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,發行
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,規劃
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,發行
 DocType: Project,Total Billing Amount (via Time Logs),總結算金額（經由時間日誌）
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,我們賣這種產品
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,我們賣這種產品
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,供應商編號
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Quantity should be greater than 0,量應大於0
+DocType: Payment Request,Payment Gateway Details,支付網關細節
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,量應大於0
 DocType: Journal Entry,Cash Entry,現金分錄
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子節點可以在&#39;集團&#39;類型的節點上創建
+DocType: Academic Year,Academic Year Name,學年名稱
 DocType: Sales Partner,Contact Desc,聯絡倒序
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",葉似漫不經心，生病等類型
 DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
+DocType: Assessment Result,Student Name,學生姓名
 DocType: Brand,Item Manager,項目經理
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,應付職工薪酬
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
 DocType: Production Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,注：項目{0}多次輸入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +168,Note: Item {0} entered multiple times,注：項目{0}多次輸入
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有聯絡人。
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,公司縮寫
-DocType: GL Entry,Party Type,黨的類型
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,Raw material cannot be same as main Item,原料不能同主品相
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,用戶{0}不存在
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,原料不能同主品相
 DocType: Item Attribute Value,Abbreviation,縮寫
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +171,Payment Entry already exists,付款項目已存在
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪資套版主檔。
 DocType: Leave Type,Max Days Leave Allowed,允許的最長休假天
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,購物車稅收規則設定
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,購物車稅收規則設定
 DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
 ,Sales Funnel,銷售漏斗
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,縮寫是強制性的
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,縮寫是強制性的
+DocType: Project,Task Progress,任務進度
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,車
 ,Qty to Transfer,轉移數量
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,行情到引線或客戶。
 DocType: Stock Settings,Role Allowed to edit frozen stock,此角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,稅務模板是強制性的。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,所有客戶群組
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累計
+apps/erpnext/erpnext/controllers/accounts_controller.py +648,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,稅務模板是強制性的。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
+DocType: Products Settings,Products Settings,產品設置
 DocType: Account,Temporary,臨時
-DocType: Address,Preferred Billing Address,偏好的帳單地址
-DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,秘書
+DocType: Program,Courses,培訓班
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,秘書
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在詞”字段不會在任何交易可見
 DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
 DocType: Pricing Rule,Buying,採購
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
 DocType: POS Profile,Apply Discount On,申請折扣
-,Reqd By Date,REQD按日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,債權人
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
+DocType: Assessment Plan,Assessment Name,評估名稱
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
+apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,研究所縮寫
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
+apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,收費
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 DocType: Lead,Add to calendar on this date,在此日期加到日曆
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,增加運輸成本的規則。
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
+DocType: Item,Opening Stock,打開股票
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是強制性的退回
-DocType: Purchase Order,To Receive,接受
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,收入／支出
 DocType: Employee,Personal Email,個人電子郵件
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,總方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果啟用，系統將自動為發布庫存會計分錄。
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
-DocType: Address,Postal Code,郵政編碼
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,考勤員工{0}已標記為這一天
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","在分
 經由“時間日誌”更新"
 DocType: Customer,From Lead,從鉛
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,發布生產訂單。
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,所需的POS資料，使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,所需的POS資料，使POS進入
 DocType: Hub Settings,Name Token,名令牌
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,至少要有一間倉庫
-DocType: Serial No,Out of Warranty,超出保修期
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: BOM Replace Tool,Replace,更換
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0}針對銷售發票{1}
+DocType: Production Order,Unstopped,通暢了
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0}針對銷售發票{1}
 DocType: Request for Quotation Item,Project Name,專案名稱
-DocType: Supplier,Mention if non-standard receivable account,提到如果不規範應收賬款
+DocType: Customer,Mention if non-standard receivable account,提到如果不規範應收賬款
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,人力資源
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,人力資源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得稅資產
 DocType: BOM Item,BOM No,BOM No.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
 DocType: BOM Replace Tool,The BOM which will be replaced,這將被替換的物料清單
-DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,電子設備
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
 DocType: Production Order,Operation Cost,運營成本
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,從。csv文件上傳考勤
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,優秀的金額
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,為此銷售人員設定跨項目群組間的目標。
 DocType: Stock Settings,Freeze Stocks Older Than [Days],凍結早於[Days]的庫存
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：資產是必須的固定資產購買/銷售
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果兩個或更多的定價規則是基於上述條件發現，優先級被應用。優先權是一個介於0到20，而預設值是零（空）。數字越大，意味著其將優先考慮是否有與相同條件下多個定價規則。
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,會計年度：{0}不存在
 DocType: Currency Exchange,To Currency,到貨幣
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允許以下用戶批准許可申請的區塊天。
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,報銷的類型。
+apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
+apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
 DocType: Item,Taxes,稅
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,支付和未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,支付和未送達
 DocType: Project,Default Cost Center,預設的成本中心
-DocType: Purchase Invoice,End Date,結束日期
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
+DocType: Bank Guarantee,End Date,結束日期
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
+DocType: Budget,Budget Accounts,預算科目
 DocType: Employee,Internal Work History,內部工作經歷
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,累計折舊額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股權投資
+DocType: Employee Loan,Fully Disbursed,全額支付
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
-DocType: Sales Invoice,Exhibition,展覽
-apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",公司是強制性的，因為它是你的公司地址
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,分數不能超過最高得分更大
 DocType: Item Attribute,From Range,從範圍
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Syntax error in formula or condition: {0},式或條件語法錯誤：{0}
+DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作總結公司的設置
+apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一個特定的交易不適用於定價規則，所有適用的定價規則應該被禁用。
-DocType: Company,Domain,網域
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Jobs,工作
+DocType: Assessment Group,Parent Assessment Group,家長評估小組
 ,Sales Order Trends,銷售訂單趨勢
 DocType: Employee,Held On,舉行
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生產項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,生產項目
 ,Employee Information,僱員資料
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),率（ ％ ）
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,財政年度年結日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料（分解）
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,事假
-DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},注： {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,發布日期不能是未來的日期
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
 ,Delivery Note Trends,送貨單趨勢
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,本週的總結
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,本週的總結
+,In Stock Qty,庫存數量
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
+DocType: Program Enrollment,Get Courses,獲取課程
 DocType: GL Entry,Party,黨
 DocType: Sales Order,Delivery Date,交貨日期
 DocType: Opportunity,Opportunity Date,機會日期
 DocType: Purchase Receipt,Return Against Purchase Receipt,採購入庫的退貨
+DocType: Request for Quotation Item,Request for Quotation Item,詢價項目
 DocType: Purchase Order,To Bill,發票待輸入
 DocType: Material Request,% Ordered,% 已訂購
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,計件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,平均。買入價
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",用逗號分隔的輸入電子郵件地址，發票就會自動在特定日期郵寄
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,計件工作
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間（小時）
 DocType: Employee,History In Company,公司歷史
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,簡訊
-DocType: Address,Shipping,航運
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,簡訊
 DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一項目已進入多次
 DocType: Department,Leave Block List,休假區塊清單
-DocType: Customer,Tax ID,稅號
+DocType: Sales Invoice,Tax ID,稅號
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號，此列必須為空白
 DocType: Accounts Settings,Accounts Settings,帳戶設定
 DocType: Customer,Sales Partner and Commission,銷售合作夥伴及佣金
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能是你應該“基於分佈式費用”改變
 DocType: Opportunity,To Discuss,為了討論
+apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0}單位{1}在{2}完成此交易所需。
 DocType: SMS Settings,SMS Settings,簡訊設定
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,臨時帳戶
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
 DocType: Account,Auditor,核數師
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,退貨
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,生產{0}項目
+DocType: Cheque Print Template,Distance from top edge,從頂邊的距離
+apps/erpnext/erpnext/stock/get_item_details.py +297,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
+DocType: Purchase Invoice,Return,退貨
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,付款方式需要進行付款
 DocType: Project Task,Pending Review,待審核
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",資產{0}不能被廢棄，因為它已經是{1}
 DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,客戶ID
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,馬克缺席
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,客戶ID
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,馬克缺席
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的貨幣{1}應等於所選貨幣{2}
 DocType: Journal Entry Account,Exchange Rate,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,銷售訂單{0}未提交
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,新增項目從
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：父帳戶{1}不屬於該公司{2}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,銷售訂單{0}未提交
+DocType: Homepage,Tag Line,標語
+DocType: Fee Component,Fee Component,收費組件
+apps/erpnext/erpnext/config/hr.py +195,Fleet Management,車隊的管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,新增項目從
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：父帳戶{1}不屬於該公司{2}
+apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100％
 DocType: BOM,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
 DocType: Project Task,Task ID,任務ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,股票可以為項目不存在{0}，因為有變種
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,股票可以為項目不存在{0}，因為有變種
 ,Sales Person-wise Transaction Summary,銷售人員相關的交易匯總
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,倉庫{0}不存在
+DocType: Training Event,Contact Number,聯繫電話
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,倉庫{0}不存在
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即註冊ERPNext中心
 DocType: Monthly Distribution,Monthly Distribution Percentages,每月分佈百分比
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所選項目不能批
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,所選項目不能批
+apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",估值率未找到項{0}，這是需要做用於記帳條目{1} {2}。如果該項目交易作為樣本項目{1}，請提及的是，在{1}項目表。否則，請創建傳入股票的交易在項目記錄的項目或提估價率，然後嘗試submiting /取消此條
 DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單物料已交貨的百分比(%)
 DocType: Project,Customer Details,客戶詳細資訊
 DocType: Employee,Reports to,隸屬於
+,Unpaid Expense Claim,未付費用報銷
 DocType: SMS Settings,Enter url parameter for receiver nos,輸入URL參數的接收器號
 DocType: Payment Entry,Paid Amount,支付的金額
+DocType: Assessment Plan,Supervisor,監
+apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,線上
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶，不允許設為信用帳戶
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,品質管理
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
+DocType: Assessment Result Tool,Assessment Result Tool,評價結果工具
+DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
+apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,提交的訂單不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶，不允許設為信用帳戶
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,品質管理
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,項{0}已被禁用
+DocType: Employee Loan,Repay Fixed Amount per Period,償還每期固定金額
+apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
 DocType: Tax Rule,Purchase,採購
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,餘額數量
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,目標不能為空
 DocType: Item Group,Parent Item Group,父項目群組
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}for {1}
-apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,成本中心
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：與排時序衝突{1}
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
+DocType: Training Event Employee,Invited,邀請
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,發現員工{0}對於給定的日期多個活動薪金結構
 DocType: Opportunity,Next Contact,下一頁聯絡人
-apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,設置網關帳戶。
+apps/erpnext/erpnext/config/accounts.py +277,Setup Gateway accounts.,設置網關帳戶。
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資產
+DocType: Payment Entry,Set Exchange Gain / Loss,設置兌換收益/損失
 ,Cash Flow,現金周轉
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
 DocType: Item Group,Default Expense Account,預設費用帳戶
-DocType: Employee,Notice (days),通告（天）
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,學生的電子郵件ID
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,選取要保存發票
 DocType: Employee,Encashment Date,兌現日期
+DocType: Training Event,Internet,互聯網
 DocType: Account,Stock Adjustment,庫存調整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默認情況下存在作業成本的活動類型 -  {0}
 DocType: Production Order,Planned Operating Cost,計劃運營成本
-apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},隨函附上{0}＃{1}
+DocType: Academic Term,Term Start Date,期限起始日期
+apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},隨函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
 DocType: Authorization Rule,Customer / Item Name,客戶／品項名稱
@@ -2909,566 +3666,667 @@
 Note: BOM = Bill of Materials",聚合組** **項目到另一個項目** **的。如果你是捆綁了一定**項目你保持股票的包裝**項目的**，而不是聚集**項這是一個有用的**到一個包和**。包** **項目將有“是股票項目”為“否”和“是銷售項目”為“是”。例如：如果你是銷售筆記本電腦和背包分開，並有一個特殊的價格，如果客戶購買兩個，那麼筆記本電腦+背包將是一個新的產品包項目。注：物料BOM =比爾
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},項目{0}的序列號是強制性的
 DocType: Item Variant Attribute,Attribute,屬性
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,請從指定/至範圍
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,請從指定/至範圍
 DocType: Serial No,Under AMC,在AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
-apps/erpnext/erpnext/config/selling.py +143,Default settings for selling transactions.,銷售交易的預設設定。
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,銷售交易的預設設定。
+DocType: Guardian,Guardian Of ,守護者
+DocType: Grading Scale Interval,Threshold,閾
 DocType: BOM Replace Tool,Current BOM,當前BOM表
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,添加序列號
 apps/erpnext/erpnext/config/support.py +22,Warranty,保證
+DocType: Purchase Invoice,Debit Note Issued,借記發行說明
 DocType: Production Order,Warehouses,倉庫
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,印刷和文具
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}資產不得轉讓
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,此項目是{0}（模板）的變體。
 DocType: Workstation,per hour,每小時
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購買
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫（永續盤存）將在該帳戶下新增。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
-DocType: Company,Distribution,分配
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,已支付的款項
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,專案經理
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,調度
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,已支付的款項
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,專案經理
+,Quoted Item Comparison,項目報價比較
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,調度
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,淨資產值作為
 DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
-DocType: Sales Invoice,Supplier Reference,供應商參考
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,選擇項目，以製造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
 DocType: Item,Material Issue,發料
 DocType: Hub Settings,Seller Description,賣家描述
 DocType: Employee Education,Qualification,合格
 DocType: Item Price,Item Price,商品價格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
+DocType: BOM,Show Items,顯示項目
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,從時間不能超過結束時間大。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,電影和視頻
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
+DocType: Assessment Criteria,Assessment Criteria Group,評估標準組
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
 DocType: Warehouse,Warehouse Name,倉庫名稱
 DocType: Naming Series,Select Transaction,選擇交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,請輸入核准角色或審批用戶
 DocType: Journal Entry,Write Off Entry,核銷進入
 DocType: BOM,Rate Of Materials Based On,材料成本基於
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,取消所有
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},公司在倉庫缺少{0}
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +28,Company is missing in warehouses {0},公司在倉庫缺少{0}
 DocType: POS Profile,Terms and Conditions,條款和條件
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡，你可以保持身高，體重，過敏，醫療問題等
 DocType: Leave Block List,Applies to Company,適用於公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
+DocType: Vehicle,Vehicle,車輛
 DocType: Purchase Invoice,In Words,大寫
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,今天是{0}的生日！
+DocType: POS Profile,Item Groups,項目組
 DocType: Production Planning Tool,Material Request For Warehouse,倉庫材料需求
 DocType: Sales Order Item,For Production,對於生產
-DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,查看任務
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,您的會計年度自
+,Asset Depreciations and Balances,資產折舊和平衡
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},金額{0} {1}從轉移{2}到{3}
 DocType: Sales Invoice,Get Advances Received,取得預先付款
 DocType: Email Digest,Add/Remove Recipients,添加／刪除收件人
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+DocType: Employee Loan,Repay from Salary,從工資償還
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
 DocType: Salary Slip,Salary Slip,工資單
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“至日期”是必需填寫的
+DocType: Lead,Lost Quotation,失落的報價
+DocType: Pricing Rule,Margin Rate or Amount,保證金稅率或稅額
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,“至日期”是必需填寫的
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
 DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
 DocType: Salary Slip,Payment Days,付款日
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +221,Warehouses with child nodes cannot be converted to ledger,與子節點倉庫不能轉換為分類賬
 DocType: BOM,Manage cost of operations,管理作業成本
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選取的交易都是“已提交”時，郵件會自動自動打開，發送電子郵件到相關的“聯絡人”通知相關交易，並用該交易作為附件。用戶可決定是否發送電子郵件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局設置
+DocType: Assessment Result Detail,Assessment Result Detail,評價結果詳細
 DocType: Employee Education,Employee Education,員工教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,在項目組表中找到重複的項目組
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,需要獲取項目細節。
 DocType: Salary Slip,Net Pay,淨收費
 DocType: Account,Account,帳戶
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,已收到序號{0}
 ,Requested Items To Be Transferred,將要轉倉的需求項目
+DocType: Expense Claim,Vehicle Log,車輛登錄
+apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",倉庫{0}不會鏈接到任何帳戶，請創建/鏈接對應的（資產）佔倉庫。
 DocType: Purchase Invoice,Recurring Id,經常性標識
 DocType: Customer,Sales Team Details,銷售團隊詳細
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,永久刪除？
 DocType: Expense Claim,Total Claimed Amount,總索賠額
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潛在的銷售機會。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},無效的{0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,病假
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},無效的{0}
 DocType: Email Digest,Email Digest,電子郵件摘要
 DocType: Delivery Note,Billing Address Name,帳單地址名稱
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百貨
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,首先保存文檔。
+DocType: Warehouse,PIN,銷
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,設置你的ERPNext學校
+DocType: Sales Invoice,Base Change Amount (Company Currency),基地漲跌額（公司幣種）
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,首先保存文檔。
 DocType: Account,Chargeable,收費
 DocType: Company,Change Abbreviation,更改縮寫
 DocType: Expense Claim Detail,Expense Date,犧牲日期
 DocType: Item,Max Discount (%),最大折讓（％）
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最後訂單金額
-DocType: Budget,Warn,警告
+DocType: Daily Work Summary,Email Sent To,電子郵件發送給
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言論，值得一提的努力，應該在記錄中。
 DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Invoice,Raw Materials Supplied,提供供應商原物料
 DocType: Purchase Invoice,Recurring Print Format,經常列印格式
-DocType: C-Form,Series,系列
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
 DocType: Appraisal,Appraisal Template,評估模板
 DocType: Item Group,Item Classification,項目分類
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,業務發展經理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,業務發展經理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,維護訪問目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,期間
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,總帳
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},僱員{0}上離開{1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看訊息
 DocType: Item Attribute Value,Attribute Value,屬性值
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}",電子郵件ID必須是唯一的，且已經存在於 {0}
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,請先選擇{0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
-DocType: Sales Invoice,Commission,佣金
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<H4>默認模板</ H4> 
- <p> <a用途神社href=""http://jinja.pocoo.org/docs/templates/"">模板</A>和地址的所有領域（包括自定義字段如果有的話）將可</ P> 
- <前> <代碼> {{address_line1}}＆LT; BR＆GT; 
- {％，如果address_line2％} {{address_line2}}＆LT; BR＆GT; { ENDIF％ - ％} 
- {{城市}}＆LT; BR＆GT; 
- {％，如果狀態％} {{狀態}}＆LT; BR＆GT; {％ENDIF - ％} {
-％，如果PIN代碼％} PIN：{{PIN碼}}＆LT; BR＆GT; {％ENDIF - ％} 
- {{國家}}＆LT; BR＆GT; 
- {％，如果電話％}電話：{{電話}}＆LT; BR＆GT; { ％ENDIF - ％} 
- {％，如果傳真％}傳真：{{傳真}}＆LT; BR＆GT; {％ENDIF - ％} 
- {％，如果email_id％}電子郵件：{{email_id}}＆LT; BR＆GT {％ENDIF - ％} 
- </代碼> </ PRE>"
+DocType: Salary Detail,Salary Detail,薪酬詳細
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,請先選擇{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
+apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,時間表製造。
+apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
 DocType: Salary Detail,Default Amount,違約金額
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,倉庫系統中未找到
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,本月摘要
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,倉庫系統中未找到
 DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於％d天。
 DocType: Tax Rule,Purchase Tax Template,購置稅模板
 ,Project wise Stock Tracking,項目明智的庫存跟踪
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},維護時間表{0}針對存在{0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),實際的數量（於 來源/目標）
 DocType: Item Customer Detail,Ref Code,參考代碼
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,員工記錄。
-DocType: Payment Gateway,Payment Gateway,支付網關
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,請設置下折舊日期
 DocType: HR Settings,Payroll Settings,薪資設置
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,下單
+DocType: Email Digest,New Purchase Orders,新的採購訂單
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,root不能有一個父成本中心
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,選擇品牌...
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,作為累計折舊
 DocType: Sales Invoice,C-Form Applicable,C-表格適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,倉庫是強制性的
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,倉庫是強制性的
 DocType: Supplier,Address and Contacts,地址和聯絡方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
+apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
+DocType: Program,Program Abbreviation,計劃縮寫
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
 DocType: Warranty Claim,Resolved By,議決
-DocType: Appraisal,Start Date,開始日期
+DocType: Bank Guarantee,Start Date,開始日期
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,離開一段時間。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正確清除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,帳戶{0}：你不能指定自己為父帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,帳戶{0}：你不能指定自己為父帳戶
 DocType: Purchase Invoice Item,Price List Rate,價格列表費率
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,創建客戶報價
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",基於倉庫內存貨的狀態顯示「有或」或「無貨」。
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清單（BOM）
 DocType: Item,Average time taken by the supplier to deliver,採取供應商的平均時間交付
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,評價結果
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小時
 DocType: Project,Expected Start Date,預計開始日期
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,刪除項目，如果收費並不適用於該項目
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：。 smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
-DocType: Payment Entry,Receive,接受
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,語錄：
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完成
 DocType: Employee,Educational Qualification,學歷
 DocType: Workstation,Operating Costs,運營成本
+DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果積累了每月預算超出行動
 DocType: Purchase Invoice,Submit on creation,提交關於創建
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},貨幣{0}必須{1}
+DocType: Asset,Disposal Date,處置日期
+DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工，如果他們沒有假期。回复摘要將在午夜被發送。
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,生產訂單{0}必須提交
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培訓反饋
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,生產訂單{0}必須提交
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},當然是行強制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
-DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +225,Add / Edit Prices,新增 / 編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,新增 / 編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心的圖
 ,Requested Items To Be Ordered,將要採購的需求項目
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,倉庫的公司必須同客戶公司
 DocType: Price List,Price List Name,價格列表名稱
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,總計
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},每日工作總結{0}
+DocType: Employee Loan,Totals,總計
 DocType: BOM,Manufacturing,製造
 ,Ordered Items To Be Delivered,未交貨的訂購項目
 DocType: Account,Income,收入
 DocType: Industry Type,Industry Type,行業類型
-apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,出事了！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,出事了！
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,會計年度{0}不存在
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金額（公司貨幣）
-apps/erpnext/erpnext/config/hr.py +181,Organization unit (department) master.,組織單位（部門）的主人。
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,請輸入有效的手機號
+apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}來完成這一交易單位。
+DocType: Fee Structure,Student Category,學生組
+DocType: Announcement,Student,學生
+apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,組織單位（部門）的主人。
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,請輸入有效的手機號
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在發送前，請填寫留言
-apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,簡介銷售點的
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,請更新簡訊設定
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,無抵押貸款
+DocType: Email Digest,Pending Quotations,待語錄
+apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,簡介銷售點的
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +75,Please Update SMS Settings,請更新簡訊設定
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
+DocType: HR Settings,Max working hours against Timesheet,最大工作時間針對時間表
 DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,數金額金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,數金額金額
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
 DocType: Purchase Receipt Item,Received and Accepted,收貨及允收
 ,Serial No Service Contract Expiry,序號服務合同到期
-DocType: Item,Unit of Measure Conversion,轉換度量單位
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
 DocType: Naming Series,Help HTML,HTML幫助
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
-DocType: Address,Name of person or organization that this address belongs to.,此地址所屬的人或組織的名稱。
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,您的供應商
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,從......收到
+DocType: Student Group Creation Tool,Student Group Creation Tool,學生組創建工具
+DocType: Item,Variant Based On,基於變異對
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,您的供應商
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
+DocType: Request for Quotation Item,Supplier Part No,供應商部件號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總&#39;不能扣除
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,從......收到
 DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}：從{0}給 {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}：從{0}給 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
 DocType: Issue,Content Type,內容類型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,項：{0}不存在於系統中
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,您無權設定值凍結
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,項：{0}不存在於系統中
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 DocType: Payment Reconciliation,From Invoice Date,從發票日期
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,結算幣種必須等於要么默認業公司的貨幣或一方賬戶貨幣
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,離開兌現
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,它有什麼作用？
-DocType: Delivery Note,To Warehouse,到倉庫
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,到倉庫
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有學生入學
 ,Average Commission Rate,平均佣金比率
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能標記為未來的日期
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
 DocType: Purchase Taxes and Charges,Account Head,帳戶頭
-apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,更新額外成本來計算項目的到岸成本
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,電子的
+apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,更新額外成本來計算項目的到岸成本
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,電子的
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的組織的其餘部分用戶。您還可以添加邀請客戶到您的門戶網站通過從聯繫人中添加它們
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差（輸出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},用戶ID不為員工設置{0}
+DocType: Vehicle,Vehicle Value,汽車衡
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
 DocType: Item,Customer Code,客戶代碼
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},生日提醒{0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},生日提醒{0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
-DocType: Buying Settings,Naming Series,命名系列
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},難道你真的想要提交的所有{1}年{0}月的工資單
+DocType: Timesheet,Production Detail,生產細節
 DocType: Target Detail,Target Qty,目標數量
 DocType: Shopping Cart Settings,Checkout Settings,結帳設定
 DocType: Attendance,Present,現在
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送貨單{0}不能提交
 DocType: Notification Control,Sales Invoice Message,銷售發票訊息
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
 DocType: Sales Order Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,專案活動／任務。
+DocType: Vehicle Log,Refuelling Details,加油詳情
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工資條
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,最後購買率未找到
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+DocType: Sales Invoice Timesheet,Billing Hours,結算時間
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,默認BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,點擊項目將其添加到此處
+DocType: Fees,Program Enrollment,招生計劃
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},請設置{0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},請設置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
 DocType: Employee,Health Details,健康細節
 DocType: Offer Letter,Offer Letter Terms,報價函條款
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
+DocType: Payment Entry,Allocate Payment Amount,分配付款金額
 DocType: Employee External Work History,Salary,薪水
 DocType: Serial No,Delivery Document Type,交付文件類型
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,對上面選擇的條件提交所有工資單
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}項目已同步
-DocType: Sales Order,Partly Delivered,部分交付
-DocType: Sales Invoice,Existing Customer,現有客戶
 DocType: Email Digest,Receivables,應收賬款
+DocType: Lead Source,Lead Source,鉛源
 DocType: Customer,Additional information regarding the customer.,對於客戶的其他訊息。
 DocType: Quality Inspection Reading,Reading 5,閱讀5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,活動名稱是必需的
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒絕序列號
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,新年的開始日期或結束日期與{0}重疊。為了避免請將公司
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果串聯設定並且序列號沒有在交易中提到，然後自動序列號將在此基礎上創建的系列。如果你總是想明確提到序號為這個項目。留空。"
 DocType: Upload Attendance,Upload Attendance,上傳考勤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +129,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +306,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
-DocType: Bank Reconciliation Detail,Amount,量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設定電子郵件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,Guardian1手機號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
 DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,每日提醒
 DocType: Products Settings,Home Page is Products,首頁是產品頁
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},稅收規範衝突{0}
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,New Account Name,新帳號名稱
+,Asset Depreciation Ledger,資產減值總帳
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},稅收規範衝突{0}
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新帳號名稱
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料供應成本
 DocType: Selling Settings,Settings for Selling Module,設置銷售模塊
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,顧客服務
-DocType: Homepage Featured Product,Thumbnail,縮略圖
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,顧客服務
+DocType: BOM,Thumbnail,縮略圖
 DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,報價候選作業。
 DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +83,Total allocated leaves are more than days in the period,分配的總葉多天的期限
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,分配的總葉多天的期限
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
-apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,會計交易的預設設定。
+apps/erpnext/erpnext/config/accounts.py +257,Default settings for accounting transactions.,會計交易的預設設定。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
+DocType: Purchase Invoice Item,Stock Qty,庫存數量
+DocType: Purchase Invoice Item,Stock Qty,庫存數量
+DocType: Production Order,Source Warehouse (for reserving Items),源數據倉庫（用於保留項目）
+DocType: Employee Loan,Repayment Period in Months,在月還款期
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,錯誤：沒有有效的身份證？
 DocType: Naming Series,Update Series Number,更新序列號
 DocType: Account,Equity,公平
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“損益”帳戶類型{2}不允許進入開
 DocType: Sales Order,Printing Details,印刷詳情
 DocType: Task,Closing Date,截止日期
 DocType: Sales Order Item,Produced Quantity,生產的產品數量
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,工程師
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,工程師
+DocType: Journal Entry,Total Amount Currency,總金額幣種
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},於列{0}需要產品編號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Item Code required at Row No {0},於列{0}需要產品編號
 DocType: Sales Partner,Partner Type,合作夥伴類型
 DocType: Purchase Taxes and Charges,Actual,實際
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
+apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,時間表的任務。
 DocType: Purchase Invoice,Against Expense Account,對費用帳戶
 DocType: Production Order,Production Order,生產訂單
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,安裝注意{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +270,Installation Note {0} has already been submitted,安裝注意{0}已提交
+DocType: Bank Reconciliation,Get Payment Entries,獲取付款項
 DocType: Quotation Item,Against Docname,對Docname
 DocType: SMS Center,All Employee (Active),所有員工（活動）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,選擇發票會自動生成期間
-DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item Reorder,Re-Order Level,重新排序級別
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,兼任
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,甘特圖
 DocType: Employee,Applicable Holiday List,適用假期表
-DocType: Employee,Cheque,支票
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,報告類型是強制性的
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +61,Series Updated,系列更新
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,報告類型是強制性的
 DocType: Item,Serial Number Series,序列號系列
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
+apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批發
 DocType: Issue,First Responded On,首先作出回應
 DocType: Website Item Group,Cross Listing of Item in multiple groups,在多組項目的交叉上市
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +88,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,間隙更新日期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,不甘心成功
+DocType: Request for Quotation Supplier,Download PDF,下載PDF
 DocType: Production Order,Planned End Date,計劃的結束日期
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,項目的存儲位置。
-DocType: Tax Rule,Validity,有效性
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,發票金額
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,項目的存儲位置。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供應商&gt;供應商類型
+DocType: Request for Quotation,Supplier Detail,供應商詳細
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},誤差在式或條件：{0}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,發票金額
 DocType: Attendance,Attendance,出勤
-DocType: BOM,Materials,物料
+apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,庫存產品
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取，則該列表將被加到每個應被應用到的部門。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +513,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目標倉庫不能相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,稅務模板購買交易。
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存，就會顯示出來。
-DocType: Period Closing Voucher,Period Closing Voucher,期末券
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,價格表主檔
 DocType: Task,Review Date,評論日期
 DocType: Purchase Invoice,Advance Payments,預付款
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +158,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
-apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,重複％的“通知用電子郵件地址”尚未指定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}為項目{4}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
+apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,重複％的“通知用電子郵件地址”尚未指定
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+DocType: Vehicle Service,Clutch Plate,離合器壓盤
 DocType: Company,Round Off Account,四捨五入賬戶
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,行政開支
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 DocType: Appraisal Goal,Score Earned,得分
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,通知期
+DocType: Asset Category,Asset Category Name,資產類別名稱
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,集團或Ledger ，借方或貸方，是特等帳戶
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新銷售人員的姓名
 DocType: Packing Slip,Gross Weight UOM,毛重計量單位
-DocType: Email Digest,Receivables / Payables,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Invoice,對銷售發票
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +469,Credit Account,信用賬戶
+DocType: Bin,Reserved Qty for Production,預留數量生產
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
+DocType: Asset,Frequency of Depreciation (Months),折舊率（月）
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,信用賬戶
 DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,顯示零值
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,顯示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
+apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,設置一個簡單的網站為我的組織
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,請輸入父成本中心
 DocType: Delivery Note,Print Without Amount,列印表單時不印金額
-apps/erpnext/erpnext/controllers/buying_controller.py +80,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,折舊日期
+apps/erpnext/erpnext/controllers/buying_controller.py +79,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
 DocType: Issue,Support Team,支持團隊
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),到期（天數）
 DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
-DocType: Batch,Batch,批量
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,餘額
+DocType: Program Enrollment,Batch,批量
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,餘額
+DocType: Room,Seating Capacity,座位數
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
+DocType: Assessment Result,Total Score,總得分
 DocType: Journal Entry,Debit Note,繳費單
 DocType: Stock Entry,As per Stock UOM,按庫存計量單位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,沒有過期
+DocType: Batch,Source Document Type,源文檔類型
+DocType: Batch,Source Document Type,源文檔類型
 DocType: Journal Entry,Total Debit,借方總額
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,預設成品倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,銷售人員
-DocType: Sales Invoice,Cold Calling,自薦
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +78,Sales Person,銷售人員
 DocType: SMS Parameter,SMS Parameter,短信參數
-apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,預算和成本中心
-DocType: Maintenance Schedule Item,Half Yearly,半年度
+apps/erpnext/erpnext/config/accounts.py +202,Budget and Cost Center,預算和成本中心
 DocType: Lead,Blog Subscriber,網誌訂閱者
+DocType: Guardian,Alternate Number,備用號碼
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年製作學生團體，請留空
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年製作學生團體，請留空
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果選中，則總數。工作日將包括節假日，這將縮短每天的工資的價值
 DocType: Purchase Invoice,Total Advance,預付款總計
-apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,處理工資單
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,該期限結束日期不能超過期限開始日期。請更正日期，然後再試一次。
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,報價
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,報價計數
+,BOM Stock Report,BOM庫存報告
+DocType: Stock Reconciliation Item,Quantity Difference,數量差異
+apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,處理工資單
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,設為失落
+DocType: Cheque Print Template,Signatory Position,簽署的位置
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,設為失落
+DocType: Timesheet,Total Billable Hours,總計費時間
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收貨注意事項
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,這是基於對這個顧客的交易。詳情請參閱以下時間表
 DocType: Supplier,Credit Days Based On,信貸天基於
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}：分配金額{1}必須小於或等於輸入付款金額{2}
 DocType: Tax Rule,Tax Rule,稅務規則
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,在工作站的工作時間以外計畫時間日誌。
+apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,在排隊的客戶
+DocType: Student,Nationality,國籍
 ,Items To Be Requested,需求項目
 DocType: Purchase Order,Get Last Purchase Rate,取得最新採購價格
 DocType: Company,Company Info,公司資訊
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,選擇或添加新客戶
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,成本中心需要預訂費用報銷
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用（資產）
-DocType: Sales Invoice,Frequency,頻率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,借方科目
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,這是基於該員工的考勤
 DocType: Fiscal Year,Year Start Date,年結開始日期
 DocType: Attendance,Employee Name,員工姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),整數總計（公司貨幣）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
-DocType: Purchase Common,Purchase Common,採購普通
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,員工福利
-DocType: Sales Invoice,Is POS,是POS機
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,購買金額
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,供應商報價{0}創建
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,結束年份不能啟動年前
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,員工福利
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Production Order,Manufactured Qty,生產數量
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,客戶提出的賬單。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
 DocType: Maintenance Schedule,Schedule,時間表
 DocType: Account,Parent Account,父帳戶
 DocType: Quality Inspection Reading,Reading 3,閱讀3
 ,Hub,樞紐
 DocType: GL Entry,Voucher Type,憑證類型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,價格表未找到或被禁用
-DocType: Expense Claim,Approved,批准
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,價格表未找到或被禁用
+DocType: Employee Loan Application,Approved,批准
 DocType: Pricing Rule,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",選擇“Yes”將提供一個獨特的身份，以這個項目的每個實體可在序列號主觀看。
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
-DocType: Employee,Education,教育
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+DocType: Guardian,Guardian,監護人
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,德爾
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
-DocType: Address,Office,辦公室
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,請選擇員工記錄第一。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,請輸入您的費用帳戶
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,請選擇員工記錄第一。
+DocType: POS Profile,Account for Change Amount,帳戶漲跌額
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：參考文件類型必須是採購訂單之一，購買發票或日記帳分錄
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設定的一個變體，除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購／製造詳細資訊
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,批量庫存
+DocType: Assessment Group,Assessment Group,評估小組
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,批量庫存
 DocType: Employee,Contract End Date,合同結束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
+DocType: Sales Invoice Item,Discount and Margin,折扣和保證金
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基於上述標準拉銷售訂單（待定提供）
-DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小數量
-DocType: Asset Movement,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,計劃數量
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,總稅收
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
 DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
+apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超過年度開始日期。請更正日期，然後再試一次。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
 DocType: Notification Control,Purchase Receipt Message,採購入庫單訊息
+DocType: BOM,Scrap Items,廢物品
 DocType: Production Order,Actual Start Date,實際開始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,記錄項目移動。
 DocType: Hub Settings,Hub Settings,中心設定
-DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,加入作業
-apps/erpnext/erpnext/accounts/party.py +253,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
+DocType: Asset,Is Existing Asset,是對現有資產
+DocType: Salary Detail,Statistical Component,統計組成部分
+DocType: Salary Detail,Statistical Component,統計組成部分
 ,Monthly Salary Register,月薪註冊
 DocType: Warranty Claim,If different than customer address,如果與客戶地址不同
 DocType: BOM Operation,BOM Operation,BOM的操作
+DocType: School Settings,Validate the Student Group from Program Enrollment,從計劃入學驗證學生組
+DocType: School Settings,Validate the Student Group from Program Enrollment,從計劃入學驗證學生組
 DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,轉讓資產
 DocType: POS Profile,POS Profile,POS簡介
-apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
-apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,購買者
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,淨工資不能為負
+DocType: Training Event,Event Name,事件名稱
+apps/erpnext/erpnext/config/schools.py +39,Admission,入場
+apps/erpnext/erpnext/config/accounts.py +226,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
+apps/erpnext/erpnext/stock/get_item_details.py +137,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
+DocType: Asset,Asset Category,資產類別
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,購買者
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,淨工資不能為負
 DocType: SMS Settings,Static Parameters,靜態參數
+DocType: Assessment Plan,Room,房間
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,材料到供應商
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,消費稅發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,消費稅發票
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現％不止一次
 DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
 DocType: Employee Attendance Tool,Marked Attendance,明顯考勤
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,流動負債
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,發送群發短信到您的聯絡人
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,發送群發短信到您的聯絡人
+DocType: Program,Program Name,程序名稱
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考慮稅收或收費
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,實際數量是強制性
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,信用卡
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
+DocType: Employee Loan,Loan Type,貸款類型
+DocType: Scheduling Tool,Scheduling Tool,調度工具
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,庫存交易的預設設定。
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,庫存交易的預設設定。
 DocType: Purchase Invoice,Next Date,下一個日期
 DocType: Employee Education,Major/Optional Subjects,大/選修課
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,請輸入稅費
 DocType: Sales Invoice Item,Drop Ship,直接發運給客戶
+DocType: Training Event,Attendees,與會者
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
+DocType: Academic Term,Term End Date,期限結束日期
 DocType: Hub Settings,Seller Name,賣家名稱
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
 DocType: Item Group,General Settings,一般設定
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,原始貨幣和目標貨幣不能相同
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,原始貨幣和目標貨幣不能相同
 DocType: Stock Entry,Repack,重新包裝
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在繼續之前，您必須儲存表單
 DocType: Item Attribute,Numeric Values,數字值
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,附加標誌
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,附加標誌
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,庫存水平
 DocType: Customer,Commission Rate,佣金比率
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部門封鎖請假申請。
-apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics（分析）
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必須是接收之一，收費和內部轉賬
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,root不能被編輯。
+DocType: Payment Entry,Cheque/Reference No,支票/參考編號
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,root不能被編輯。
+DocType: Item,Units of Measure,測量的單位
 DocType: Manufacturing Settings,Allow Production on Holidays,允許假日生產
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,股本
+DocType: Shopping Cart Settings,Show Public Attachments,顯示公共附件
 DocType: Packing Slip,Package Weight Details,包裝重量詳情
 DocType: Payment Gateway Account,Payment Gateway Account,網路支付閘道帳戶
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成後重定向用戶選擇的頁面。
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,請選擇一個csv文件
+DocType: Company,Existing Company,現有的公司
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,請選擇一個csv文件
+DocType: Student Leave Application,Mark as Present,標記為現
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Designer,設計師
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,條款及細則範本
+apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色產品
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,設計師
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+DocType: Program,Program Code,程序代碼
+DocType: Terms and Conditions,Terms and Conditions Help,條款和條件幫助
 ,Item-wise Purchase Register,項目明智的購買登記
 DocType: Batch,Expiry Date,到期時間
 ,Supplier Addresses and Contacts,供應商的地址和聯絡方式
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,Please select Category first,請先選擇分類
+,accounts-browser,賬戶瀏覽器
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +13,Project master.,專案主持。
+apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允許對賬單或過度訂貨，庫存設置或更新項目“津貼”。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,讓學生批
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,從物料清單取得項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
+apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,材料清單
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,未提交工資單
+,Stock Summary,股票摘要
+apps/erpnext/erpnext/config/accounts.py +241,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清單
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
+DocType: BOM Operation,Operating Cost(Company Currency),營業成本（公司貨幣）
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
+apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 98315cd..3c0dba4 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -57,7 +57,7 @@
 ,Batch Item Expiry Status,批处理项到期状态
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,银行汇票
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,显示变体
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,显示变体
 DocType: Academic Term,Academic Term,学期
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,数量
@@ -73,6 +73,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付（天）
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
@@ -116,19 +117,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,广告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Employee,Married,已婚
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允许{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,从获得项目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有列出项目
 DocType: Payment Reconciliation,Reconcile,对账
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
 DocType: Process Payroll,Make Bank Entry,创建银行分录
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,未找到项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,未找到项目
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,薪酬结构缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
@@ -137,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,库存报告
 DocType: Warehouse,Warehouse Detail,仓库详细信息
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,该期限结束日期不能晚于学年年终日期到这个词联系在一起（学年{}）。请更正日期，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
 DocType: Vehicle Service,Brake Oil,刹车油
 DocType: Tax Rule,Tax Type,税收类型
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
 DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,选择BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,选择BOM
 DocType: SMS Log,SMS Log,短信日志
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付品目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
@@ -191,11 +194,11 @@
 DocType: Training Result Employee,Grade,年级
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,年薪
 DocType: Daily Work Summary,Daily Work Summary,每日工作总结
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1}已冻结
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1}已冻结
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,库存费用
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,选择目标仓库
@@ -204,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",你想更新考勤？ <br>现任：{0} \ <br>缺席：{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
 DocType: Products Settings,Show Products as a List,产品展示作为一个列表
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",下载此模板，填写相应的数据后上传。所有的日期和员工出勤记录将显示在模板里。
@@ -223,12 +226,12 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,计提折旧进入
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,请求类型
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使员工
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,使员工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,广播
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,执行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作详情。
 DocType: Serial No,Maintenance Status,维护状态
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要对供应商应付账款{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要对供应商支付的账款{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,项目和定价
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},总时间：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
@@ -239,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,规划维护访问。
 DocType: SMS Settings,Enter url parameter for message,请输入消息的URL参数
 DocType: POS Profile,Customer Groups,客户群
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,财务报表
 DocType: Guardian,Students,学生们
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,规则适用的定价和折扣。
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于购买或出售
@@ -264,7 +268,7 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Company,Default Payroll Payable Account,默认情况下，应付职工薪酬帐户
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,更新电子邮件组
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,更新电子邮件组
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
 DocType: Course Schedule,Instructor Name,导师姓名
@@ -276,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,从融资净现金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",localStorage的满了，没救
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
@@ -302,7 +306,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量（通过时间表）
 DocType: Item Website Specification,Item Website Specification,项目网站规格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,银行条目
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
@@ -321,7 +325,7 @@
 DocType: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,项目{0}已取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,项目{0}已取消
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
@@ -374,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,送货单
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售资产的成本
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0}输入了两次税项
-DocType: Grade Interval,Min Score,闵分数
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0}输入了两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本周和待活动总结
 DocType: Student Applicant,Admitted,录取
 DocType: Workstation,Rent Cost,租金成本
@@ -392,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,银行/现金对一方或内部转让交易
 DocType: Shipping Rule,Valid for Countries,有效的国家
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货考虑
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
@@ -402,13 +405,13 @@
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,选择项目
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
 DocType: C-Form Invoice Detail,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
@@ -439,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,询价
 DocType: Salary Slip Timesheet,Working Hours,工作时间
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,创建一个新的客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,创建一个新的客户
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,创建采购订单
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,创建采购订单
 ,Purchase Register,购买注册
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,适用费用
@@ -485,7 +488,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
@@ -507,6 +510,7 @@
 DocType: Packing Slip,From Package No.,起始包号
 DocType: Item Attribute,To Range,为了范围
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,证券及存款
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改变估值方法，因为有一些项目没有自己的估值方法的交易
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,总叶分配是必须的
 DocType: Job Opening,Description of a Job Opening,空缺职位的说明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今天待定活动
@@ -534,7 +538,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妆品
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,购买
@@ -544,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
 DocType: Sales Order,To Deliver,为了提供
 DocType: Purchase Invoice Item,Item,产品
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,序号项目不能是一个分数
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,序号项目不能是一个分数
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,管理转包
@@ -570,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,安装单项目
 DocType: Production Plan Item,Pending Qty,待定数量
 DocType: Budget,Ignore,忽略
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} 未激活
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} 未激活
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},短信发送至以下号码：{0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,设置检查尺寸打印
 DocType: Salary Slip,Salary Slip Timesheet,工资单时间表
@@ -579,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,总委员会
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
 DocType: Buying Settings,Purchase Receipt Required,外购入库单要求
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的，如果打开股票进入
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的，如果打开股票进入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,请选择公司和党的第一型
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,创建销售订单
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,创建销售订单
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
@@ -602,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,简历附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,销售退货
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,销售退货
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：总分配叶{0}应不低于已核定叶{1}期间
 DocType: Announcement,Posted By,发布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
@@ -612,7 +616,7 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,调配数量不能为负
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,请设定公司
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,请设定公司
@@ -624,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,销售发票时间表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
 DocType: Process Payroll,Select Payment Account to make Bank Entry,选择付款账户，使银行进入
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,添加到知识库
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,提案写作
 DocType: Payment Entry Deduction,Payment Entry Deduction,输入付款扣除
@@ -665,8 +669,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,与关系Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,经理
 DocType: Payment Entry,Payment From / To,支付自/至
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,日期范围
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于当前余额为客户着想。信用额度是ATLEAST {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于当前余额为客户着想。信用额度是ATLEAST {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,相同的品目已输入多次
 DocType: SMS Settings,Receiver Parameter,接收人参数
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
@@ -676,7 +679,7 @@
 DocType: Issue,Resolution Date,决议日期
 DocType: Student Batch Name,Batch Name,批名
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,注册
 DocType: Selling Settings,Customer Naming By,客户命名方式
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,将显示学生每月学生出勤记录报告为存在
@@ -720,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,学生出勤
 DocType: Sales Invoice Timesheet,Time Sheet,时间表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,反吹为原材料的开
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,请输入项目细节
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,请输入项目细节
 DocType: Interest,Interest,利益
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,售前
 DocType: Purchase Receipt,Other Details,其他详细信息
@@ -738,7 +741,7 @@
 ,Absent Student Report,缺席学生报告
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
 DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,项目有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,项目有变体。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,公司{0}不存在
@@ -747,8 +750,6 @@
 DocType: Serial No,Warranty Expiry Date,保修到期日
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,请选择程序
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,请选择程序
 DocType: Project,Estimated Cost,估计成本
@@ -767,7 +768,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}不是一个库存品目
 DocType: Mode of Payment Account,Default Account,默认帐户
 DocType: Payment Entry,Received Amount (Company Currency),收到的款项（公司币种）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,请选择每周休息日
 DocType: Production Order Operation,Planned End Time,计划结束时间
 ,Sales Person Target Variance Item Group-Wise,品目组特定的销售人员目标差异
@@ -842,7 +843,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Request for Quotation Supplier,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},警告：无效的附件{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
@@ -855,8 +856,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,未找到任何雇员
 DocType: Supplier Quotation,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,学生组已经更新。
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,学生组已经更新。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,学生组已经更新。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,学生组已经更新。
 DocType: SMS Center,All Customer Contact,所有的客户联系人
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,通过CSV文件上传库存余额
 DocType: Warehouse,Tree Details,树详细信息
@@ -867,8 +868,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不属于公司{3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
@@ -884,7 +885,7 @@
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,课程表
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,课程表
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: HR Settings,Enter retirement age in years,在年内进入退休年龄
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,目标仓库
@@ -892,7 +893,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
 DocType: Stock Entry,STE-,甜菊
 DocType: Upload Attendance,Import Attendance,导入考勤记录
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,所有品目群组
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,净利润/亏损
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
@@ -903,7 +904,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,采购订单到付款
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',“打开”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Notification Control,Delivery Note Message,送货单留言
@@ -919,7 +920,7 @@
 DocType: Item Reorder,Re-Order Qty,再次订货数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 DocType: Pricing Rule,Price or Discount,价格或折扣
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外购入库单项目表总的相关费用必须是相同的总税费
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外购入库单项目表总的相关费用必须是相同的总税费
 DocType: Sales Team,Incentives,奖励
 DocType: SMS Log,Requested Numbers,请求号码
 DocType: Production Planning Tool,Only Obtain Raw Materials,只有取得原料
@@ -977,8 +978,7 @@
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Fee Structure,Components,组件
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},请输入项目资产类别{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,项目变体{0}已更新
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},请输入项目资产类别{0}
 DocType: Quality Inspection Reading,Reading 6,阅读6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
@@ -1030,8 +1030,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学品
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默认银行/现金帐户时，会选择此模式可以自动在工资日记条目更新。
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",甲级码间隔{0}随着年级的间隔为其他等级重叠。请检查间隔{0}和{1}，然后重试
 DocType: BOM,Raw Material Cost(Company Currency),原料成本（公司货币）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大于{1} {2}中使用的速率
@@ -1044,7 +1042,7 @@
 DocType: BOM Website Item,BOM Website Item,BOM网站项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
 DocType: Timesheet Detail,Bill,法案
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{2} {3}）
@@ -1058,7 +1056,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},订单类型必须是一个{0}
 DocType: Lead,Next Contact Date,下次联络日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,开放数量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,对于涨跌额请输入帐号
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,对于涨跌额请输入帐号
 DocType: Student Batch Name,Student Batch Name,学生批名
 DocType: Holiday List,Holiday List Name,假期列表名称
 DocType: Repayment Schedule,Balance Loan Amount,平衡贷款额
@@ -1078,10 +1076,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},请指定{0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}不能为负
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,折扣
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,折扣
 DocType: Asset,Total Number of Depreciations,折旧总数
 DocType: Sales Invoice Item,Rate With Margin,利率保证金
 DocType: Sales Invoice Item,Rate With Margin,利率保证金
@@ -1110,7 +1108,7 @@
 DocType: Lead,Organization Name,组织名称
 DocType: Tax Rule,Shipping State,运输状态
 ,Projected Quantity as Source,预计库存量的来源
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,包括非股票项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,销售费用
@@ -1118,7 +1116,7 @@
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,邮编
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,邮编
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,制作Stock条目
@@ -1162,7 +1160,7 @@
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,从范围必须小于要范围
 DocType: Global Defaults,Global Defaults,全局默认值
@@ -1197,11 +1195,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,请输入产品代码来获得批号
 DocType: Stock Settings,Default Item Group,默认品目群组
 DocType: Employee Loan,Partially Disbursed,部分已支付
-DocType: Grading Structure,Grading System Name,分级系统名称
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',成本中心：品目代码‘
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的销售人员将在此日期收到联系客户的提醒
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一项目不能输入多次。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
@@ -1240,11 +1237,11 @@
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Announcement,All Students,所有学生
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,项目{0}必须是一个非库存项目
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,项目{0}必须是一个非库存项目
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看总帐
 DocType: Grading Scale,Intervals,间隔
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,学生手机号码
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
@@ -1285,8 +1282,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,销售订单{0}无效
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",抱歉，公司不能合并
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,小
@@ -1310,7 +1307,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,同步主数据
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 DocType: Student Applicant,AP,美联社
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,这是一个root群组，无法被编辑。
@@ -1328,7 +1325,7 @@
 DocType: Student Group Student,Group Roll Number,组卷编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
@@ -1355,7 +1352,7 @@
 DocType: Depreciation Schedule,Journal Entry,日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0}操作中的单品
 DocType: Workstation,Workstation Name,工作站名称
-DocType: Grade Interval,Grade Code,等级代码
+DocType: Grading Scale Interval,Grade Code,等级代码
 DocType: POS Item Group,POS Item Group,POS项目组
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
@@ -1372,7 +1369,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,硬件
 DocType: Sales Order,Recurring Upto,经常性高达
 DocType: Attendance,HR Manager,人力资源经理
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,请选择一个公司
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,请选择一个公司
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,您需要启用购物车
@@ -1388,7 +1385,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
 DocType: Maintenance Schedule Item,No of Visits,访问数量
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,马克考勤
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,马克考勤
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},针对{1}存在维护计划{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,招生学生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
@@ -1437,13 +1435,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,项目{0}不是库存项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,项目{0}不是库存项目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Detail,Depends on Leave Without Pay,依赖于无薪休假
 DocType: Pricing Rule,"Higher the number, higher the priority",数字越大，优先级越高
 ,Purchase Invoice Trends,购买发票趋势
 DocType: Employee,Better Prospects,更好的前景
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}数量。请选择具有{3}数量的其他批次，或将该行拆分成多个行，以便从多个批次中传递/发布
 DocType: Vehicle,License Plate,牌照
 DocType: Appraisal,Goals,目标
 DocType: Warranty Claim,Warranty / AMC Status,保修/ 年度保养合同状态
@@ -1461,18 +1460,18 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,雇员不能向自己报告。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果科目被冻结，则只有特定用户才能创建分录。
 DocType: Email Digest,Bank Balance,银行存款余额
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
 DocType: Job Opening,"Job profile, qualifications required etc.",工作概况，要求的学历等。
 DocType: Journal Entry Account,Account Balance,账户余额
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,税收规则进行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
 apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,我们购买这些物件
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户对应收账款{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户支付的应收账款{2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税费和费用（公司货币）
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,显示未关闭的会计年度的盈亏平衡
 DocType: Shipping Rule,Shipping Account,送货账户
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: 帐户{2}无效
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,制作销售订单，以帮助你计划你的工作和按时交付
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,制作销售订单，以帮助你计划你的工作和按时交付
 DocType: Quality Inspection,Readings,阅读
 DocType: Stock Entry,Total Additional Costs,总额外费用
 DocType: Course Schedule,SH,SH
@@ -1483,7 +1482,7 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Asset Movement,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,装箱单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,短信网关的设置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
@@ -1509,7 +1508,7 @@
 DocType: Sales Invoice,Source,源
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,没有在支付表中找到记录
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}冲突{1}在{2} {3}
 DocType: Student Attendance Tool,Students HTML,学生HTML
@@ -1527,7 +1526,7 @@
 DocType: Student,Date of Leaving,离开日期
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,建立潜在客户
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,建立潜在客户
 DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
@@ -1555,7 +1554,7 @@
 DocType: Program Enrollment Tool,Program Enrollments,计划扩招
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,默认仓库需要选中的项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,箱
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,可能的供应商
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,组织机构
@@ -1589,7 +1588,7 @@
 DocType: Quality Inspection Reading,Reading 4,阅读4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},默认BOM {0}未找到项目{1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,公司开支报销
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}无法支票日期前{2}
 DocType: Company,Default Holiday List,默认假期列表
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：从时间和结束时间{1}是具有重叠{2}
@@ -1601,20 +1600,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任务
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,请报价
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,请报价
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他报告
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
 DocType: SMS Center,Receiver List,接收人列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,搜索项目
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,现金净变动
 DocType: Assessment Plan,Grading Scale,分级量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,已经完成
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
@@ -1652,7 +1651,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,搜集
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,资产运动记录{0}创建
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,资产运动记录{0}创建
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
 DocType: Journal Entry,Entry Type,条目类型
 ,Customer Credit Balance,客户贷方余额
@@ -1694,7 +1693,6 @@
 DocType: Student Sibling,Studying in Same Institute,就读于同一研究所
 DocType: Territory,Territory Manager,区域经理
 DocType: Packed Item,To Warehouse (Optional),仓库（可选）
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品编号&gt;商品组&gt;品牌
 DocType: Payment Entry,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
@@ -1704,9 +1702,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,查看你的购物车
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,市场营销开支
 ,Item Shortage Report,项目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,接下来折旧日期是强制性的新资产
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,接下来折旧日期是强制性的新资产
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,为每个批次分离基于课程的组
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,为每个批次分离基于课程的组
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,此品目的一件。
@@ -1723,9 +1721,7 @@
 DocType: Course Assessment Criteria,Weightage,权重
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的损益“账户成本中心{2}。请设置为公司默认的成本中心。
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新建联系人
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
@@ -1752,20 +1748,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,基于JSON格式对账
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表，并使用电子表格应用程序进行打印。
 DocType: Purchase Invoice Item,Batch No,批号
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},无法找到汇率{0} {1}的关键日期{2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 DocType: Student Group Instructor,Student Group Instructor,学生组教练
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2手机号码
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,主
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,变体
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,主
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Email Digest,Annual Expenses,年度支出
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -1785,7 +1780,6 @@
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,估价
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
-DocType: Grading Structure,Grading Intervals,分级间隔
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,请输入
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill为项目{0} {1}超过{2}。要允许对帐单，请在购买设置中设置
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
@@ -1798,16 +1792,17 @@
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,付款
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,管理您的订单
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,管理您的订单
 DocType: Production Order Operation,Actual Time and Cost,实际时间和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
 DocType: Employee,Salutation,称呼
 DocType: Course,Course Abbreviation,当然缩写
 DocType: Student Leave Application,Student Leave Application,学生请假申请
 DocType: Item,Will also apply for variants,会同时应用于变体
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},员工{0}上半天{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,于
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在销售时捆绑品目。
 DocType: Quotation Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
@@ -1817,7 +1812,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,协理
 DocType: Asset Movement,Asset Movement,资产运动
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,新的车
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,新的车
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,项目{0}不是一个序列项目
 DocType: SMS Center,Create Receiver List,创建接收人列表
 DocType: Vehicle,Wheels,车轮
@@ -1849,10 +1844,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,禁止对创作生产订单的时间日志。操作不得对生产订单追踪
 DocType: Student,Student Mobile Number,学生手机号码
 DocType: Item,Has Variants,有变体
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},您已经选择从项目{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},您已经选择从项目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,批号是必需的
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,批号是必需的
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批号是必需的
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批号是必需的
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 DocType: Purchase Invoice,Recurring Invoice,常用发票
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,项目管理
@@ -1860,7 +1855,7 @@
 DocType: Budget,Fiscal Year,财政年度
 DocType: Vehicle Log,Fuel Price,燃油价格
 DocType: Budget,Budget,预算
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
 DocType: Student Admission,Application Form Route,申请表路线
@@ -1892,7 +1887,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,到期日不能前于过账日期
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,关税与税项
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,参考日期请输入
@@ -1951,7 +1946,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,对
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,选择BOM和数量生产
 DocType: Asset,Depreciation Schedule,折旧计划
 DocType: Bank Reconciliation Detail,Against Account,针对科目
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
@@ -1968,13 +1963,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
 DocType: Purchase Order,Delivered,已交付
 ,Vehicle Expenses,车辆费用
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
+DocType: Serial No,Invoice Details,发票明细
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
 DocType: Employee Loan,Loan Amount,贷款额度
@@ -1998,7 +1994,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：订购数量必须是1，因为项目是固定资产。请使用单独的行多数量。
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,集团以非组
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
 DocType: Loan Type,Loan Name,贷款名称
@@ -2010,6 +2006,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
 DocType: Production Order,Skip Material Transfer,跳过材料转移
 DocType: Production Order,Skip Material Transfer,跳过材料转移
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,无法为关键日期{2}查找{0}到{1}的汇率。请手动创建货币兑换记录
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,您的会计年度结束于
 DocType: POS Profile,Price List,价格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
@@ -2047,9 +2044,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,项目{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
 DocType: Student Admission,Eligibility,合格
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
@@ -2090,7 +2087,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0}是{1}的必填项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0}是{1}的必填项
 DocType: Process Payroll,Fortnightly,半月刊
 DocType: Currency Exchange,From Currency,源货币
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
@@ -2106,7 +2103,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子项不应该是一个产品包。请删除项目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,银行业
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,添加时间表
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,添加时间表
 DocType: Vehicle Service,Service Item,服务项目
 DocType: Bank Guarantee,Bank Guarantee,银行担保
 DocType: Bank Guarantee,Bank Guarantee,银行担保
@@ -2115,7 +2112,7 @@
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Grading Scale,Grading Scale Intervals,分级刻度间隔
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能在货币：{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能用货币单位：{3}
 DocType: Production Order,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,项目特定的折扣
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,财务账目的树。
@@ -2156,8 +2153,8 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,请指定一个国家的这种运输规则或检查全世界运输
 DocType: Stock Entry,Total Incoming Value,总传入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,借记是必需的
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,借记是必需的
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
 DocType: Offer Letter Term,Offer Term,要约期限
 DocType: Quality Inspection,Quality Manager,质量经理
@@ -2191,14 +2188,14 @@
 DocType: Opportunity,Lost Reason,丧失原因
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,请输入收据凭证
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,请输入收据凭证
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,所有品目已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 DocType: Project,External,外部
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
 DocType: Vehicle Log,VLOG.,VLOG。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},生产订单创建：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},生产订单创建：{0}
 DocType: Branch,Branch,分支
 DocType: Guardian,Mobile Number,手机号码
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
@@ -2207,7 +2204,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
 DocType: Scheduling Tool,Student Batch,学生批
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客户
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,使学生
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,使学生
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
 DocType: Leave Block List Date,Block Date,禁离日期
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,现在申请
@@ -2231,8 +2228,9 @@
 DocType: SMS Log,Sent To,发给
 DocType: Payment Request,Make Sales Invoice,创建销售发票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,软件
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,接下来跟日期不能过去
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下来跟日期不能过去
 DocType: Company,For Reference Only.,仅供参考。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,选择批号
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},无效的{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,预付款总额
@@ -2246,7 +2244,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,箱号不能为0
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,物料清单
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,仓库
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,仓库
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
 DocType: Item,End of Life,寿命结束
@@ -2262,8 +2260,8 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,转印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件是超过限制，通过{0} {1}项{4}。你在做另一个{3}对同一{2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1039,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -2274,7 +2272,7 @@
 DocType: Budget Account,Budget Account,预算科目
 DocType: Quality Inspection,Verified By,认证机构
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",因为已有交易不能改变公司的默认货币，请先取消交易。
-DocType: Grade Interval,Grade Description,等级说明
+DocType: Grading Scale Interval,Grade Description,等级说明
 DocType: Stock Entry,Purchase Receipt No,购买收据号码
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保证金
 DocType: Process Payroll,Create Salary Slip,建立工资单
@@ -2312,7 +2310,7 @@
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,应收账款净额变化
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,补假
 DocType: Offer Letter,Accepted,已接受
@@ -2325,7 +2323,7 @@
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
 DocType: Employee,Previous Work Experience,以前的工作经验
@@ -2334,12 +2332,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0}必须返回文档中负
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0}在返回文档中必须为负
 ,Minutes to First Response for Issues,分钟的问题第一个反应
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,该机构的名称要为其建立这个系统。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会计分录冻结截止至此日期，除了以下角色禁止录入/修改。
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,项目状态
 DocType: UOM,Check this to disallow fractions. (for Nos),要对编号禁止分数，请勾选此项。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,创建以下生产订单：
@@ -2362,6 +2360,7 @@
 DocType: Email Digest,How frequently?,多经常？
 DocType: Purchase Receipt,Get Current Stock,获取当前库存
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清单树
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品编号&gt;商品组&gt;品牌
 DocType: Student,Joining Date,入职日期
 ,Employees working on a holiday,员工在假期工作
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,马克现在
@@ -2455,7 +2454,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生产
 DocType: Guardian,Occupation,占用
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计（数量）
 DocType: Sales Invoice,This Document,本文档
 DocType: Installation Note Item,Installed Qty,已安装数量
@@ -2478,8 +2477,8 @@
 DocType: Notification Control,Sales Order Message,销售订单信息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",设置例如公司，货币，当前财政年度等的默认值
 DocType: Payment Entry,Payment Type,针对选择您要分配款项的发票。
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
 DocType: Process Payroll,Select Employees,选择雇员
 DocType: Opportunity,Potential Sales Deal,潜在的销售交易
 DocType: Payment Entry,Cheque/Reference Date,支票/参考日期
@@ -2496,7 +2495,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},全球POS档案{0}的公司已经创建{1}
 DocType: Purchase Order,Ref SQ,参考SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,更换项目/物料清单中的所有材料明细表
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,收到文件必须提交
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,收到文件必须提交
 DocType: Purchase Invoice Item,Received Qty,收到数量
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,没有支付，未送达
@@ -2509,7 +2508,7 @@
 ,To Produce,以生产
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工资表
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,使用户
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,使用户
 DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的名称
 DocType: Bin,Reserved Quantity,保留数量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,请输入有效的电子邮件地址
@@ -2523,11 +2522,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,残疾人模板必须不能默认模板
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一页
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤，评估和费用
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤，评估和费用
 DocType: Payment Entry,Total Allocated Amount,总拨款额
 DocType: Item Reorder,Material Request Type,物料申请类型
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural日记条目从{0}薪金{1}
@@ -2550,7 +2550,7 @@
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,轨道信息通过行业类型。
 DocType: Item Supplier,Item Supplier,项目供应商
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,请输入产品编号，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
@@ -2560,6 +2560,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',会发邮件有关该事件员工状态“打开”
 DocType: Task,Depends on Tasks,取决于任务
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客户群组
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,可以显示附件，而不启用购物车
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
@@ -2572,12 +2573,10 @@
 DocType: Sales Invoice,Debit To,入借
 DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,事务后实际数量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},没有找到之间的工资单{0}和{1}
 ,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生入学
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1}已禁用
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1}已禁用
 DocType: Supplier,Billing Currency,结算货币
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,特大号
@@ -2594,7 +2593,7 @@
 DocType: Homepage Featured Product,Homepage Featured Product,首页推荐产品
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,所有评估组
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新仓库名称
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),总{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),总{0}（{1}）
 DocType: C-Form Invoice Detail,Territory,区域
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
@@ -2612,7 +2611,7 @@
 DocType: Price List,Price List Master,价格表大师
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
 ,S.O. No.,销售订单号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},请牵头建立客户{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},请牵头建立客户{0}
 DocType: Price List,Applicable for Countries,适用于国家
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申请“已批准”和“拒绝”，就可以提交
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},学生组名称是强制性的行{0}
@@ -2693,7 +2692,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,库存的会计分录
 DocType: Vehicle Service,Engine Oil,机油
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,产品{0}不存在
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,产品{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Employee Loan,Loan Details,贷款详情
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成数量必须大于零。
@@ -2758,7 +2757,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
 DocType: Assessment Result Tool,Result HTML,结果HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,到期
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,新增学生
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,新增学生
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
@@ -2823,7 +2822,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,限制交叉
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,这个“学年”一个学期{0}和“术语名称”{1}已经存在。请修改这些条目，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
 DocType: UOM,Must be Whole Number,必须是整数
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,序列号{0}不存在
@@ -2867,7 +2866,7 @@
 DocType: Supplier,Last Day of the Next Month,下个月的最后一天
 DocType: Support Settings,Auto close Issue after 7 days,7天之后自动关闭问题
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,学生申请
 DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
@@ -2895,7 +2894,7 @@
 DocType: Asset,Item Code,项目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,为基于活动的组手动选择学生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,为基于活动的组手动选择学生
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
@@ -2913,7 +2912,7 @@
 DocType: Production Planning Tool,Create Material Requests,创建物料需要
 DocType: Employee Education,School/University,学校/大学
 DocType: Payment Request,Reference Details,详细参考信息
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用寿命结束后必须小于总消费金额
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用寿命结束后必须小于总消费金额
 DocType: Sales Invoice Item,Available Qty at Warehouse,库存可用数量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,已开票金额
 DocType: Asset,Double Declining Balance,双倍余额递减
@@ -2934,19 +2933,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},所需物品的采购订单号{0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,生产订单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,生产订单未创建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
 DocType: Asset,Fully Depreciated,已提足折旧
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列号和批次
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,请设置折旧数预订
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,请设置折旧数预订
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,价值或数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,制作订单不能上调：
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,分钟
@@ -3077,7 +3076,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生组
 DocType: Shopping Cart Settings,Quotation Series,报价系列
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,请选择客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,请选择客户
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
 DocType: Sales Order Item,Sales Order Date,销售订单日期
@@ -3096,19 +3095,18 @@
 DocType: Vehicle,Insurance Details,保险详情
 DocType: Account,Payable,支付
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,请输入还款期
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),债务人（{0}）
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),债务人（{0}）
 DocType: Pricing Rule,Margin,利润
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客户
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,毛利％
 DocType: Appraisal Goal,Weightage (%),权重（％）
 DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,总消费金额是强制性
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,总消费金额是强制性
 DocType: Lead,Address Desc,地址倒序
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,党是强制性
 DocType: Journal Entry,JV-,将N-
 DocType: Topic,Topic Name,主题名称
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
-DocType: Grading Structure,Grade Intervals,间隔级
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,选择您的业务的性质。
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生产流程进行的地方。
 DocType: Asset Movement,Source Warehouse,源仓库
@@ -3137,6 +3135,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 DocType: Territory,Territory Targets,区域目标
 DocType: Delivery Note,Transporter Info,转运信息
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},请设置在默认情况下公司{0} {1}
 DocType: Cheque Print Template,Starting position from top edge,起价顶边位置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,同一个供应商已多次输入
@@ -3190,7 +3189,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,再订购数量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,当前职位空缺
 DocType: Company,Stock Adjustment Account,库存调整账户
-DocType: Journal Entry,Write Off,抹杀
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,抹杀
 DocType: Timesheet Detail,Operation ID,操作ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系统用户的（登录）ID，将作为人力资源表单的默认ID。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：来自{1}
@@ -3201,8 +3200,8 @@
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) 超出了库存
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,展会税分手
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,展会税分手
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",Stock条目存在对仓库{0}，因此你不能重新分配或修改
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,没有发现学生
@@ -3214,14 +3213,15 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
 DocType: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,请选择报价
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,请选择报价
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,创建维护访问
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,请选择报价
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,请选择报价
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,创建维护访问
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
 DocType: Company,Default Cash Account,默认现金账户
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,没有学生
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多项目或全开放形式
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',请输入“预产期”
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
@@ -3268,9 +3268,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,项目{0}必须是固定资产项目
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,项目{0}必须是固定资产项目
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,请确认重新输入公司名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
@@ -3293,7 +3293,7 @@
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
 DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,实习生
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,地址名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,地址名称
 DocType: Stock Entry,From BOM,从BOM
 DocType: Assessment Code,Assessment Code,评估准则
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,基本
@@ -3318,7 +3318,7 @@
 DocType: Purchase Invoice,Print Language,打印语言
 DocType: Salary Slip,Total Working Hours,总的工作时间
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,输入值必须为正
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,输入值必须为正
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,所有的区域
 DocType: Purchase Invoice,Items,项目
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生已经注册。
@@ -3338,17 +3338,15 @@
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
-DocType: Grading Structure,Grading Structure,分级结构
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
 DocType: Tax Rule,Shipping City,航运市
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,该项目是{0}（模板）的变体。属性将被复制的模板，除非“不复制”设置
 DocType: Notification Control,Customize the Notification,自定义通知
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,运营现金流
 DocType: Sales Invoice,Shipping Rule,配送规则
@@ -3371,6 +3369,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},品目{0}没有默认的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,请选择发布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
 DocType: Leave Control Panel,Carry Forward,顺延
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
 DocType: Department,Days for which Holidays are blocked for this department.,此部门的禁离日
@@ -3399,7 +3398,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Quality Inspection,Item Serial No,项目序列号
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,建立员工档案
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,建立员工档案
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,总现
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,会计报表
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,小时
@@ -3414,8 +3413,6 @@
 DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
 apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,销售点
 DocType: Payment Entry,Received Amount,收金额
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",创建全量，订单已经忽略数量
 DocType: Account,Tax,税项
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,未标记
@@ -3428,7 +3425,7 @@
 DocType: Batch,Source Document Name,源文档名称
 DocType: Batch,Source Document Name,源文档名称
 DocType: Job Opening,Job Title,职位
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,创建用户
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,创建用户
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,公克
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,保养电话的现场报告。
@@ -3440,8 +3437,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: BOM,Website Description,网站简介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在净资产收益变化
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,收据
 ,Sales Register,销售记录
@@ -3452,16 +3449,18 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活动总结
 DocType: Customer Group,Customer Group Name,客户群组名称
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,还没有客户！
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,现金流量表
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Item,Attributes,属性
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
 DocType: Student,Guardian Details,卫详细
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,马克出席了多个员工
@@ -3486,14 +3485,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',行{0}＃账户的类型必须是&#39;固定资产&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,系列是必须项
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
 DocType: Student Sibling,Student ID,学生卡
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,活动类型的时间记录
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
 DocType: Training Event,Exam,考试
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,信用
 DocType: Tax Rule,Billing State,计费状态
@@ -3526,7 +3525,7 @@
 DocType: Payment Entry,Account Paid From,帐户支付从
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料产品编号
 DocType: Journal Entry,Write Off Based On,核销基于
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,使铅
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,使铅
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,打印和文具
 DocType: Stock Settings,Show Barcode Field,显示条形码域
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,发送电子邮件供应商
@@ -3542,6 +3541,7 @@
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,以上
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},无效的属性{0} {1}
+DocType: Supplier,Mention if non-standard payable account,如果非标准应付账款提到
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,负评估价格是不允许的
@@ -3577,7 +3577,7 @@
 DocType: Program Enrollment Tool,Get Students From,让学生从
 DocType: Hub Settings,Seller Country,卖家国家
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公布于网页上的项目
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,一群学生在分批
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,一群学生在分批
 DocType: Authorization Rule,Authorization Rule,授权规则
 DocType: Sales Invoice,Terms and Conditions Details,条款和条件详情
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,产品规格
@@ -3637,7 +3637,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,缓刑
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,工资组件
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,返回/信用票据
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,返回/信用票据
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,总支付金额
 DocType: Production Order Item,Transferred Qty,转让数量
@@ -3678,6 +3678,7 @@
 ,Sales Funnel,销售管道
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,缩写是强制性的
 DocType: Project,Task Progress,任务进度
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,车
 ,Qty to Transfer,转移数量
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
@@ -3711,7 +3712,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,收费
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
 DocType: Item,Opening Stock,期初库存
@@ -3729,7 +3730,7 @@
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Program Enrollment Tool,Enroll Students,招生
 DocType: Hub Settings,Name Token,名称令牌
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
@@ -3740,7 +3741,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0}不允许销售发票{1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,项目名称
-DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
+DocType: Customer,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Production Order,Required Items,所需物品
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
@@ -3771,6 +3772,7 @@
 DocType: Item,Taxes,税
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Bank Guarantee,End Date,结束日期
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,库存交易
 DocType: Budget,Budget Accounts,预算科目
@@ -3835,7 +3837,7 @@
 DocType: Customer,Sales Partner and Commission,销售合作伙伴及佣金
 DocType: Employee Loan,Rate of Interest (%) / Year,利息（％）/年的速率
 ,Project Quantity,工程量
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能是你应该“基于分布式费用”改变
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能是你应该“基于分布式费用”改变
 DocType: Opportunity,To Discuss,为了讨论
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
 DocType: Loan Type,Rate of Interest (%) Yearly,利息率的比例（％）年
@@ -3844,7 +3846,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,{0}项目已经产生
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,{0}项目已产生
 DocType: Cheque Print Template,Distance from top edge,从顶边的距离
 apps/erpnext/erpnext/stock/get_item_details.py +297,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,回报
@@ -3858,7 +3860,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,马克缺席
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的货币{1}应等于所选货币{2}
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,销售订单{0}未提交
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,车队的管理
@@ -3875,7 +3877,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,仓库{0}不存在
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即注册ERPNext中心
 DocType: Monthly Distribution,Monthly Distribution Percentages,月度分布比例
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,所选项目不能有批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,所选项目不能有批次
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",估值率未找到项{0}，这是需要做用于记帐条目{1} {2}。如果该项目交易作为样本项目{1}，请提及的是，在{1}项目表。否则，请创建传入股票的交易在项目记录的项目或提估价率，然后尝试submiting /取消此条
 DocType: Delivery Note,% of materials delivered against this Delivery Note,此出货单% 的材料已交货。
 DocType: Project,Customer Details,客户详细信息
@@ -3892,7 +3894,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,提交的订单不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,质量管理
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,项目{0}已被禁用
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,项目{0}已被禁用
 DocType: Employee Loan,Repay Fixed Amount per Period,偿还每期固定金额
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},请输入量的项目{0}
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
@@ -3919,7 +3921,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,学生的电子邮件ID
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,选取要保存发票
 DocType: Employee,Encashment Date,兑现日期
 DocType: Training Event,Internet,互联网
 DocType: Account,Stock Adjustment,库存调整
@@ -3953,6 +3955,7 @@
 DocType: Purchase Invoice,Debit Note Issued,借记发行说明
 DocType: Production Order,Warehouses,仓库
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}资产不得转让
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,此项目是{0}（模板）的变体。
 DocType: Workstation,per hour,每小时
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,购买
 DocType: Announcement,Announcement,公告
@@ -3968,7 +3971,7 @@
 DocType: Account,Receivable,应收账款
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,选择项目，以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,选择项目，以制造
 apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
 DocType: Item,Material Issue,发料
 DocType: Hub Settings,Seller Description,卖家描述
@@ -3981,7 +3984,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,订购
 DocType: Salary Detail,Component,零件
 DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,请输入角色核准或审批用户
@@ -4016,7 +4019,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
 DocType: Employee Loan,Repay from Salary,从工资偿还
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
@@ -4034,7 +4037,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,评价结果详细
 DocType: Employee Education,Employee Education,雇员教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,在项目组表中找到重复的项目组
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,这是需要获取项目详细信息。
 DocType: Salary Slip,Net Pay,净支付金额
 DocType: Account,Account,账户
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列号{0}已收到过
@@ -4043,7 +4046,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",仓库{0}不会链接到任何帐户，请创建/链接对应的（资产）占仓库。
 DocType: Purchase Invoice,Recurring Id,经常性ID
 DocType: Customer,Sales Team Details,销售团队详情
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,永久删除？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,永久删除？
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},无效的{0}
@@ -4054,13 +4057,14 @@
 DocType: Warehouse,PIN,销
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,设置你的ERPNext学校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地涨跌额（公司币种）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,没有以下仓库的会计分录
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,首先保存文档。
 DocType: Account,Chargeable,应课
 DocType: Company,Change Abbreviation,更改缩写
 DocType: Expense Claim Detail,Expense Date,报销日期
 DocType: Item,Max Discount (%),最大折扣(%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最后订单金额
+DocType: Task,Is Milestone,是里程碑
 DocType: Daily Work Summary,Email Sent To,电子邮件发送给
 DocType: Budget,Warn,警告
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论，值得一提的努力，应该在记录中。
@@ -4093,11 +4097,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
 DocType: Tax Rule,Purchase Tax Template,购置税模板
 ,Project wise Stock Tracking,项目明智的库存跟踪
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},维护计划{0}已存在{0}中
 DocType: Stock Entry Detail,Actual Qty (at source/target),实际数量（源/目标）
 DocType: Item Customer Detail,Ref Code,参考代码
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,雇员记录。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,请设置下折旧日期
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,请设置下折旧日期
 DocType: HR Settings,Payroll Settings,薪资设置
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,下订单
@@ -4120,7 +4123,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正确清除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
 DocType: Purchase Invoice Item,Price List Rate,价格列表费率
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,创建客户报价
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,创建客户报价
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清单(BOM)
 DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
@@ -4142,7 +4145,7 @@
 DocType: Asset,Disposal Date,处置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职职工，如果他们没有假期。回复摘要将在午夜被发送。
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培训反馈
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,生产订单{0}必须提交
@@ -4150,7 +4153,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},当然是行强制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,添加/编辑价格
 DocType: Batch,Parent Batch,父母批
 DocType: Batch,Parent Batch,父母批
 DocType: Cheque Print Template,Cheque Print Template,支票打印模板
@@ -4195,7 +4198,7 @@
 DocType: Item,Variant Based On,基于变异对
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,您的供应商
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
 DocType: Request for Quotation Item,Supplier Part No,供应商部件号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,从......收到
@@ -4205,7 +4208,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
@@ -4214,20 +4217,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,离开兑现
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,贵公司的标语
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,到仓库
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有学生入学
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: School House,House Name,房名
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,电气
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
@@ -4236,7 +4239,7 @@
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0}的生日提醒
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保险开始日期应小于保险终止日期
@@ -4251,7 +4254,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
 DocType: Vehicle Log,Odometer,里程表
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM不包含任何库存项目
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
@@ -4264,7 +4267,8 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
 DocType: Sales Invoice Timesheet,Billing Hours,结算时间
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,默认BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,点击项目将其添加到此处
 DocType: Fees,Program Enrollment,招生计划
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},请设置{0}
@@ -4279,7 +4283,7 @@
 DocType: Employee External Work History,Salary,工资
 DocType: Serial No,Delivery Document Type,交货文档类型
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,根据上述所选条件提交工资单
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}项已同步
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}项目已同步
 DocType: Sales Order,Partly Delivered,部分交付
 DocType: Email Digest,Receivables,应收款
 DocType: Lead Source,Lead Source,线索来源
@@ -4366,7 +4370,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
-DocType: Grade Interval,Grade Interval,间隔级
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,间隙更新日期
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,拆分批
@@ -4375,6 +4378,7 @@
 DocType: Request for Quotation Supplier,Download PDF,下载PDF
 DocType: Production Order,Planned End Date,计划的结束日期
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,物件的存储位置。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Request for Quotation,Supplier Detail,供应商详细
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},公式或条件错误:{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,已开票金额
@@ -4420,7 +4424,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,设置一个简单的网站为我的组织
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,请输入父成本中心
@@ -4480,7 +4484,7 @@
 ,Items To Be Requested,要申请的项目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,选择或添加新客户
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,成本中心需要预订费用报销
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,这是基于该员工的考勤
@@ -4493,13 +4497,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,购买金额
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,供应商报价{0}创建
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,结束年份不能启动年前
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,结束年份不能启动年前
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,员工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
 DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
@@ -4508,15 +4512,17 @@
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,价格表未找到或禁用
 DocType: Employee Loan Application,Approved,已批准
 DocType: Pricing Rule,Price,价格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
 DocType: Guardian,Guardian,监护人
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
 DocType: Employee,Education,教育
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,德尔
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,改性
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
@@ -4553,7 +4559,7 @@
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,带工艺
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 DocType: Asset,Is Existing Asset,是对现有资产
 DocType: Salary Detail,Statistical Component,统计组成部分
 DocType: Salary Detail,Statistical Component,统计组成部分
@@ -4609,7 +4615,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,附加标志
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,库存水平
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部门禁止假期申请。
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics（分析）
@@ -4622,6 +4628,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
 DocType: Sales Order,Customer's Purchase Order Date,客户的采购订单日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,股本
+DocType: Shopping Cart Settings,Show Public Attachments,显示公共附件
 DocType: Packing Slip,Package Weight Details,包装重量详情
 DocType: Payment Gateway Account,Payment Gateway Account,支付网关账户
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后重定向用户选择的页面。
@@ -4646,7 +4653,7 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,让学生批
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,让学生批
 DocType: Leave Type,Is Carry Forward,是否顺延假期
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,从物料清单获取品目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
@@ -4665,8 +4672,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。